diff options
| -rw-r--r-- | net-misc/miniupnpd/ChangeLog | 11 | ||||
| -rw-r--r-- | net-misc/miniupnpd/files/miniupnpd-1.9-build.patch (renamed from net-misc/miniupnpd/files/miniupnpd-1.8-build.patch) | 83 | ||||
| -rw-r--r-- | net-misc/miniupnpd/files/miniupnpd-1.9-cleanup.patch | 170 | ||||
| -rw-r--r-- | net-misc/miniupnpd/miniupnpd-1.8.ebuild | 62 | ||||
| -rw-r--r-- | net-misc/miniupnpd/miniupnpd-1.9_pre20140422.ebuild (renamed from net-misc/miniupnpd/miniupnpd-1.8-r1.ebuild) | 7 |
5 files changed, 213 insertions, 120 deletions
diff --git a/net-misc/miniupnpd/ChangeLog b/net-misc/miniupnpd/ChangeLog index 0ef756c77784..3a5e5d9d63a2 100644 --- a/net-misc/miniupnpd/ChangeLog +++ b/net-misc/miniupnpd/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-misc/miniupnpd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.33 2014/04/29 20:58:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.34 2014/05/10 09:25:26 gurligebis Exp $ + +*miniupnpd-1.9_pre20140422 (10 May 2014) + + 10 May 2014; <gurligebis@gentoo.org> -miniupnpd-1.8.ebuild, + -miniupnpd-1.8-r1.ebuild, +miniupnpd-1.9_pre20140422.ebuild, + -files/miniupnpd-1.8-build.patch, +files/miniupnpd-1.9-build.patch, + +files/miniupnpd-1.9-cleanup.patch: + Bumping to 1.9_pre20140422 and seperating patch into upstream and + non-upstream part. *miniupnpd-1.8-r1 (29 Apr 2014) diff --git a/net-misc/miniupnpd/files/miniupnpd-1.8-build.patch b/net-misc/miniupnpd/files/miniupnpd-1.9-build.patch index 007c6a030644..333ce8a8810f 100644 --- a/net-misc/miniupnpd/files/miniupnpd-1.8-build.patch +++ b/net-misc/miniupnpd/files/miniupnpd-1.9-build.patch @@ -1,36 +1,22 @@ -https://github.com/miniupnp/miniupnp/pull/70 - --- a/Makefile.linux +++ b/Makefile.linux -@@ -21,10 +21,9 @@ - # $ IPTABLESPATH=/path/to/iptables-1.4.1 make -f Makefile.linux - # - #CFLAGS = -O -g -DDEBUG --CFLAGS ?= -Os - CFLAGS += -fno-strict-aliasing - CFLAGS += -fno-common --CFLAGS += -D_GNU_SOURCE -+CPPFLAGS += -D_GNU_SOURCE - CFLAGS += -Wall - CFLAGS += -Wextra -Wstrict-prototypes -Wdeclaration-after-statement - #CFLAGS += -Wno-missing-field-initializers -@@ -53,69 +52,8 @@ NETFILTEROBJS = netfilter/iptcrdr.o netfilter/iptpinhole.o - - ALLOBJS = $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS) +@@ -75,70 +75,10 @@ LDFLAGS += $(shell $(PKG_CONFIG) --libs- + LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-other libiptc) + else -ifeq "$(wildcard /etc/gentoo-release )" "" --LIBS ?= -liptc +-LDLIBS ?= -liptc -else # gentoo -# the following is better, at least on gentoo with iptables 1.4.6 -# see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=1618 -# and http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=2183 --LIBS ?= -lip4tc --CFLAGS := -DIPTABLES_143 $(CFLAGS) +-LDLIBS ?= -lip4tc +-CPPFLAGS := -DIPTABLES_143 $(CPPFLAGS) -endif - -ARCH ?= $(shell uname -m | grep -q "x86_64" && echo 64) -ifdef IPTABLESPATH --CFLAGS := $(CFLAGS) -I$(IPTABLESPATH)/include/ +-CPPFLAGS := $(CPPFLAGS) -I$(IPTABLESPATH)/include/ -LDFLAGS := $(LDFLAFGS) -L$(IPTABLESPATH)/libiptc/ -# get iptables version and set IPTABLES_143 macro if needed -ifeq ($(TARGET_OPENWRT),) @@ -41,12 +27,12 @@ https://github.com/miniupnp/miniupnp/pull/70 -# test if iptables version >= 1.4.3 -TEST := $(shell [ \( \( $(IPTABLESVERSION1) -ge 1 \) -a \( $(IPTABLESVERSION2) -ge 4 \) \) -a \( $(IPTABLESVERSION3) -ge 3 \) ] && echo 1 ) -ifeq ($(TEST), 1) --CFLAGS := $(CFLAGS) -DIPTABLES_143 +-CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143 -# the following sucks, but works --LIBS = $(IPTABLESPATH)/libiptc/.libs/libip4tc.o --#LIBS = $(IPTABLESPATH)/libiptc/.libs/libiptc.a +-LDLIBS = $(IPTABLESPATH)/libiptc/.libs/libip4tc.o +-#LDLIBS = $(IPTABLESPATH)/libiptc/.libs/libiptc.a -else # ifeq ($(TEST), 1) --LIBS = $(IPTABLESPATH)/libiptc/libiptc.a +-LDLIBS = $(IPTABLESPATH)/libiptc/libiptc.a -endif # ifeq ($(TEST), 1) -else # ($(TARGET_OPENWRT),) -# openWRT : @@ -54,12 +40,12 @@ https://github.com/miniupnp/miniupnp/pull/70 -# the following test has to be verified : -TEST := $(shell test -f /usr/include/iptables/internal.h && grep -q "\#define IPTABLES_VERSION" /usr/include/iptables/internal.h && echo 1) -ifeq ($(TEST), 1) --CFLAGS := $(CFLAGS) -DIPTABLES_143 --LIBS = -liptc +-CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143 +-LDLIBS = -liptc -endif # ($(TEST), 1) -TEST_LIB := $(shell test -f /usr/lib$(ARCH)/libiptc.a && echo 1) -ifeq ($(TEST_LIB), 1) --LIBS = -liptc /usr/lib$(ARCH)/libiptc.a +-LDLIBS = -liptc /usr/lib$(ARCH)/libiptc.a -endif # ($(TEST_LIB), 1) -endif # ($(TARGET_OPENWRT),) -else # ifdef IPTABLESPATH @@ -67,42 +53,31 @@ https://github.com/miniupnp/miniupnp/pull/70 -# the following test has to be verified : -TEST := $(shell test -f /usr/include/xtables.h && grep -q "XTABLES_VERSION_CODE" /usr/include/xtables.h && echo 1) -ifeq ($(TEST), 1) --CFLAGS := $(CFLAGS) -DIPTABLES_143 --LIBS = -liptc +-CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143 +-LDLIBS = -liptc -TESTIP4TC := $(shell test -f /lib/libip4tc.so && echo 1) -ifeq ($(TESTIP4TC), 1) --LIBS := $(LIBS) -lip4tc +-LDLIBS := $(LDLIBS) -lip4tc -endif # ($(TESTIP4TC), 1) -TESTIP6TC := $(shell test -f /lib/libip6tc.so && echo 1) -ifeq ($(TESTIP6TC), 1) --LIBS := $(LIBS) -lip6tc +-LDLIBS := $(LDLIBS) -lip6tc -endif # ($(TESTIP6TC), 1) -endif # ($(TEST), 1) -endif # ifdef IPTABLESPATH -- --LIBS += -lnfnetlink -+LDLIBS = -lip4tc -lnfnetlink -+CPPFLAGS += -DIPTABLES_143 + endif # ifdef PCFILE_FOUND - TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o +-LDLIBS += -lnfnetlink ++LDLIBS += -lip4tc -lnfnetlink ++CPPFLAGS += -DIPTABLES_143 -@@ -150,8 +88,8 @@ install: miniupnpd miniupnpd.8 miniupnpd.conf genuuid \ - $(INSTALL) --mode=0644 -b miniupnpd.conf $(ETCINSTALLDIR) - $(INSTALL) -d $(PREFIX)/etc/init.d - $(INSTALL) linux/miniupnpd.init.d.script $(PREFIX)/etc/init.d/miniupnpd -+ $(INSTALL) -d $(MANINSTALLDIR) -+ $(INSTALL) --mode=0644 miniupnpd.8 $(MANINSTALLDIR) -- $(INSTALL) miniupnpd.8 $(MANINSTALLDIR) -- gzip $(MANINSTALLDIR)/miniupnpd.8 + TEST := $(shell $(PKG_CONFIG) --atleast-version=1.0.2 libnetfilter_conntrack && $(PKG_CONFIG) --atleast-version=1.0.3 libmnl && echo 1) + ifeq ($(TEST),1) +@@ -184,7 +124,6 @@ install: miniupnpd miniupnpd.8 miniupnpd + $(INSTALL) linux/miniupnpd.init.d.script $(DESTDIR)$(PREFIX)/etc/init.d/miniupnpd + $(INSTALL) -d $(DESTDIR)$(MANINSTALLDIR) + $(INSTALL) --mode=0644 miniupnpd.8 $(DESTDIR)$(MANINSTALLDIR) +- gzip $(DESTDIR)$(MANINSTALLDIR)/miniupnpd.8 # genuuid is using the uuidgen CLI tool which is part of libuuid # from the e2fsprogs -@@ -162,7 +100,7 @@ else - sed -i -e "s/^uuid=[-0-9a-f]*/uuid=`($(STAGING_DIR_HOST)/bin/genuuid||$(STAGING_DIR_HOST)/bin/uuidgen||$(STAGING_DIR_HOST)/bin/uuid) 2>/dev/null`/" miniupnpd.conf - endif - --miniupnpd: $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS) $(LIBS) -+miniupnpd: $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS) - - testupnpdescgen: $(TESTUPNPDESCGENOBJS) - diff --git a/net-misc/miniupnpd/files/miniupnpd-1.9-cleanup.patch b/net-misc/miniupnpd/files/miniupnpd-1.9-cleanup.patch new file mode 100644 index 000000000000..0469d2b95708 --- /dev/null +++ b/net-misc/miniupnpd/files/miniupnpd-1.9-cleanup.patch @@ -0,0 +1,170 @@ +--- a/Makefile.linux ++++ b/Makefile.linux +@@ -25,7 +25,7 @@ + CFLAGS ?= -Os + CFLAGS += -fno-strict-aliasing + CFLAGS += -fno-common +-CFLAGS += -D_GNU_SOURCE ++CPPFLAGS += -D_GNU_SOURCE + CFLAGS += -Wall + CFLAGS += -Wextra -Wstrict-prototypes -Wdeclaration-after-statement + #CFLAGS += -Wno-missing-field-initializers +@@ -34,6 +34,7 @@ CC ?= gcc + RM = rm -f + INSTALL = install + STRIP ?= strip ++PKG_CONFIG ?= pkg-config + CP = cp + + +@@ -54,39 +55,39 @@ NETFILTEROBJS = netfilter/iptcrdr.o netf + + ALLOBJS = $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS) + +-PCFILE_FOUND := $(shell pkg-config --exists libiptc; echo $$?) ++PCFILE_FOUND := $(shell $(PKG_CONFIG) --exists libiptc; echo $$?) + + ifeq (${PCFILE_FOUND},0) + +-IPTABLESVERSION := $(shell pkg-config --modversion libiptc) ++IPTABLESVERSION := $(shell $(PKG_CONFIG) --modversion libiptc) + IPTABLESVERSION1 := $(shell echo $(IPTABLESVERSION) | cut -d. -f1 ) + IPTABLESVERSION2 := $(shell echo $(IPTABLESVERSION) | cut -d. -f2 ) + IPTABLESVERSION3 := $(shell echo $(IPTABLESVERSION) | cut -d. -f3 ) + # test if iptables version >= 1.4.3 + TEST := $(shell [ \( \( $(IPTABLESVERSION1) -ge 1 \) -a \( $(IPTABLESVERSION2) -ge 4 \) \) -a \( $(IPTABLESVERSION3) -ge 3 \) ] && echo 1 ) + ifeq ($(TEST), 1) +-CFLAGS += -DIPTABLES_143 ++CPPFLAGS += -DIPTABLES_143 + endif + +-CFLAGS += $(shell pkg-config --cflags libiptc) +-LIBS += $(shell pkg-config --static --libs-only-l libiptc) +-LDFLAGS += $(shell pkg-config --libs-only-L libiptc) +-LDFLAGS += $(shell pkg-config --libs-only-other libiptc) ++CFLAGS += $(shell $(PKG_CONFIG) --cflags libiptc) ++LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libiptc) ++LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L libiptc) ++LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-other libiptc) + else + + ifeq "$(wildcard /etc/gentoo-release )" "" +-LIBS ?= -liptc ++LDLIBS ?= -liptc + else # gentoo + # the following is better, at least on gentoo with iptables 1.4.6 + # see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=1618 + # and http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=2183 +-LIBS ?= -lip4tc +-CFLAGS := -DIPTABLES_143 $(CFLAGS) ++LDLIBS ?= -lip4tc ++CPPFLAGS := -DIPTABLES_143 $(CPPFLAGS) + endif + + ARCH ?= $(shell uname -m | grep -q "x86_64" && echo 64) + ifdef IPTABLESPATH +-CFLAGS := $(CFLAGS) -I$(IPTABLESPATH)/include/ ++CPPFLAGS := $(CPPFLAGS) -I$(IPTABLESPATH)/include/ + LDFLAGS := $(LDFLAFGS) -L$(IPTABLESPATH)/libiptc/ + # get iptables version and set IPTABLES_143 macro if needed + ifeq ($(TARGET_OPENWRT),) +@@ -97,12 +98,12 @@ IPTABLESVERSION3 := $(shell echo $(IPTAB + # test if iptables version >= 1.4.3 + TEST := $(shell [ \( \( $(IPTABLESVERSION1) -ge 1 \) -a \( $(IPTABLESVERSION2) -ge 4 \) \) -a \( $(IPTABLESVERSION3) -ge 3 \) ] && echo 1 ) + ifeq ($(TEST), 1) +-CFLAGS := $(CFLAGS) -DIPTABLES_143 ++CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143 + # the following sucks, but works +-LIBS = $(IPTABLESPATH)/libiptc/.libs/libip4tc.o +-#LIBS = $(IPTABLESPATH)/libiptc/.libs/libiptc.a ++LDLIBS = $(IPTABLESPATH)/libiptc/.libs/libip4tc.o ++#LDLIBS = $(IPTABLESPATH)/libiptc/.libs/libiptc.a + else # ifeq ($(TEST), 1) +-LIBS = $(IPTABLESPATH)/libiptc/libiptc.a ++LDLIBS = $(IPTABLESPATH)/libiptc/libiptc.a + endif # ifeq ($(TEST), 1) + else # ($(TARGET_OPENWRT),) + # openWRT : +@@ -110,12 +111,12 @@ else # ($(TARGET_OPENWRT),) + # the following test has to be verified : + TEST := $(shell test -f /usr/include/iptables/internal.h && grep -q "\#define IPTABLES_VERSION" /usr/include/iptables/internal.h && echo 1) + ifeq ($(TEST), 1) +-CFLAGS := $(CFLAGS) -DIPTABLES_143 +-LIBS = -liptc ++CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143 ++LDLIBS = -liptc + endif # ($(TEST), 1) + TEST_LIB := $(shell test -f /usr/lib$(ARCH)/libiptc.a && echo 1) + ifeq ($(TEST_LIB), 1) +-LIBS = -liptc /usr/lib$(ARCH)/libiptc.a ++LDLIBS = -liptc /usr/lib$(ARCH)/libiptc.a + endif # ($(TEST_LIB), 1) + endif # ($(TARGET_OPENWRT),) + else # ifdef IPTABLESPATH +@@ -123,30 +124,30 @@ else # ifdef IPTABLESPATH + # the following test has to be verified : + TEST := $(shell test -f /usr/include/xtables.h && grep -q "XTABLES_VERSION_CODE" /usr/include/xtables.h && echo 1) + ifeq ($(TEST), 1) +-CFLAGS := $(CFLAGS) -DIPTABLES_143 +-LIBS = -liptc ++CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143 ++LDLIBS = -liptc + TESTIP4TC := $(shell test -f /lib/libip4tc.so && echo 1) + ifeq ($(TESTIP4TC), 1) +-LIBS := $(LIBS) -lip4tc ++LDLIBS := $(LDLIBS) -lip4tc + endif # ($(TESTIP4TC), 1) + TESTIP6TC := $(shell test -f /lib/libip6tc.so && echo 1) + ifeq ($(TESTIP6TC), 1) +-LIBS := $(LIBS) -lip6tc ++LDLIBS := $(LDLIBS) -lip6tc + endif # ($(TESTIP6TC), 1) + endif # ($(TEST), 1) + endif # ifdef IPTABLESPATH + endif # ifdef PCFILE_FOUND + +-LIBS += -lnfnetlink ++LDLIBS += -lnfnetlink + +-TEST := $(shell pkg-config --atleast-version=1.0.2 libnetfilter_conntrack && pkg-config --atleast-version=1.0.3 libmnl && echo 1) ++TEST := $(shell $(PKG_CONFIG) --atleast-version=1.0.2 libnetfilter_conntrack && $(PKG_CONFIG) --atleast-version=1.0.3 libmnl && echo 1) + ifeq ($(TEST),1) +-CFLAGS += -DUSE_NFCT +-LIBS += $(shell pkg-config --static --libs-only-l libmnl) +-LIBS += $(shell pkg-config --static --libs-only-l libnetfilter_conntrack) ++CPPFLAGS += -DUSE_NFCT ++LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libmnl) ++LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libnetfilter_conntrack) + endif # ($(TEST),1) + +-LIBS += $(shell pkg-config --static --libs-only-l libssl) ++LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libssl) + + TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o + +@@ -195,7 +196,7 @@ else + sed -i -e "s/^uuid=[-0-9a-f]*/uuid=`($(STAGING_DIR_HOST)/bin/genuuid||$(STAGING_DIR_HOST)/bin/uuidgen||$(STAGING_DIR_HOST)/bin/uuid) 2>/dev/null`/" miniupnpd.conf + endif + +-miniupnpd: $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS) $(LIBS) ++miniupnpd: $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS) + + testupnpdescgen: $(TESTUPNPDESCGENOBJS) + +@@ -205,13 +206,13 @@ testupnppermissions: testupnppermissions + + testgetifaddr: testgetifaddr.o getifaddr.o + +-testgetroute: testgetroute.o linux/getroute.o upnputils.o -lnfnetlink ++testgetroute: testgetroute.o linux/getroute.o upnputils.o + + testasyncsendto: testasyncsendto.o asyncsendto.o upnputils.o \ +- linux/getroute.o -lnfnetlink ++ linux/getroute.o + + testportinuse: testportinuse.o portinuse.o getifaddr.o \ +- netfilter/iptcrdr.o $(LIBS) ++ netfilter/iptcrdr.o + + miniupnpdctl: miniupnpdctl.o + diff --git a/net-misc/miniupnpd/miniupnpd-1.8.ebuild b/net-misc/miniupnpd/miniupnpd-1.8.ebuild deleted file mode 100644 index 3d67ee3ef657..000000000000 --- a/net-misc/miniupnpd/miniupnpd-1.8.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.8.ebuild,v 1.2 2014/04/29 19:47:34 vapier Exp $ - -EAPI=2 -inherit eutils toolchain-funcs - -MY_PV=1.8 -S="${WORKDIR}/${PN}-${MY_PV}" - -DESCRIPTION="MiniUPnP IGD Daemon" -SRC_URI="http://miniupnp.free.fr/files/${PN}-${MY_PV}.tar.gz" -HOMEPAGE="http://miniupnp.free.fr/" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -RDEPEND=">=net-firewall/iptables-1.4.6 - net-libs/libnfnetlink" -DEPEND="${RDEPEND} - sys-apps/util-linux - sys-apps/lsb-release" - -src_prepare() { - 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 - - emake config.h - - sed -i \ - -e 's/\/\*#define ENABLE_LEASEFILE\*\//#define ENABLE_LEASEFILE/g' \ - config.h || die -} - -src_compile() { - emake CC="$(tc-getCC)" || die "emake failed" -} - -src_install () { - dodir /usr/share/man/man8 - - einstall PREFIX="${D}" STRIP="true" || die "einstall failed" - - newinitd "${FILESDIR}"/${PN}-init.d ${PN} - newconfd "${FILESDIR}"/${PN}-conf.d ${PN} -} - -pkg_postinst() { - elog "Please correct the external interface in the top of the two" - elog "scripts in /etc/miniupnpd and edit the config file in there too" -} diff --git a/net-misc/miniupnpd/miniupnpd-1.8-r1.ebuild b/net-misc/miniupnpd/miniupnpd-1.9_pre20140422.ebuild index 1ba6c4ec32d7..543bcb426c50 100644 --- a/net-misc/miniupnpd/miniupnpd-1.8-r1.ebuild +++ b/net-misc/miniupnpd/miniupnpd-1.9_pre20140422.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.8-r1.ebuild,v 1.1 2014/04/29 20:58:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.9_pre20140422.ebuild,v 1.1 2014/05/10 09:25:26 gurligebis Exp $ EAPI="5" inherit eutils toolchain-funcs -MY_PV=1.8 +MY_PV=1.8.20140422 MY_P="${PN}-${MY_PV}" DESCRIPTION="MiniUPnP IGD Daemon" @@ -27,7 +27,8 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" src_prepare() { - epatch "${FILESDIR}"/${PN}-1.8-build.patch + epatch "${FILESDIR}"/${PN}-1.9-cleanup.patch + epatch "${FILESDIR}"/${PN}-1.9-build.patch mv Makefile.linux Makefile || die } |