Update net-libs/libupnp-1.6.21, net-libs/libupnp-1.8.0

6 files changed, 60 insertions, 27 deletions

diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index b2eebc35..1d697911 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,12 +1,13 @@
 AUX CVE-2016-6255.patch 2300 SHA256 8b4300d0c1bc19b19d7f4c4ac6c5bf493b636d51b9d85f17483d0c6d5c37bb09 SHA512 4e415875a4c843b64d92baf9530994829639939db7be710a6ba27ec02651c8faf86a2f9af80105d0895f2eb420a48c8d4ce31ad38d39ab02a10e095905870c42 WHIRLPOOL a09b8b494b03151feca9bda97d06796232461aa0b431ffaac2f4bf72d12dd83bbc68a5d724a4495125c63e3089139dad303a99b6af93e770f5eab3acd3b513e9
 AUX libupnp-1.6.19-docs-install.patch 387 SHA256 1b7ee5e36e2d53ef0d02b0d703c90f5a8e322d1f1dad6cb36dba4885fd0c2df3 SHA512 b9c3ff0014f3b0d4f62b4b52948356581e09b5beefa548ddbe9a93084d2df0708557c22fafe919c867a9e48e5c19d09bfdded2619c8dde67cc44a3c12721671c WHIRLPOOL dbebe934973aef59038945d2120d98b12c3aed4c2df8ad198ae04ebd0280a2e33b7319cfaf1e6a025ef661a5373ca5b90c0b1033345b956d20fb0efdacb4b043
 AUX libupnp-1.6.20-suse.patch 3297 SHA256 a0c85f95f94b792987f7c3162c37872f93f60943aadaa9ccdd6846118c40125a SHA512 7bb64e08a393c1d16b01bcef83ee72ac665bd7ee4290cf618e3d4f2d83514b12364eb58f0df2c4d4913738b17ff542ee1c4020a2542fc6564092fe8569fd6001 WHIRLPOOL e688ed64798bededfdad9b7539d5b0333a9e3c40adee837d100ae5d7bf6e6b5ffc2c73d12207679e6266d16e8bd5e41cccd102f9bcd4c5ec9510b3a98ad2ab98
-AUX libupnp-1.6.21-suse.patch 4209 SHA256 ce5d46aae09efdfd15b1f3615738502d6e55ca6e2248b40c7372630daead5add SHA512 c9d72ec14ef5baae8fe4f984a58759013e7c6dd44b53e024e7ef467a4d99bc66576a5582e15b3304294501e9166cf8102df7bc880388f49c61e5d5b936b03089 WHIRLPOOL 5011ef17767b00b85dbcf42801111a6d49b3782ca17f5c5095bc1b03f58d0b38cf48dc4043183ea6fc70d269ba021785c53724912571520536e9d141ef59757f
+AUX libupnp-1.6.21-cflags.patch 905 SHA256 eb13e211b37b11b3ef18a8eb233851cd190a43723378409a752db661e8a12698 SHA512 3ecc83863e4cf35b9f0ba10b7982aaa103bb2eea7e0f256757fc5ef6a912a57dfdc237e6b20f29cc948f38816f1a57aff88aa0da7d7263658f584eb27ef7c8fe WHIRLPOOL 43b098a71a2b69716bde0c079e70f475e9020150106e0f3804c4ef3211f664aaeea0fa770f0fd8d73068d7e6451b2c7dbabab26fd1911c8f919754ef0e8b2a7a
+AUX libupnp-1.6.21-suse.patch 4219 SHA256 7c76e5cb9bc67e02af6bb745115f4d686cb29f87e9a481f1ebfc24aea9112360 SHA512 4d9af8e7ba5df10aa7feb428ed340021b0ad7b35df35fab105a43519aec8362348561f805bae48f53a1c4846f9cc3b0f925f5f0308b7d99a64670ffb1bab6215 WHIRLPOOL f8914f7bb91d23cf7bea8f3e14368752475dad86423c1e2723c348d63a0aa5496d5c4967df3160e00cdfb2c4bb98a2c3daed753d70f6a58657716118782523ac
 AUX libupnp-1.8.0-docs-install.patch 403 SHA256 b0c6504e3bdc24f8df4cfbab24f37c759f319759fafce24e5f84b69833cb0bec SHA512 a1157f13933f0cb61a3c256f6a57ee0e415e36f48cf2fabb9c4ae060d91c4a8f6a9f2ed31f5b36a0dbecb3d46b0a051275a597fb8069f43a79d6da6a8207f486 WHIRLPOOL c297905bd9627715567f32e2e8bd220515e51e0d2b3cf755f79d52bdfe495cbda632c786bc5389012c41e26f94961b5f598e5fe6ed9bf65c5141f1bff3750a95
