summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric Sandall2022-06-23 09:04:44 -0700
committerEric Sandall2022-06-23 09:04:44 -0700
commitd53f1d20fabaa70892bf502060c1bb55daa92e2a (patch)
tree3a2e14703af601735cd6d6dfcfd0608238cc5f66 /net
parent89fd6c5ec73be3a8a220285dd6949aa8781884da (diff)
parent4dbd184515164b18f20f8717c2d839eae0f112e7 (diff)
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
Diffstat (limited to 'net')
-rwxr-xr-xnet/bind-tools/BUILD5
-rwxr-xr-xnet/bind-tools/DETAILS2
-rw-r--r--net/bind-tools/HISTORY7
-rwxr-xr-xnet/i2pd/DETAILS4
-rw-r--r--net/i2pd/HISTORY4
-rwxr-xr-xnet/i2pd/PRE_BUILD4
-rw-r--r--net/i2pd/patches/libressl-3.5.patch26
-rwxr-xr-xnet/iproute2/DETAILS2
-rw-r--r--net/iproute2/HISTORY3
-rwxr-xr-xnet/iputils/DEPENDS3
-rw-r--r--net/iputils/HISTORY3
-rwxr-xr-xnet/iwd/DEPENDS4
-rwxr-xr-xnet/iwd/DETAILS2
-rw-r--r--net/iwd/HISTORY6
-rwxr-xr-xnet/libpcap/DETAILS2
-rw-r--r--net/libpcap/HISTORY4
-rwxr-xr-xnet/libpcap/PRE_BUILD3
-rw-r--r--net/libpcap/missing-includes.patch14
-rwxr-xr-xnet/libpsl/DEPENDS4
-rw-r--r--net/libpsl/HISTORY3
-rwxr-xr-xnet/openconnect/DEPENDS1
-rwxr-xr-xnet/openconnect/DETAILS4
-rw-r--r--net/openconnect/HISTORY3
-rwxr-xr-xnet/vpnc-scripts/BUILD1
-rwxr-xr-xnet/vpnc-scripts/DETAILS19
-rw-r--r--net/vpnc-scripts/HISTORY2
-rwxr-xr-xnet/vpnc-scripts/INSTALL2
-rwxr-xr-xnet/vpnc/DEPENDS1
-rwxr-xr-xnet/vpnc/DETAILS1
-rw-r--r--net/vpnc/HISTORY4
-rw-r--r--net/vpnc/patches/0001-Fix-build-against-musl-libc.patch2
-rw-r--r--net/vpnc/patches/0002-Fix-cleanup-of-shared-secret.patch2
-rw-r--r--net/vpnc/patches/0003-Fix-unused-variable-warnings.patch2
-rw-r--r--net/vpnc/patches/0004-Fix-debug-message-format-string.patch2
-rw-r--r--net/vpnc/patches/0005-Remove-vpnc-script.patch39
-rwxr-xr-xnet/wireguard-tools/DETAILS4
-rw-r--r--net/wireguard-tools/HISTORY3
37 files changed, 127 insertions, 70 deletions
diff --git a/net/bind-tools/BUILD b/net/bind-tools/BUILD
index 4f066348c6..1acc77b2d1 100755
--- a/net/bind-tools/BUILD
+++ b/net/bind-tools/BUILD
@@ -8,7 +8,6 @@ disable_reject_underlinking &&
--disable-fuzzing \
$OPTS &&
-make_single &&
#
# The order here is important
#
@@ -17,6 +16,4 @@ make -C bin/delv &&
make -C bin/dig &&
make -C bin/nsupdate &&
make -C bin/dnssec &&
-make -C doc/man man &&
-
-make_normal
+make -C doc/man man
diff --git a/net/bind-tools/DETAILS b/net/bind-tools/DETAILS
index 0819bf3273..cb99aaa5ba 100755
--- a/net/bind-tools/DETAILS
+++ b/net/bind-tools/DETAILS
@@ -1,5 +1,5 @@
SPELL=bind-tools
- VERSION=9.16.24
+ VERSION=9.16.30
SOURCE=bind-$VERSION.tar.xz
SOURCE2=$SOURCE.sha512.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/bind-$VERSION"
diff --git a/net/bind-tools/HISTORY b/net/bind-tools/HISTORY
index 410f23ba62..e37e468cd9 100644
--- a/net/bind-tools/HISTORY
+++ b/net/bind-tools/HISTORY
@@ -1,3 +1,10 @@
+2022-06-18 Florian Franzmann <bwlf@bandrate.org>
+ * DETAILS: version 9.16.30
+
+2022-06-05 Florian Franzmann <bwlf@bandrate.org>
+ * DETAILS: version 9.16.29
+ * BUILD: remove make_single
+
2021-12-26 Florian Franzmann <bwlf@bandrate.org>
* DETAILS: version 9.16.24
diff --git a/net/i2pd/DETAILS b/net/i2pd/DETAILS
index 567e511ab1..93b885a8c3 100755
--- a/net/i2pd/DETAILS
+++ b/net/i2pd/DETAILS
@@ -1,7 +1,7 @@
source "${GRIMOIRE}/CMAKE_FUNCTIONS"
SPELL=i2pd
- VERSION=2.41.0
- SOURCE_HASH=sha512:10ba77d714e4b02f9640c64b16b597550f71bfacf02242bd17cfdc7fc416e0e9bc62a2f1da486161baea397dae3d260fa88359325062b1c587f509058d418d85
+ VERSION=2.42.0
+ SOURCE_HASH=sha512:b50d3ac18f2a9b671b59b8b0dd0fb4de2b116ba9a4bf2caf9ea7abf43be616ca99446d19b6cda83a94188062956d5dbc36f3acb4d2d773921234ef753205af8b
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=https://github.com/PurpleI2P/${SPELL}/archive/${VERSION}.tar.gz
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/net/i2pd/HISTORY b/net/i2pd/HISTORY
index 6ae85cc0fd..e3c544b0ff 100644
--- a/net/i2pd/HISTORY
+++ b/net/i2pd/HISTORY
@@ -1,3 +1,7 @@
+2022-05-29 Pavel Vinogradov <public@sourcemage.org>
+ * DETAILS: version 2.42.0
+ * PRE_BUILD, patches/libressl-3.5.patch: dropped, fixed by upstream
+
2022-03-14 Pavel Vinogradov <public@sourcemage.org>
* PRE_BUILD, patches/libressl-3.5.patch: added patch to build with LibreSSL 3.5.x
diff --git a/net/i2pd/PRE_BUILD b/net/i2pd/PRE_BUILD
deleted file mode 100755
index f80ee7decc..0000000000
--- a/net/i2pd/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-apply_patch_dir patches
diff --git a/net/i2pd/patches/libressl-3.5.patch b/net/i2pd/patches/libressl-3.5.patch
deleted file mode 100644
index fb8c6b1816..0000000000
--- a/net/i2pd/patches/libressl-3.5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/libi2pd/Crypto.h b/libi2pd/Crypto.h
---- a/libi2pd/Crypto.h
-+++ b/libi2pd/Crypto.h
-@@ -29,12 +29,13 @@
- #include "CPU.h"
-
- // recognize openssl version and features
--#if ((OPENSSL_VERSION_NUMBER < 0x010100000) || defined(LIBRESSL_VERSION_NUMBER)) // 1.0.2 and below or LibreSSL
-+#if ((OPENSSL_VERSION_NUMBER < 0x010100000) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)) // 1.0.2 and below or LibreSSL < 3.5.0
- # define LEGACY_OPENSSL 1
- # define X509_getm_notBefore X509_get_notBefore
- # define X509_getm_notAfter X509_get_notAfter
- #else
- # define LEGACY_OPENSSL 0
-+# if !defined LIBRESSL_VERSION_NUMBER
- # if (OPENSSL_VERSION_NUMBER >= 0x010101000) // 1.1.1
- # define OPENSSL_HKDF 1
- # define OPENSSL_EDDSA 1
-@@ -46,6 +47,7 @@
- # if !defined OPENSSL_NO_CHACHA && !defined OPENSSL_NO_POLY1305 // some builds might not include them
- # define OPENSSL_AEAD_CHACHA20_POLY1305 1
- # endif
-+# endif
- #endif
-
- namespace i2p
diff --git a/net/iproute2/DETAILS b/net/iproute2/DETAILS
index f287c17fa3..3e2f502c59 100755
--- a/net/iproute2/DETAILS
+++ b/net/iproute2/DETAILS
@@ -1,5 +1,5 @@
SPELL=iproute2
- VERSION=5.17.0
+ VERSION=5.18.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${KERNEL_URL}/pub/linux/utils/net/iproute2/$SOURCE
diff --git a/net/iproute2/HISTORY b/net/iproute2/HISTORY
index 9cc8b4b85d..5ed110e935 100644
--- a/net/iproute2/HISTORY
+++ b/net/iproute2/HISTORY
@@ -1,3 +1,6 @@
+2022-05-27 Pavel Vinogradov <public@sourcemage.org>
+ * DETAILS: version 5.18.0
+
2022-03-22 Pavel Vinogradov <public@sourcemage.org>
* DETAILS: version 5.17.0
diff --git a/net/iputils/DEPENDS b/net/iputils/DEPENDS
index a35cd79a79..feaf8b6722 100755
--- a/net/iputils/DEPENDS
+++ b/net/iputils/DEPENDS
@@ -1,4 +1,5 @@
-depends meson &&
+. "$GRIMOIRE"/MESON_DEPENDS &&
+
depends gcc &&
optional_depends libcap \
"USE_CAP=true" \
diff --git a/net/iputils/HISTORY b/net/iputils/HISTORY
index 3bbb3984f4..6bb7a6d319 100644
--- a/net/iputils/HISTORY
+++ b/net/iputils/HISTORY
@@ -1,3 +1,6 @@
+2022-05-27 Florian Franzmann <bwlf@bandrate.org>
+ * DEPENDS: use MESON_DEPENDS
+
2021-12-26 Florian Franzmann <bwlf@bandrate.org>
* DETAILS, DEPENDS: version 20211215
diff --git a/net/iwd/DEPENDS b/net/iwd/DEPENDS
index a86f97cc76..da215af40a 100755
--- a/net/iwd/DEPENDS
+++ b/net/iwd/DEPENDS
@@ -15,6 +15,6 @@ optional_depends systemd \
"enable systemd service" &&
optional_depends docutils \
- "" \
- "" \
+ "--enable-manual-pages" \
+ "--disable-manual-pages" \
"for documentation"
diff --git a/net/iwd/DETAILS b/net/iwd/DETAILS
index 338f956814..60a6cbeb2d 100755
--- a/net/iwd/DETAILS
+++ b/net/iwd/DETAILS
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=1.27
+ VERSION=1.28
SOURCE=${SPELL}-${VERSION}.tar.xz
SOURCE2=${SPELL}-${VERSION}.tar.sign
SOURCE_GPG="kernel.gpg:${SOURCE2}:UPSTREAM_KEY"
diff --git a/net/iwd/HISTORY b/net/iwd/HISTORY
index fad7976839..bc6c475093 100644
--- a/net/iwd/HISTORY
+++ b/net/iwd/HISTORY
@@ -1,3 +1,9 @@
+2022-06-04 Pavel Vinogradov <public@sourcemage.org>
+ * DETAILS: version 1.28
+
+2022-05-30 Pavel Vinogradov <public@sourcemage.org>
+ * DEPENDS: added flags for docutils
+
2022-04-21 Pavel Vinogradov <public@sourcemage.org>
* DETAILS: version 1.27
diff --git a/net/libpcap/DETAILS b/net/libpcap/DETAILS
index 5a59078fa5..9bb61430ef 100755
--- a/net/libpcap/DETAILS
+++ b/net/libpcap/DETAILS
@@ -1,5 +1,5 @@
SPELL=libpcap
- VERSION=1.9.1
+ VERSION=1.10.1
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/net/libpcap/HISTORY b/net/libpcap/HISTORY
index 838a9f1b83..984f874dd6 100644
--- a/net/libpcap/HISTORY
+++ b/net/libpcap/HISTORY
@@ -1,3 +1,7 @@
+2022-06-22 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.10.1
+ * PRE_BUILD, missing-includes.patch: deleted
+
2019-10-02 Florian Franzmann <bwlf@bandrate.org>
* DETAILS: version 1.9.1, SECURITY_PATCH++, fixes
CVE-2019-15161,
diff --git a/net/libpcap/PRE_BUILD b/net/libpcap/PRE_BUILD
deleted file mode 100755
index 514701ae58..0000000000
--- a/net/libpcap/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-patch -fp1 -i "$SPELL_DIRECTORY/missing-includes.patch"
diff --git a/net/libpcap/missing-includes.patch b/net/libpcap/missing-includes.patch
deleted file mode 100644
index 02c2bc763b..0000000000
--- a/net/libpcap/missing-includes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Missing includes; required at least for compiling against musl.
-
-diff --git a/pcap-usb-linux.c.orig b/pcap-usb-linux.c
-index 6f8adf6..a1aa576 100644
---- a/pcap-usb-linux.c.orig
-+++ b/pcap-usb-linux.c
-@@ -45,6 +45,7 @@
- #include "strerror.h"
- #endif
-
-+#include <limits.h> /* NAME_MAX */
- #include <ctype.h>
- #include <errno.h>
- #include <stdlib.h>
diff --git a/net/libpsl/DEPENDS b/net/libpsl/DEPENDS
index 5e717e3495..f99b537652 100755
--- a/net/libpsl/DEPENDS
+++ b/net/libpsl/DEPENDS
@@ -1,4 +1,4 @@
+. "$GRIMOIRE"/MESON_DEPENDS &&
+
depends python3 &&
-depends meson &&
-depends ninja-build-system &&
depends icu
diff --git a/net/libpsl/HISTORY b/net/libpsl/HISTORY
index 79f36e57a8..646c300346 100644
--- a/net/libpsl/HISTORY
+++ b/net/libpsl/HISTORY
@@ -1,3 +1,6 @@
+2022-05-28 Florian Franzmann <bwlf@bandrate.org>
+ * DEPENDS: use MESON_DEPENDS
+
2020-11-07 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 0.21.1
meson build
diff --git a/net/openconnect/DEPENDS b/net/openconnect/DEPENDS
new file mode 100755
index 0000000000..a3c11a88aa
--- /dev/null
+++ b/net/openconnect/DEPENDS
@@ -0,0 +1 @@
+depends vpnc-scripts
diff --git a/net/openconnect/DETAILS b/net/openconnect/DETAILS
index 7f807fcaa1..4569d4aa09 100755
--- a/net/openconnect/DETAILS
+++ b/net/openconnect/DETAILS
@@ -1,8 +1,8 @@
SPELL=openconnect
- VERSION=7.08
+ VERSION=8.20
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=ftp://ftp.infradead.org/pub/${SPELL}/${SOURCE}
- SOURCE_HASH=sha512:22f9b0bd4bd17e2ab91ff42b2464c89abba035fe705c037ba4d1042ace460c8738e20481783a1edc3b7dd6503fe9fcc7fdd188552811fb1525310e25a4c2f400
+ SOURCE_HASH=sha512:76f5e49948391397ea1f7d2fca5798731f4278fee74c3da9b0f0daba6c386ce79ec5d87d40b6d3d99bb2528a038b5a2076df4159bb29c52cba62efb2ca52c8ab
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.infradead.org/openconnect/"
LICENSE[0]="LGPL-2.1"
diff --git a/net/openconnect/HISTORY b/net/openconnect/HISTORY
index 48d3f72373..cfad4a0853 100644
--- a/net/openconnect/HISTORY
+++ b/net/openconnect/HISTORY
@@ -1,2 +1,5 @@
+2022-05-30 Ismael Luceno <ismael@sourcemage.org>
+ * DEPENDS, DETAILS: updated spell to 8.20
+
2018-02-05 Ismael Luceno <ismael@sourcemage.org>
* DETAILS: spell created
diff --git a/net/vpnc-scripts/BUILD b/net/vpnc-scripts/BUILD
new file mode 100755
index 0000000000..397db75f0d
--- /dev/null
+++ b/net/vpnc-scripts/BUILD
@@ -0,0 +1 @@
+:
diff --git a/net/vpnc-scripts/DETAILS b/net/vpnc-scripts/DETAILS
new file mode 100755
index 0000000000..fe17b3f4b9
--- /dev/null
+++ b/net/vpnc-scripts/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=vpnc-scripts
+ VERSION=20210402
+ SOURCE="$SPELL-$VERSION.tar.gz"
+ SOURCE_URL[0]=ftp://ftp.infradead.org/pub/$SPELL/$SOURCE
+ SOURCE_HASH=sha512:5f9fc5ab1a5a2607f807700536c4a8e71c551052e72979c1cdd02b15906615be33a297b873b0806f269e51645f10f1c02a7acfed2501148bfa2797250582920d
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE="http://www.infradead.org/openconnect/vnpc-script.html"
+ LICENSE[0]="GPL-2.0-or-later"
+ ENTERED=20220530
+ KEYWORDS=""
+ SHORT="Configuration script for VPNC and OpenConnect"
+cat << EOF
+This script setups the routing and name service for the VPN client.
+
+It improves over the original VPNC script with:
+* Bug fixes.
+* IPv6 support
+* Support for newer Linux kernels.
+EOF
diff --git a/net/vpnc-scripts/HISTORY b/net/vpnc-scripts/HISTORY
new file mode 100644
index 0000000000..de96167fe0
--- /dev/null
+++ b/net/vpnc-scripts/HISTORY
@@ -0,0 +1,2 @@
+2018-02-05 Ismael Luceno <ismael@sourcemage.org>
+ * BUILD, DETAILS, INSTALL: spell created
diff --git a/net/vpnc-scripts/INSTALL b/net/vpnc-scripts/INSTALL
new file mode 100755
index 0000000000..2ec5e29195
--- /dev/null
+++ b/net/vpnc-scripts/INSTALL
@@ -0,0 +1,2 @@
+install -d "$INSTALL_ROOT"/etc/vpnc/ &&
+install -m755 vpnc-script "$INSTALL_ROOT"/etc/vpnc/
diff --git a/net/vpnc/DEPENDS b/net/vpnc/DEPENDS
index 3e32532cba..874864e714 100755
--- a/net/vpnc/DEPENDS
+++ b/net/vpnc/DEPENDS
@@ -1,2 +1,3 @@
+runtime_depends vpnc-scripts &&
runtime_depends iproute2 &&
depends libgcrypt
diff --git a/net/vpnc/DETAILS b/net/vpnc/DETAILS
index 841e038e5a..498d25064c 100755
--- a/net/vpnc/DETAILS
+++ b/net/vpnc/DETAILS
@@ -1,5 +1,6 @@
SPELL=vpnc
VERSION=0.5.3
+ PATCHLEVEL=1
SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/net/vpnc/HISTORY b/net/vpnc/HISTORY
index 59d1029cb1..d9245fc37c 100644
--- a/net/vpnc/HISTORY
+++ b/net/vpnc/HISTORY
@@ -1,3 +1,7 @@
+2022-05-30 Ismael Luceno <ismael@sourcemage.org>
+ * DEPENDS, patches/0005-Remove-vpnc-script.patch: added vpnc-scripts dep
+ * DETAILS: PATCHLEVEL++
+
2022-04-19 Ismael Luceno <ismael@sourcemage.org>
* DETAILS, patches/0002-Fix-cleanup-of-shared-secret.patch: updated patch
SECURITY_PATCH++
diff --git a/net/vpnc/patches/0001-Fix-build-against-musl-libc.patch b/net/vpnc/patches/0001-Fix-build-against-musl-libc.patch
index b376fcd79a..6bc6440554 100644
--- a/net/vpnc/patches/0001-Fix-build-against-musl-libc.patch
+++ b/net/vpnc/patches/0001-Fix-build-against-musl-libc.patch
@@ -1,7 +1,7 @@
From 82ec49cec5c78f1ba3d1b5dddedfa77804d9fe5d Mon Sep 17 00:00:00 2001
From: Ismael Luceno <ismael@iodev.co.uk>
Date: Mon, 18 Apr 2022 18:55:20 +0200
-Subject: [PATCH 1/4] Fix build against musl libc
+Subject: [PATCH 1/5] Fix build against musl libc
Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
---
diff --git a/net/vpnc/patches/0002-Fix-cleanup-of-shared-secret.patch b/net/vpnc/patches/0002-Fix-cleanup-of-shared-secret.patch
index e656e8d765..dda032c74a 100644
--- a/net/vpnc/patches/0002-Fix-cleanup-of-shared-secret.patch
+++ b/net/vpnc/patches/0002-Fix-cleanup-of-shared-secret.patch
@@ -1,7 +1,7 @@
From 0c9a06b9555bf48b07f5d69ec78ac835510676cf Mon Sep 17 00:00:00 2001
From: Ismael Luceno <ismael@iodev.co.uk>
Date: Mon, 18 Apr 2022 19:04:44 +0200
-Subject: [PATCH 2/4] Fix cleanup of shared secret
+Subject: [PATCH 2/5] Fix cleanup of shared secret
Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
---
diff --git a/net/vpnc/patches/0003-Fix-unused-variable-warnings.patch b/net/vpnc/patches/0003-Fix-unused-variable-warnings.patch
index aaae1a033e..1ffbbf1d53 100644
--- a/net/vpnc/patches/0003-Fix-unused-variable-warnings.patch
+++ b/net/vpnc/patches/0003-Fix-unused-variable-warnings.patch
@@ -1,7 +1,7 @@
From 30c29986235c24607e484e9bf7246666a249cc9c Mon Sep 17 00:00:00 2001
From: Ismael Luceno <ismael@iodev.co.uk>
Date: Mon, 18 Apr 2022 19:07:19 +0200
-Subject: [PATCH 3/4] Fix unused variable warnings
+Subject: [PATCH 3/5] Fix unused variable warnings
Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
---
diff --git a/net/vpnc/patches/0004-Fix-debug-message-format-string.patch b/net/vpnc/patches/0004-Fix-debug-message-format-string.patch
index 91cfcc1b4b..a8899dc667 100644
--- a/net/vpnc/patches/0004-Fix-debug-message-format-string.patch
+++ b/net/vpnc/patches/0004-Fix-debug-message-format-string.patch
@@ -1,7 +1,7 @@
From f7cb5f93d85063590841d60bb10cf7b306d0c246 Mon Sep 17 00:00:00 2001
From: Ismael Luceno <ismael@iodev.co.uk>
Date: Mon, 18 Apr 2022 19:07:40 +0200
-Subject: [PATCH 4/4] Fix debug message format string
+Subject: [PATCH 4/5] Fix debug message format string
Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
---
diff --git a/net/vpnc/patches/0005-Remove-vpnc-script.patch b/net/vpnc/patches/0005-Remove-vpnc-script.patch
new file mode 100644
index 0000000000..039d4e3220
--- /dev/null
+++ b/net/vpnc/patches/0005-Remove-vpnc-script.patch
@@ -0,0 +1,39 @@
+From 415e88c3cfbb34647d0b1bc61e796ce18cce4da6 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael@iodev.co.uk>
+Date: Mon, 18 Apr 2022 19:07:40 +0200
+Subject: [PATCH 5/5] Remove vpnc-script
+
+An improved replacement is provided by the vpnc-scripts package.
+
+Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
+
+---
+ Makefile | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 920bd18b2f25..ca94eeaf01ee 100644
+--- a/Makefile
++++ b/Makefile
+@@ -66,7 +66,7 @@ ifneq (,$(findstring Apple,$(shell $(CC) --version)))
+ CFLAGS += -fstrict-aliasing -freorder-blocks -fsched-interblock
+ endif
+
+-all : $(BINS) vpnc.8 vpnc-script
++all : $(BINS) vpnc.8
+
+ vpnc : $(OBJS) vpnc.o
+ $(CC) -o $@ $^ $(LDFLAGS)
+@@ -113,12 +113,6 @@ distclean : clean
+
+ install-common: all
+ install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(DOCDIR)
+- if [ "`uname -s | cut -c-6`" = "CYGWIN" ]; then \
+- install vpnc-script-win $(DESTDIR)$(ETCDIR)/vpnc-script; \
+- install vpnc-script-win.js $(DESTDIR)$(ETCDIR); \
+- else \
+- install vpnc-script $(DESTDIR)$(ETCDIR); \
+- fi
+ install -m600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf
+ install -m755 vpnc-disconnect $(DESTDIR)$(SBINDIR)
+ install -m755 pcf2vpnc $(DESTDIR)$(BINDIR)
diff --git a/net/wireguard-tools/DETAILS b/net/wireguard-tools/DETAILS
index 435bd05e54..e6565ac37d 100755
--- a/net/wireguard-tools/DETAILS
+++ b/net/wireguard-tools/DETAILS
@@ -1,8 +1,8 @@
SPELL=wireguard-tools
- VERSION=1.0.20210424
+ VERSION=1.0.20210914
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL[0]=https://github.com/WireGuard/${SPELL}/archive/v${VERSION}.tar.gz
- SOURCE_HASH=sha512:4b32a84a411c9efbbcbb14221eb4d0e82b423c36b2cbcab6281b185514c24df4e8ba607eaaa0c85991b5f9df97873256f252394cb0fc02de2034d43211792d66
+ SOURCE_HASH=sha512:0cbe0112898b7cd139b9679f7b495321c89c03b58266a6c66d5ed72ad9681726c84a92be5868268ca0c5ea9fa26f865b8e1fe72803f8e2aa2c2b38a4e2f8b99e
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://www.wireguard.com/"
LICENSE[0]=GPL
diff --git a/net/wireguard-tools/HISTORY b/net/wireguard-tools/HISTORY
index ae7cd58977..876a3e5bd9 100644
--- a/net/wireguard-tools/HISTORY
+++ b/net/wireguard-tools/HISTORY
@@ -1,3 +1,6 @@
+2022-05-27 Florian Franzmann <bwlf@bandrate.org>
+ * DETAILS: version 1.0.20210914
+
2021-05-01 Florian Franzmann <bwlf@bandrate.org>
* DETAILS: version 1.0.20210424