diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-08-23 02:29:22 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-08-23 02:29:22 +0000 |
| commit | 6952f2f2095f69e938064ffbf101af6ff2e2fcf6 (patch) | |
| tree | 6d6eb1ef074e20cb368fb7ed581f7c9a0f1dd547 /sys-apps/iproute2 | |
| parent | Stable for HPPA (bug #285213). (diff) | |
| download | gentoo-2-6952f2f2095f69e938064ffbf101af6ff2e2fcf6.tar.gz gentoo-2-6952f2f2095f69e938064ffbf101af6ff2e2fcf6.tar.bz2 gentoo-2-6952f2f2095f69e938064ffbf101af6ff2e2fcf6.zip | |
Allow people to disable ipv6 support #326849 by Pinkbyte.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/iproute2')
| -rw-r--r-- | sys-apps/iproute2/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/iproute2/files/iproute2-2.6.35-no-ipv6.patch | 27 | ||||
| -rw-r--r-- | sys-apps/iproute2/iproute2-2.6.35-r1.ebuild | 5 |
3 files changed, 35 insertions, 3 deletions
diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog index 86bad4eefb1f..be347623f175 100644 --- a/sys-apps/iproute2/ChangeLog +++ b/sys-apps/iproute2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/iproute2 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.159 2010/08/14 15:55:18 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.160 2010/08/23 02:29:22 vapier Exp $ + + 23 Aug 2010; Mike Frysinger <vapier@gentoo.org> iproute2-2.6.35-r1.ebuild, + +files/iproute2-2.6.35-no-ipv6.patch: + Allow people to disable ipv6 support #326849 by Pinkbyte. 14 Aug 2010; Harald van Dijk <truedfx@gentoo.org> iproute2-2.6.35-r1.ebuild: diff --git a/sys-apps/iproute2/files/iproute2-2.6.35-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-2.6.35-no-ipv6.patch new file mode 100644 index 000000000000..d82c8873344c --- /dev/null +++ b/sys-apps/iproute2/files/iproute2-2.6.35-no-ipv6.patch @@ -0,0 +1,27 @@ +https://bugs.gentoo.org/326849 + +allow ipv6 to be disabled + +--- iproute2-2.6.31/ip/iptunnel.c ++++ iproute2-2.6.31/ip/iptunnel.c +@@ -456,13 +456,6 @@ int do_iptunnel(int argc, char **argv) + break; + case AF_INET: + break; +- /* +- * This is silly enough but we have no easy way to make it +- * protocol-independent because of unarranged structure between +- * IPv4 and IPv6. +- */ +- case AF_INET6: +- return do_ip6tunnel(argc, argv); + default: + fprintf(stderr, "Unsupported family:%d\n", preferred_family); + exit(-1); +--- iproute2-2.6.31/ip/Makefile ++++ iproute2-2.6.31/ip/Makefile +@@ -1,4 +1,4 @@ + IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o \ +- rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ ++ rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ + ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o \ diff --git a/sys-apps/iproute2/iproute2-2.6.35-r1.ebuild b/sys-apps/iproute2/iproute2-2.6.35-r1.ebuild index 84d6d4404b20..566448e69f86 100644 --- a/sys-apps/iproute2/iproute2-2.6.35-r1.ebuild +++ b/sys-apps/iproute2/iproute2-2.6.35-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.35-r1.ebuild,v 1.3 2010/08/14 15:55:18 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.35-r1.ebuild,v 1.4 2010/08/23 02:29:22 vapier Exp $ EAPI="2" @@ -28,7 +28,7 @@ HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iprou LICENSE="GPL-2" SLOT="0" -IUSE="atm berkdb minimal" +IUSE="atm berkdb ipv6 minimal" RDEPEND="!net-misc/arpd !minimal? ( berkdb? ( sys-libs/db ) ) @@ -48,6 +48,7 @@ src_prepare() { rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc epatch "${FILESDIR}"/${PN}-2.6.29.1-hfsc.patch #291907 + use ipv6 || epatch "${FILESDIR}"/${PN}-2.6.35-no-ipv6.patch #326849 epatch_user |