-AUX libupnp-1.8.0-suse.patch 3827 SHA256 23415f5886e9a72a05d01c4c4d1eb0c236d4a31e4bb6fd9f9bafea926d5aa862 SHA512 683b5eba9ae1db301b236a20e6e9671d4dedf528f989e36ff6cdeef698c797d5a354c83ee17c4a3c557e6abe8a39d5b72edc433754bdfb7c15fb1c84634b14e2 WHIRLPOOL 004d6e78326f42d6392529170e193e61e944791c7396246a968ae838b47c69883f6ca8ba698a5bd17b090539f56d921db0ebc709f4ba6a0c8f38e27353751dd2
+AUX libupnp-1.8.0-suse.patch 3837 SHA256 327fcbb0694c023248989e3fa02f0df6738c6a8a62be43d6da1c601c3aea6276 SHA512 859909ea2d6d163b3e0490ac85157cbca3ae0c069515af15a599c5000ae574cecb62fe4c5a03a903de2ab0e072ce9c0fc76261272d3ee9f81732dddd62b21ef4 WHIRLPOOL a28329f0848f7868190bc083b6a0ddab6da2a8a36d6b3de135eca3907fb88a1eeaa932ef100b5c6512499310e17567f85b373660eefc8d900dffba847de93b7b
 DIST libupnp-1.6.20.tar.bz2 1243637 SHA256 ee3537081e3ea56f66ada10387486823989210bc98002f098305551c966e3a63 SHA512 754a3f587963078fc60e8a58f6b04536dac03d053c8cd14d4fd7e505a3417484fa03b72dd09ef92150f00263f270aa19646b7aab1b8707111aff53c43f8a120a WHIRLPOOL df2702b30a9e895371ba0647bfdd017fd17b4478feb691efaf754618fa032cb8ba72317030960676584da44dfc144f8b9bd07218799b40c2afa7fdee28e8b164
 DIST libupnp-1.6.21.tar.bz2 1245353 SHA256 af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b SHA512 65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb WHIRLPOOL b4869189054ac00d57394e0919ad2f672af64f2c2b0ecc676c2b3fc4a3c22caa25ac38b57bbb5cf1ef12a5857b4cdfd450c6bd5955a5eacaf8bdf95a058c9dab
 DIST libupnp-1.8.0.tar.gz 1380524 SHA256 1ddfb4e12e947deb5637e0d5e09bbe7835dfc8fb8a57712346026afa029165b1 SHA512 e2ae54352d747191f3ffc15c50481da515665fb35ddf6a9e488b6e1962e47803937bf078d0c2c5d56f8339cfd226ffba7433975363dc312e484ed22f83eda061 WHIRLPOOL c3d4abf54d25e87a1d650a18c475097a47633e8bf7691248695a7682ecff8aca4419c8eb2db4d24d62ca5a7905321971adf924166c20876ee18dd32d846748a1
 EBUILD libupnp-1.6.20.ebuild 1386 SHA256 da64eb3d8281541ee808762544914f70447d6eb96c0c86caf3c301df59158749 SHA512 518a01603c1c9ec8165bd8799f8eb71ed5b33493b02b69d6006c4590d4bb3a52926fa165e749da9bed16c44a94e7f0d347c33a5462da605e81d800a7aa37843d WHIRLPOOL 5fe6c068ee79d20909ecd088fc9e8da0c4b55717dc83b80b2488bb703a763dd49f2d003926dd9e76c9508d402fa8384db831aeab6a1b5ee340dbb97af2b6180e
