Date: Monday, November 2, 2015 @ 17:11:16
Author: tredaelli
Revision: 145674
upgpkg: miniupnpd 1.9.20150922-1
Use Type=forking and remove miniupnpd-1.8.20140401-foreground.patch.
Remove --igd2 since broken clients (like uTorrent) couldn't add port mapping
FS#44726
Modified:
miniupnpd/trunk/PKGBUILD
miniupnpd/trunk/miniupnpd.systemd
Deleted:
miniupnpd/trunk/miniupnpd-1.8.20140401-foreground.patch
-----------------------------------------+
PKGBUILD | 16 +++---------
miniupnpd-1.8.20140401-foreground.patch | 40 ------------------------------
miniupnpd.systemd | 3 +-
3 files changed, 6 insertions(+), 53 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-11-02 16:01:28 UTC (rev 145673)
+++ PKGBUILD 2015-11-02 16:11:16 UTC (rev 145674)
@@ -2,7 +2,7 @@
# Maintainer: Timothy Redaelli <timothy.redae...@gmail.com>
# Contributor: fauno <fa...@parabola.nu>
pkgname=miniupnpd
-pkgver=1.9.20150721
+pkgver=1.9.20150922
pkgrel=1
pkgdesc="Lightweight UPnP IGD daemon"
arch=('i686' 'x86_64')
@@ -12,22 +12,14 @@
depends=('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=('9340224e5023ecb5d1b7f45e4d69734dcfbadbe41a80d1f0182347e6b8104470'
- '79350f2dbb695b58744aa9036d34a7dfdcfc97cf0f5f3419b86bd9ca58482f8e'
- '74d23781dd585fc1a4af77b4f0144774c57a9743b6c3670e75029e65c92a3db0')
+sha256sums=('d71a7435d93a311bf7ac8dd369efd1a805a95afe29d2df42399b97eec8ad1c28'
+ '66cd1ed0ae55c683910d46c2e486a8b52e48088b70248323cf894bc962ede48f')
-prepare() {
- cd "$pkgname-$pkgver"
-
- patch -p0 -i "$srcdir"/miniupnpd-1.8.20140401-foreground.patch
-}
-
build() {
cd "$pkgname-$pkgver"
- CONFIG_OPTIONS="--ipv6 --igd2 --leasefile" make -f Makefile.linux config.h
+ CONFIG_OPTIONS="--ipv6 --leasefile" make -f Makefile.linux config.h
make -f Makefile.linux
}
Deleted: miniupnpd-1.8.20140401-foreground.patch
===================================================================
--- miniupnpd-1.8.20140401-foreground.patch 2015-11-02 16:01:28 UTC (rev
145673)
+++ miniupnpd-1.8.20140401-foreground.patch 2015-11-02 16:11:16 UTC (rev
145674)
@@ -1,40 +0,0 @@
---- ./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
Modified: miniupnpd.systemd
===================================================================
--- miniupnpd.systemd 2015-11-02 16:01:28 UTC (rev 145673)
+++ miniupnpd.systemd 2015-11-02 16:11:16 UTC (rev 145674)
@@ -4,8 +4,9 @@
After=network.target
[Service]
+Type=forking
ExecStartPre=/etc/miniupnpd/iptables_init.sh
-ExecStart=/usr/bin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -D
+ExecStart=/usr/bin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf
ExecStopPost=/etc/miniupnpd/iptables_removeall.sh
PIDFile=/run/miniupnpd.pid
