diff options
Diffstat (limited to 'sys-apps/iproute2')
-rw-r--r-- | sys-apps/iproute2/Manifest | 8 | ||||
-rw-r--r-- | sys-apps/iproute2/iproute2-5.18.0-r1.ebuild (renamed from sys-apps/iproute2/iproute2-5.17.0.ebuild) | 83 | ||||
-rw-r--r-- | sys-apps/iproute2/iproute2-9999.ebuild | 85 | ||||
-rw-r--r-- | sys-apps/iproute2/metadata.xml | 1 |
4 files changed, 130 insertions, 47 deletions
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index cc531cba7543..23455a3b9a99 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -3,8 +3,8 @@ AUX iproute2-4.20.0-no-ipv6.patch 1334 BLAKE2B 612fa64a897fe8c601aca529a09508cc8 AUX iproute2-5.12.0-configure-nomagic.patch 6967 BLAKE2B 8707ace3766d2bb797901886032bbbfc78b3116b548d317038144307a52ba86a01dc49460fa8b4524f03de3abc5b56f4901a9cb24f1f6cacfbd7a5b92cea7145 SHA512 a6184d1fc150717ab40a278c2a6ce439ea04e9967d55f1d10fecc8162452a1a38a6e11c2f736c5aebfe0ffe726bfa80e154169004ccc571b89dcef9c0dbe1242 AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1bfb9d92379983d989d9d4a396e773f02c655ac14c57cc25c5d4e37fbdb0e0d1cb1d35fc94ee70077b81d1285ac2d58cb1b19fa69db SHA512 09a9d450179b06c434a41b7bdd8d4a47b8ca2303de3d08b2b101e8695aec28e5d1e454a8c62e1b71d66b6e776dc6975f2837acc0a0f8a2a3f1e31b1eb56b71e3 DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d SHA512 e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22 -DIST iproute2-5.17.0.tar.xz 870908 BLAKE2B 4310829ebbde7fd21ecc28856deddabfa93f26bf7937b3ef3c0e05e4e0bf925a9b167334efaefe3e275d196e7370a290679739ae8d8397dc6511f4da25dfd459 SHA512 fcffe96fb4819305ddf5c3764b100bd1d204069cf53a6bd776c2716144f574b4fc17963fc231a83ad253cce6a563814556eeb60b211ba9b0b87330186259b34d +DIST iproute2-5.18.0.tar.xz 880456 BLAKE2B 21b15d84b07199d4ddd12cbf14d94806a073f4eda659958a8459ef2ca8becbef8638dac2550cc53893cd147888b6a3b738256dac074307b37ebec8dbb460e600 SHA512 7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068 EBUILD iproute2-5.15.0.ebuild 4994 BLAKE2B bc73ac11db47b0d52926149af6546fe81fd94354ca48aad8f452c5fedeebc1629d847ba653175bdb18172a3d74c9e8c6026ffd8f3436130985929e38f4e0dec6 SHA512 5737c4bd54bc283c1c50c9b2f5e7c87f8b40d2665e15d72a05893d890427d1c389d2f6c857bd8ca0db2d38996dadea810b5a11f061e95830347ff7f864bd7f7e -EBUILD iproute2-5.17.0.ebuild 4933 BLAKE2B 7ef77ee3b1725b8c7b428e6ed97e9fc218f6956824e2b723c06aee7bf66e7e02901f05b2dca4099ddbfd4901a51c16198ba34410fdeac4280220dda94e3086c8 SHA512 56dd4e89a9ac6733ad4c8b2fc09368f2ad7c02f399d6fba7794b3a7b715fad743b1270f7d02a95b96979634e31d91596f3f64a84498e51bfb44247f71ba7a39e -EBUILD iproute2-9999.ebuild 4926 BLAKE2B b10bd40a6acb0ca3345a5ca66349e70fb170e53471249021655ca073efb72bf335ad12a9b4ba44c339657e69212083fed886b92f0bc998ffa0f34ffffa68b5e9 SHA512 1a7faee630ec6735e49ddf30bf902f7e781114fbf0ea0f14c61aa7d074a4ef871f9b3f51648f766f27a49d087c2efc314eb054147eb5bc4346c5266851b5853b -MISC metadata.xml 814 BLAKE2B a74c3bee84fc81acfeee405c22b84ca9a10f2daf4be9d496202cbc5a2595f7222b864f4105f5dd46ec45e7de57b6ffff991f907da6378293267209b9eafe91d5 SHA512 74936295cae7e84f39ea6dd8e6bee613bed9e9716c6a96aa8f497be96b14367a2d8829db3ed108b760afdd196c5dbc9f32b14f29f5a0939e47b15d7a68aeca4a +EBUILD iproute2-5.18.0-r1.ebuild 5803 BLAKE2B 5be3d8f2c91cb5d1e8d6b13d9a736e75d6066922caacaae94881b37e4cb963ed14eb185a68e745e484ec29fbd66c33a0deeccee75065af8fa292bfea945406fd SHA512 e42d7f42d7cab34838b1cc3984083d143ccf2d02743ed0ad14e091ae0fd4a3c4d8c82113cd813a1e517c527dac7915c5908e2503ddf8fedb2f46eb65675bb266 +EBUILD iproute2-9999.ebuild 5803 BLAKE2B 5be3d8f2c91cb5d1e8d6b13d9a736e75d6066922caacaae94881b37e4cb963ed14eb185a68e745e484ec29fbd66c33a0deeccee75065af8fa292bfea945406fd SHA512 e42d7f42d7cab34838b1cc3984083d143ccf2d02743ed0ad14e091ae0fd4a3c4d8c82113cd813a1e517c527dac7915c5908e2503ddf8fedb2f46eb65675bb266 +MISC metadata.xml 898 BLAKE2B f3c281e448846b5fa0e4cabec04767fe7217bd0d77a2baba7c1524ebdc1df4cc4c7d38ff441617959281c3a08b564d3cc6b7a89f846041f2416441b82079318d SHA512 404bd3aa523554bd78da7eb90bd3c53c146f71da92116115c238e1b186e971bf6d49161c33e58d6116af1616688bc00eb7d96f0fa5afb300a703cbdf6fdfe4ed diff --git a/sys-apps/iproute2/iproute2-5.17.0.ebuild b/sys-apps/iproute2/iproute2-5.18.0-r1.ebuild index f9085bf91567..c0e45a9ec79e 100644 --- a/sys-apps/iproute2/iproute2-5.17.0.ebuild +++ b/sys-apps/iproute2/iproute2-5.18.0-r1.ebuild @@ -3,9 +3,9 @@ EAPI=7 -inherit toolchain-funcs +inherit eapi8-dosym edo toolchain-funcs -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" inherit git-r3 else @@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" LICENSE="GPL-2" SLOT="0" -IUSE="atm berkdb bpf caps elf +iptables libbsd minimal selinux" +IUSE="atm berkdb bpf caps elf +iptables libbsd minimal nfs selinux split-usr" # We could make libmnl optional, but it's tiny, so eh RDEPEND=" @@ -31,9 +31,10 @@ RDEPEND=" elf? ( virtual/libelf:= ) iptables? ( >=net-firewall/iptables-1.4.20:= ) libbsd? ( dev-libs/libbsd ) + nfs? ( net-libs/libtirpc:= ) selinux? ( sys-libs/libselinux ) " -# We require newer linux-headers for ipset support #549948 and some defines #553876 +# We require newer linux-headers for ipset support (bug #549948) and some defines (bug #553876) DEPEND=" ${RDEPEND} >=sys-kernel/linux-headers-3.16 @@ -52,17 +53,12 @@ PATCHES=( "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch ) -doecho() { - echo "${@}" - "${@}" || die -} - src_prepare() { default # Fix version if necessary local versionfile="include/version.h" - if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then + if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then einfo "Fixing version string" sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ -i ${versionfile} || die @@ -91,21 +87,62 @@ src_prepare() { src_configure() { tc-export AR CC PKG_CONFIG - # This sure is ugly. Should probably move into toolchain-funcs at some point. + # This sure is ugly. Should probably move into toolchain-funcs at some point. local setns pushd "${T}" >/dev/null || die - 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 + printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c || die + if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null ; then + setns=y + else + setns=n + fi + + echo 'int main(){return 0;}' > test.c || die + if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ; then + sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die + fi popd >/dev/null || die # run "configure" script first which will create "config.mk"... # Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242) - doecho ./configure --libbpf_force $(usex bpf on off) + edo ./configure --libbpf_force $(usex bpf on off) + + # Remove the definitions made by configure and allow them to be overridden + # by USE flags below. + # We have to do the cheesy only-sed-if-disabled because otherwise + # the *_FLAGS etc stuff found by configure will be used but result + # in a broken build. + if ! use berkdb ; then + sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die + fi + + if ! use caps ; then + sed -i -e '/HAVE_CAP/d' config.mk || die + fi + + if use minimal ; then + sed -i -e '/HAVE_MNL/d' config.mk || die + fi - # ...now switch on/off requested features via USE flags + if ! use elf ; then + sed -i -e '/HAVE_ELF/d' config.mk || die + fi + + if ! use nfs ; then + sed -i -e '/HAVE_RPC/d' config.mk || die + fi + + if ! use selinux ; then + sed -i -e '/HAVE_SELINUX/d' config.mk || die + fi + + if ! use libbsd ; then + sed -i -e '/HAVE_LIBBSD/d' config.mk || die + fi + + # ...Now switch on/off requested features via USE flags # this is only useful if the test did not set other things, per bug #643722 + # Keep in sync with ifs above, or refactor to be unified. cat <<-EOF >> config.mk TC_CONFIG_ATM := $(usex atm y n) TC_CONFIG_XT := $(usex iptables y n) @@ -116,6 +153,7 @@ src_configure() { HAVE_CAP := $(usex caps y n) HAVE_MNL := $(usex minimal n y) HAVE_ELF := $(usex elf y n) + HAVE_RPC := $(usex nfs y n) HAVE_SELINUX := $(usex selinux y n) IP_CONFIG_SETNS := ${setns} # Use correct iptables dir, bug #144265, bug #293709 @@ -153,10 +191,13 @@ src_install() { 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. # bug #467716 - sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die + + if use split-usr ; then + # Can remove compatibility symlink in a year: 2023-05-28. + # bug #547264 + mv "${ED}"/sbin/ss "${ED}"/bin/ss || die + dosym8 -r /bin/ss /sbin/ss + fi if use berkdb ; then keepdir /var/lib/arpd diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild index 11dfd239d1a7..c0e45a9ec79e 100644 --- a/sys-apps/iproute2/iproute2-9999.ebuild +++ b/sys-apps/iproute2/iproute2-9999.ebuild @@ -3,14 +3,14 @@ EAPI=7 -inherit toolchain-funcs +inherit eapi8-dosym edo toolchain-funcs -if [[ ${PV} == "9999" ]] ; then +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="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="kernel routing and traffic control utilities" @@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" LICENSE="GPL-2" SLOT="0" -IUSE="atm berkdb bpf caps elf +iptables libbsd minimal selinux" +IUSE="atm berkdb bpf caps elf +iptables libbsd minimal nfs selinux split-usr" # We could make libmnl optional, but it's tiny, so eh RDEPEND=" @@ -31,9 +31,10 @@ RDEPEND=" elf? ( virtual/libelf:= ) iptables? ( >=net-firewall/iptables-1.4.20:= ) libbsd? ( dev-libs/libbsd ) + nfs? ( net-libs/libtirpc:= ) selinux? ( sys-libs/libselinux ) " -# We require newer linux-headers for ipset support #549948 and some defines #553876 +# We require newer linux-headers for ipset support (bug #549948) and some defines (bug #553876) DEPEND=" ${RDEPEND} >=sys-kernel/linux-headers-3.16 @@ -52,17 +53,12 @@ PATCHES=( "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch ) -doecho() { - echo "${@}" - "${@}" || die -} - src_prepare() { default # Fix version if necessary local versionfile="include/version.h" - if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then + if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then einfo "Fixing version string" sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ -i ${versionfile} || die @@ -91,21 +87,62 @@ src_prepare() { src_configure() { tc-export AR CC PKG_CONFIG - # This sure is ugly. Should probably move into toolchain-funcs at some point. + # This sure is ugly. Should probably move into toolchain-funcs at some point. local setns pushd "${T}" >/dev/null || die - 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 + printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c || die + if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null ; then + setns=y + else + setns=n + fi + + echo 'int main(){return 0;}' > test.c || die + if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ; then + sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die + fi popd >/dev/null || die # run "configure" script first which will create "config.mk"... # Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242) - doecho ./configure --libbpf_force $(usex bpf on off) + edo ./configure --libbpf_force $(usex bpf on off) + + # Remove the definitions made by configure and allow them to be overridden + # by USE flags below. + # We have to do the cheesy only-sed-if-disabled because otherwise + # the *_FLAGS etc stuff found by configure will be used but result + # in a broken build. + if ! use berkdb ; then + sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die + fi + + if ! use caps ; then + sed -i -e '/HAVE_CAP/d' config.mk || die + fi + + if use minimal ; then + sed -i -e '/HAVE_MNL/d' config.mk || die + fi - # ...now switch on/off requested features via USE flags + if ! use elf ; then + sed -i -e '/HAVE_ELF/d' config.mk || die + fi + + if ! use nfs ; then + sed -i -e '/HAVE_RPC/d' config.mk || die + fi + + if ! use selinux ; then + sed -i -e '/HAVE_SELINUX/d' config.mk || die + fi + + if ! use libbsd ; then + sed -i -e '/HAVE_LIBBSD/d' config.mk || die + fi + + # ...Now switch on/off requested features via USE flags # this is only useful if the test did not set other things, per bug #643722 + # Keep in sync with ifs above, or refactor to be unified. cat <<-EOF >> config.mk TC_CONFIG_ATM := $(usex atm y n) TC_CONFIG_XT := $(usex iptables y n) @@ -116,6 +153,7 @@ src_configure() { HAVE_CAP := $(usex caps y n) HAVE_MNL := $(usex minimal n y) HAVE_ELF := $(usex elf y n) + HAVE_RPC := $(usex nfs y n) HAVE_SELINUX := $(usex selinux y n) IP_CONFIG_SETNS := ${setns} # Use correct iptables dir, bug #144265, bug #293709 @@ -153,10 +191,13 @@ src_install() { 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. # bug #467716 - sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die + + if use split-usr ; then + # Can remove compatibility symlink in a year: 2023-05-28. + # bug #547264 + mv "${ED}"/sbin/ss "${ED}"/bin/ss || die + dosym8 -r /bin/ss /sbin/ss + fi if use berkdb ; then keepdir /var/lib/arpd diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml index ab92eca64ca4..10e4c7acb786 100644 --- a/sys-apps/iproute2/metadata.xml +++ b/sys-apps/iproute2/metadata.xml @@ -12,6 +12,7 @@ <flag name="iptables">include support for iptables filtering</flag> <flag name="libbsd">Use <pkg>dev-libs/libbsd</pkg> instead of internal funcs</flag> <flag name="minimal">only install ip and tc programs, without eBPF support</flag> + <flag name="nfs">Support RPC lookups via <pkg>net-libs/libtirpc</pkg> in ss</flag> </use> <upstream> <remote-id type="cpe">cpe:/a:iproute2_project:iproute2</remote-id> |