Add check for invalid usage #130243 by F. Steinel.

Package-Manager: portage-2.1_pre9

4 files changed, 46 insertions, 13 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 2d690ab3cbea..8ca646ec5b09 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.53 2006/04/18 23:02:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.54 2006/04/19 00:32:49 vapier Exp $
+
+  19 Apr 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/iproute2-2.6.16.20060323-ifcfg-catch-missing-argument.patch,
+  iproute2-2.6.16.20060323.ebuild:
+  Add check for invalid usage #130243 by F. Steinel.
 
 *iproute2-2.6.16.20060323 (18 Apr 2006)
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 0ea1ecca79b0..5571417c8075 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -9,20 +9,24 @@ AUX iproute2-2.6.11.20050330-wrr.patch 13574 RMD160 30b684bca7909c97f2bb23a49662
 MD5 f2f62bc9b7aa8ad751e47fa11a952976 files/iproute2-2.6.11.20050330-wrr.patch 13574
 RMD160 30b684bca7909c97f2bb23a4966228c10f942e1e files/iproute2-2.6.11.20050330-wrr.patch 13574
 SHA256 67ddf275e6fab4e1b78541f617326b8182a0095b6fdbc96b6415751c4deeac7a files/iproute2-2.6.11.20050330-wrr.patch 13574
+AUX iproute2-2.6.16.20060323-ifcfg-catch-missing-argument.patch 578 RMD160 83b0f70fd1699010212f00b4c584e4d3d3e25d77 SHA1 8564667a1d66557d73a2395c27a4b608908483d5 SHA256 1cd4274318f51a5e989abdb0e339ba8ce53025e38de2af7c12f7023ee7bdcf49 size 578
+MD5 d69e0e70cafe6753a28679140550040a files/iproute2-2.6.16.20060323-ifcfg-catch-missing-argument.patch 578
+RMD160 83b0f70fd1699010212f00b4c584e4d3d3e25d77 files/iproute2-2.6.16.20060323-ifcfg-catch-missing-argument.patch 578
+SHA256 1cd4274318f51a5e989abdb0e339ba8ce53025e38de2af7c12f7023ee7bdcf49 files/iproute2-2.6.16.20060323-ifcfg-catch-missing-argument.patch 578
 DIST iproute2-2.6.15-060110.tar.gz 394322 RMD160 6738587d26a95cb2563fa5d218c00bd3ed3e598f SHA256 9736c27e606b31af714e319bfad5bb9abdcbaf9b4f2ec496ca6310ff56b815d8 size 394322
 DIST iproute2-2.6.16-060323.tar.gz 386555 RMD160 fbc5999842a6a1a5b4ba792e93e25ed8df7c959b SHA256 e382a4c0de31a5196e0c7829d6f7e29d0263cf90a4def10302db694fc2f30da2 size 386555
 EBUILD iproute2-2.6.15.20060110.ebuild 1968 RMD160 8b4252220af945ae7758a25aaed94dc8c5f0b309 SHA1 923635a6a8aa656f8927f3d3cb1c51ec1e6a512c SHA256 8fb4fe52f1de8f6d2f159036fe7c97d60fd7b7f0cc825e34ea73acbe0c9a07e8 size 1968
 MD5 3d22038ef9c00140188c1715dfee610a iproute2-2.6.15.20060110.ebuild 1968
 RMD160 8b4252220af945ae7758a25aaed94dc8c5f0b309 iproute2-2.6.15.20060110.ebuild 1968
 SHA256 8fb4fe52f1de8f6d2f159036fe7c97d60fd7b7f0cc825e34ea73acbe0c9a07e8 iproute2-2.6.15.20060110.ebuild 1968
