From 6e94e3117aaaa93bc81f56827f366353311017ac Mon Sep 17 00:00:00 2001
From: Francesco Colista <fcolista@alpinelinux.org>
Date: Wed, 24 Aug 2016 15:45:45 +0000
Subject: community/miniupnpd: moved from testing

---
 community/miniupnpd/APKBUILD        | 71 +++++++++++++++++++++++++++++++++++++
 community/miniupnpd/miniupnpd.confd |  2 ++
 community/miniupnpd/miniupnpd.initd | 23 ++++++++++++
 community/miniupnpd/musl.patch      | 11 ++++++
 testing/miniupnpd/APKBUILD          | 71 -------------------------------------
 testing/miniupnpd/miniupnpd.confd   |  2 --
 testing/miniupnpd/miniupnpd.initd   | 23 ------------
 testing/miniupnpd/musl.patch        | 11 ------
 8 files changed, 107 insertions(+), 107 deletions(-)
 create mode 100644 community/miniupnpd/APKBUILD
 create mode 100644 community/miniupnpd/miniupnpd.confd
 create mode 100644 community/miniupnpd/miniupnpd.initd
 create mode 100644 community/miniupnpd/musl.patch
 delete mode 100644 testing/miniupnpd/APKBUILD
 delete mode 100644 testing/miniupnpd/miniupnpd.confd
 delete mode 100644 testing/miniupnpd/miniupnpd.initd
 delete mode 100644 testing/miniupnpd/musl.patch

