commit: 462f35e0a18a4c1b0f4e236124fdc1f126b790fc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 9 06:12:19 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 06:12:19 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=462f35e0
sys-apps/iproute2: drop 6.9.0, 6.11.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/iproute2/Manifest | 1 -
sys-apps/iproute2/iproute2-6.11.0.ebuild | 214 -------------------------------
sys-apps/iproute2/iproute2-6.9.0.ebuild | 213 ------------------------------
3 files changed, 428 deletions(-)
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 6d83ad4b25e4..2d3bad50e643 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,3 +1,2 @@
DIST iproute2-6.11.0.tar.xz 923736 BLAKE2B
1a360d7cb9a70f5cde184abe934f2d08e9c0d2196c4ec10015636af3984abe2738d9dd8d6c7a69569fc7449e9933829f4eccd593ab8c041ce7b6385adaed63cc
SHA512
06bedd7ae573fe5cf9c72af698987ba03e53dc6fce5f41813bf5bb155b683490e5c75cc835ce5ba4509e491eb6138e96da162204c28ea1b3d80887107997a3b3
DIST iproute2-6.12.0.tar.xz 925392 BLAKE2B
95aee769662e21c8c6223d09ee0ec365fcdeb7a10d01e89e33aa3039a6dfac11401cbdca4bf436544fc05ed709ad90871ac91eaf17dc553d7ca157b98577a7b7
SHA512
dbd6afb8162a6086e4be9045b8dc53aa563bd4b7abaf43ee13cd7d493730ff0b90e6985f68c6f42d64f4af6a692d0589e0cefd2f24045ec1c10418cfb73940b2
-DIST iproute2-6.9.0.tar.xz 918144 BLAKE2B
a7434a2537a55b4875db0e3cc35383dfe4d0c8a118a8a1102c4076bfb154c9c2ab0781dcff324fa18ce7cfde798bf332a9e0ff08003ff39acbb8129b597a93a6
SHA512
1cbb234cb8f94213c3529f0b74fed5a575ff1fb838e783b8d2b440643c2e91246eda42e9b26e9775897aadb8b8133d199b2851b8ea0df06a899dc02acf403325
diff --git a/sys-apps/iproute2/iproute2-6.11.0.ebuild
b/sys-apps/iproute2/iproute2-6.11.0.ebuild
deleted file mode 100644
index debd258b42ea..000000000000
--- a/sys-apps/iproute2/iproute2-6.11.0.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo toolchain-funcs flag-o-matic
-
-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 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 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 bpf caps elf +iptables minimal nfs selinux"
-# Needs root
-RESTRICT="test"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
- !net-misc/arpd
- !minimal? ( net-libs/libmnl:= )
- atm? ( net-dialup/linux-atm )
- berkdb? ( sys-libs/db:= )
- bpf? ( >=dev-libs/libbpf-0.6:= )
- caps? ( sys-libs/libcap )
- elf? ( virtual/libelf:= )
- iptables? ( >=net-firewall/iptables-1.4.20:= )
- nfs? ( net-libs/libtirpc:= )
- selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support (bug #549948) and some
defines (bug #553876)
-DEPEND="
- ${RDEPEND}
- >=sys-kernel/linux-headers-3.16
-"
-BDEPEND="
- app-arch/xz-utils
- >=sys-devel/bison-2.4
- app-alternatives/lex
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.10.0-musl-1.patch # bug #936234
- "${FILESDIR}"/${PN}-6.10.0-musl-2.patch # bug #926341
- "${FILESDIR}"/${PN}-6.9.0-mtu.patch # bug #291907
- "${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug
#643722 & #911727
- "${FILESDIR}"/${PN}-6.8.0-disable-libbsd-fallback.patch # bug #911727
-)
-
-src_prepare() {
- default
-
- # Fix version if necessary
- local versionfile="include/version.h"
- if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
- einfo "Fixing version string"
- sed -i "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
- ${versionfile} || die
- fi
-
- # echo -n is not POSIX compliant
- sed -i 's@echo -n@printf@' configure || die
-
- 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
-
- # 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 || die
- 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
-
- # build system does not pass CFLAGS to LDFLAGS, as is recommended by
GCC upstream
- # https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html#index-flto
- # https://bugs.gentoo.org/929233
- append-ldflags ${CFLAGS}
-
- # run "configure" script first which will create "config.mk"...
- # Using econf breaks since 5.14.0
(a9c3d70d902a0473ee5c13336317006a52ce8242)
- edo ./configure --color=auto --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
-
- 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
-
- # ...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)
- TC_CONFIG_NO_XT := $(usex iptables n y)
- # We've locked in recent enough kernel headers, bug #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_RPC := $(usex nfs y n)
- HAVE_SELINUX := $(usex selinux y n)
- IP_CONFIG_SETNS := ${setns}
- # Use correct iptables dir, bug #144265, bug #293709
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables
--variable=xtlibdir)
- EOF
-}
-
-src_compile() {
- emake V=1 NETNS_RUN_DIR=/run/netns
-}
-
-src_test() {
- emake check
-}
-
-src_install() {
- if use minimal ; then
- into /
- dosbin tc/tc
- dobin ip/ip
- return 0
- fi
-
- emake \
- DESTDIR="${D}" \
- PREFIX="${EPREFIX}/usr" \
- 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 # bug #330115
- mv "${ED}"/{s,}bin/ss || die # bug #547264
-
- dolib.a lib/libnetlink.a
- insinto /usr/include
- doins include/libnetlink.h
-
- # Collides with net-analyzer/ifstat
- # https://bugs.gentoo.org/868321
- mv "${ED}"/sbin/ifstat{,-iproute2} || 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
- elif [[ -d "${ED}"/var/lib/arpd ]]; then
- rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
- fi
-}
diff --git a/sys-apps/iproute2/iproute2-6.9.0.ebuild
b/sys-apps/iproute2/iproute2-6.9.0.ebuild
deleted file mode 100644
index 1e889a3bf892..000000000000
--- a/sys-apps/iproute2/iproute2-6.9.0.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo toolchain-funcs flag-o-matic
-
-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 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 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 bpf caps elf +iptables minimal nfs selinux"
-# Needs root
-RESTRICT="test"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
- !net-misc/arpd
- !minimal? ( net-libs/libmnl:= )
- atm? ( net-dialup/linux-atm )
- berkdb? ( sys-libs/db:= )
- bpf? ( dev-libs/libbpf:= )
- caps? ( sys-libs/libcap )
- elf? ( virtual/libelf:= )
- iptables? ( >=net-firewall/iptables-1.4.20:= )
- nfs? ( net-libs/libtirpc:= )
- selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support (bug #549948) and some
defines (bug #553876)
-DEPEND="
- ${RDEPEND}
- >=sys-kernel/linux-headers-3.16
-"
-BDEPEND="
- app-arch/xz-utils
- >=sys-devel/bison-2.4
- app-alternatives/lex
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.9.0-mtu.patch # bug #291907
- "${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug
#643722 & #911727
- "${FILESDIR}"/${PN}-6.8.0-disable-libbsd-fallback.patch # bug #911727
- "${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622 & #932617
-)
-
-src_prepare() {
- default
-
- # Fix version if necessary
- local versionfile="include/version.h"
- if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
- einfo "Fixing version string"
- sed -i "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
- ${versionfile} || die
- fi
-
- # echo -n is not POSIX compliant
- sed -i 's@echo -n@printf@' configure || die
-
- 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
-
- # 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 || die
- 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
-
- # build system does not pass CFLAGS to LDFLAGS, as is recommended by
GCC upstream
- # https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html#index-flto
- # https://bugs.gentoo.org/929233
- append-ldflags ${CFLAGS}
-
- # run "configure" script first which will create "config.mk"...
- # Using econf breaks since 5.14.0
(a9c3d70d902a0473ee5c13336317006a52ce8242)
- edo ./configure --color=auto --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
-
- 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
-
- # ...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)
- TC_CONFIG_NO_XT := $(usex iptables n y)
- # We've locked in recent enough kernel headers, bug #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_RPC := $(usex nfs y n)
- HAVE_SELINUX := $(usex selinux y n)
- IP_CONFIG_SETNS := ${setns}
- # Use correct iptables dir, bug #144265, bug #293709
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables
--variable=xtlibdir)
- EOF
-}
-
-src_compile() {
- emake V=1 NETNS_RUN_DIR=/run/netns
-}
-
-src_test() {
- emake check
-}
-
-src_install() {
- if use minimal ; then
- into /
- dosbin tc/tc
- dobin ip/ip
- return 0
- fi
-
- emake \
- DESTDIR="${D}" \
- PREFIX="${EPREFIX}/usr" \
- 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 # bug #330115
- mv "${ED}"/{s,}bin/ss || die # bug #547264
-
- dolib.a lib/libnetlink.a
- insinto /usr/include
- doins include/libnetlink.h
-
- # Collides with net-analyzer/ifstat
- # https://bugs.gentoo.org/868321
- mv "${ED}"/sbin/ifstat{,-iproute2} || 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
- elif [[ -d "${ED}"/var/lib/arpd ]]; then
- rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
- fi
-}
