From 1603847507a63218a29aada46e43f133d16d07eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Oct 2022 01:33:06 +0100 Subject: gentoo auto-resync : 10:10:2022 - 01:33:06 --- sys-apps/Manifest.gz | Bin 49394 -> 49396 bytes sys-apps/iproute2/Manifest | 4 +- sys-apps/iproute2/iproute2-6.0.0.ebuild | 215 +++++++++++++++++++++ sys-apps/iproute2/metadata.xml | 33 ++-- sys-apps/osinfo-db-tools/Manifest | 4 +- .../files/1.10.0-use-libsoup-2.4.patch | 16 ++ .../osinfo-db-tools-1.10.0-r1.ebuild | 49 +++++ .../osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild | 4 + 8 files changed, 307 insertions(+), 18 deletions(-) create mode 100644 sys-apps/iproute2/iproute2-6.0.0.ebuild create mode 100644 sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch create mode 100644 sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r1.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 2711c65bc49c..7097c8db103b 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index 6bc23705f50c..6b58b9259a73 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -8,8 +8,10 @@ AUX iproute2-default-color-auto.patch 186 BLAKE2B 4f751e1292d7f14c8fac68c115c666 DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d SHA512 e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22 DIST iproute2-5.18.0.tar.xz 880456 BLAKE2B 21b15d84b07199d4ddd12cbf14d94806a073f4eda659958a8459ef2ca8becbef8638dac2550cc53893cd147888b6a3b738256dac074307b37ebec8dbb460e600 SHA512 7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068 DIST iproute2-5.19.0.tar.xz 892696 BLAKE2B ee287065d7c33c0fa97f0fc130bb3a4a3ad5ac9417ad74ce8489e64ec146ff97749d79bb6563043c8835eab91a51631576441d450693cb50808ad0d37b2ea648 SHA512 eb0fffb153f7cecc89b5573b7fc211d67fb1c06789fd3b0aec75ba5032521d53c51ccc52db7367e41397993df50244af84763b0b1d5a76d9dfccf013c010131b +DIST iproute2-6.0.0.tar.xz 900312 BLAKE2B 1cfb9b5a7892dec2b35e0eadbd957083e95fdc5077a1aa193329801ff25f9ed90a1fc4152756547be1fab8fe18d9a399001a4c3a61e951f64946156af6a90bae SHA512 be30362b0df6906aa786f935d5f555b8b86c747fe05314066f4180ab2f7c952ae227b7cf04c15e75d8f99ca17bafb7c8dc0fb1c18f3a9e3222d98716bb449f7a EBUILD iproute2-5.15.0.ebuild 4994 BLAKE2B bc73ac11db47b0d52926149af6546fe81fd94354ca48aad8f452c5fedeebc1629d847ba653175bdb18172a3d74c9e8c6026ffd8f3436130985929e38f4e0dec6 SHA512 5737c4bd54bc283c1c50c9b2f5e7c87f8b40d2665e15d72a05893d890427d1c389d2f6c857bd8ca0db2d38996dadea810b5a11f061e95830347ff7f864bd7f7e EBUILD iproute2-5.18.0-r1.ebuild 5803 BLAKE2B 5be3d8f2c91cb5d1e8d6b13d9a736e75d6066922caacaae94881b37e4cb963ed14eb185a68e745e484ec29fbd66c33a0deeccee75065af8fa292bfea945406fd SHA512 e42d7f42d7cab34838b1cc3984083d143ccf2d02743ed0ad14e091ae0fd4a3c4d8c82113cd813a1e517c527dac7915c5908e2503ddf8fedb2f46eb65675bb266 EBUILD iproute2-5.19.0-r3.ebuild 6020 BLAKE2B 86761a5001746be00a658445202a5135a448f46b22f7e07ede80be9c870779da16f8677e4c2544bf100e3dd4ff5d7c4fe2714866f8367469cb26aa965d58c4b0 SHA512 2910286974fb7a5630c824b934efb41045fbe361ebd366d0e143a09c648ab332ccb9314e0174409b65f7fbb66a3f7912841f87c875a34858aa8c22bb2f0f2d74 +EBUILD iproute2-6.0.0.ebuild 5951 BLAKE2B 88d5f8622e202a4fab367d17ad8dd92b1fe5c28acdc525398856f99a943f1058066cc4a61b094a6b997683f4306ec81b34a9c5b8281e4c195e3aa3f50d148ddc SHA512 5734f8baa085cbac1f5793bb8f70d12890dddf8e66748c9fdab68dabd08c21123311d88d49a8dcaf3a0f53147c097483134124124687b337a4a89a1922832014 EBUILD iproute2-9999.ebuild 5951 BLAKE2B 88d5f8622e202a4fab367d17ad8dd92b1fe5c28acdc525398856f99a943f1058066cc4a61b094a6b997683f4306ec81b34a9c5b8281e4c195e3aa3f50d148ddc SHA512 5734f8baa085cbac1f5793bb8f70d12890dddf8e66748c9fdab68dabd08c21123311d88d49a8dcaf3a0f53147c097483134124124687b337a4a89a1922832014 -MISC metadata.xml 898 BLAKE2B f3c281e448846b5fa0e4cabec04767fe7217bd0d77a2baba7c1524ebdc1df4cc4c7d38ff441617959281c3a08b564d3cc6b7a89f846041f2416441b82079318d SHA512 404bd3aa523554bd78da7eb90bd3c53c146f71da92116115c238e1b186e971bf6d49161c33e58d6116af1616688bc00eb7d96f0fa5afb300a703cbdf6fdfe4ed +MISC metadata.xml 973 BLAKE2B e505f65ebcc30561fe249ede546cbad6289a0be929be6105379c25674e1dbade56fc62fa75839b0485099f13bc175daa55ad8b86f0a346e52907cfa00c4bb3f1 SHA512 a7e201275dd562c097d66083225e74221f81d89a7efac98b7c05cc7c508100a94b9e928854796cfbfbfeb679acfe34fb79026f7d04df8e07f57132ffc64be525 diff --git a/sys-apps/iproute2/iproute2-6.0.0.ebuild b/sys-apps/iproute2/iproute2-6.0.0.ebuild new file mode 100644 index 000000000000..46297152d6c6 --- /dev/null +++ b/sys-apps/iproute2/iproute2-6.0.0.ebuild @@ -0,0 +1,215 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo toolchain-funcs + +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 ~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 libbsd minimal nfs selinux split-usr" + +# 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:= ) + libbsd? ( dev-libs/libbsd ) + 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 + sys-devel/flex + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907 + "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722 + #"${FILESDIR}"/${PN}-5.1.0-portability.patch + "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch + "${FILESDIR}"/${PN}-default-color-auto.patch +) + +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 "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ + -i ${versionfile} || die + fi + + # echo -n is not POSIX compliant + sed 's@echo -n@printf@' -i 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 \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) + 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 + + 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) + 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) + HAVE_LIBBSD := $(usex libbsd y n) + EOF +} + +src_compile() { + emake V=1 NETNS_RUN_DIR=/run/netns +} + +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 + + 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 split-usr ; then + # Can remove compatibility symlink in a year: 2023-05-28. + # bug #547264 + mv "${ED}"/sbin/ss "${ED}"/bin/ss || die + dosym -r /bin/ss /sbin/ss + fi + + 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/metadata.xml b/sys-apps/iproute2/metadata.xml index 10e4c7acb786..f4d408562814 100644 --- a/sys-apps/iproute2/metadata.xml +++ b/sys-apps/iproute2/metadata.xml @@ -1,20 +1,21 @@ - - base-system@gentoo.org - Gentoo Base System - - - build programs that use berkdb (just arpd) - Use dev-libs/libbpf - support loading eBPF programs from ELFs (e.g. LLVM's eBPF backend) - include support for iptables filtering - Use dev-libs/libbsd instead of internal funcs - only install ip and tc programs, without eBPF support - Support RPC lookups via net-libs/libtirpc in ss - - - cpe:/a:iproute2_project:iproute2 - + + base-system@gentoo.org + Gentoo Base System + + + build programs that use berkdb (just arpd) + Use dev-libs/libbpf + support loading eBPF programs from ELFs (e.g. LLVM's eBPF backend) + include support for iptables filtering + Use dev-libs/libbsd instead of internal funcs + only install ip and tc programs, without eBPF support + Support RPC lookups via net-libs/libtirpc in ss + + + cpe:/a:iproute2_project:iproute2 + shemminger/iproute2 + diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest index 612eeb941ea9..14f9906badde 100644 --- a/sys-apps/osinfo-db-tools/Manifest +++ b/sys-apps/osinfo-db-tools/Manifest @@ -1,3 +1,5 @@ +AUX 1.10.0-use-libsoup-2.4.patch 570 BLAKE2B a43ae98006dc2791c4594dfba5cd5a7400f44e2313b39fbc3cfd835ac476af53ec5fe682867c275e5a99ec72e3f0765c3eaf5b9a5272bbacb3f769832ab3a2aa SHA512 61f847cf7a57dfa083fac7a4595a9b7c96226d3a23ddd4400143f859ab93f81e2be020cb27b6daf70d121e9c0fa787813524bba255e006a35a57144c3efe9ad6 DIST osinfo-db-tools-1.10.0.tar.xz 60508 BLAKE2B 2b9abbdba25add96440e2a937ae994c0305f995b924ffc7c88c2c31c122d3e5cf0c710fbf55724bea56f63be7250321ee27d2179e3f247461d6843f7e03dfc58 SHA512 27271b15404a6cb0065854ba8556c272cf3427ff4fd18fc9a22dbca2b01686c32661b24e18f5eff9a1b240a3a459d8fe66cbde530873d60b8c850bdd0b42c475 -EBUILD osinfo-db-tools-1.10.0.ebuild 1056 BLAKE2B 0ab7b8ff43a04aec547f0bc3f149d063c425740ca77426f834a7b651ab3d29e3c31970ebeac1e0df19d797fe356081bb63a826d5e0107c467679e8ba8afbc099 SHA512 c00edab69b10ea90a00438b50753a3d526310653b04d01b03e97b9fda8d86e97488ef107e647c68fd3b68e7cbe408ed693f61b8f7e20f1427b825c875d1a5612 +EBUILD osinfo-db-tools-1.10.0-r1.ebuild 1056 BLAKE2B c197806b9a5f1e4b6abdd04e954006dcfae0dd6007078dc9dc2d90e550c00c7771336dd1ef51457e9731da172d00055e9b3d69e0283332465f37b724c32e1050 SHA512 e47b2e22b6d05379114f970bb65dd5c39de177e8d8275083444de88df96776f20d7f1e3b8e60befb192ba6f5331c9d5b76ba8eb3dee20e2eadd3754bb2563723 +EBUILD osinfo-db-tools-1.10.0.ebuild 1112 BLAKE2B b66b20ac5699c5e6f6cbb9bfe485af4b9beabb491b7df64361f2ba604d1428a3e1d1b4bbeca215b60d0e7060ba1827373c429192ccd03ea7a143917459c6d9e3 SHA512 1042e3e5442b3a07aa4c7817d5033ff2ffbe75b91890b240fbbd0f10eda59a11001d9b552e16c48d531ca9449dd5b2f86701b75a8e2490d4fa61b9667b7be82b MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch b/sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch new file mode 100644 index 000000000000..a59e451baed9 --- /dev/null +++ b/sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch @@ -0,0 +1,16 @@ +diff --git a/meson.build b/meson.build +index 1cc5ff5..72b18a8 100644 +--- a/meson.build ++++ b/meson.build +@@ -58,11 +58,7 @@ gobject_dep = dependency('gobject-2.0', version: glib_version_info) + # everything else + json_glib_dep = dependency('json-glib-1.0') + libarchive_dep = dependency('libarchive', version: '>= 3.0.0') +-libsoup_dep = dependency('libsoup-3.0', required: false) +-# fallback to libsoup2 +-if not libsoup_dep.found() + libsoup_dep = dependency('libsoup-2.4') +-endif + libxml_dep = dependency('libxml-2.0', version: '>= 2.6.0') + + # common dependencies diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r1.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r1.ebuild new file mode 100644 index 000000000000..4bbfc428e588 --- /dev/null +++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit meson python-any-r1 + +DESCRIPTION="Tools for managing the osinfo database" +HOMEPAGE="https://libosinfo.org/" +SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.44:2 + dev-libs/json-glib + >=app-arch/libarchive-3.0.0:= + net-libs/libsoup:3.0 + >=dev-libs/libxml2-2.6.0 +" +# perl dep is for pod2man (manpages) +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + >=sys-devel/gettext-0.19.8 + dev-lang/perl + test? ( + $(python_gen_any_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ') + ) +" + +python_check_deps() { + python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/requests[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild index a202146e59fb..ab5d9f49f3fe 100644 --- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild +++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild @@ -39,6 +39,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${PV}-use-libsoup-2.4.patch +) + python_check_deps() { use test && \ has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \ -- cgit v1.2.3