diff --git a/community/miniupnpd/APKBUILD b/community/miniupnpd/APKBUILD
new file mode 100644
index 0000000000..ccac0b5a1f
--- /dev/null
+++ b/community/miniupnpd/APKBUILD
@@ -0,0 +1,71 @@
+# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=miniupnpd
+pkgver=2.0
+pkgrel=0
+pkgdesc="Lightweight UPnP IGD daemon"
+url="http://miniupnp.free.fr"
+arch="all"
+license="BSD"
+depends=""
+depends_dev="libnfnetlink-dev iptables-dev"
+makedepends="$depends_dev bsd-compat-headers"
+install=""
+subpackages="$pkgname-doc"
+source="http://miniupnp.free.fr/files/miniupnpd-$pkgver.tar.gz
+	$pkgname.initd
+	$pkgname.confd"
+
+_builddir="$srcdir"/miniupnpd-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+	mv Makefile.linux Makefile
+	sed -i \
+		-e "s#^CFLAGS = .*-D#CPPFLAGS += -I/usr/include -D#" \
+		-e '/^CFLAGS :=/s/CFLAGS/CPPFLAGS/g' \
+		-e "s/CFLAGS += -ansi/#CFLAGS += -ansi/g" \
+		-e "s/LIBS = -liptc/LIBS = -lip4tc/g" \
+		-e 's/genuuid||//' \
+		-e "s/--mode=/-m /g" \
+		Makefile || die
+	sed -i \
+		-e 's/\(strncpy(\([->a-z.]\+\), "[a-zA-Z]\+", \)IPT_FUNCTION_MAXNAMELEN);/\1sizeof(\2));/' \
+		netfilter/iptcrdr.c || die
+
+	make config.h
+
+	sed -i \
+		-e 's/\/\*#define ENABLE_LEASEFILE\*\//#define ENABLE_LEASEFILE/g' \
+		config.h || die
+}
+
+build() {
+	cd "$_builddir"
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make PREFIX="$pkgdir/" install || return 1
+	install -m755 -D "$srcdir"/$pkgname.initd \
+		"$pkgdir"/etc/init.d/$pkgname || return 1
+	install -m644 -D "$srcdir"/$pkgname.confd \
+		"$pkgdir"/etc/conf.d/$pkgname || return 1
+
+}
+
+md5sums="1c07a215dd9b362e75a9efc05e2fb3b4  miniupnpd-2.0.tar.gz
+df8b62fd39a040d0bc10d9d4f8492578  miniupnpd.initd
+5f461c988dc4b11b036771d56864087c  miniupnpd.confd"
+sha256sums="d96aa3a00e0f5490826bba3cb97e68cd27479e5839adac4b9bcb66eae786bfb7  miniupnpd-2.0.tar.gz
+2a11cab5615550c1263448f943a62ed3fe4dd647888675588e59146a691f3643  miniupnpd.initd
+8c6dae8588e21208a2f0a17965548e0b0708ceeea1157e2506f745e28913f9b3  miniupnpd.confd"
+sha512sums="c88036d3f4b065fc855572db8945d921641a71a23ffe8b52cb4ccb1a7cf3e7396841c436d54d7ff5968d034d8c4bfc91630719959000436230bb8c37e5bdc8d4  miniupnpd-2.0.tar.gz
+a25b2a444cde623fbdbe6fb26c544614cceb2cc1262a0409f40286f4c69b70ba1c05e55815552a12b0624b16ddd48d3e424dad18b278ff9da04bac335feb1d45  miniupnpd.initd
+81aa2dac0643bbd1331549427c438900319adce91928b6bad6f7d470492f6f48e04e4d1af89f961db53fc132a7ff89ea52625441f051afd5a1b48680917f4ff7  miniupnpd.confd"
diff --git a/community/miniupnpd/miniupnpd.confd b/community/miniupnpd/miniupnpd.confd
new file mode 100644
index 0000000000..8482ef2d18
--- /dev/null
+++ b/community/miniupnpd/miniupnpd.confd
@@ -0,0 +1,2 @@
+ARGS='-f /etc/miniupnpd/miniupnpd.conf'
+
diff --git a/community/miniupnpd/miniupnpd.initd b/community/miniupnpd/miniupnpd.initd
new file mode 100644
index 0000000000..cc67646ed1
--- /dev/null
+++ b/community/miniupnpd/miniupnpd.initd
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-init.d,v 1.3 2011/10/17 12:03:01 gurligebis Exp $
+
+depend() {
+	need net iptables
+	use minissdpd
+}
+
+start() {
+	ebegin "Starting miniupnpd"
+	/etc/miniupnpd/iptables_init.sh
+	start-stop-daemon --start --pidfile /var/run/miniupnpd.pid --exec /usr/sbin/miniupnpd -- ${ARGS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping miniupnpd"
+        start-stop-daemon --stop --pidfile /var/run/miniupnpd.pid
+	eend $?
+	/etc/miniupnpd/iptables_removeall.sh
+}
diff --git a/community/miniupnpd/musl.patch b/community/miniupnpd/musl.patch
new file mode 100644
index 0000000000..7c2e2dc0f7
--- /dev/null
+++ b/community/miniupnpd/musl.patch
@@ -0,0 +1,11 @@
+--- ./miniupnpd.c.orig
++++ ./miniupnpd.c
+@@ -39,7 +39,7 @@
+ #include <sys/param.h>
+ #if defined(sun)
+ #include <kstat.h>
+-#else
++#elif defined(__BSD__)
+ /* for BSD's sysctl */
+ #include <sys/sysctl.h>
+ #endif
diff --git a/testing/miniupnpd/APKBUILD b/testing/miniupnpd/APKBUILD
deleted file mode 100644
index ccac0b5a1f..0000000000
--- a/testing/miniupnpd/APKBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=miniupnpd
-pkgver=2.0
-pkgrel=0
-pkgdesc="Lightweight UPnP IGD daemon"
-url="http://miniupnp.free.fr"
-arch="all"
-license="BSD"
-depends=""
-depends_dev="libnfnetlink-dev iptables-dev"
-makedepends="$depends_dev bsd-compat-headers"
-install=""
-subpackages="$pkgname-doc"
-source="http://miniupnp.free.fr/files/miniupnpd-$pkgver.tar.gz
-	$pkgname.initd
-	$pkgname.confd"
-
-_builddir="$srcdir"/miniupnpd-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	mv Makefile.linux Makefile
-	sed -i \
-		-e "s#^CFLAGS = .*-D#CPPFLAGS += -I/usr/include -D#" \
-		-e '/^CFLAGS :=/s/CFLAGS/CPPFLAGS/g' \
-		-e "s/CFLAGS += -ansi/#CFLAGS += -ansi/g" \
-		-e "s/LIBS = -liptc/LIBS = -lip4tc/g" \
-		-e 's/genuuid||//' \
-		-e "s/--mode=/-m /g" \
-		Makefile || die
-	sed -i \
-		-e 's/\(strncpy(\([->a-z.]\+\), "[a-zA-Z]\+", \)IPT_FUNCTION_MAXNAMELEN);/\1sizeof(\2));/' \
-		netfilter/iptcrdr.c || die
-
-	make config.h
-
-	sed -i \
-		-e 's/\/\*#define ENABLE_LEASEFILE\*\//#define ENABLE_LEASEFILE/g' \
-		config.h || die
-}
-
-build() {
-	cd "$_builddir"
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make PREFIX="$pkgdir/" install || return 1
-	install -m755 -D "$srcdir"/$pkgname.initd \
-		"$pkgdir"/etc/init.d/$pkgname || return 1
-	install -m644 -D "$srcdir"/$pkgname.confd \
-		"$pkgdir"/etc/conf.d/$pkgname || return 1
-
-}
-
-md5sums="1c07a215dd9b362e75a9efc05e2fb3b4  miniupnpd-2.0.tar.gz
-df8b62fd39a040d0bc10d9d4f8492578  miniupnpd.initd
-5f461c988dc4b11b036771d56864087c  miniupnpd.confd"
-sha256sums="d96aa3a00e0f5490826bba3cb97e68cd27479e5839adac4b9bcb66eae786bfb7  miniupnpd-2.0.tar.gz
-2a11cab5615550c1263448f943a62ed3fe4dd647888675588e59146a691f3643  miniupnpd.initd
-8c6dae8588e21208a2f0a17965548e0b0708ceeea1157e2506f745e28913f9b3  miniupnpd.confd"
-sha512sums="c88036d3f4b065fc855572db8945d921641a71a23ffe8b52cb4ccb1a7cf3e7396841c436d54d7ff5968d034d8c4bfc91630719959000436230bb8c37e5bdc8d4  miniupnpd-2.0.tar.gz
-a25b2a444cde623fbdbe6fb26c544614cceb2cc1262a0409f40286f4c69b70ba1c05e55815552a12b0624b16ddd48d3e424dad18b278ff9da04bac335feb1d45  miniupnpd.initd
-81aa2dac0643bbd1331549427c438900319adce91928b6bad6f7d470492f6f48e04e4d1af89f961db53fc132a7ff89ea52625441f051afd5a1b48680917f4ff7  miniupnpd.confd"
diff --git a/testing/miniupnpd/miniupnpd.confd b/testing/miniupnpd/miniupnpd.confd
deleted file mode 100644
index 8482ef2d18..0000000000
--- a/testing/miniupnpd/miniupnpd.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-ARGS='-f /etc/miniupnpd/miniupnpd.conf'
-
diff --git a/testing/miniupnpd/miniupnpd.initd b/testing/miniupnpd/miniupnpd.initd
deleted file mode 100644
index cc67646ed1..0000000000
--- a/testing/miniupnpd/miniupnpd.initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-init.d,v 1.3 2011/10/17 12:03:01 gurligebis Exp $
-
-depend() {
-	need net iptables
-	use minissdpd
-}
-
-start() {
-	ebegin "Starting miniupnpd"
-	/etc/miniupnpd/iptables_init.sh
-	start-stop-daemon --start --pidfile /var/run/miniupnpd.pid --exec /usr/sbin/miniupnpd -- ${ARGS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping miniupnpd"
-        start-stop-daemon --stop --pidfile /var/run/miniupnpd.pid
-	eend $?
-	/etc/miniupnpd/iptables_removeall.sh
-}
diff --git a/testing/miniupnpd/musl.patch b/testing/miniupnpd/musl.patch
deleted file mode 100644
index 7c2e2dc0f7..0000000000
--- a/testing/miniupnpd/musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./miniupnpd.c.orig
-+++ ./miniupnpd.c
-@@ -39,7 +39,7 @@
- #include <sys/param.h>
- #if defined(sun)
- #include <kstat.h>
--#else
-+#elif defined(__BSD__)
- /* for BSD's sysctl */
- #include <sys/sysctl.h>
- #endif
-- 
cgit v1.2.3