upgpkg: miniupnpd-git 2.0.r121.g587f33c-1

3 files changed, 13 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4e958019f0fe..0e7f61c68aa1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = miniupnpd-git
 	pkgdesc = Lightweight UPnP IGD daemon (git)
-	pkgver = r76.ge6ed3c5
+	pkgver = 2.0.r121.g587f33c
 	pkgrel = 1
 	url = http://miniupnp.free.fr
 	arch = i686
@@ -8,16 +8,18 @@ pkgbase = miniupnpd-git
 	license = BSD
 	makedepends = git
 	makedepends = lsb-release
+	depends = glibc
 	depends = iptables
 	depends = net-tools
 	depends = util-linux
+	depends = sh
 	provides = miniupnpd
 	conflicts = miniupnpd
 	backup = etc/miniupnpd/miniupnpd.conf
 	source = git+https://github.com/miniupnp/miniupnp.git
-	source = miniupnpd.systemd
+	source = miniupnpd.systemd::https://git.archlinux.org/svntogit/community.git/plain/trunk/miniupnpd.systemd?h=packages/miniupnpd
+	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 66cd1ed0ae55c683910d46c2e486a8b52e48088b70248323cf894bc962ede48f
 
 pkgname = miniupnpd-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 1a8cdde9e666..d26cbaa37e4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,27 @@
 # Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
 
 pkgname=miniupnpd-git
-pkgver=r76.ge6ed3c5
+pkgver=2.0.r121.g587f33c
 pkgrel=1
 pkgdesc="Lightweight UPnP IGD daemon (git)"
 arch=('i686' 'x86_64')
 url="http://miniupnp.free.fr"
 license=('BSD')
-depends=('iptables' 'net-tools' 'util-linux')
+depends=('glibc' 'iptables' 'net-tools' 'util-linux' 'sh')
 makedepends=('git' 'lsb-release')
 provides=('miniupnpd')
 conflicts=('miniupnpd')
 backup=(etc/miniupnpd/miniupnpd.conf)
 source=("git+https://github.com/miniupnp/miniupnp.git"
-        miniupnpd.systemd)
+        "miniupnpd.systemd::https://git.archlinux.org/svntogit/community.git/plain/trunk/miniupnpd.systemd?h=packages/miniupnpd")
 sha256sums=('SKIP'
-            '66cd1ed0ae55c683910d46c2e486a8b52e48088b70248323cf894bc962ede48f')
+            'SKIP')
 
 
 pkgver() {
   cd "miniupnp"
 
-  git describe --long --tags | sed 's/[^-]*-\(.*\)/r\1/;s/-/./g'
+  git describe --long --tags | sed 's/^miniupnpc_//;s/\([^-]*-g\)/r\1/;s/[_-]/./g'
 }
 
 build() {
@@ -38,11 +38,11 @@ package() {
 
   rm -r "$pkgdir/etc/init.d"
 
-  install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/miniupnpd/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
+          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"
+             s/make genuuid/uuidgen/" "$pkgdir/etc/miniupnpd/miniupnpd.conf"
 }
diff --git a/miniupnpd.systemd b/miniupnpd.systemd
deleted file mode 100644
index 7da147f6eea9..000000000000
--- a/miniupnpd.systemd
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Lightweight UPnP IGD daemon
-Documentation=man:miniupnpd(8)
-After=network.target
-
-[Service]
-Type=forking
-ExecStartPre=/etc/miniupnpd/iptables_init.sh
-ExecStart=/usr/bin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf
-ExecStopPost=/etc/miniupnpd/iptables_removeall.sh
-PIDFile=/run/miniupnpd.pid
-
-[Install]
-WantedBy=network.target