-EBUILD iproute2-2.6.16.20060323.ebuild 1982 RMD160 7952c37dd4c86f5fed4d5b35986fa09858e72ad9 SHA1 b3adb3769dad4a31fffd735ed1df5e82aacfc40a SHA256 f39806c2dc50b21a12759251421086c459c1599e31d8f54d5e2e37c2ccb0d7ef size 1982
-MD5 818d98641b75c16e879d06c8e29f96ed iproute2-2.6.16.20060323.ebuild 1982
-RMD160 7952c37dd4c86f5fed4d5b35986fa09858e72ad9 iproute2-2.6.16.20060323.ebuild 1982
-SHA256 f39806c2dc50b21a12759251421086c459c1599e31d8f54d5e2e37c2ccb0d7ef iproute2-2.6.16.20060323.ebuild 1982
-MISC ChangeLog 12476 RMD160 5307c1d9b990678abbf97339fb6a238730f5f8db SHA1 35cd3628174baf1457fa8d7d9ef0b29ad2cdd599 SHA256 795030088aaa7a558d78bd9a87f6296ea89a03de2f457483a20afc360555b9e3 size 12476
-MD5 93831fe5ab2cf9f5a9111249a1208f8a ChangeLog 12476
-RMD160 5307c1d9b990678abbf97339fb6a238730f5f8db ChangeLog 12476
-SHA256 795030088aaa7a558d78bd9a87f6296ea89a03de2f457483a20afc360555b9e3 ChangeLog 12476
+EBUILD iproute2-2.6.16.20060323.ebuild 2053 RMD160 698bf8989085b2efad528dffe7b37a2bd0208d7b SHA1 afa94ff3020c7a07a5d41f92dafe7320ff409608 SHA256 7fa7a46d5189ce5ae15ae08375f4d1c60c3aa201bcffe89a39f8c281248bf5d6 size 2053
+MD5 8b8c02d83f7315abc7e26fc509026a12 iproute2-2.6.16.20060323.ebuild 2053
+RMD160 698bf8989085b2efad528dffe7b37a2bd0208d7b iproute2-2.6.16.20060323.ebuild 2053
+SHA256 7fa7a46d5189ce5ae15ae08375f4d1c60c3aa201bcffe89a39f8c281248bf5d6 iproute2-2.6.16.20060323.ebuild 2053
+MISC ChangeLog 12685 RMD160 d62f8eddf4896a52358359a25588a4b2ce73babd SHA1 c7b525382d85c9325aa0aaac428be5933013353e SHA256 9e97f986d99017356f0a9e1bf14b17b292b466b8ca7a0c32fbc0a3efa65f6b7a size 12685
+MD5 4b6c1659877995bc3b09dc4ca0fb7f69 ChangeLog 12685
+RMD160 d62f8eddf4896a52358359a25588a4b2ce73babd ChangeLog 12685
+SHA256 9e97f986d99017356f0a9e1bf14b17b292b466b8ca7a0c32fbc0a3efa65f6b7a ChangeLog 12685
 MISC metadata.xml 225 RMD160 c09b983b2a71ef5738567b899ab087ff80d63ca1 SHA1 e384e99e2d9d8b4dd3ce54f8e857268cbe352c5e SHA256 8c13ed9cb8e178d0e1af782bee862350146dc46765dedd79e6f531211ef52a68 size 225
 MD5 d0dad7daa0e6d356fc35f778fed36006 metadata.xml 225
 RMD160 c09b983b2a71ef5738567b899ab087ff80d63ca1 metadata.xml 225
@@ -38,7 +42,7 @@ size 268 files/digest-iproute2-2.6.16.20060323 268
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFERXBF2+ySkm8kpY0RAsSmAJ9Z7ID563qYLSr9cplXt7h4mFmAKACgjxj1
-o3mGxwAa0Flhyo50h/OQ8hc=
-=XKzD
+iD8DBQFERYV+2+ySkm8kpY0RApijAJ996Ak0xinhKg7q0FFuIX4bKCmkPACgjN64
+40aJlS5vBKLishrvscCNB9M=
+=cc44
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/files/iproute2-2.6.16.20060323-ifcfg-catch-missing-argument.patch b/sys-apps/iproute2/files/iproute2-2.6.16.20060323-ifcfg-catch-missing-argument.patch
new file mode 100644
index 000000000000..796161b5a490
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-2.6.16.20060323-ifcfg-catch-missing-argument.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/130243
+
+Fix syntax errors when running `ifcfg dev`
+
+Index: ip/ifcfg
+===================================================================
+RCS file: /repos/iproute2/ip/ifcfg,v
+retrieving revision 1.2
+diff -u -p -r1.2 ifcfg
+--- ip/ifcfg	15 Apr 2004 20:56:59 -0000	1.2
++++ ip/ifcfg	19 Apr 2006 00:30:28 -0000
+@@ -86,6 +86,10 @@ if [ "$peer" != "" ]; then
+   fi
+   pfx="$ipaddr peer $peer"
+ else
++  if [ "$ipaddr" = "" ]; then
++    echo "Missing IP address argument." 1>&2
++    exit 1
++  fi
+   if [ "$pfxlen" = "" ]; then
+     ABCMaskLen $ipaddr
+     pfxlen=$?
diff --git a/sys-apps/iproute2/iproute2-2.6.16.20060323.ebuild b/sys-apps/iproute2/iproute2-2.6.16.20060323.ebuild
index 6be1f30225b8..551c5d7cb38d 100644
--- a/sys-apps/iproute2/iproute2-2.6.16.20060323.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.16.20060323.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/sys-apps/iproute2/iproute2-2.6.16.20060323.ebuild,v 1.1 2006/04/18 23:02:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.16.20060323.ebuild,v 1.2 2006/04/19 00:32:49 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -28,6 +28,8 @@ src_unpack() {
 	cd "${S}"
 	sed -i -e "s:-O2:${CFLAGS}:" Makefile || die "sed Makefile failed"
 
+	epatch "${FILESDIR}"/${P}-ifcfg-catch-missing-argument.patch #130243
+
 	#68948 - esfq/wrr patches
 	epatch "${FILESDIR}"/${PN}-051007-esfq-2.6.13.patch
 	epatch "${FILESDIR}"/${PN}-2.6.11.20050330-wrr.patch