-EBUILD libupnp-1.6.21.ebuild 1329 SHA256 3ee992ce2561922a86efc5a052c86745bbfd592bcd833508a60f2f2747cabc4e SHA512 27ca7f57540387e27f76080f8a7682fd9394674af5882025a0a5ce7f22c3de2504e6a41369a6bc9c068ec63a19b1fd205335add9e1017d85ec2add92a72e0334 WHIRLPOOL 5b155b5a1a1bcd0436a00bb5724eafd550abcfcc680bfdad5832daecd671a7881033b089ee1df8322400b1cc3491ac0e0543cecff59a3a1c505ed211a0523c00
-EBUILD libupnp-1.8.0.ebuild 1435 SHA256 b20baf908d1c02467ca83046d346e094874669dccb40bfa882649a282cd84d77 SHA512 bd82653c60ae2f09fc4b437ea62a7033f5e2b080a3e18ca09e63f26fd460b6f7fe4ef344dd3c846788eccd825ef3906201513ad277abb36aebfd4707777afe07 WHIRLPOOL fc146405f410053fb5485dc14da0183251f3425233c564036dfea9eeca6c8e945bd5360ef5b593d9d49a68b3e670c65e0e19c3df054fc8156cb45f96fb6c97a8
+EBUILD libupnp-1.6.21.ebuild 1370 SHA256 26ad25888962987098017b43de7a10d59e2faf66834d9c468aea836a470f466a SHA512 b83a8dfacb31f8d287ecaf78677c2eaf342d26a68f6fb4417900caca3772eada72a06d649a2059ec8118bfeaee2e411315bcecbcdf46d8b609c507d910b77f13 WHIRLPOOL bf23d676f11b71bb08fae2faccf19f075cc41f354ba4100f1faa19703c856c58d4c2576bdc2aa2cc55dc3acf7bbc9d78bb751b70fe621a3d85811e58dfde2f0d
+EBUILD libupnp-1.8.0.ebuild 1476 SHA256 e8d513bc6519892cbd5f7329ca32f396e6e2c7da2667ede60fbe45d26cf352d0 SHA512 e602ae6969a9e10d0acd6582454c64969fb71a235b4c4b5129840c4c19fc430a4e02723acc7574cabaf971c8f770af09010a7430e30165097258609010249df3 WHIRLPOOL 9daad7ce933b454b7e4bfd0a9e1f76e8166965f180204814f15525214a843f64daf6a13a4745666fb8178f04fac5568f148603169a4fbb1989567cb30468c558
diff --git a/net-libs/libupnp/files/libupnp-1.6.21-cflags.patch b/net-libs/libupnp/files/libupnp-1.6.21-cflags.patch
new file mode 100644
index 00000000..3eaf66e8
--- /dev/null
+++ b/net-libs/libupnp/files/libupnp-1.6.21-cflags.patch
@@ -0,0 +1,30 @@
+don't append flags like -O0/-Os which clobber the user's settings
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -539,25 +539,6 @@ AC_PROG_EGREP
+ echo "--------------------- Default compilation flags -------------------------------"
+ echo host is $host
+ echo host_os is $host_os
+-case $host_os in
+-freebsd*)
+-	echo "Using FreeBSD specific compiler settings"
+-	# Put FreeBSD specific compiler flags here
+-	;;
+-*)
+-	echo "Using non-specific system compiler settings"
+-	if test x"$enable_debug" = xyes; then
+-		# AC_PROG_CC already sets CFLAGS to "-g -O2" by default,
+-		# but only if CFLAGS was not previously set.
+-		#:
+-		# Use -O0 in debug so that variables do not get optimized out
+-		AX_CFLAGS_GCC_OPTION([-O0, -g])
+-	else
+-		# add optimise for size
+-		AX_CFLAGS_GCC_OPTION([-Os])
+-	fi
+-	;;
+-esac
+ 
+ AX_CFLAGS_WARN_ALL
+ echo "-------------------------------------------------------------------------------"
diff --git a/net-libs/libupnp/files/libupnp-1.6.21-suse.patch b/net-libs/libupnp/files/libupnp-1.6.21-suse.patch
index 430287ad..97348627 100644
--- a/net-libs/libupnp/files/libupnp-1.6.21-suse.patch
+++ b/net-libs/libupnp/files/libupnp-1.6.21-suse.patch
@@ -82,16 +82,16 @@
  AC_PROG_INSTALL
  AC_PROG_MAKE_SET
  AC_PROG_EGREP
