[arch-commits] Commit in miniupnpd/repos (10 files)
Timothy Redaelli
tredaelli at nymeria.archlinux.org
Wed Apr 23 15:59:45 UTC 2014
Date: Wednesday, April 23, 2014 @ 17:59:45
Author: tredaelli
Revision: 110046
archrelease: copy trunk to community-i686, community-x86_64
Added:
miniupnpd/repos/community-i686/PKGBUILD
(from rev 110045, miniupnpd/trunk/PKGBUILD)
miniupnpd/repos/community-i686/miniupnpd-1.8.20140401-foreground.patch
(from rev 110045, miniupnpd/trunk/miniupnpd-1.8.20140401-foreground.patch)
miniupnpd/repos/community-i686/miniupnpd.systemd
(from rev 110045, miniupnpd/trunk/miniupnpd.systemd)
miniupnpd/repos/community-x86_64/PKGBUILD
(from rev 110045, miniupnpd/trunk/PKGBUILD)
miniupnpd/repos/community-x86_64/miniupnpd-1.8.20140401-foreground.patch
(from rev 110045, miniupnpd/trunk/miniupnpd-1.8.20140401-foreground.patch)
miniupnpd/repos/community-x86_64/miniupnpd.systemd
(from rev 110045, miniupnpd/trunk/miniupnpd.systemd)
Deleted:
miniupnpd/repos/community-i686/PKGBUILD
miniupnpd/repos/community-i686/miniupnpd.systemd
miniupnpd/repos/community-x86_64/PKGBUILD
miniupnpd/repos/community-x86_64/miniupnpd.systemd
----------------------------------------------------------+
/PKGBUILD | 98 +++++++++++++
/miniupnpd.systemd | 22 ++
community-i686/PKGBUILD | 41 -----
community-i686/miniupnpd-1.8.20140401-foreground.patch | 40 +++++
community-i686/miniupnpd.systemd | 12 -
community-x86_64/PKGBUILD | 41 -----
community-x86_64/miniupnpd-1.8.20140401-foreground.patch | 40 +++++
community-x86_64/miniupnpd.systemd | 12 -
8 files changed, 200 insertions(+), 106 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-04-23 15:59:32 UTC (rev 110045)
+++ community-i686/PKGBUILD 2014-04-23 15:59:45 UTC (rev 110046)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
-# Contributor: fauno <fauno at parabola.nu>
-pkgname=miniupnpd
-pkgver=1.8.20140401
-pkgrel=1
-pkgdesc="Lightweight UPnP IGD daemon"
-arch=('i686' 'x86_64')
-url="http://miniupnp.free.fr"
-license=('BSD')
-backup=(etc/miniupnpd/miniupnpd.conf)
-depends=('libnfnetlink' 'iptables' 'net-tools' 'util-linux')
-makedepends=('lsb-release')
-source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz"
- miniupnpd.systemd)
-sha256sums=('086dfffa59e8e86e792b73a71d275fec55ef17fe3e94a8c140301aceb05bcdbd'
- '2707d028f28fbb28c3a9d13605c9c738e9628f828e22288a8a1492ac93f9ad7c')
-
-build() {
- cd "$pkgname-$pkgver"
-
- CONFIG_OPTIONS="--strict --ipv6 --leasefile" make -f Makefile.linux config.h
- make -f Makefile.linux
-}
-
-package() {
- cd "$pkgname-$pkgver"
- mkdir -p "$pkgdir/usr/share/man/man8"
-
- make PREFIX="$pkgdir/" SBININSTALLDIR="$pkgdir/usr/bin" -f Makefile.linux install
-
- rm -r "${pkgdir}/etc/init.d"
-
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service"
-
- sed -i 's:/s\?bin/iptables:/usr/bin/iptables:
- s:eth0:"`cat /etc/miniupnpd/miniupnpd.conf | '"awk -F= '/^ext_ifname/ { print \$2 }'"'`":' "${pkgdir}"/etc/miniupnpd/*.sh
- sed -i -e "s/^uuid=[-0-9a-f]*/uuid=00000000-0000-0000-0000-000000000000/
- s/make genuuid/uuidgen/" "${pkgdir}/etc/miniupnpd/miniupnpd.conf"
-}
Copied: miniupnpd/repos/community-i686/PKGBUILD (from rev 110045, miniupnpd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-04-23 15:59:45 UTC (rev 110046)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Contributor: fauno <fauno at parabola.nu>
+pkgname=miniupnpd
+pkgver=1.8.20140401
+pkgrel=2
+pkgdesc="Lightweight UPnP IGD daemon"
+arch=('i686' 'x86_64')
+url="http://miniupnp.free.fr"
+license=('BSD')
+backup=(etc/miniupnpd/miniupnpd.conf)
+depends=('libnfnetlink' 'iptables' 'net-tools' 'util-linux')
+makedepends=('lsb-release')
+source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz"
+ miniupnpd-1.8.20140401-foreground.patch
+ miniupnpd.systemd)
+sha256sums=('086dfffa59e8e86e792b73a71d275fec55ef17fe3e94a8c140301aceb05bcdbd'
+ '79350f2dbb695b58744aa9036d34a7dfdcfc97cf0f5f3419b86bd9ca58482f8e'
+ 'baac6223eb35729ea301bd658dc2df6aad5396c7c0b1ec15c8aac1803ef37f6a')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -p0 -i "$srcdir"/miniupnpd-1.8.20140401-foreground.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ CONFIG_OPTIONS="--strict --ipv6 --leasefile" make -f Makefile.linux config.h
+ make -f Makefile.linux
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ mkdir -p "$pkgdir/usr/share/man/man8"
+
+ make PREFIX="$pkgdir/" SBININSTALLDIR="$pkgdir/usr/bin" -f Makefile.linux install
+
+ rm -r "${pkgdir}/etc/init.d"
+
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service"
+
+ sed -i 's:/s\?bin/iptables:/usr/bin/iptables:
+ s:eth0:"`cat /etc/miniupnpd/miniupnpd.conf | '"awk -F= '/^ext_ifname/ { print \$2 }'"'`":' "${pkgdir}"/etc/miniupnpd/*.sh
+ sed -i -e "s/^uuid=[-0-9a-f]*/uuid=00000000-0000-0000-0000-000000000000/
+ s/make genuuid/uuidgen/" "${pkgdir}/etc/miniupnpd/miniupnpd.conf"
+}
Copied: miniupnpd/repos/community-i686/miniupnpd-1.8.20140401-foreground.patch (from rev 110045, miniupnpd/trunk/miniupnpd-1.8.20140401-foreground.patch)
===================================================================
--- community-i686/miniupnpd-1.8.20140401-foreground.patch (rev 0)
+++ community-i686/miniupnpd-1.8.20140401-foreground.patch 2014-04-23 15:59:45 UTC (rev 110046)
@@ -0,0 +1,40 @@
+--- ./miniupnpd.c.orig 2014-04-23 15:41:11.783562093 +0000
++++ ./miniupnpd.c 2014-04-23 15:43:19.672842038 +0000
+@@ -797,7 +797,7 @@
+ {
+ int i;
+ int pid;
+- int debug_flag = 0;
++ int debug_flag = 0, foreground_flag = 0;
+ int openlog_option;
+ struct sigaction sa;
+ /*const char * logfilename = 0;*/
+@@ -1159,6 +1159,9 @@
+ case 'd':
+ debug_flag = 1;
+ break;
++ case 'D':
++ foreground_flag = 1;
++ break;
+ case 'w':
+ if(i+1 < argc)
+ presurl = argv[++i];
+@@ -1273,7 +1276,7 @@
+ goto print_usage;
+ }
+
+- if(debug_flag)
++ if(debug_flag || foreground_flag)
+ {
+ pid = getpid();
+ }
+@@ -1413,7 +1416,8 @@
+ "\tNotify interval is in seconds. Default is 30 seconds.\n"
+ "\tDefault pid file is '%s'.\n"
+ "\tDefault config file is '%s'.\n"
+- "\tWith -d miniupnpd will run as a standard program.\n"
++ "\tWith -D miniupnpd will run as a standard program.\n"
++ "\tWith -d miniupnpd will run as a standard program in debug mode.\n"
+ #if defined(USE_PF) || defined(USE_IPF)
+ "\t-L sets packet log in pf and ipf on.\n"
+ #endif
Deleted: community-i686/miniupnpd.systemd
===================================================================
--- community-i686/miniupnpd.systemd 2014-04-23 15:59:32 UTC (rev 110045)
+++ community-i686/miniupnpd.systemd 2014-04-23 15:59:45 UTC (rev 110046)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Lightweight UPnP IGD daemon
-
-[Service]
-ExecStartPre=/etc/miniupnpd/iptables_init.sh
-ExecStart=/usr/bin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d
-ExecStopPost=/etc/miniupnpd/iptables_removeall.sh
-PIDFile=/run/miniupnpd.pid
-StandardOutput=null
-
-[Install]
-WantedBy=network.target
Copied: miniupnpd/repos/community-i686/miniupnpd.systemd (from rev 110045, miniupnpd/trunk/miniupnpd.systemd)
===================================================================
--- community-i686/miniupnpd.systemd (rev 0)
+++ community-i686/miniupnpd.systemd 2014-04-23 15:59:45 UTC (rev 110046)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Lightweight UPnP IGD daemon
+
+[Service]
+ExecStartPre=/etc/miniupnpd/iptables_init.sh
+ExecStart=/usr/bin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -D
+ExecStopPost=/etc/miniupnpd/iptables_removeall.sh
+PIDFile=/run/miniupnpd.pid
+
+[Install]
+WantedBy=network.target
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-04-23 15:59:32 UTC (rev 110045)
+++ community-x86_64/PKGBUILD 2014-04-23 15:59:45 UTC (rev 110046)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
-# Contributor: fauno <fauno at parabola.nu>
-pkgname=miniupnpd
-pkgver=1.8.20140401
-pkgrel=1
-pkgdesc="Lightweight UPnP IGD daemon"
-arch=('i686' 'x86_64')
-url="http://miniupnp.free.fr"
-license=('BSD')
-backup=(etc/miniupnpd/miniupnpd.conf)
-depends=('libnfnetlink' 'iptables' 'net-tools' 'util-linux')
-makedepends=('lsb-release')
-source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz"
- miniupnpd.systemd)
-sha256sums=('086dfffa59e8e86e792b73a71d275fec55ef17fe3e94a8c140301aceb05bcdbd'
- '2707d028f28fbb28c3a9d13605c9c738e9628f828e22288a8a1492ac93f9ad7c')
-
-build() {
- cd "$pkgname-$pkgver"
-
- CONFIG_OPTIONS="--strict --ipv6 --leasefile" make -f Makefile.linux config.h
- make -f Makefile.linux
-}
-
-package() {
- cd "$pkgname-$pkgver"
- mkdir -p "$pkgdir/usr/share/man/man8"
-
- make PREFIX="$pkgdir/" SBININSTALLDIR="$pkgdir/usr/bin" -f Makefile.linux install
-
- rm -r "${pkgdir}/etc/init.d"
-
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service"
-
- sed -i 's:/s\?bin/iptables:/usr/bin/iptables:
- s:eth0:"`cat /etc/miniupnpd/miniupnpd.conf | '"awk -F= '/^ext_ifname/ { print \$2 }'"'`":' "${pkgdir}"/etc/miniupnpd/*.sh
- sed -i -e "s/^uuid=[-0-9a-f]*/uuid=00000000-0000-0000-0000-000000000000/
- s/make genuuid/uuidgen/" "${pkgdir}/etc/miniupnpd/miniupnpd.conf"
-}
Copied: miniupnpd/repos/community-x86_64/PKGBUILD (from rev 110045, miniupnpd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-04-23 15:59:45 UTC (rev 110046)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Contributor: fauno <fauno at parabola.nu>
+pkgname=miniupnpd
+pkgver=1.8.20140401
+pkgrel=2
+pkgdesc="Lightweight UPnP IGD daemon"
+arch=('i686' 'x86_64')
+url="http://miniupnp.free.fr"
+license=('BSD')
+backup=(etc/miniupnpd/miniupnpd.conf)
+depends=('libnfnetlink' 'iptables' 'net-tools' 'util-linux')
+makedepends=('lsb-release')
+source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz"
+ miniupnpd-1.8.20140401-foreground.patch
+ miniupnpd.systemd)
+sha256sums=('086dfffa59e8e86e792b73a71d275fec55ef17fe3e94a8c140301aceb05bcdbd'
+ '79350f2dbb695b58744aa9036d34a7dfdcfc97cf0f5f3419b86bd9ca58482f8e'
+ 'baac6223eb35729ea301bd658dc2df6aad5396c7c0b1ec15c8aac1803ef37f6a')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -p0 -i "$srcdir"/miniupnpd-1.8.20140401-foreground.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ CONFIG_OPTIONS="--strict --ipv6 --leasefile" make -f Makefile.linux config.h
+ make -f Makefile.linux
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ mkdir -p "$pkgdir/usr/share/man/man8"
+
+ make PREFIX="$pkgdir/" SBININSTALLDIR="$pkgdir/usr/bin" -f Makefile.linux install
+
+ rm -r "${pkgdir}/etc/init.d"
+
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service"
+
+ sed -i 's:/s\?bin/iptables:/usr/bin/iptables:
+ s:eth0:"`cat /etc/miniupnpd/miniupnpd.conf | '"awk -F= '/^ext_ifname/ { print \$2 }'"'`":' "${pkgdir}"/etc/miniupnpd/*.sh
+ sed -i -e "s/^uuid=[-0-9a-f]*/uuid=00000000-0000-0000-0000-000000000000/
+ s/make genuuid/uuidgen/" "${pkgdir}/etc/miniupnpd/miniupnpd.conf"
+}
Copied: miniupnpd/repos/community-x86_64/miniupnpd-1.8.20140401-foreground.patch (from rev 110045, miniupnpd/trunk/miniupnpd-1.8.20140401-foreground.patch)
===================================================================
--- community-x86_64/miniupnpd-1.8.20140401-foreground.patch (rev 0)
+++ community-x86_64/miniupnpd-1.8.20140401-foreground.patch 2014-04-23 15:59:45 UTC (rev 110046)
@@ -0,0 +1,40 @@
+--- ./miniupnpd.c.orig 2014-04-23 15:41:11.783562093 +0000
++++ ./miniupnpd.c 2014-04-23 15:43:19.672842038 +0000
+@@ -797,7 +797,7 @@
+ {
+ int i;
+ int pid;
+- int debug_flag = 0;
++ int debug_flag = 0, foreground_flag = 0;
+ int openlog_option;
+ struct sigaction sa;
+ /*const char * logfilename = 0;*/
+@@ -1159,6 +1159,9 @@
+ case 'd':
+ debug_flag = 1;
+ break;
++ case 'D':
++ foreground_flag = 1;
++ break;
+ case 'w':
+ if(i+1 < argc)
+ presurl = argv[++i];
+@@ -1273,7 +1276,7 @@
+ goto print_usage;
+ }
+
+- if(debug_flag)
++ if(debug_flag || foreground_flag)
+ {
+ pid = getpid();
+ }
+@@ -1413,7 +1416,8 @@
+ "\tNotify interval is in seconds. Default is 30 seconds.\n"
+ "\tDefault pid file is '%s'.\n"
+ "\tDefault config file is '%s'.\n"
+- "\tWith -d miniupnpd will run as a standard program.\n"
++ "\tWith -D miniupnpd will run as a standard program.\n"
++ "\tWith -d miniupnpd will run as a standard program in debug mode.\n"
+ #if defined(USE_PF) || defined(USE_IPF)
+ "\t-L sets packet log in pf and ipf on.\n"
+ #endif
Deleted: community-x86_64/miniupnpd.systemd
===================================================================
--- community-x86_64/miniupnpd.systemd 2014-04-23 15:59:32 UTC (rev 110045)
+++ community-x86_64/miniupnpd.systemd 2014-04-23 15:59:45 UTC (rev 110046)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Lightweight UPnP IGD daemon
-
-[Service]
-ExecStartPre=/etc/miniupnpd/iptables_init.sh
-ExecStart=/usr/bin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d
-ExecStopPost=/etc/miniupnpd/iptables_removeall.sh
-PIDFile=/run/miniupnpd.pid
-StandardOutput=null
-
-[Install]
-WantedBy=network.target
Copied: miniupnpd/repos/community-x86_64/miniupnpd.systemd (from rev 110045, miniupnpd/trunk/miniupnpd.systemd)
===================================================================
--- community-x86_64/miniupnpd.systemd (rev 0)
+++ community-x86_64/miniupnpd.systemd 2014-04-23 15:59:45 UTC (rev 110046)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Lightweight UPnP IGD daemon
+
+[Service]
+ExecStartPre=/etc/miniupnpd/iptables_init.sh
+ExecStart=/usr/bin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -D
+ExecStopPost=/etc/miniupnpd/iptables_removeall.sh
+PIDFile=/run/miniupnpd.pid
+
+[Install]
+WantedBy=network.target
More information about the arch-commits
mailing list