vpnc: Add vpnc-scripts dependency

8 files changed, 49 insertions, 4 deletions

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)