Bumping to 1.9_pre20140523 and adding configure option to enable changing name in config file.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x15AE484C

4 files changed, 21 insertions, 182 deletions

diff --git a/net-misc/miniupnpd/ChangeLog b/net-misc/miniupnpd/ChangeLog
index 3a5e5d9d63a2..97544003bf7d 100644
--- a/net-misc/miniupnpd/ChangeLog
+++ b/net-misc/miniupnpd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.34 2014/05/10 09:25:26 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.35 2014/07/26 09:03:37 gurligebis Exp $
+
+*miniupnpd-1.9_pre20140523 (26 Jul 2014)
+
+  26 Jul 2014; <gurligebis@gentoo.org> -miniupnpd-1.9_pre20140422.ebuild,
+  +miniupnpd-1.9_pre20140523.ebuild, -files/miniupnpd-1.9-cleanup.patch:
+  Bumping to 1.9_pre20140523 and adding configure option to enable changing
+  name in config file.
 
 *miniupnpd-1.9_pre20140422 (10 May 2014)
 
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 1b7953d92dcb..dc45e9bceac4 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -2,17 +2,16 @@
 Hash: SHA256
 
 AUX miniupnpd-1.9-build.patch 3425 SHA256 c1b71c39c97c1522bd08ac6ae21afb548103d8accf2019fb66922aecd0dd8441 SHA512 57bb6acc191922ec65797c0617fd0c0d3f13012abf24ef1298eb6e6c1421aba82fc4a58d68beeb534584e91704eff5297bd1256a96db774a8bbca70208ca2a74 WHIRLPOOL 0a2c2fa9e6143fdd8e8362de18209247ff2a6b9c3af161642e77b3dd279d813585c02f07e75dbcd7a3248d187d3eb3344d75096ebddd774226b7727b8ba771bf
-AUX miniupnpd-1.9-cleanup.patch 6339 SHA256 792b1b97b1be026e9114b167cbe1009bdfe93fff634a0417954967a7e70e8790 SHA512 8502320756a9d08fc83762886b4a34347f5c103c4e93ba4ef56cb9ddd2a0bed851c906765dccfc6fc6dc2b43f3a7fa378b99337b61e502805c2f653b150ef54c WHIRLPOOL 26bf4a4c4ef48ba27e46419ec7870c3d03aa8b219906ea941ff6374a25591da13143c6285a3357b0f72fe0c092b5630cca9bedf45f08339dc3280802cdb5bfd2
 AUX miniupnpd-conf.d 41 SHA256 8c6dae8588e21208a2f0a17965548e0b0708ceeea1157e2506f745e28913f9b3 SHA512 81aa2dac0643bbd1331549427c438900319adce91928b6bad6f7d470492f6f48e04e4d1af89f961db53fc132a7ff89ea52625441f051afd5a1b48680917f4ff7 WHIRLPOOL 1e7a01c6d9ae398f418fafd9d1fb23842d999635d34ed567b4b21b23e1119e43aba3fae40ea8834e179372fbb94bc74371dd37eb0e99420fa0503810ecfb9088
 AUX miniupnpd-init.d 629 SHA256 2a11cab5615550c1263448f943a62ed3fe4dd647888675588e59146a691f3643 SHA512 a25b2a444cde623fbdbe6fb26c544614cceb2cc1262a0409f40286f4c69b70ba1c05e55815552a12b0624b16ddd48d3e424dad18b278ff9da04bac335feb1d45 WHIRLPOOL 4de02748e8430803a891cc99f5c06601e1a316eca1082ea1ad43e296c9268c40e56a77d557d0ce2a8f7ee395ee0c5d598f2752d90c4e7e9982c197f5714e877f