-@@ -576,9 +577,6 @@ freebsd*)
- 		#:
- 		# Use -O0 in debug so that variables do not get optimized out
- 		AX_CFLAGS_GCC_OPTION([-O0, -g])
--	else
--		# add optimise for size
--		AX_CFLAGS_GCC_OPTION([-Os])
- 	fi
- 	;;
- esac
+#@@ -576,9 +577,6 @@ freebsd*)
+# 		#:
+# 		# Use -O0 in debug so that variables do not get optimized out
+# 		AX_CFLAGS_GCC_OPTION([-O0, -g])
+#-	else
+#-		# add optimise for size
+#-		AX_CFLAGS_GCC_OPTION([-Os])
+# 	fi
+# 	;;
+# esac
 @@ -592,8 +590,6 @@ echo "----------------------------------
  #
  AC_TYPE_SIZE_T
diff --git a/net-libs/libupnp/files/libupnp-1.8.0-suse.patch b/net-libs/libupnp/files/libupnp-1.8.0-suse.patch
index 6d7ccefa..5fffea89 100644
--- a/net-libs/libupnp/files/libupnp-1.8.0-suse.patch
+++ b/net-libs/libupnp/files/libupnp-1.8.0-suse.patch
@@ -82,16 +82,16 @@
  AC_PROG_INSTALL
  AC_PROG_MAKE_SET
  AC_PROG_EGREP
-@@ -552,9 +553,6 @@ freebsd*)
- 		#:
- 		# Use -O0 in debug so that variables do not get optimized out
- 		AX_CFLAGS_GCC_OPTION([-O0, -g])
--	else
--		# add optimise for size
--		AX_CFLAGS_GCC_OPTION([-Os])
- 	fi
- 	;;
- esac
+#@@ -552,9 +553,6 @@ freebsd*)
+# 		#:
+# 		# Use -O0 in debug so that variables do not get optimized out
+# 		AX_CFLAGS_GCC_OPTION([-O0, -g])
+#-	else
+#-		# add optimise for size
+#-		AX_CFLAGS_GCC_OPTION([-Os])
+# 	fi
+# 	;;
+# esac
 @@ -568,8 +566,6 @@ echo "----------------------------------
  #
  AC_TYPE_SIZE_T
diff --git a/net-libs/libupnp/libupnp-1.6.21.ebuild b/net-libs/libupnp/libupnp-1.6.21.ebuild
index 706b7abd..121dde68 100644
--- a/net-libs/libupnp/libupnp-1.6.21.ebuild
+++ b/net-libs/libupnp/libupnp-1.6.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 4e7f7656a072c222a2080728c8520ec977c9890e $
+# $Id: 4342f131eb28cb50f3866418377f20162f0c6c55 $
 
 EAPI=6
 
@@ -20,6 +20,7 @@ DOCS="NEWS README ChangeLog"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.19-docs-install.patch
+	"${FILESDIR}"/${PN}-1.6.21-cflags.patch
 	"${FILESDIR}"/${P}-suse.patch
 )
 
diff --git a/net-libs/libupnp/libupnp-1.8.0.ebuild b/net-libs/libupnp/libupnp-1.8.0.ebuild
index c98258d6..b3ad7744 100644
--- a/net-libs/libupnp/libupnp-1.8.0.ebuild
+++ b/net-libs/libupnp/libupnp-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: abee901f84419b90736449f28412c6a3bd43733d $
+# $Id: 32baec6ad6fa2b067ebd5dfafc6f2dda59519543 $
 
 EAPI=6
 
@@ -19,8 +19,9 @@ REQUIRED_USE="!server? ( !webserver )"
 DOCS="NEWS README.md ChangeLog"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-suse.patch
 	"${FILESDIR}"/${P}-docs-install.patch
+	"${FILESDIR}"/${PN}-1.6.21-cflags.patch
+	"${FILESDIR}"/${P}-suse.patch
 )
 
 src_prepare() {