From e7c8bfba32f6eb01a178be2f9ac002b4241a382f Mon Sep 17 00:00:00 2001
From: Nathaniel van Diepen <Eeems@users.noreply.github.com>
Date: Sat, 16 Dec 2023 12:16:25 -0700
Subject: [PATCH] Remove wireguard-tools from wireguard (#784)

* Remove wireguard-tools from wireguard and mark it as depending on wireguard-tools

* Dropping wireguard-tools as entware has it and wg-quick already
---
 package/wireguard-tools/package | 32 --------------------------------
 package/wireguard/package       | 21 ++-------------------
 2 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100755 package/wireguard-tools/package

diff --git a/package/wireguard-tools/package b/package/wireguard-tools/package
deleted file mode 100755
index 87bbb3971..000000000
--- a/package/wireguard-tools/package
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) 2031 The Toltec Contributors
-# SPDX-License-Identifier: MIT
-
-pkgnames=(wireguard-tools)
-pkgdesc="Fast, modern, secure VPN tunnel"
-url=https://www.wireguard.com
-pkgver=1.0.20210914-1
-timestamp=2021-02-23T00:00Z
-section=kernel
-maintainer="Salvatore Stella <etn45p4m@gmail.com>"
-license=GPL-2.0-only
-image=base:v3.1
-provides=(wireguard-tools)
-conflicts=(wireguard)
-source=("https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${pkgver%-*}.tar.xz")
-
-sha256sums=(97ff31489217bb265b7ae850d3d0f335ab07d2652ba1feec88b734bc96bd05ac)
-
-prepare() {
-    # The symlink at src/wg-quick/wg needs something to point to
-    touch "$srcdir/src/wg"
-}
-
-build() {
-    make -C "$srcdir/src" PLATFORM=linux "CC=${CROSS_COMPILE}cc"
-}
-
-package() {
-    install -D -t "$pkgdir/opt/bin" "$srcdir/src/wg"
-    install -D "$srcdir/src/wg-quick/linux.bash" "$pkgdir/opt/bin/wg-quick"
-}
diff --git a/package/wireguard/package b/package/wireguard/package
index 67b900c9d..23665bb19 100755
--- a/package/wireguard/package
+++ b/package/wireguard/package
@@ -5,15 +5,14 @@
 pkgnames=(wireguard)
 pkgdesc="Fast, modern, secure VPN tunnel"
 url=https://www.wireguard.com
-pkgver=1.0.20210219-3
-_wireguardtoolsver=1.0.20210223
+pkgver=1.0.20210219-4
 timestamp=2021-02-19T14:08Z
 section=kernel
 maintainer="Jonah Weissman <jonahrweissman+toltec@gmail.com>"
 license=GPL-2.0-only
 makedepends=(build:bc build:lzop build:git)
 flags=(nostrip)
-provides=(wireguard-tools)
+installdepends=(wireguard-tools)
 
 _kernelrepo=https://github.com/remarkable/linux
 _kernelrevs=(
@@ -28,28 +27,14 @@ _defconfigs=(
 image=base:v2.1
 source=(
     "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${pkgver%-*}.tar.xz"
-    "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${_wireguardtoolsver}.tar.xz"
     fix-multiple-yylloc-definitions.patch
 )
-noextract=("wireguard-tools-${_wireguardtoolsver}.tar.xz")
 sha256sums=(
     99d35296b8d847a0d4db97a4dda96b464311a6354e75fe0bef6e7c4578690f00
-    1f72da217044622d79e0bab57779e136a3df795e3761a3fc1dc0941a9055877c
     SKIP
 )
 
-prepare() {
-    bsdtar -x \
-        --directory "$srcdir" \
-        --file "$srcdir/wireguard-tools-${_wireguardtoolsver}.tar.xz"
-    mv "$srcdir/wireguard-tools-${_wireguardtoolsver}" "$srcdir/wireguard-tools"
-    # the symlink at src/wg-quick/wg needs something to point to
-    touch "$srcdir/wireguard-tools/src/wg"
-}
-
 build() {
-    make -C wireguard-tools/src PLATFORM=linux "CC=${CROSS_COMPILE}cc"
-
     mkdir pkg
     git init linux
     for i in $(seq 0 1); do
@@ -81,8 +66,6 @@ build() {
 }
 
 package() {
-    make -C "$srcdir/wireguard-tools/src" DESTDIR="$pkgdir" WITH_WGQUICK=yes \
-        WITH_SYSTEMDUNITS=yes WITH_BASHCOMPLETION=no install
     mkdir -p "$pkgdir/lib/modules"
     cp -r "$srcdir/pkg"/* "$pkgdir/lib/modules"
 }