-DIST miniupnpd-1.8.20140422.tar.gz 187225 SHA256 2980c7dbcdf00d6942ad21c814d88a3c70996b550a8e229eb52362bd472c3961 SHA512 f484ff8eb730baeaa2af70d3e70b60d83d92bd643b23244d3ca1d48c5cc39cf697b047505961e3b35e01117f86d89501bf1d69cf30987c03ef0a5d0d9c82e229 WHIRLPOOL 01cede0e624766fe4fa86137d48c0cedb04a001f6698dcde452897b4ba97b4ce1a8854460def1b351e5559df0a8e4116d7397b36ac5a5bfc95c0d261bdd98da4
-EBUILD miniupnpd-1.9_pre20140422.ebuild 1365 SHA256 4ca211493ed0e0fcf40262b77db6d18d53111ff2d69a64b7bf1b674603df9068 SHA512 fd91a19fcebffff992d6821ea1fdb13a8e0c72636bccd137c14c8a433a57d827bb7d13ef05e8c67cc9c2a7ed3d96903a7e6b2a4c41b51912a24bad56fd083d8b WHIRLPOOL bdff162b0ae1b0ded4b893d1bac9bd1660fa8d0dbbb451e98f7cdab84babc1cce834123c8f853d5bd819c33562643f38f1a8571fb1883570fa0508f99fb7f7fb
-MISC ChangeLog 7947 SHA256 226f3532f91d91e09419c810c283bf1226e1d4174c1a012ffcdd18b0411179d0 SHA512 4cf649ca978a9d102e502afefcb3a50f9ca3c97e4d49e3d73d59bd28690ff2e2f2a8461c6ae687996b8e880412b0ee864bc1f11e36f359bf40e8f08f6569f2d7 WHIRLPOOL fb1e3c10bc586f8a6904760d26591727fa5ee4ca04919483fd03d1e93f30406f09502495c34ff3dd279f62a73a158e3ce61adc984d8e9c4fa458ba9152bbc56c
+DIST miniupnpd-1.8.20140523.tar.gz 190936 SHA256 e72cd1e515aa9e6281e519e1814fe74e7689f5da71ce463a996a17e787ffe490 SHA512 4045dc1fb80143cda6914d837aabcd19aa35fc8c63fe5190f3a161efd29a652320c79a898230e26b8429760ea5b383a96b91d18853e7dcb2ddc2ebcf242f7feb WHIRLPOOL 302602e96cc983132ed82c18320c0e2834a8f4eb598539e1a20a97c768adb0caa28970bd9075c5e1e9ae54e2c53fbbc0f346a30bd6064e36b548c3825951fca8
+EBUILD miniupnpd-1.9_pre20140523.ebuild 1426 SHA256 30166702fb26bc8abb3904bc95333e69c50bcf225c9bfb5fd5f0e983547e4427 SHA512 d3182e7971742b4546c757541365d26ae0cc73254d1ec85be17006e01349f2219d3faa6e40eac1ffb392bc9b55fb6379ec62fcb7af30d224b6fedff44c1cd1f7 WHIRLPOOL 7458129ceec4218b71edad23c321ae1543218430cbb88790ddaf02473b3a1932fa50f229fc0e04e30a2a6231224b0098715fa6817e2aabe5d0b4a7709e33192a
+MISC ChangeLog 8236 SHA256 adeae8d479b338d6e610e289bf8c593c7bd4fc50aec9d3dcdc359d6f620481de SHA512 103ef55c33e7c10cedcd157b1b02ffb32aa17b803d5b6ff8d0cf89738142d93f59a73dd5dfec3d234e12eba1ea6512fd9dd8397017a5a80681cae4aa78bea787 WHIRLPOOL 4dbee96e5b28115e4692243f427a85ff31d729d176653c99311d657ea8e7acacf080733d90e6f6e8325f70b16a77fdc2e8c1ee9ce08b43da3ac004b5770f899b
 MISC metadata.xml 380 SHA256 cbfddfa590d65e994e3e3c45bdfa0f4d94cb2b446f5cd8815ed93cd1d7fcf727 SHA512 937b31ef4f1881a4e252aec0f7a1064b5151b0a5f8e77f5861c70f3ea2b308f94746ed5409aeb15080070fde56dacc362f1b6b10216a60b79f330854f63e793b WHIRLPOOL 0c387658aa3f54ebc27b813de32899804a8c7d148c02cc1b512d4dd6d838137f45a7b968c700b31e6accd52d203c84e92c7879979386b1c11bf9ca73e0f3eda6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlNt8IgACgkQsR7PQhRXYEnxlgCeMwLSNTgLVh+SWPhh5sICe9Cs
-y+QAn1ljNp8qwO4adSRa9I4FXM1FAQ0Y
-=suyd
+iEYEAREIAAYFAlPTbuoACgkQsR7PQhRXYEk6ywCdEgzfXicgKpGcIv149Q6E7fOS
++mYAn0ozZSoUotbz4V86z0uPIUX2MG9q
+=YWTc
 -----END PGP SIGNATURE-----
diff --git a/net-misc/miniupnpd/files/miniupnpd-1.9-cleanup.patch b/net-misc/miniupnpd/files/miniupnpd-1.9-cleanup.patch
deleted file mode 100644
index 0469d2b95708..000000000000
--- a/net-misc/miniupnpd/files/miniupnpd-1.9-cleanup.patch
+++ /dev/null
@@ -1,170 +0,0 @@
---- 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.9_pre20140422.ebuild b/net-misc/miniupnpd/miniupnpd-1.9_pre20140523.ebuild
index 543bcb426c50..0379c8b60d28 100644
--- a/net-misc/miniupnpd/miniupnpd-1.9_pre20140422.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-1.9_pre20140523.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.9_pre20140422.ebuild,v 1.1 2014/05/10 09:25:26 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.9_pre20140523.ebuild,v 1.1 2014/07/26 09:03:37 gurligebis Exp $
 
 EAPI="5"
 
 inherit eutils toolchain-funcs
 
-MY_PV=1.8.20140422
+MY_PV=1.8.20140523
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="MiniUPnP IGD Daemon"
@@ -27,7 +27,6 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.9-cleanup.patch
 	epatch "${FILESDIR}"/${PN}-1.9-build.patch
 	mv Makefile.linux Makefile || die
 }
@@ -40,6 +39,10 @@ src_configure() {
 	sed -i -r \
 		-e '/#define ENABLE_LEASEFILE/s:(/[*]|[*]/)::g' \
 		config.h || die
+
+	sed -i -r \
+		-e '/#define ENABLE_MANUFACTURER_INFO_CONFIGURATION/s:(/[*]|[*]/)::g' \
+		 config.h || die
 }
 
 src_compile() {