From 4e896c87d73f92798cff4976422f319f2aa278cb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 2 Nov 2020 14:45:16 +0100
Subject: [PATCH] miniupnpd: update to 2.2.0.

---
 srcpkgs/miniupnpd/files/miniupnpd/run      |  2 +-
 srcpkgs/miniupnpd/patches/foreground.patch | 31 --------------------
 srcpkgs/miniupnpd/template                 | 34 +++++++++++++---------
 3 files changed, 22 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/miniupnpd/patches/foreground.patch

diff --git a/srcpkgs/miniupnpd/files/miniupnpd/run b/srcpkgs/miniupnpd/files/miniupnpd/run
index 5d4ed1a3bd4..9634ae5d576 100644
--- a/srcpkgs/miniupnpd/files/miniupnpd/run
+++ b/srcpkgs/miniupnpd/files/miniupnpd/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
 exec 2>&1
-exec miniupnpd ${OPTS:=-f /etc/miniupnpd/miniupnpd.conf} -D
+exec miniupnpd ${OPTS:=-f /etc/miniupnpd/miniupnpd.conf}
diff --git a/srcpkgs/miniupnpd/patches/foreground.patch b/srcpkgs/miniupnpd/patches/foreground.patch
deleted file mode 100644
index ee8cee6951f..00000000000
--- a/srcpkgs/miniupnpd/patches/foreground.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git miniupnpd.c miniupnpd.c
-index eb68365..62071f4 100644
---- miniupnpd.c
-+++ miniupnpd.c
-@@ -839,6 +839,7 @@ init(int argc, char * * argv, struct runtime_vars * v)
- 	int i;
- 	int pid;
- 	int debug_flag = 0;
-+	int foreground_flag = 0;
- 	int openlog_option;
- 	struct sigaction sa;
- 	/*const char * logfilename = 0;*/
-@@ -1235,6 +1236,9 @@ init(int argc, char * * argv, struct runtime_vars * v)
- 		case 'd':
- 			debug_flag = 1;
- 			break;
-+		case 'D':
-+			foreground_flag = 1;
-+			break;
- 		case 'w':
- 			if(i+1 < argc)
- 				presurl = argv[++i];
-@@ -1353,7 +1357,7 @@ init(int argc, char * * argv, struct runtime_vars * v)
- 		goto print_usage;
- 	}
- 
--	if(debug_flag)
-+	if(debug_flag || foreground_flag)
- 	{
- 		pid = getpid();
- 	}
diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index 9e568d0bc7b..8f3126e7031 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -1,10 +1,16 @@
 # Template file for 'miniupnpd'
 pkgname=miniupnpd
-version=2.1
-revision=3
-build_style=gnu-makefile
-make_cmd="make -f Makefile.linux"
-make_install_args="PREFIX= SBININSTALLDIR=/usr/bin"
+version=2.2.0
+revision=1
+build_style=configure
+configure_args="
+ --disable-fork
+ --ipv6
+ --igd2
+ --leasefile"
+make_install_args="
+ INSTALLPREFIX=/usr
+ SBININSTALLDIR=/usr/bin"
 conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
@@ -14,22 +20,24 @@ short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://miniupnp.free.fr"
+changelog="http://miniupnp.free.fr/files/changelog.php?file=miniupnpd-${version}.tar.gz"
 distfiles="http://miniupnp.free.fr/files/miniupnpd-${version}.tar.gz"
-checksum=950894779661197fe093855fda29a728f434b5756eb4fa6cb5f7b9bff7ffe0c1
+checksum=f105210a13ed0ebfc649f661ecc59e0a072cc547b04977851f22b5521b4cadff
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi
 
-do_configure() {
-	sed -i ${wrksrc}/genconfig.sh \
-		-e 's|LSB_RELEASE=.*|LSB_RELEASE=$(false)|g' \
-		-e '\|/sbin/sysctl|d'
+post_extract() {
+	vsed -i ${wrksrc}/configure \
+		-e 's|LSB_RELEASE=.*|LSB_RELEASE=$(false)|' \
+		-e 's|V6SOCKETS_ARE_V6ONLY=.*|V6SOCKETS_ARE_V6ONLY="0"|'
+}
 
-	${make_cmd} CONFIG_OPTIONS="--ipv6 --igd2 --leasefile" config.h
 
-	sed -i ${wrksrc}/config.h \
-		-e 's|^#define OS_URL.*$|#define OS_URL "http://voidlinux.org/"|g' \
+post_configure() {
+	vsed -i ${wrksrc}/config.h \
+		-e 's|^#define OS_URL.*$|#define OS_URL "https://voidlinux.org/"|g' \
 		-e 's|^#define OS_NAME.*$|#define OS_NAME "Void"|g' \
 		-e 's|^#define OS_VERSION.*$|#define OS_VERSION "Void"|g'
 }