commit: 7bf1151e9228c3ffa37847d505c28f5e9bd537a9
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 03:15:58 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 03:28:15 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7bf1151e
sys-apps/iproute2: remove older versions
Package-Manager: Portage-2.3.13, Repoman-2.3.3
sys-apps/iproute2/Manifest | 1 -
.../iproute2/files/iproute2-4.2.0-no-ipv6.patch | 37 ------
.../files/iproute2-4.3.0-musl-noiptables.patch | 38 ------
sys-apps/iproute2/files/iproute2-4.3.0-musl.patch | 95 --------------
.../files/iproute2-4.4.0-missing-limits_h.patch | 11 --
sys-apps/iproute2/iproute2-4.14.1-r1.ebuild | 142 ---------------------
sys-apps/iproute2/iproute2-4.4.0.ebuild | 132 -------------------
7 files changed, 456 deletions(-)
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index aab6559..ea284a2 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,2 +1 @@
DIST iproute2-4.14.1.tar.xz 636876 SHA256
d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067 SHA512
e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c
WHIRLPOOL
42ee7611f3fb1ceb922c606bf11cd4d72cf71020a73f96f5130f07a9cab08f1dbc973cb5924f6a15cf4613dac5b60a3a97583c0e801db960f5039d6d8c0ef095
-DIST iproute2-4.4.0.tar.xz 528552 SHA256
bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 SHA512
48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69
WHIRLPOOL
7e90c98805e12b28de284bb998e5a27cf524a78d0bd7632c0d49a7ddff8f11f5229ac6867076e9fea6f21b6b31360bddb21138673d94de766bdf7324a09bc013
diff --git a/sys-apps/iproute2/files/iproute2-4.2.0-no-ipv6.patch
b/sys-apps/iproute2/files/iproute2-4.2.0-no-ipv6.patch
deleted file mode 100644
index b29e1aa..0000000
--- a/sys-apps/iproute2/files/iproute2-4.2.0-no-ipv6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- iproute2-4.2.0/ip/ipmonitor.c
-+++ iproute2-4.2.0/ip/ipmonitor.c
-@@ -115,7 +115,6 @@
- }
- if (n->nlmsg_type == RTM_NEWPREFIX) {
- print_headers(fp, "[PREFIX]", ctrl);
-- print_prefix(who, n, arg);
- return 0;
- }
- if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) {
---- iproute2-4.2.0/ip/iptunnel.c
-+++ iproute2-4.2.0/ip/iptunnel.c
-@@ -637,13 +637,6 @@
- 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 protocol family: %d\n",
preferred_family);
- exit(-1);
---- iproute2-4.2.0/ip/Makefile
-+++ iproute2-4.2.0/ip/Makefile
-@@ -1,6 +1,6 @@
- IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
-- rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
-- ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \
-+ rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
-+ ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \
- ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \
- iplink_vlan.o link_veth.o link_gre.o iplink_can.o \
- iplink_macvlan.o iplink_macvtap.o ipl2tp.o link_vti.o link_vti6.o \
diff --git a/sys-apps/iproute2/files/iproute2-4.3.0-musl-noiptables.patch
b/sys-apps/iproute2/files/iproute2-4.3.0-musl-noiptables.patch
deleted file mode 100644
index ef91814..0000000
--- a/sys-apps/iproute2/files/iproute2-4.3.0-musl-noiptables.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 560dee4b4be54699c0c9679771c9e0d61e4db80a Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Thu, 19 Nov 2015 17:48:55 +0100
-Subject: [PATCH] Add missing <sys/types.h> include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The u_intXX_t types are defined in <sys/types.h>, so it should be
-included before using those types. Otherwise, with certain C
-libraries, the build fails with:
-
-In file included from ../include/iptables.h:4:0,
- from m_ipt.c:18:
-../include/iptables_common.h:47:16: error: unknown type name ‘u_int32_t’
- #define __le32 u_int32_t
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- include/iptables_common.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/iptables_common.h b/include/iptables_common.h
-index 9099667..2c27a4b 100644
---- a/include/iptables_common.h
-+++ b/include/iptables_common.h
-@@ -43,6 +43,8 @@ extern char *lib_dir;
- extern void init_extensions(void);
- #endif
-
-+#include <sys/types.h>
-+
- #define __be32 u_int32_t
- #define __le32 u_int32_t
- #define __be16 u_int16_t
---
-2.6.3
-
diff --git a/sys-apps/iproute2/files/iproute2-4.3.0-musl.patch
b/sys-apps/iproute2/files/iproute2-4.3.0-musl.patch
deleted file mode 100644
index 52e2940..0000000
--- a/sys-apps/iproute2/files/iproute2-4.3.0-musl.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 48596709d8ab59727b79a5c6db33ebb251c36543 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Thu, 19 Nov 2015 17:44:25 +0100
-Subject: [PATCH] Avoid in6_addr redefinition
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Due to both <netinet/in.h> and <linux/in6.h> being included, the
-in6_addr is being redefined: once from the C library headers and once
-from the kernel headers. This causes some build failures with for
-example the musl C library:
-
-In file included from ../include/linux/xfrm.h:4:0,
- from xfrm.h:29,
- from ipxfrm.c:39:
-../include/linux/in6.h:32:8: error: redefinition of ‘struct in6_addr’
- struct in6_addr {
- ^
-In file included from
.../output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/netdb.h:9:0,
- from ipxfrm.c:34:
-.../output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:24:8:
note: originally defined here
- struct in6_addr
- ^
-
-In order to fix this, use just the C library header <netinet/in.h>.
-
-Original patch taken from
-http://git.alpinelinux.org/cgit/aports/tree/main/iproute2/musl-fixes.patch.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- include/libiptc/ipt_kernel_headers.h | 2 --
- include/linux/if_bridge.h | 1 -
- include/linux/netfilter.h | 2 --
- include/linux/xfrm.h | 1 -
- 4 files changed, 6 deletions(-)
-
-diff --git a/include/libiptc/ipt_kernel_headers.h
b/include/libiptc/ipt_kernel_headers.h
-index 7e87828..9566be5 100644
---- a/include/libiptc/ipt_kernel_headers.h
-+++ b/include/libiptc/ipt_kernel_headers.h
-@@ -15,12 +15,10 @@
- #else /* libc5 */
- #include <sys/socket.h>
- #include <linux/ip.h>
--#include <linux/in.h>
- #include <linux/if.h>
- #include <linux/icmp.h>
- #include <linux/tcp.h>
- #include <linux/udp.h>
- #include <linux/types.h>
--#include <linux/in6.h>
- #endif
- #endif
-diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
-index ee197a3..f823aa4 100644
---- a/include/linux/if_bridge.h
-+++ b/include/linux/if_bridge.h
-@@ -15,7 +15,6 @@
-
- #include <linux/types.h>
- #include <linux/if_ether.h>
--#include <linux/in6.h>
-
- #define SYSFS_BRIDGE_ATTR "bridge"
- #define SYSFS_BRIDGE_FDB "brforward"
-diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
-index b71b4c9..3e4e6ae 100644
---- a/include/linux/netfilter.h
-+++ b/include/linux/netfilter.h
-@@ -4,8 +4,6 @@
- #include <linux/types.h>
-
- #include <linux/sysctl.h>
--#include <linux/in.h>
--#include <linux/in6.h>
-
- /* Responses from hook functions. */
- #define NF_DROP 0
-diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
-index b8f5451..a9761a5 100644
---- a/include/linux/xfrm.h
-+++ b/include/linux/xfrm.h
-@@ -1,7 +1,6 @@
- #ifndef _LINUX_XFRM_H
- #define _LINUX_XFRM_H
-
--#include <linux/in6.h>
- #include <linux/types.h>
-
- /* All of the structures in this file may not change size as they are
---
-2.6.3
-
diff --git a/sys-apps/iproute2/files/iproute2-4.4.0-missing-limits_h.patch
b/sys-apps/iproute2/files/iproute2-4.4.0-missing-limits_h.patch
deleted file mode 100644
index d08f300..0000000
--- a/sys-apps/iproute2/files/iproute2-4.4.0-missing-limits_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur iproute2-4.4.0.orig/lib/rt_names.c iproute2-4.4.0/lib/rt_names.c
---- iproute2-4.4.0.orig/lib/rt_names.c 2016-01-11 16:33:03.000000000 +0000
-+++ iproute2-4.4.0/lib/rt_names.c 2016-03-13 22:19:57.103454162 +0000
-@@ -18,6 +18,7 @@
- #include <sys/time.h>
- #include <sys/socket.h>
- #include <dirent.h>
-+#include <limits.h>
-
- #include <asm/types.h>
- #include <linux/rtnetlink.h>
diff --git a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
deleted file mode 100644
index 9341b81..0000000
--- a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
- inherit git-r3
-else
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 arm ~mips ppc x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
- !net-misc/arpd
- !minimal? ( net-libs/libmnl virtual/libelf )
- iptables? ( >=net-firewall/iptables-1.4.20:= )
- berkdb? ( sys-libs/db:= )
- atm? ( net-dialup/linux-atm )
- selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support #549948 and some defines
#553876
-DEPEND="
- ${RDEPEND}
- app-arch/xz-utils
- iptables? ( virtual/pkgconfig )
- >=sys-devel/bison-2.4
- sys-devel/flex
- >=sys-kernel/linux-headers-3.16
- elibc_glibc? ( >=sys-libs/glibc-2.7 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
- "${FILESDIR}"/${PN}-4.14.0-musl.patch
-)
-
-src_prepare() {
- if ! use ipv6 ; then
- PATCHES+=(
- "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
- )
- fi
-
- default
-
- sed -i \
- -e '/^CC :\?=/d' \
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
- -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^WFLAGS/s:-Werror::" \
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
- Makefile || die
-
- # Use /run instead of /var/run.
- sed -i \
- -e 's:/var/run:/run:g' \
- include/namespace.h \
- man/man8/ip-netns.8 || die
-
- # build against system headers
- rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h
include/libiptc
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
-}
-
-src_configure() {
- tc-export AR CC PKG_CONFIG
-
- # This sure is ugly. Should probably move into toolchain-funcs at some
point.
- local setns
- pushd "${T}" >/dev/null
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null
&& setns=y || setns=n
- echo 'int main(){return 0;}' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ||
sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
- popd >/dev/null
-
- cat <<-EOF > Config
- TC_CONFIG_ATM := $(usex atm y n)
- TC_CONFIG_XT := $(usex iptables y n)
- TC_CONFIG_NO_XT := $(usex iptables n y)
- # We've locked in recent enough kernel headers #549948
- TC_CONFIG_IPSET := y
- HAVE_BERKELEY_DB := $(usex berkdb y n)
- HAVE_MNL := $(usex minimal n y)
- HAVE_ELF := $(usex minimal n y)
- HAVE_SELINUX := $(usex selinux y n)
- IP_CONFIG_SETNS := ${setns}
- # Use correct iptables dir, #144265 #293709
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables
--variable=xtlibdir)
- EOF
-}
-
-src_install() {
- if use minimal ; then
- into /
- dosbin tc/tc
- dobin ip/ip
- return 0
- fi
-
- emake \
- DESTDIR="${D}" \
- LIBDIR="${EPREFIX%/}"/$(get_libdir) \
- SBINDIR="${EPREFIX%/}"/sbin \
- CONFDIR="${EPREFIX%/}"/etc/iproute2 \
- DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
- MANDIR="${EPREFIX%/}"/usr/share/man \
- ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
- install
-
- dodir /bin
- mv "${ED%/}"/{s,}bin/ip || die #330115
-
- dolib.a lib/libnetlink.a
- insinto /usr/include
- doins include/libnetlink.h
- # This local header pulls in a lot of linux headers it
- # doesn't directly need. Delete this header that requires
- # linux-headers-3.8 until that goes stable. #467716
- sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
-
- if use berkdb ; then
- dodir /var/lib/arpd
- # bug 47482, arpd doesn't need to be in /sbin
- dodir /usr/bin
- mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
- fi
-}
diff --git a/sys-apps/iproute2/iproute2-4.4.0.ebuild
b/sys-apps/iproute2/iproute2-4.4.0.ebuild
deleted file mode 100644
index 4e5b37c..0000000
--- a/sys-apps/iproute2/iproute2-4.4.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
- inherit git-2
-else
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh
sparc x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="!net-misc/arpd
- !minimal? ( net-libs/libmnl virtual/libelf )
- iptables? ( >=net-firewall/iptables-1.4.20:= )
- berkdb? ( sys-libs/db:= )
- atm? ( net-dialup/linux-atm )
- selinux? ( sys-libs/libselinux )"
-# We require newer linux-headers for ipset support #549948 and some defines
#553876
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- iptables? ( virtual/pkgconfig )
- >=sys-devel/bison-2.4
- sys-devel/flex
- >=sys-kernel/linux-headers-3.16
- elibc_glibc? ( >=sys-libs/glibc-2.7 )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
- use ipv6 || epatch "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849
- epatch "${FILESDIR}"/${PN}-4.3.0-musl.patch
- epatch "${FILESDIR}"/${PN}-4.3.0-musl-noiptables.patch
- epatch "${FILESDIR}"/${PN}-4.4.0-missing-limits_h.patch
-
- sed -i \
- -e '/^CC :\?=/d' \
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
- -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^WFLAGS/s:-Werror::" \
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
- Makefile || die
-
- # Use /run instead of /var/run.
- sed -i \
- -e 's:/var/run:/run:g' \
- include/namespace.h \
- man/man8/ip-netns.8 || die
-
- # build against system headers
- rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h
include/libiptc
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
-}
-
-src_configure() {
- tc-export AR CC PKG_CONFIG
-
- # This sure is ugly. Should probably move into toolchain-funcs at some
point.
- local setns
- pushd "${T}" >/dev/null
- printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null
&& setns=y || setns=n
- echo 'int main(){return 0;}' > test.c
- ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ||
sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
- popd >/dev/null
-
- cat <<-EOF > Config
- TC_CONFIG_ATM := $(usex atm y n)
- TC_CONFIG_XT := $(usex iptables y n)
- # We've locked in recent enough kernel headers #549948
- TC_CONFIG_IPSET := y
- HAVE_BERKELEY_DB := $(usex berkdb y n)
- HAVE_MNL := $(usex minimal n y)
- HAVE_ELF := $(usex minimal n y)
- HAVE_SELINUX := $(usex selinux y n)
- IP_CONFIG_SETNS := ${setns}
- # Use correct iptables dir, #144265 #293709
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables
--variable=xtlibdir)
- EOF
-}
-
-src_install() {
- if use minimal ; then
- into /
- dosbin tc/tc
- dobin ip/ip
- return 0
- fi
-
- emake \
- DESTDIR="${D}" \
- LIBDIR="${EPREFIX}"/$(get_libdir) \
- SBINDIR="${EPREFIX}"/sbin \
- CONFDIR="${EPREFIX}"/etc/iproute2 \
- DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
- MANDIR="${EPREFIX}"/usr/share/man \
- ARPDDIR="${EPREFIX}"/var/lib/arpd \
- install
-
- rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
-
- dodir /bin
- mv "${ED}"/{s,}bin/ip || die #330115
-
- dolib.a lib/libnetlink.a
- insinto /usr/include
- doins include/libnetlink.h
- # This local header pulls in a lot of linux headers it
- # doesn't directly need. Delete this header that requires
- # linux-headers-3.8 until that goes stable. #467716
- sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
- if use berkdb ; then
- dodir /var/lib/arpd
- # bug 47482, arpd doesn't need to be in /sbin
- dodir /usr/bin
- mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
- fi
-}
