Fix silly segfault when using --log-prefix="" #148169 by tla.

Package-Manager: portage-2.1.2_pre1

4 files changed, 77 insertions, 12 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 25ac53aa93dd..a3300ecb18e0 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.108 2006/09/04 05:50:25 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.109 2006/09/23 05:19:04 vapier Exp $
+
+  23 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/1.3.5-files/iptables-1.3.5-log-prefix-no-empty-strings.patch,
+  iptables-1.3.5-r4.ebuild:
+  Fix silly segfault when using --log-prefix="" #148169 by tla.
 
   04 Sep 2006; Joshua Kinard <kumba@gentoo.org> iptables-1.3.5-r1.ebuild:
   Marked stable on mips.
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index cc7ff0622058..f755e46a02e1 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.2.11-files/CAN-2004-0986.patch 1365 RMD160 a184a41e0b3ad611f271e22e35adf684213307a5 SHA1 a9b5e7ac2753dc55d776d16c9e2911d9c5574669 SHA256 15c98cb61c8a2787bb6e4f01f01fd29b0e6a2731e817349bd5fa4c4cd458bef3
 MD5 756f721b4c0c0646a174993befa199c4 files/1.2.11-files/CAN-2004-0986.patch 1365
 RMD160 a184a41e0b3ad611f271e22e35adf684213307a5 files/1.2.11-files/CAN-2004-0986.patch 1365
@@ -46,6 +49,10 @@ AUX 1.3.5-files/iptables-1.3.5-errno.patch 689 RMD160 67ce38c86fbef574e8f7d2f4eb
 MD5 b27a0ebcd83384e92ee63d64da85af69 files/1.3.5-files/iptables-1.3.5-errno.patch 689
 RMD160 67ce38c86fbef574e8f7d2f4ebffbecff35bf59f files/1.3.5-files/iptables-1.3.5-errno.patch 689
 SHA256 09eff37038db0fd66cb68f5e84dd93c031445f29e3a50afe18d3d389fe5cded1 files/1.3.5-files/iptables-1.3.5-errno.patch 689
+AUX 1.3.5-files/iptables-1.3.5-log-prefix-no-empty-strings.patch 1607 RMD160 9624733334644b55136724a665e15afa7156f86a SHA1 5cc4fd5fabb44fe72c8a3695e0bd63d06b28c1bd SHA256 5c7617471f98413f1af9ab2846336cbcdf8b2449402967a03b460683aa225bec
+MD5 638f482b4704faf36ba7c6081b86fb55 files/1.3.5-files/iptables-1.3.5-log-prefix-no-empty-strings.patch 1607
+RMD160 9624733334644b55136724a665e15afa7156f86a files/1.3.5-files/iptables-1.3.5-log-prefix-no-empty-strings.patch 1607
+SHA256 5c7617471f98413f1af9ab2846336cbcdf8b2449402967a03b460683aa225bec files/1.3.5-files/iptables-1.3.5-log-prefix-no-empty-strings.patch 1607
 AUX ip6tables-1.2.9-r1.confd 266 RMD160 e42235c98c8fec22bad9e8953939d7d0dc64cd1d SHA1 e1fc7e8e9b0963d7ac0bee50dd97ae1ad637eefe SHA256 8434238fad47255691fda04dfff08ab65de44661678d680fab21cc51922a5c68
 MD5 dd4f4563c89d33fc6987043d95531e05 files/ip6tables-1.2.9-r1.confd 266
 RMD160 e42235c98c8fec22bad9e8953939d7d0dc64cd1d files/ip6tables-1.2.9-r1.confd 266
@@ -102,18 +109,18 @@ EBUILD iptables-1.3.5-r3.ebuild 5241 RMD160 5991dc79f8ad2ccaa452df9bc0360ee2c4dd
 MD5 394593497a454f0f24dcf449aacd07a7 iptables-1.3.5-r3.ebuild 5241
 RMD160 5991dc79f8ad2ccaa452df9bc0360ee2c4dd2326 iptables-1.3.5-r3.ebuild 5241
 SHA256 d5102e65285357386d6635c1ac816320bfc8770ad0f6e1bad9c9dde38089faac iptables-1.3.5-r3.ebuild 5241
