Updated to 1.8.20140523, migrated to systemd

.abf.yml

@@ -1,3 +1,5 @@
-sources:
+removed_sources:
-  "miniupnpd-1.5.20110520.tar.gz": 7d4009daa5dd977be6d6c88fa9510a228978b7a6
+  miniupnpd-1.5.20110520.tar.gz: 7d4009daa5dd977be6d6c88fa9510a228978b7a6
   miniupnpd-1.7.20121005.tar.gz: 4579c4711a8455bf455f3757ac9ce0dc40088901
+sources:
+  miniupnpd-1.8.20140523.tar.gz: 1f29d76df57fcf4046c7cb9c7312d7fbc3f28e26

miniupnpd.init.d.script

@@ -1,56 +0,0 @@
-#! /bin/sh
-#
-# Startup script for the miniupnp daemon
-#
-# chkconfig: 2345 86 14
-# description: The miniUPnP daemon is an UPnP IGD
-# processname: miniupnpd
-# config: /etc/miniupnpd/miniupnpd.conf
-
-### BEGIN INIT INFO
-# Provides: miniupnpd upnp
-# Required-Start: iptables
-# Default-Start: 2 3 4 5
-# Short-Description: The UPNP & NAT-PMP implementation
-# Description: The miniUPnP daemon is an UPnP IGD (internet gateway device)
-# 	       which provide NAT traversal services to any UPnP enabled client on
-# 	       the network.
-### END INIT INFO
-
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# See how we were called.
-case "$1" in
-  start)
-	# Start daemons.
-	echo -n "Starting miniupnpd: "
-	daemon miniupnpd -f /etc/miniupnpd/miniupnpd.conf
-	echo
-	touch /var/lock/subsys/miniupnpd
-	;;
-
-  stop)
-	# Stop daemons.
-	echo -n "Shutting down miniupnpd: "
-	killproc miniupnpd
-	echo
-	rm -f /var/lock/subsys/miniupnpd
-	;;
-
-  reload|restart)
-	$0 stop
-	$0 start
-	;;
-
-  status)
-	status miniupnpd
-	;;
-
-  *)
-        echo "Usage: $0 {start|stop|restart|reload|status}"
-        exit 1
-esac
-
-exit 0

miniupnpd.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=The miniUPnP daemon is an UPnP IGD
+Requires=rpcbind.service iptables.service
+After=syslog.target network.target rpcbind.service iptables.service
+
+[Service]
+Type=forking
+RemainAfterExit=yes
+EnvironmentFile=/etc/sysconfig/network
+#EnvironmentFile=/etc/miniupnpd/miniupnpd.conf
+ExecStart=/usr/sbin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf
+
+[Install]
+WantedBy=multi-user.target

miniupnpd.spec

@@ -1,16 +1,17 @@
 Summary:	The UPNP & NAT-PMP implementation
 Name:		miniupnpd
-Version:	1.7.20121005
+Version:	1.8.20140523
 Release:	1
 License:	GPLv2
 Group:		System/Servers
 URL:		http://miniupnp.free.fr
 Source0:	http://miniupnp.free.fr/files/download.php?file=/%{name}-%{version}.tar.gz
-BuildRequires:	iptables-ip4tc-devel iptables-devel
+BuildRequires:	iptables-ip4tc-devel
+BuildRequires:	iptables-devel
+BuildRequires:	pkgconfig(libiptc)
 BuildRequires:	pkgconfig(libnetfilter_conntrack)
 Requires:	iptables
-
+Source1:	miniupnpd.service
-Source1:	miniupnpd.init.d.script
 
 %description
 The miniUPnP daemon is an UPnP IGD (internet gateway device)
@@ -19,7 +20,7 @@ the network.
 See http://www.upnp.org/ for more details on UPnP.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 %build
     mv Makefile.linux Makefile
@@ -42,19 +43,17 @@ See http://www.upnp.org/ for more details on UPnP.
 
 %make CC=gcc
 
-
 %install
-
 mkdir -p %{buildroot}%{_mandir}/man8/
 
 make install  PREFIX="%{buildroot}" STRIP="true"
 rm -f %{buildroot}%{_sysconfdir}/init.d/miniupnpd
 rm -f %{buildroot}%{_sysconfdir}/miniupnpd/miniupnpd.conf~
-install -D -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
+install -D -m 755 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
 
 %files
 %{_sbindir}/miniupnpd
-%{_initrddir}/miniupnpd
+%{_unitdir}/miniupnpd*
 %doc %{_mandir}/man*/*
 %config(noreplace) %{_sysconfdir}/miniupnpd/*
 %doc README Changelog.txt