From 18dda890570fa3e80643f91e2fc394ffd0bae5ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@parabola.nu>
Date: Tue, 4 Jun 2013 10:25:28 -0300
Subject: miniupnpd rebuild for /usr/bin

---
 pcr/miniupnpd/PKGBUILD          | 13 +++++++++----
 pcr/miniupnpd/miniupnpd.systemd |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'pcr/miniupnpd')

diff --git a/pcr/miniupnpd/PKGBUILD b/pcr/miniupnpd/PKGBUILD
index 543002e04..1ab99d0ed 100644
--- a/pcr/miniupnpd/PKGBUILD
+++ b/pcr/miniupnpd/PKGBUILD
@@ -1,14 +1,14 @@
 # $Id$
-# Maintainer: None
+# Maintainer: fauno <fauno@parabola.nu>
 pkgname=miniupnpd
 pkgver=1.8.20130503
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight UPnP IGD daemon"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://miniupnp.free.fr"
 license=('BSD')
 backup=(etc/miniupnpd/miniupnpd.conf)
-depends=('libnfnetlink' 'iptables>=1.4.3')
+depends=('libnfnetlink' 'iptables>=1.4.3' 'net-tools')
 makedepends=('lsb-release')
 source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz"
         miniupnpd.systemd)
@@ -34,8 +34,13 @@ package() {
 	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service"
 
-	sed -i 's:/sbin/iptables:/usr/sbin/iptables:
+	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"
+        # usrmove
+        cd "$pkgdir"
+        mv usr/sbin usr/bin
 }
+md5sums=('484dbda7c428b2d5f3768500a48d3375'
+         'f862f79b673359adc80faf0be914394f')
diff --git a/pcr/miniupnpd/miniupnpd.systemd b/pcr/miniupnpd/miniupnpd.systemd
index 4c5aa77cc..88973535c 100644
--- a/pcr/miniupnpd/miniupnpd.systemd
+++ b/pcr/miniupnpd/miniupnpd.systemd
@@ -3,9 +3,9 @@ Description=Lightweight UPnP IGD daemon
 
 [Service]
 ExecStartPre=/etc/miniupnpd/iptables_init.sh
-ExecStart=/usr/sbin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d
+ExecStart=/usr/bin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d
 ExecStopPost=/etc/miniupnpd/iptables_removeall.sh
-PIDFile=/var/run/miniupnpd.pid
+PIDFile=/run/miniupnpd.pid
 StandardOutput=null
 
 [Install]
-- 
cgit v1.2.3-2-g168b