From aa3411e241a201d53a2689766fe419f2756819f3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Mar 2019 17:22:19 +0000 Subject: gentoo resync : 24.03.2019 --- sys-apps/iproute2/Manifest | 4 +- sys-apps/iproute2/iproute2-5.0.0.ebuild | 157 ++++++++++++++++++++++++++++++++ sys-apps/iproute2/iproute2-9999.ebuild | 19 ++-- 3 files changed, 171 insertions(+), 9 deletions(-) create mode 100644 sys-apps/iproute2/iproute2-5.0.0.ebuild (limited to 'sys-apps/iproute2') diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index 1312923518c9..4a57ca27a29d 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -8,9 +8,11 @@ DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c SHA512 ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5 DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd87aea04971a28eca9f9b7ea82d0e4aa397c9338c0cb6cb463887678a541a5407644e82244ffbbae0eb8f6ac088e8 SHA512 47c750da2247705b1b1d1621f58987333e54370d0fff2f24106194022de793ff35dfd67fd1be127ce019008705702092d31dac49abf930a7c0dc5c7e7c0665b8 DIST iproute2-4.20.0.tar.xz 707016 BLAKE2B d62c6b995c4c1f79617e2f8149ff2ed297d741965e81bffebfa475514f5e96f0c9300e65d12bdd14ab492ce66675677eb41af6816876d5e1360218e4f32f4bc8 SHA512 ed29638c864062e199152c7b3b24b6495987ca6f79cc9ab1b529dab37a8a840fa2b5858d5db2b94eeefa1c0d72ff666a790107e27d11a597b189bfb7a01a4b8b +DIST iproute2-5.0.0.tar.xz 710656 BLAKE2B 0adf7554c4d3d16821297158e025894efdb72834b93caa89521e200c70e287e7d1ebebd22dd91593483ed4e2f3274b370bbb786b9c249263c84b2345a1f5b358 SHA512 4b1649ccdfefbb5eace9d444843492db9d1357b9b3ee1567d6241283cde00ad3c9dbee6b8e507c4e9a5ca0a6378b71ca0c5fbf1e2ed2a9c7d479daf5d49eaed0 EBUILD iproute2-4.14.1-r2.ebuild 4092 BLAKE2B b3e3ae2b24182aa2d99f16120231bd4ac2029b73b9af53f0098046ecce73049e3dac510ee405f4dd12aa8c0e45b0504b7f82425c8063d05b5a958475ac2ce9d6 SHA512 c4f5cb98704d5a78d74a17a057bebb89f059c0a622d5e7ed28c6b36a73ed6be6d2a9205ed6b1ac4401f23ae46372e25d85a1038631d6ed215b2fd68c2e6a4c73 EBUILD iproute2-4.17.0-r1.ebuild 4265 BLAKE2B 12f2034aebd08983d8349dfa07935bfbeb04126b2af45c1a88c00e7a40ff865fb00e498955aa2f0e6a0e1c55e702d281f653b1cf9817e8bdeebc21b8e79b1fbe SHA512 e46431a3827de15fe0d0bd4837a66f378c3e4bc067ca29ae5292faa2bcda10b3bfc79e1eedc31ab4f38db8d245750bc9de9733202e87a2a974bef2cff60640dd EBUILD iproute2-4.19.0-r1.ebuild 4278 BLAKE2B bedd85f0cfac4e0db1e210067f287bd4be04e89d6623373ed61097ce91e59636f00ef68a1a39335dc43335e5ca6d3e5ab94091084ae6fc703b7fa939305ca15f SHA512 a71917519ea3a8cff82a3eb5f50cb71723bd3749d2dfa7d7e7a5fa4db27325a14880d9b108ef4bbe450553c65f4711f73f94208acc19b12263cd97ebd9bafa18 EBUILD iproute2-4.20.0.ebuild 4314 BLAKE2B a4267caef40fefa2ef46a8103c0ca558a51f4f298ed25630614752035c3d2cdadef160904c77f46a978c3d85f2fbf1714d5cd0b9d9c6fb52b8d04cf68f52f664 SHA512 68768fd94cc1571b51e3e87dfa8f0fe009ca354ccca5a5e9b2faa0db5e6f827be637f5cc5594d7c08136e9ff2e8b664bedd2296c02bcad143150e7ebe3c765e5 -EBUILD iproute2-9999.ebuild 4310 BLAKE2B 0569ce4999daa8315da5fa8692ad3bef4623133ea91c8520950b14c0dabeb63f922fbdda33ddad194b44ea205554a61afe225a28f9e5711bb501f3add3fd2f7d SHA512 d70a72670a882f7b1ecc13018e993282a0d532d3d8a8e024d8ab655746daf00d7316ab71ec9caad15c1d9195ba25aea722adb1b73a0753f77fefe48516f03e71 +EBUILD iproute2-5.0.0.ebuild 4345 BLAKE2B 42ac27a91a993f7078ce0c0abfea29ca1819772fde0a48676cd3150a1be529a710a7bfa849f34fb289ccde85d9e6fc18661ca304205c3c58a40e28846edf4b28 SHA512 33259ab7401d30f8ba90679f3432842cf2aadb2e2748a12cbcbd50af106ba692c33d4c434a49f4e523a9e49b14ce9464d5e6ed6fc7a8bb2bc4e1d5499ccb6b55 +EBUILD iproute2-9999.ebuild 4345 BLAKE2B 42ac27a91a993f7078ce0c0abfea29ca1819772fde0a48676cd3150a1be529a710a7bfa849f34fb289ccde85d9e6fc18661ca304205c3c58a40e28846edf4b28 SHA512 33259ab7401d30f8ba90679f3432842cf2aadb2e2748a12cbcbd50af106ba692c33d4c434a49f4e523a9e49b14ce9464d5e6ed6fc7a8bb2bc4e1d5499ccb6b55 MISC metadata.xml 581 BLAKE2B b63c391d8d9ba608c12ea74f0cdf0d4d762d18e5b62ab1e2489f34140def1691bc295d8d252ab984b313b6fb037cd4d5a74d992db7ca670557bd8458501f8c04 SHA512 607dd3006049664a4c780a65b187fb938cbf7c5e79b445eb4a69c3115af8fe6718ea227a68cfcf4b42fd92c3e760579a92b49a58415d01ccb0715fdf9c052a97 diff --git a/sys-apps/iproute2/iproute2-5.0.0.ebuild b/sys-apps/iproute2/iproute2-5.0.0.ebuild new file mode 100644 index 000000000000..c6720ff8aed3 --- /dev/null +++ b/sys-apps/iproute2/iproute2-5.0.0.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2019 Gentoo Authors +# 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="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 ~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} + app-arch/xz-utils + iptables? ( virtual/pkgconfig ) + >=sys-devel/bison-2.4 + sys-devel/flex + >=sys-kernel/linux-headers-3.16 + virtual/pkgconfig + elibc_glibc? ( >=sys-libs/glibc-2.7 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 + "${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722 +) + +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 \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 +} diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild index f9527624933e..c6720ff8aed3 100644 --- a/sys-apps/iproute2/iproute2-9999.ebuild +++ b/sys-apps/iproute2/iproute2-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,11 +18,12 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" LICENSE="GPL-2" SLOT="0" -IUSE="atm caps berkdb elf +iptables ipv6 minimal selinux" +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 ) @@ -39,18 +40,19 @@ DEPEND=" >=sys-devel/bison-2.4 sys-devel/flex >=sys-kernel/linux-headers-3.16 + virtual/pkgconfig elibc_glibc? ( >=sys-libs/glibc-2.7 ) " PATCHES=( "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - "${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722 + "${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722 ) src_prepare() { if ! use ipv6 ; then PATCHES+=( - "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849 + "${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849 ) fi @@ -61,7 +63,6 @@ src_prepare() { -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 @@ -72,10 +73,12 @@ src_prepare() { man/man8/ip-netns.8 || die # build against system headers - rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc + 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 - use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile + if use minimal ; then + sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die + fi } src_configure() { @@ -146,7 +149,7 @@ src_install() { sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die if use berkdb ; then - dodir /var/lib/arpd + 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 -- cgit v1.2.3