-EBUILD iptables-1.3.5-r4.ebuild 5708 RMD160 d1d3c14f5ae508612fd81713c948b1a7afff28a6 SHA1 bc61f9948f6fdf40c404c75eeb27634440501abc SHA256 717ab14a1fb412de74572371d0d8748318cdf5431c234b4f19124208e96610e8
-MD5 d39fa1eb0fae67ef6bce24e779cca80f iptables-1.3.5-r4.ebuild 5708
-RMD160 d1d3c14f5ae508612fd81713c948b1a7afff28a6 iptables-1.3.5-r4.ebuild 5708
-SHA256 717ab14a1fb412de74572371d0d8748318cdf5431c234b4f19124208e96610e8 iptables-1.3.5-r4.ebuild 5708
+EBUILD iptables-1.3.5-r4.ebuild 5782 RMD160 c014718d3a1747139f5305ff249e3c50b8f2d778 SHA1 f9fca4539fee59a9631d7c1577b95545ae54ab6b SHA256 582b5d581ad76f3466409c37ad3807d33883d834191a7278f71b0e63d37cf291
+MD5 67a7b25fe7166320b6aa6ab7deee9734 iptables-1.3.5-r4.ebuild 5782
+RMD160 c014718d3a1747139f5305ff249e3c50b8f2d778 iptables-1.3.5-r4.ebuild 5782
+SHA256 582b5d581ad76f3466409c37ad3807d33883d834191a7278f71b0e63d37cf291 iptables-1.3.5-r4.ebuild 5782
 EBUILD iptables-1.3.5.ebuild 5064 RMD160 f8e01015e5804862da12168cca8da9bf451dfb14 SHA1 d1b64266e3cadc4932729d10219ba37962abbc54 SHA256 1a37910c39e95ed8efbf2aaf132fc8c6878b61e0cbeb635ca072d9a68193f94e
 MD5 925412ddd3ef1cda9a5c0016c2268c06 iptables-1.3.5.ebuild 5064
 RMD160 f8e01015e5804862da12168cca8da9bf451dfb14 iptables-1.3.5.ebuild 5064
 SHA256 1a37910c39e95ed8efbf2aaf132fc8c6878b61e0cbeb635ca072d9a68193f94e iptables-1.3.5.ebuild 5064
