From 4a74938e510c0dad732ae4c48f815dd0f0cabb46 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 13 Feb 2023 08:16:09 +0000 Subject: gentoo auto-resync : 13:02:2023 - 08:16:09 --- sys-apps/Manifest.gz | Bin 48608 -> 48627 bytes sys-apps/edid-decode/Manifest | 2 + .../edid-decode/edid-decode-0_pre20230131.ebuild | 34 ++++ sys-apps/gentoo-systemd-integration/Manifest | 4 +- .../gentoo-systemd-integration-9.ebuild | 6 +- .../gentoo-systemd-integration-9999.ebuild | 6 +- sys-apps/iproute2/Manifest | 2 + .../files/iproute2-6.1.0-strncpy-overlap.patch | 39 ++++ sys-apps/iproute2/iproute2-6.1.0-r1.ebuild | 216 +++++++++++++++++++++ sys-apps/man-pages/Manifest | 2 + sys-apps/man-pages/man-pages-6.03.ebuild | 116 +++++++++++ sys-apps/nawk/Manifest | 2 +- sys-apps/nawk/nawk-20220122-r1.ebuild | 4 +- sys-apps/systemd-utils/Manifest | 2 +- sys-apps/systemd-utils/systemd-utils-252.5.ebuild | 2 + 15 files changed, 427 insertions(+), 10 deletions(-) create mode 100644 sys-apps/edid-decode/edid-decode-0_pre20230131.ebuild create mode 100644 sys-apps/iproute2/files/iproute2-6.1.0-strncpy-overlap.patch create mode 100644 sys-apps/iproute2/iproute2-6.1.0-r1.ebuild create mode 100644 sys-apps/man-pages/man-pages-6.03.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 19658e7ff948..e4a812ff72b1 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/edid-decode/Manifest b/sys-apps/edid-decode/Manifest index 811147a5b4d2..c5e44cc8786c 100644 --- a/sys-apps/edid-decode/Manifest +++ b/sys-apps/edid-decode/Manifest @@ -1,4 +1,6 @@ DIST edid-decode-0_pre20220319.tar.gz 135715 BLAKE2B 3ca70f7147463ec586d9b28e4e68327c5b2e8075dcf6f57f0be40288f87a4b498998654333321b3d3ca7e7d38926befc53094250b2953cd2b33b686f5cd878cc SHA512 5f3f285b898ae1a47abf06e787e097c8aebb558e3efbc6e80bdd4ed5505ea4f59f723d5a0a820bbc0c575d25f686f03aa33fe424e1b3a1b2c1be1ef13b6508c2 +DIST edid-decode-0_pre20230131.tar.gz 147392 BLAKE2B 8a08ca44bbdb61b0264a24b911b082d264eb1ef281d98a93dc12d62f5d233cc898cf1ad06647e680f8ab49b047721f31c80572582a2dd5dc8fec93ff70227b03 SHA512 53619eb79e456d4bf3566506019ad77a8f8dacb4211106cdf21164c26d0d026383bedd8a8ba2a7050d4d0657e1bbca51fb89978cfd066f1130f888a4537dd19b EBUILD edid-decode-0_pre20220319.ebuild 676 BLAKE2B 24b12550cea4f8bdc2d24aeca29eea88fc6311c833f23d8bf2d484e1338f9534dc2fde388deb4343f52c74d69e137681accef07981bdb54d81e6d222cd4b5cb3 SHA512 b8e6fc02163f9f1e6b921051211e299d18c8ad1f9046a726856d263b2fb8073ee8bffbe6357106b21a60130ee30454b6d0d7f4d2f7221219fc5e2149a56ce745 +EBUILD edid-decode-0_pre20230131.ebuild 677 BLAKE2B f88fae4aa6890e6a59c0bbd30070451bc8ef8ae6c86775f0d432359b688a03c23ab718793831254f5b9fc3783874013f194a0173aab02d5988e631228cdd85c3 SHA512 81b9052f73020770aca3b271f80142bc7d17567ae48e4cb0edd92cacaab53924848bfe460ad20eac836d6dc8a6cac949a28c520dddd424310f8d9247fea62ca2 EBUILD edid-decode-9999.ebuild 550 BLAKE2B 775a90997efcdbe276451be45fb7533e5132864ec6bebf44172d708c328e0acb9ecb58c66e6402642c0b3dc7a8da71715b8592f4e86975f8c538946cdf53cd21 SHA512 0fcd19bdb9b1bfb54db0140b96efdbd6058648c2dc663f617a9823e453255844a377dbff3ddbe98557ca514ed0ee4d54cbb68f5859d1a060d5f5202a86c25c5f MISC metadata.xml 647 BLAKE2B 42d8d41db31a4748f5ffad976c0ad35ff483073c286236d77f3c6fc91e854844e519bc8d4761a02880e116faca88c43c16bea37c008719c8adb8f55f4226ac83 SHA512 c7c46f576fd17b42a06a6b241d3a5b6f5dfb9597e824f00ff311feba48a587ecd821285ecc3fb46d3533b6bdd352b34a69ec8886e0e7e8da38dbd29055effbad diff --git a/sys-apps/edid-decode/edid-decode-0_pre20230131.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20230131.ebuild new file mode 100644 index 000000000000..76dd496bae09 --- /dev/null +++ b/sys-apps/edid-decode/edid-decode-0_pre20230131.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +EGIT_COMMIT="915b0ce5329f417d2c3f84ddab3d443dd0e01b61" +MY_P="${PN}-${EGIT_COMMIT}" + +DESCRIPTION="Decode EDID data in a human-readable format" +HOMEPAGE="https://git.linuxtv.org/edid-decode.git/" +SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +KEYWORDS="amd64 ~arm64 x86" +LICENSE="MIT" +SLOT="0" +IUSE="examples" + +src_compile() { + tc-export CXX + default +} + +src_install() { + emake DESTDIR="${ED}" install + einstalldocs + + if use examples; then + insinto /usr/share/edid-decode/examples + doins data/* + fi +} diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest index 78447249a0c8..4f9e738a2047 100644 --- a/sys-apps/gentoo-systemd-integration/Manifest +++ b/sys-apps/gentoo-systemd-integration/Manifest @@ -1,4 +1,4 @@ DIST gentoo-systemd-integration-9.tar.gz 65696 BLAKE2B 7d2105e37ff53d48e312b78a971f16124df1d3a1f99ae37eb757e4be31663eee15ba1a9fb31ef31250c79f902f7a00e1de84030f3fb67e41ab2243d58deabcb6 SHA512 e4810e74c713793f1e5aca7f025780c32e8f0fe404bf74b65263bfaeff1ae1398551fdff7de37a4050f0e48d5e0b90525217f5b3caa18111ab1981f57f41fc18 -EBUILD gentoo-systemd-integration-9.ebuild 1002 BLAKE2B 7fb4bb0c606f5bdf1ac5f00636518ee3b987179d15cc10477b6aea687a3466764af1a6b6a069a42daaf26ae6f266fe448a9dbdedc75cc1c42a25c88b0d18dac6 SHA512 4151bdfa598c9ae80dfa1531a109defd8c367ab1f04129dccdb2f0ea381b3a6ef5ff8e9ecff18bc45998fa2aac6358dc12f745a6ad67766e454523e2d6329daa -EBUILD gentoo-systemd-integration-9999.ebuild 1003 BLAKE2B e3b623391925b2f628ae48bb8b66d60d056d977ceb1219641e5e8e19f6b0d627826a1e851bd674b589c603a2ccfa64a191b9899e5dc8051a26939316a7bf6fb1 SHA512 447214da6d0bf9fc07fbfdc2e5a2f841e5f17d626f19500dd4cca5e7de259c581fac1b69ace46e2441a76763a43c13095085f8096defaa7c95bcdd87d256a88e +EBUILD gentoo-systemd-integration-9.ebuild 1037 BLAKE2B 912f1401f57bed1fd9d4779ebdec8bfce3047514b33aa374e7a5e96dfdd109b18839d60a670f17a481c96f887b3180359c48633c70ce288b80a92a5d112fd3b2 SHA512 c7362a7de3181e1182d2798f020d3f188d4d3732fb9936a3a026a33d8b8d9cc829e14c2c043b83171fd059361527c058ee86592d98468f7de37632d841e4a8c6 +EBUILD gentoo-systemd-integration-9999.ebuild 1038 BLAKE2B 9d4ea9943f8a1a29d3693060ceb585d29327a018c1daf3ab91c182c15ab45cce32d69b19844a6b4c5123ae99068c502b096ed0ec752690dacd479b895c358305 SHA512 2efc245c46c4b2eb633ab23545816d8d0b6eda7c8798c34913fa42bc67cd85310a3777354d35cdfe33d333fdd623b6a6994ebfc2217f457a20cd42f082d8dbfc MISC metadata.xml 380 BLAKE2B c85bcefccc2876a63a0b0348c42099812d371f2893971cd3ed76726bb1c305c6d17a30814743b9db8f91f96448ea241be723bd9deb11d627ee0c3b38643f8a42 SHA512 d72a532ad36554a12da2dad9645e939f79fe67ad969850f702bfb2691e80fda2c3c7a99e5f7be992a2b0b78aac4a09aa56d04ee914d1c98f131ef29e10a91dcc diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild index ff0712f83a44..0023f2d5ed9d 100644 --- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild +++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 2013-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,7 +20,9 @@ LICENSE="BSD" SLOT="0" IUSE="" -RDEPEND=">=sys-apps/systemd-207 +RDEPEND="acct-group/floppy + acct-group/usb + >=sys-apps/systemd-207 !sys-fs/eudev !sys-fs/udev" DEPEND=">=sys-apps/systemd-207" diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild index 0332820fef8a..693cb5671001 100644 --- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild +++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 2013-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,7 +20,9 @@ LICENSE="BSD" SLOT="0" IUSE="" -RDEPEND=">=sys-apps/systemd-207 +RDEPEND="acct-group/floppy + acct-group/usb + >=sys-apps/systemd-207 !sys-fs/eudev !sys-fs/udev" DEPEND=">=sys-apps/systemd-207" diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index 4135dad5852a..e112dc88ddbf 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -2,12 +2,14 @@ AUX iproute2-3.1.0-mtu.patch 1649 BLAKE2B cbecd9770391ca7c7f25b860a95bb5b2783073 AUX iproute2-4.20.0-no-ipv6.patch 1334 BLAKE2B 612fa64a897fe8c601aca529a09508cc865f2f0fb7cb865ba28f3369748086622b6910f25052047c972f495b5e20014cdf6e9f73b230124f372cfe6301bc0bf2 SHA512 f4b42667d4433225b2e4272b6e629fc43b73ede02ac0e706d2e46d81ffcecd19ca45b8b9789904b4bd6d10d34c82239f9b3c33cfcf3f9e5b309d828a3494c864 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 +AUX iproute2-6.1.0-strncpy-overlap.patch 1401 BLAKE2B 8fe99941751ed3ab451ce8623a165e330f59ec3559e15b51e851c046d67b4a2225ac078dde0afede32eea9d1fc116db50183bc2138477036a145813269da8600 SHA512 c21acdb9af0185b9e50b03efaff7e9233d44d5056a24268785f61759d654aa87e00b41fdb211adfe8d964cfccf45e6c9340ec7cf0b2269c705109e01db34f059 AUX iproute2-default-color-auto.patch 186 BLAKE2B 4f751e1292d7f14c8fac68c115c666f51d2494cb6d68d2da18e7fd6f694ea1d01b0731488b9482ed41cff8b985140d4bbee135861209d1a8f90ce26a7d972485 SHA512 d47ea460a1d92504184d9063c0539f69e7807204c17eefbb0342a27f30745ccb80e2f7ff61e516f3086516e66e0e68d361312bd6a0babd840927a57ef2fe9793 DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d SHA512 e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22 DIST iproute2-6.0.0.tar.xz 900312 BLAKE2B 1cfb9b5a7892dec2b35e0eadbd957083e95fdc5077a1aa193329801ff25f9ed90a1fc4152756547be1fab8fe18d9a399001a4c3a61e951f64946156af6a90bae SHA512 be30362b0df6906aa786f935d5f555b8b86c747fe05314066f4180ab2f7c952ae227b7cf04c15e75d8f99ca17bafb7c8dc0fb1c18f3a9e3222d98716bb449f7a DIST iproute2-6.1.0.tar.xz 905512 BLAKE2B 38249703e0a9ba74405aebdb97560b286deefa959a9c3f0e0893962b6966f5da2da46199dda6a0f9584bb473f8ba529440643d97f66e9b7619df029e3091d163 SHA512 4e4d3b5e1e1a5444f42671c1e6caee072e80063e34e37386695f76f85a1ab662f4513050814006e5154426cbaadfba1d86b0be14e65978d5e670a16446047b28 EBUILD iproute2-5.15.0.ebuild 4994 BLAKE2B bc73ac11db47b0d52926149af6546fe81fd94354ca48aad8f452c5fedeebc1629d847ba653175bdb18172a3d74c9e8c6026ffd8f3436130985929e38f4e0dec6 SHA512 5737c4bd54bc283c1c50c9b2f5e7c87f8b40d2665e15d72a05893d890427d1c389d2f6c857bd8ca0db2d38996dadea810b5a11f061e95830347ff7f864bd7f7e EBUILD iproute2-6.0.0.ebuild 5943 BLAKE2B d85a48405ed9359c187e770afdd7583f54c3905ee5b58488a604369957333a79c9d0f3c3964436116e5799ad9d8e7ade1ad51c02d89cb10983b9d5f11d015297 SHA512 6df97340ce887a0f9a1319c5a4458872cf8157c3131cb8dd27027fd18867571a6b80267974c1c0009996e4fd8fa6431434d5ae61ab2fc0b0c988ba3668c7f84e +EBUILD iproute2-6.1.0-r1.ebuild 6000 BLAKE2B 49f03ac76621e34f65217bfbed93815d72914a081dda6598b1ce789dff8cf3f19697b199dde9a9e235738ef35b0cfcbdef04ba4652d3022dee49cd32b7f11a66 SHA512 d8a3fadd4a4ac3a1539f1b6c0e74320b321114ea3ddba75111606362f49412e04b6ca578cfc0f07d2fbc460d2639a1bbe8727c08e65cf103f29c552dc93b3bc5 EBUILD iproute2-6.1.0.ebuild 5951 BLAKE2B 88d5f8622e202a4fab367d17ad8dd92b1fe5c28acdc525398856f99a943f1058066cc4a61b094a6b997683f4306ec81b34a9c5b8281e4c195e3aa3f50d148ddc SHA512 5734f8baa085cbac1f5793bb8f70d12890dddf8e66748c9fdab68dabd08c21123311d88d49a8dcaf3a0f53147c097483134124124687b337a4a89a1922832014 EBUILD iproute2-9999.ebuild 5951 BLAKE2B 88d5f8622e202a4fab367d17ad8dd92b1fe5c28acdc525398856f99a943f1058066cc4a61b094a6b997683f4306ec81b34a9c5b8281e4c195e3aa3f50d148ddc SHA512 5734f8baa085cbac1f5793bb8f70d12890dddf8e66748c9fdab68dabd08c21123311d88d49a8dcaf3a0f53147c097483134124124687b337a4a89a1922832014 MISC metadata.xml 973 BLAKE2B e505f65ebcc30561fe249ede546cbad6289a0be929be6105379c25674e1dbade56fc62fa75839b0485099f13bc175daa55ad8b86f0a346e52907cfa00c4bb3f1 SHA512 a7e201275dd562c097d66083225e74221f81d89a7efac98b7c05cc7c508100a94b9e928854796cfbfbfeb679acfe34fb79026f7d04df8e07f57132ffc64be525 diff --git a/sys-apps/iproute2/files/iproute2-6.1.0-strncpy-overlap.patch b/sys-apps/iproute2/files/iproute2-6.1.0-strncpy-overlap.patch new file mode 100644 index 000000000000..8b4b0abbbc7d --- /dev/null +++ b/sys-apps/iproute2/files/iproute2-6.1.0-strncpy-overlap.patch @@ -0,0 +1,39 @@ +fix UB in strncpy (e.g. truncated ip route output) + +Fix overlapping buffers passed to strncpy which is UB. format_host_rta_r writes +to the buffer passed to it, so hostname (derived from b1) & b1 partly overlap. + +This gets worse with sys-libs/glibc-2.37 where the ip route output can be truncated, +but it was UB anyway and you can see it occurring w/ glibc-2.36. + +Bug: https://lore.kernel.org/netdev/0011AC38-4823-4D0A-8580-B108D08959C2@gentoo.org/T/#u +Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30112 +Thanks-to: Doug Freed +--- a/ip/iproute.c ++++ b/ip/iproute.c +@@ -753,6 +753,7 @@ int print_route(struct nlmsghdr *n, void *arg) + int ret; + + SPRINT_BUF(b1); ++ SPRINT_BUF(b2); + + if (n->nlmsg_type != RTM_NEWROUTE && n->nlmsg_type != RTM_DELROUTE) { + fprintf(stderr, "Not a route: %08x %08x %08x\n", +@@ -814,7 +815,7 @@ int print_route(struct nlmsghdr *n, void *arg) + r->rtm_dst_len); + } else { + const char *hostname = format_host_rta_r(family, tb[RTA_DST], +- b1, sizeof(b1)); ++ b2, sizeof(b2)); + if (hostname) + strncpy(b1, hostname, sizeof(b1) - 1); + } +@@ -837,7 +838,7 @@ int print_route(struct nlmsghdr *n, void *arg) + r->rtm_src_len); + } else { + const char *hostname = format_host_rta_r(family, tb[RTA_SRC], +- b1, sizeof(b1)); ++ b2, sizeof(b2)); + if (hostname) + strncpy(b1, hostname, sizeof(b1) - 1); + } diff --git a/sys-apps/iproute2/iproute2-6.1.0-r1.ebuild b/sys-apps/iproute2/iproute2-6.1.0-r1.ebuild new file mode 100644 index 000000000000..72f3265dd8e0 --- /dev/null +++ b/sys-apps/iproute2/iproute2-6.1.0-r1.ebuild @@ -0,0 +1,216 @@ +# Copyright 1999-2023 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 + "${FILESDIR}"/${PN}-6.1.0-strncpy-overlap.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/man-pages/Manifest b/sys-apps/man-pages/Manifest index 341362dfa880..8ab1ba393efd 100644 --- a/sys-apps/man-pages/Manifest +++ b/sys-apps/man-pages/Manifest @@ -2,10 +2,12 @@ DIST man-pages-5.12.tar.xz 1778220 BLAKE2B 347c5ef63cb80134018f322f810545354ccc7 DIST man-pages-5.13.tar.xz 1788980 BLAKE2B 7cca88b7f201d177b087893f60e6a87fd3ed8c78a183bd6ebcd0c28961f5f5d24aa2ba9d3a1d9cec4e0fc9cc0b26489c91e991a2d4420c28e1f61b850b882752 SHA512 a68c0bd5f078aff2f13f962060863e5d30734c1c562e8e9e3d5eda5a329b18ad3e9b4ebb883d31cacfc0a476f91fccb8dd4257598acd75d09dd21351893d3499 DIST man-pages-6.01.tar.xz 1789204 BLAKE2B 37005b45af798315992fe4836457982d4203245eb546a6f1dcb02b67d63db1ba7e872b1259ebb58ee01178c726fff5f2276ec548ba768f73683edaee9a3233ca SHA512 93d09380a08c36740dbb2f3f246d190e5467147344b584253a2e0248fa764559008c21bb567f379f6166952ee1635ae3c2145e2a63aaf6d30728ca680d7b57a9 DIST man-pages-6.02.tar.xz 1800876 BLAKE2B 005bc57d2abca18516502faa7ea31798e6fb992d4a2fa1ce83dbba2992d9cc29e3b48fef97f1faa55bc40eafcb4eedbafb113dc2561f4a438f0a7fa711e259f0 SHA512 124e5157c25b5a3c62d225be1da2879f436d7fd8fe2f116c11982178e34085d1e50ef47e13fde413a7bf16d1177cbe744d00b2a178be3dfe4c4828371812ea5a +DIST man-pages-6.03.tar.xz 2184824 BLAKE2B 16eba629c5fcbac7b52fa0ecf32d30d0e07308653d3617d1edf7503b6f983aa3f5145b1af7c5fcc96cb5a64ad425af7fe9be9a0da74c92c52d2d9b8fc60c9661 SHA512 df9de826c8289869fb27928f14eb28040b0f5bdae18247dc2ea847e660dd8bff9eee5656f6b2b38330abc64b69cad7cd44681bdf49173dd49a53877eaf725dba DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770 EBUILD man-pages-5.12-r3.ebuild 2227 BLAKE2B 3b3bd8ef026cdd916dd380a88a79e0bf79752309440629bfaed6791c18e09e86c7703b042f241e86c69d4bbd92b9cd37f9b450c05628555f2eb4d79a85026cb0 SHA512 7c054aeb1a8dee95e8f94ddc7226e83fb21fb8d8080111b0f20173c911fa37c6d63976af8db7cfaadfb6223ca205cc29fe33ec3c84aa7a78a71bf0b1a2034ed9 EBUILD man-pages-5.13-r2.ebuild 2235 BLAKE2B 69ccf3e43c912486f4a10dd6a96a084eb51e2373d6eaf5fb2d1bdb1168d6b7c6a2157f97ebd3a30c9b3e562b1d047156f6ad92b1cf7aa593c84b3a2bcccc14f6 SHA512 9b48404aed7680bfecda777399c24c9e93d4415ec4585832e9a6eb2f621a9ed471e3773be86d798e96b45784b03b42df28528af7cea228f024fb1ca4586df26b EBUILD man-pages-6.01.ebuild 3392 BLAKE2B 0f8398df0b7672947b45c8828722855ab33363b7bdf46fc6f9c9d4ffa95e90fc2d4ab200fa5d5707231b410619d3448ee7b1a855862d9e5085d3aec700a3dc14 SHA512 7082fa2ad2e45ed0948354bc9e4360f82ef182a17adc0e8525fbc661386c60c54c7bb4a7d1298d09ccef4105799b49520a9edd259b2acde1d83008c85a07fe44 EBUILD man-pages-6.02-r1.ebuild 3371 BLAKE2B 9ecbd1a5707cb9587529024730ecbf8307d44e9db384a127ca0be500630abb4fa2bd7fa10dafab1745d1e1967f3cf71d3bb96ca266a3748718cbfb0c36e9b7fd SHA512 d6fa94f7b8c96c68c12b464700d111f651ed351977145efa52d8294472faf9e560eda024f43bde10e1416a570025c9685de6fa9486b53edb4de84a67a313f40d +EBUILD man-pages-6.03.ebuild 3379 BLAKE2B b0df0eed6006fa9db18088b6105a702f95ba231b339367675baa4ff927becd72bff8bb1bbdf410b1d1fbd4ac2466d49258aaaae55e1a3ea708e3f212248aec0e SHA512 2c46990ca15fa6081262331e1debe6b728556ff2ff38d65ee629a42c44b06e91c0bdde427f9f4c3a17a10ec867056cea6a46d5b91cf6cc73ae21990886e579be EBUILD man-pages-9999.ebuild 3331 BLAKE2B f2c4dc45fc55921d9469d70e22c0f8338a87323b034c85da25c2a5b75308a313c19ffa79b42900fb2d659daa45c54896f7913348e8f9b4f97f78653d73712abc SHA512 cc64c8a1208cbda742acb6edd48400ece591ac5b57b742c1a25edc3e4c1abc3b15e061654659cc931b4aa41ecce42a36dcc8d0e0f90ce27399e9572374229e1a MISC metadata.xml 277 BLAKE2B 866b0f11a1927de0a75083001a598aa5ff99fc21b3e2b61811bda22915df73776a2d0ffe350497964c95c47a050723d2573d7248589c5cce28ba83c2660736b9 SHA512 0f502e6d4e3e23c0c88e2d5f4ba641974d934a175a643ba2ad96cdd954a2ab26972794b6ca9a1b370536c6eade6798bcb9c89be0193d170320e1b0f302a2747f diff --git a/sys-apps/man-pages/man-pages-6.03.ebuild b/sys-apps/man-pages/man-pages-6.03.ebuild new file mode 100644 index 000000000000..36a5195a9ce7 --- /dev/null +++ b/sys-apps/man-pages/man-pages-6.03.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Maintenance notes: +# - Upstream are very friendly, do approach them if have any questions; +# +# - It's considered fine (and somewhat encouraged) for us to make snapshots +# if we want specific fixes, perhaps aligned with newer kernels, glibc, etc. +# Just generate it with 'make dist'. We can set DISTVERSION if we want a vanity +# name or if the comit hash is too long; +# +# - If we do use a snapshot, *don't* grab it directly from git and use it +# raw in the ebuild. Use 'make dist' as above; +# +# - Sometimes there's no dist tarball available post-release and upstream +# encourage distros to make their own. Set MAN_PAGES_GENTOO_DIST to 1 if none is +# available, 0 otherwise. +MAN_PAGES_GENTOO_DIST=0 +GENTOO_PATCH=2 + +DESCRIPTION="A somewhat comprehensive collection of Linux man pages" +HOMEPAGE="https://www.kernel.org/doc/man-pages/" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git" + inherit git-r3 +elif [[ ${PV} == *_rc* ]] ; then + MY_P=${PN}-${PV/_/-} + + SRC_URI="https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/snapshot/${MY_P}.tar.gz" + S="${WORKDIR}"/${MY_P} +else + if [[ ${MAN_PAGES_GENTOO_DIST} -eq 1 ]] ; then + SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-gentoo.tar.xz" + else + SRC_URI=" + https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz + https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz + " + fi + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +SRC_URI+=" + mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2 + https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2 +" + +LICENSE="man-pages GPL-2+ BSD" +SLOT="0" +# Keep the following in sync with app-i18n/man-pages-l10n +MY_L10N=( cs da de el es fi fr hu id it mk nb nl pl pt-BR ro sr sv uk vi ) +IUSE="l10n_ja l10n_ru l10n_zh-CN ${MY_L10N[@]/#/l10n_}" +RESTRICT="binchecks" + +BDEPEND=" + sys-devel/bc +" +# Block packages that used to install colliding man pages: +# bug #341953, bug #548900, bug #612640, bug #617462 +RDEPEND=" + virtual/man + !