sys-apps/iproute2: Bump to version 5.2.0

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 134e8f0787684d09143cdf8f18323931f6629b22..b3c8dad34e4dc1adc0c571c93335b85ad2a80eda 100644 (file)
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,3 +4,4 @@ DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd8
 DIST iproute2-4.20.0.tar.xz 707016 BLAKE2B d62c6b995c4c1f79617e2f8149ff2ed297d741965e81bffebfa475514f5e96f0c9300e65d12bdd14ab492ce66675677eb41af6816876d5e1360218e4f32f4bc8 SHA512 ed29638c864062e199152c7b3b24b6495987ca6f79cc9ab1b529dab37a8a840fa2b5858d5db2b94eeefa1c0d72ff666a790107e27d11a597b189bfb7a01a4b8b
 DIST iproute2-5.0.0.tar.xz 710656 BLAKE2B 0adf7554c4d3d16821297158e025894efdb72834b93caa89521e200c70e287e7d1ebebd22dd91593483ed4e2f3274b370bbb786b9c249263c84b2345a1f5b358 SHA512 4b1649ccdfefbb5eace9d444843492db9d1357b9b3ee1567d6241283cde00ad3c9dbee6b8e507c4e9a5ca0a6378b71ca0c5fbf1e2ed2a9c7d479daf5d49eaed0
 DIST iproute2-5.1.0.tar.xz 722412 BLAKE2B 06330b636d661df5e2128a87bb63455bcbb5c8cda0faab96928e2068bb23b3bc3b2e5a0daa68d2d112e66fa58d7b3360791c7d5a0d679fc01cecb3ca9ad8ea4d SHA512 5c8319b040bd0ba98cf1225b2a77efafc662741344c53877ee38cf108ca01906b03328e4f9b00b7557e301c6e64bca4e42e92af477b4d657bcbff5120c0c4e87
+DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999eb4955b708ef49a3276f3c574eab757e2c81f10a11e2ce5f709c7849bbf6556e40c7f261fc72d498046f73eade4 SHA512 82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1

diff --git a/sys-apps/iproute2/iproute2-5.2.0.ebuild b/sys-apps/iproute2/iproute2-5.2.0.ebuild
new file mode 100644 (file)
index 0000000..f2771e5
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-5.2.0.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+       EGIT_REPO_URI="https://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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 caps elf +iptables ipv6 minimal selinux"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+       !net-misc/arpd
+       dev-libs/libbsd
+       !minimal? ( net-libs/libmnl )
+       caps? ( sys-libs/libcap )
+       elf? ( 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}
+       >=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+       app-arch/xz-utils
+       >=sys-devel/bison-2.4
+       sys-devel/flex
+       virtual/pkgconfig
+"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+       "${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
+       "${FILESDIR}"/${PN}-5.1.0-portability.patch
+)
+
+src_prepare() {
+       if ! use ipv6 ; then
+               PATCHES+=(
+                       "${FILESDIR}"/${PN}-4.20.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 "/^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 || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+       sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+       if use minimal ; then
+               sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
+       fi
+}
+
+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
+
+       # run "configure" script first which will create "config.mk"...
+       econf
+
+       # ...now switch on/off requested features via USE flags
+       # this is only useful if the test did not set other things, per bug #643722
+       cat <<-EOF >> config.mk
+       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_CAP      := $(usex caps y n)
+       HAVE_MNL      := $(usex minimal n y)
+       HAVE_ELF      := $(usex elf y n)
+       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_compile() {
+       emake V=1
+}
+
+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
+               keepdir /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
+}