diff --git a/.abf.yml b/.abf.yml index 17169db..cc433f5 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,3 @@ sources: "miniupnpd-1.5.20110520.tar.gz": 7d4009daa5dd977be6d6c88fa9510a228978b7a6 + miniupnpd-1.7.20121005.tar.gz: 4579c4711a8455bf455f3757ac9ce0dc40088901 diff --git a/miniupnpd.spec b/miniupnpd.spec index 9d5c835..d7ac76f 100644 --- a/miniupnpd.spec +++ b/miniupnpd.spec @@ -1,12 +1,11 @@ Summary: The UPNP & NAT-PMP implementation Name: miniupnpd -Version: 1.5.20110520 +Version: 1.7.20121005 Release: 1 -License: GPL +License: GPLv2 Group: System/Servers URL: http://miniupnp.free.fr -Source: http://miniupnp.free.fr/files/download.php?file=/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version} +Source0: http://miniupnp.free.fr/files/download.php?file=/%{name}-%{version}.tar.gz BuildRequires: iptables-ip4tc-devel iptables-devel Requires: iptables @@ -22,47 +21,39 @@ See http://www.upnp.org/ for more details on UPnP. %setup -q -n %{name}-%{version} %build -%make -f Makefile.linux config.h CFLAGS="%optflags -DIPTABLES_143" + mv Makefile.linux Makefile + sed -i \ + -e "s#^CFLAGS = .*-D#CPPFLAGS += -I/usr/include -D#" \ + -e '/^CFLAGS :=/s/CFLAGS/CPPFLAGS/g' \ + -e "s/CFLAGS += -ansi/#CFLAGS += -ansi/g" \ + -e "s/LIBS = -liptc/LIBS = -lip4tc/g" \ + -e 's/genuuid||//' \ + Makefile || die + sed -i \ + -e 's/\(strncpy(\([->a-z.]\+\), "[a-zA-Z]\+", \)IPT_FUNCTION_MAXNAMELEN);/\1sizeof(\2));/' \ + netfilter/iptcrdr.c || die + + make config.h + + sed -i \ + -e 's/\/\*#define ENABLE_LEASEFILE\*\//#define ENABLE_LEASEFILE/g' \ + config.h || die + +%make CC=gcc + %install -PREFIX=%{buildroot} make -f Makefile.linux install CFLAGS="%optflags -DIPTABLES_143" LIBS="/%{_lib}/libip4tc.so" + +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} -mkdir -p %{buildroot}%{_mandir}/man1/ -install -D -m 755 miniupnpd.1 %{buildroot}%{_mandir}/man1/ - -%clean -rm -fr %{buildroot} %files -%defattr(-,root,root) %{_sbindir}/miniupnpd %{_initrddir}/miniupnpd %doc %{_mandir}/man*/* %config(noreplace) %{_sysconfdir}/miniupnpd/* %doc README Changelog.txt - - -%changelog -* Tue May 24 2011 Funda Wang 1.5.20110520-1 -+ Revision: 678010 -- new version 1.5.20110520 - -* Thu Mar 03 2011 zamir 1.5.20110302-0 -+ Revision: 641422 -- upload new sources -- update version. remove old patch - -* Tue Nov 23 2010 Eugeni Dodonov 1.4.20100511-0mdv2011.0 -+ Revision: 600151 -- Update package group to comply with the policy. -- Use proper %%make command. -- Cleaned up spec. - - + zamir - - clear trash - - adding source and spec file - - adding rpm and srpm - - create miniupnpd -