diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-04-19 00:32:49 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-04-19 00:32:49 +0000 |
| commit | 92bd06f75e6dd3ca45bd3522d670e7c714fb2601 (patch) | |
| tree | c21ec689246c27ab6f50a53021566f24b703e072 /sys-apps/iproute2 | |
| parent | Add patch to fix lvalue error when compiling with gcc4. Fixes bug 128204, tha... (diff) | |
| download | gentoo-2-92bd06f75e6dd3ca45bd3522d670e7c714fb2601.tar.gz gentoo-2-92bd06f75e6dd3ca45bd3522d670e7c714fb2601.tar.bz2 gentoo-2-92bd06f75e6dd3ca45bd3522d670e7c714fb2601.zip | |
Add check for invalid usage #130243 by F. Steinel.
(Portage version: 2.1_pre9)
Diffstat (limited to 'sys-apps/iproute2')
| -rw-r--r-- | sys-apps/iproute2/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/iproute2/files/iproute2-2.6.16.20060323-ifcfg-catch-missing-argument.patch | 22 | ||||
| -rw-r--r-- | sys-apps/iproute2/iproute2-2.6.16.20060323.ebuild | 4 |
3 files changed, 31 insertions, 2 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/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 |