-MISC ChangeLog 23204 RMD160 661c439c315479778ba4a10f7bb8ea94918fc752 SHA1 23a41eeb1729e21ac9062bc1158d3349df257038 SHA256 76f3283aaa627faf0c717123d3f61078ec5214697348508e4605e81237bbca58
-MD5 1dbbc6fb10375dffc79293b67c0b340c ChangeLog 23204
-RMD160 661c439c315479778ba4a10f7bb8ea94918fc752 ChangeLog 23204
-SHA256 76f3283aaa627faf0c717123d3f61078ec5214697348508e4605e81237bbca58 ChangeLog 23204
+MISC ChangeLog 23419 RMD160 8545706bb185094cc8c56d9e2d815be570962cdb SHA1 cf78795c721f06dce0d0578333b34833374f6d57 SHA256 dff344ce690cd35610b2dfd89b5063b9eb5da68d599436d0acb214ee8f11cf19
+MD5 5fdc5aa7d3d2a9825c6d064ea5c5cac4 ChangeLog 23419
+RMD160 8545706bb185094cc8c56d9e2d815be570962cdb ChangeLog 23419
+SHA256 dff344ce690cd35610b2dfd89b5063b9eb5da68d599436d0acb214ee8f11cf19 ChangeLog 23419
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -139,3 +146,10 @@ SHA256 5526edeb288993a93689f0d39cacd94bc6dbd0f8f41ea3b4e30b1d4790acee72 files/di
 MD5 aad33073eeb74d8f8b7b7c1d8a15feda files/digest-iptables-1.3.5-r4 759
 RMD160 b1301d3acf934885365d3dc23a56a0254f97f266 files/digest-iptables-1.3.5-r4 759
 SHA256 77bb5fb7a5d08a68d83c29526ac411e6e40c1a8ae103bf446895f7b355bc5e7c files/digest-iptables-1.3.5-r4 759
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFFMPYamhnQswr0vIRAirVAJ40WSR5aBK19F3jBxYCLTsUnqPxywCcDYty
+dcm84Hqrv4HHRz2EQo/ySrE=
+=Dh4t
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/files/1.3.5-files/iptables-1.3.5-log-prefix-no-empty-strings.patch b/net-firewall/iptables/files/1.3.5-files/iptables-1.3.5-log-prefix-no-empty-strings.patch
new file mode 100644
index 000000000000..cc397007292f
--- /dev/null
+++ b/net-firewall/iptables/files/1.3.5-files/iptables-1.3.5-log-prefix-no-empty-strings.patch
@@ -0,0 +1,46 @@
+http://bugs.gentoo.org/148169
+https://bugzilla.netfilter.org/bugzilla/show_bug.cgi?id=516
+
+--- extensions/libip6t_LOG.c
++++ extensions/libip6t_LOG.c
+@@ -143,6 +143,10 @@ parse(int c, char **argv, int invert, un
+ 				   "Maximum prefix length %u for --log-prefix",
+ 				   (unsigned int)sizeof(loginfo->prefix) - 1);
+ 
++		if (strlen(optarg) == 0)
++			exit_error(PARAMETER_PROBLEM,
++				   "No prefix specified for --log-prefix");
++
+ 		if (strlen(optarg) != strlen(strtok(optarg, "\n")))
+ 			exit_error(PARAMETER_PROBLEM,
+ 				   "Newlines not allowed in --log-prefix");
+--- extensions/libipt_LOG.c
++++ extensions/libipt_LOG.c
+@@ -143,6 +143,10 @@ parse(int c, char **argv, int invert, un
+ 				   "Maximum prefix length %u for --log-prefix",
+ 				   (unsigned int)sizeof(loginfo->prefix) - 1);
+ 
++		if (strlen(optarg) == 0)
++			exit_error(PARAMETER_PROBLEM,
++				   "No prefix specified for --log-prefix");
++
+ 		if (strlen(optarg) != strlen(strtok(optarg, "\n")))
+ 			exit_error(PARAMETER_PROBLEM,
+ 				   "Newlines not allowed in --log-prefix");
+--- extensions/libipt_ULOG.c
++++ extensions/libipt_ULOG.c
+@@ -110,6 +110,14 @@ static int parse(int c, char **argv, int
+ 				   "Maximum prefix length %u for --ulog-prefix",
+ 				   (unsigned int)sizeof(loginfo->prefix) - 1);
+ 
++		if (strlen(optarg) == 0)
++			exit_error(PARAMETER_PROBLEM,
++				   "No prefix specified for --ulog-prefix");
++
++		if (strlen(optarg) != strlen(strtok(optarg, "\n")))
++			exit_error(PARAMETER_PROBLEM,
++				   "Newlines not allowed in --ulog-prefix");
++
+ 		strcpy(loginfo->prefix, optarg);
+ 		*flags |= IPT_LOG_OPT_PREFIX;
+ 		break;
diff --git a/net-firewall/iptables/iptables-1.3.5-r4.ebuild b/net-firewall/iptables/iptables-1.3.5-r4.ebuild
index 281bb166eab9..cbbc1c63ecf9 100644
--- a/net-firewall/iptables/iptables-1.3.5-r4.ebuild
+++ b/net-firewall/iptables/iptables-1.3.5-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.5-r4.ebuild,v 1.3 2006/08/05 23:54:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.5-r4.ebuild,v 1.4 2006/09/23 05:19:04 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -70,8 +70,8 @@ src_unpack() {
 	EPATCH_OPTS="-p1" \
 	epatch "${FILESDIR}"/1.3.1-files/${PN}-1.3.1-compilefix.patch
 
-	# bug #139726
-	epatch "${FILESDIR}"/1.3.5-files/${P}-errno.patch
+	epatch "${FILESDIR}"/1.3.5-files/${P}-errno.patch #139726
+	epatch "${FILESDIR}"/1.3.5-files/${P}-log-prefix-no-empty-strings.patch #148169
 
 	if use imq ; then
 		EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}