From e745e1d281540da525df5eaae0904b62bc27852f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 29 Jun 2023 13:40:31 +0100 Subject: gentoo auto-resync : 29:06:2023 - 13:40:31 --- sys-apps/Manifest.gz | Bin 49840 -> 49829 bytes sys-apps/hwloc/Manifest | 2 + sys-apps/hwloc/hwloc-2.9.2.ebuild | 120 +++++++ sys-apps/minijail/Manifest | 5 +- sys-apps/minijail/files/minijail-18-makefile.patch | 41 +++ sys-apps/minijail/metadata.xml | 3 + sys-apps/minijail/minijail-18.ebuild | 78 ++++ sys-apps/net-tools/Manifest | 2 +- sys-apps/net-tools/metadata.xml | 1 + sys-apps/prctl/Manifest | 2 +- sys-apps/prctl/prctl-1.6-r1.ebuild | 2 +- sys-apps/util-linux/Manifest | 7 - .../util-linux-2.39-check-for-mount_setattr.patch | 98 ----- .../util-linux-2.39-mount-dont-call-hooks.patch | 79 ---- .../util-linux-2.39-mount-parse-options-user.patch | 46 --- .../util-linux-2.39-tests-for-mount_setattr.patch | 13 - sys-apps/util-linux/util-linux-2.39-r4.ebuild | 400 --------------------- 17 files changed, 252 insertions(+), 647 deletions(-) create mode 100644 sys-apps/hwloc/hwloc-2.9.2.ebuild create mode 100644 sys-apps/minijail/files/minijail-18-makefile.patch create mode 100644 sys-apps/minijail/minijail-18.ebuild delete mode 100644 sys-apps/util-linux/files/util-linux-2.39-check-for-mount_setattr.patch delete mode 100644 sys-apps/util-linux/files/util-linux-2.39-mount-dont-call-hooks.patch delete mode 100644 sys-apps/util-linux/files/util-linux-2.39-mount-parse-options-user.patch delete mode 100644 sys-apps/util-linux/files/util-linux-2.39-tests-for-mount_setattr.patch delete mode 100644 sys-apps/util-linux/util-linux-2.39-r4.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index adb1cd983059..646b93f8517b 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest index 59141078f099..545415b691c8 100644 --- a/sys-apps/hwloc/Manifest +++ b/sys-apps/hwloc/Manifest @@ -4,10 +4,12 @@ DIST hwloc-2.6.0.tar.bz2 6728585 BLAKE2B 96099ae3527e11a83adc068e07756752d2effa3 DIST hwloc-2.8.0.tar.bz2 6896344 BLAKE2B 33f75987ee904d5ee9c62268695a2f7f59b0adc2e1601fc4407f525664b78a7fab04c75823ce9d190c8cb9ffc0ce983d7137555625d47bc1451a2d0c6f330055 SHA512 025c8ebc2945bdf696cc66fe2cfea0195694713a6098603fb4eaeac409d2f6c3386a7c2b4d7f3758d828f6b621e7f06ffb5745224cb1df2f8ff4f19b2a8a4a7b DIST hwloc-2.9.0.tar.bz2 6923168 BLAKE2B 8451d24a2685b1e52b93a21a0fd43cb93564e03a4a3d1708ffe021dd59e701b50088b7202a1e50358c23e19278cc0526f0064b5ec79ca5152697e1380549e6e0 SHA512 45705d30c8a974c6afd998559cd1195e7e478cf01b669ad60c06baeac9d17c5cd163eb00ad12c2187889e9a7ea96ff6d5a3cb414e8e6de7f00a6fa10eb8c7507 DIST hwloc-2.9.1.tar.bz2 6942860 BLAKE2B 6f0a0caa593683d76b52751b32d47a28509fc99e9ee4b8645257de054823328afe35e46ac5e264a8a6a9279e6c06129d6df096b7c2c491d90fc7d05ee0c011f5 SHA512 9c05b7b7c4e3cb5474efb6eb1a4bf3e5ad0f8d0480d043a11e695e4a1f5f6748abb96c7055c0f3b2bc36950dda247fbdd7dc02ec7c9debbfe2631e6ebb89d957 +DIST hwloc-2.9.2.tar.bz2 6976699 BLAKE2B 70737325888b87f90f95799490621e209864430813deff4731dbbbaa7be900d6d58fa874b3da5e851b553af00ba17e387762d3825bb9a592ffb311705b4a6833 SHA512 ed38bd608eac81d3182243f0b63c6da070be918fdd8c876ca35fd63cccb4e25684b28bb045d033c53cd7b53451795d28e05e0bd876a5a0231de06c76ace11fef DIST lstopo.png 18008 BLAKE2B 5468cc81f9ee4b9a4dd28bd9334edd7f4e7d4ff394caf09228b4e860ab924bb80114b977b1b1125cd180478967d2f3bbde50435522b77a8314f823b1c2678e75 SHA512 8a8a6e62c3089a8d77f592a348ad87fca14a84bdecd889760a37bef8e65c876594b91091aac2f54ca3cca855a02459fe1c960909ccd0ddea1ff77c95bb171823 EBUILD hwloc-1.11.13-r1.ebuild 2170 BLAKE2B c60546587b078379e46b409675d5e0efdd1ea7a19e08e2640d4119574212e55798274f776a25b9f326a4e97d47afed5a2e85c512b825cca040eb27cae6ff3ac6 SHA512 2d359bbef4c8689f96a0a3ad94a0db259fe62ecc4e95e5340f8c8284fccff896355d950988689189199ab67ecd9df3c1057311f2f78d36f9add5b2c4ffdc8613 EBUILD hwloc-2.6.0-r1.ebuild 2974 BLAKE2B 7498ce7bf1f84a79837ccbd329c7283d0999736c235be8eb9354022dd0dfa950566bc31cd3a8c3951393e33a596ab99e331831db622b82efcfcec22886121765 SHA512 c55a5e9b2c59adbc2dcf2bfe70a2da041af0affb20f645f6dcab392006007a682e66db96a62c5988a4450cd905d0754ba7f25d744b89f573e621e8165bb0d913 EBUILD hwloc-2.8.0-r1.ebuild 3347 BLAKE2B e3bc52b80d9870e68c7542a43753bba200f749d7e9d78440df19e0f4fb653a129e2a64a07b9cba3726dae1ac6c7f8ff30c98b7b8d8ab1a1ca5a1f3a75714848a SHA512 46789edd7f853a858098570b4c717cb525af0cec83098e93d164d516e5f689964c42d6c8dfb04842b0531bf6bb871c77a79904f402015c55dfed66288fa48a34 EBUILD hwloc-2.9.0.ebuild 3354 BLAKE2B 4b49483208e41198a89369aa924e1b337137b232bf551161ebd199a6df4b59ae1d2ea6c907f3981cd8b1a047f29f176224877af0c3c5fd9126853b1cbdbda247 SHA512 8ed673373fcd541f116af478c2c9140f7423e0db3b0bc9a7a7e36545392bd08571b7ccef4db2cc43f2dd6784d549830810b8136126caa83aeff3507bc5769346 EBUILD hwloc-2.9.1.ebuild 3557 BLAKE2B 881f4994c8972f9a8388788580ed3537935edab3d260a2ba85274af5a7cada2d827d0e6e5b87489ab53c2e6e997cd6c1124697c65773c5424cf6c4970604d1d4 SHA512 d68c3c63d0eacbde5eec8dd4809152c92b76ab54fdc71afefa21345524945f78631ec467fbfc2c862bae7be4ba146e1634cdb4d9d29dd875f9ad902bc630b32d +EBUILD hwloc-2.9.2.ebuild 3508 BLAKE2B 3846fbcd434fccc74d4c9d3f7507dc5fec78d7aa8dd2f58aadcd10d9ceec12cb1b6d6d0f77e860580dc0214a0ae9a6ae463c05154d9e2a7d20afd55b3391927d SHA512 79f2b669dcda81db4fd42a355da67cf2c91c9f342f755009477791db6368a20b220e99a480327e22266b46a02dafd5aef3dc7891d8e37363c7eec30d5cc49ba2 MISC metadata.xml 1661 BLAKE2B 11ace24114c7763a173d3175338aef1ade993df5e30df405eb4b94d9942ff712026f43bf19bb956cfbe6ea27b52af5746c64efbb0b752baf381ffc2eb5d58029 SHA512 a2a16701d2429b24a5d9dc4a6cff6a3d1a88e9d8e67d6d98a54915dc04c2db7b5ed1f23c798a2e4af9c1bf702529a165ca5f0ed046dc051c0aeb120c119ac6e5 diff --git a/sys-apps/hwloc/hwloc-2.9.2.ebuild b/sys-apps/hwloc/hwloc-2.9.2.ebuild new file mode 100644 index 000000000000..bba11e871c3f --- /dev/null +++ b/sys-apps/hwloc/hwloc-2.9.2.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools bash-completion-r1 cuda desktop flag-o-matic systemd toolchain-funcs multilib-minimal + +MY_PV="v$(ver_cut 1-2)" +DESCRIPTION="Displays the hardware topology in convenient formats" +HOMEPAGE="https://www.open-mpi.org/projects/hwloc/" +SRC_URI=" + https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2 + https://raw.githubusercontent.com/open-mpi/hwloc/master/contrib/android/assets/lstopo.png +" + +LICENSE="BSD" +SLOT="0/15" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="cairo +cpuid cuda debug nvml +pci static-libs svg udev valgrind xml X video_cards_nvidia" + +# opencl: opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406). +# anyone with hardware is welcome to step up and help test to get it re-added. +# video-cards_nvidia: libXext/libX11 deps are only here, see HWLOC_GL_REQUIRES usage in config/hwloc.m4 +RDEPEND=" + >=sys-libs/ncurses-5.9-r3:=[${MULTILIB_USEDEP}] + cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg(+)?,${MULTILIB_USEDEP}] ) + cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) + nvml? ( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] ) + pci? ( + >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}] + >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}] + ) + udev? ( virtual/libudev:= ) + xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] ) + video_cards_nvidia? ( + x11-drivers/nvidia-drivers[static-libs] + x11-libs/libXext + x11-libs/libX11 + ) +" +DEPEND=" + ${RDEPEND} + valgrind? ( dev-util/valgrind ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" ) + +DOCS=( AUTHORS NEWS README VERSION ) + +src_prepare() { + default + + eautoreconf +} + +multilib_src_configure() { + # bug #393467 + export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)" + + if use video_cards_nvidia ; then + addpredict /dev/nvidiactl + fi + + if use cuda ; then + append-cflags "-I${ESYSROOT}/opt/cuda/include" + append-cppflags "-I${ESYSROOT}/opt/cuda/include" + + local -x LDFLAGS="${LDFLAGS}" + append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)" + fi + + export ac_cv_header_valgrind_valgrind_h=$(multilib_native_usex valgrind) + export ac_cv_have_decl_RUNNING_ON_VALGRIND=$(multilib_native_usex valgrind) + + local myconf=( + --disable-opencl + + # netloc is deprecated upstream, about to be removed + # bug #796797 + --disable-netloc + + --disable-plugin-ltdl + --enable-plugins + --enable-shared + --runstatedir="${EPREFIX}/run" + $(multilib_native_use_enable cuda) + $(multilib_native_use_enable video_cards_nvidia gl) + $(use_enable cairo) + $(use_enable cpuid) + $(use_enable debug) + $(use_enable udev libudev) + $(use_enable nvml) + $(use_enable pci) + $(use_enable static-libs static) + $(use_enable xml libxml2) + $(use_with X x) + ) + + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_install_all() { + default + + case ${ARCH} in + # hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit. + amd64|x86) + systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service" + ;; + esac + + mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die + bashcomp_alias hwloc-annotate \ + hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology} + bashcomp_alias hwloc-annotate lstopo{,-no-graphics} + + find "${ED}" -name '*.la' -delete || die + newicon "${DISTDIR}/lstopo.png" "${PN}" +} diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest index b6618aa26139..b92d33bd85c6 100644 --- a/sys-apps/minijail/Manifest +++ b/sys-apps/minijail/Manifest @@ -1,5 +1,8 @@ AUX minijail-12-makefile.patch 1511 BLAKE2B 74b620f44ffa3a3f82771d10dfff5999f223613ee734a38be770ac91e128c3e4f26cbbdff197a0636cb8c3b094c70fbed08443560bea095407736327f9d485ac SHA512 c727ff4752345f08d89dab5bc7489793763bf459bc169f132a285bc40c1d8e1e40d366bc8336e35c5362f4e4b999ec9d07db2b3bcd5f394954dae54cb533515a AUX minijail-17-no-werror.patch 594 BLAKE2B 7afa3b6179ce975d8dac6496532222057db0f27c134b0fa6f783f1f18e7166d310ccfbaa387482fb27f91e7f9cf5b478267e6a4db2ced380efbcd77bfa1b7b6e SHA512 27f7e2c4ca046e86c81ec419fe745bc25547ff5217340af772b331448c19cbcb228835c3ddd1d2879e3b13bf59f85724dcf3cc455c22e0fd27ac81a28efd135d +AUX minijail-18-makefile.patch 1546 BLAKE2B 7b4ccf54fe13b5614dc119306c06b23e899919f17b6e880044d65d7117095023e318233695d20a55f9012d3172d100e4ba94bf2fee8d3cc728cc944494ea1f8a SHA512 8922874c2a3b319b3699fc75f4f85428f2cc9045794d44f2cdf5cc57ae0034971162ae87ebca9d679b75840614d1ed9a3e9f247a466d52ad26976fb9b207077d DIST minijail-17.tar.gz 212425 BLAKE2B 411a0e2f1af21dd689fa669f9658e78c3c3c6439fdbea01b41b1d0cb3cbc1dc017634177350a3d5392783201f80874ec2a1604ed2577dbf5d7dbdf584a087267 SHA512 4b9aa29a78f7525ffeedfb927f6b567044ff7c9d32ef0e6771ed2b5c2d47c7a14ccbe000efc988ce6bb4173c5a9ae734b222aac1a00fb0e60777d7dccc149acf +DIST minijail-18.tar.gz 223537 BLAKE2B 894cca4bd31b12e74a309a99d98eefe24f57e4dae186e79b5800b9857ef6b87c2094ead9a1788d00557d68b0d174bdf1e22f247ffb4fbb2d44a952a8df2c953d SHA512 685f744b4783600b4c91ec678ae87dd9ae0138638e1e754520f406c203f4d92f6b510b1bcf1a921b9e93965026c461d6fe8e5efb5f90393a54ca27db7c8033e5 EBUILD minijail-17.ebuild 1847 BLAKE2B 4a29b4c111a215a627fca5349a3b00271e71985113dd4e820b48f27a230a886b440bc01101ff07de6b7ceab02c1381afaabe22adea07bba6f027b284679df606 SHA512 2a437e1cb4a841ee7898516f12ed688c7130ae0d8dd54617a8aeddfc185c83465910c6308eeaa50a26b53624f2e8cc43e7bfd04b5facf488282cd2840b7c5bfe -MISC metadata.xml 316 BLAKE2B 1c0d0d8d3d56290e6c416abd016b8e9884d281b4c8700d5e229bbd820946c9b962c148f4d838b3206f091c9340d93febf69c8dab0af58101c5c5128fceea888e SHA512 f31d33694241be5dc691ca273d0712a062b84eaccb44adc3a50a1085a451543ff1c2d20960444474c2d32121a52c2b15c2510c802a59983534c6176906fbaaee +EBUILD minijail-18.ebuild 1858 BLAKE2B 5a398dcaae440f5512f6d67cafd266d0202c1c4fa57bec3541246267267d3fca19266b37889bdcf82f380d17eeab8d4f9d5dc63bc43ff0128ac6cc2c97e98230 SHA512 0638e0c204c2a96c5ae4a88ea6bb9584db013e068b692c2a7506e48899aadcbc57eeeea83c63581eb92ed1d486e722cf3eb26aff8c95827b2bf0ee59acb95913 +MISC metadata.xml 396 BLAKE2B 2abccc653acbb41fb627d83894b7e22159994295bc7342a89e590742a22167f5e4d4cf4aac5cfe4554aa236f6449889f6e8ec249ef8e7225af6271fc34672043 SHA512 46660ec9367ef20a84b3ec32f562c1204d9102e13afd4d813444be3cb2c4378127e15fb19987c53270e283e024f2e6e9fead95a377bbfe8883c36a3065652393 diff --git a/sys-apps/minijail/files/minijail-18-makefile.patch b/sys-apps/minijail/files/minijail-18-makefile.patch new file mode 100644 index 000000000000..c1a2509dff5a --- /dev/null +++ b/sys-apps/minijail/files/minijail-18-makefile.patch @@ -0,0 +1,41 @@ +--- a/Makefile ++++ b/Makefile +@@ -72,9 +72,9 @@ GTEST_CXXFLAGS := -std=gnu++14 + GTEST_LIBS := gtest.a + UNITTEST_DEPS += $(GTEST_LIBS) + else +-GTEST_CXXFLAGS := $(shell gtest-config --cxxflags 2>/dev/null || \ ++GTEST_CXXFLAGS ?= $(shell gtest-config --cxxflags 2>/dev/null || \ + echo "-pthread") +-GTEST_LIBS := $(shell gtest-config --libs 2>/dev/null || \ ++GTEST_LIBS ?= $(shell gtest-config --libs 2>/dev/null || \ + echo "-lgtest -pthread -lpthread") + endif + UNITTEST_LIBS += $(GTEST_LIBS) +@@ -104,6 +104,7 @@ clean: CLEAN(minijail0) + + + CC_LIBRARY(libminijail.so): LDLIBS += -lcap ++CC_LIBRARY(libminijail.so): LDFLAGS += -Wl,-soname,libminijail.so + CC_LIBRARY(libminijail.so): $(CORE_OBJECT_FILES) + clean: CLEAN(libminijail.so) + +@@ -125,6 +126,7 @@ TEST(CXX_BINARY(libminijail_unittest)): CC_LIBRARY(libminijailpreload.so) + + + CC_LIBRARY(libminijailpreload.so): LDLIBS += -lcap -ldl ++CC_LIBRARY(libminijailpreload.so): LDFLAGS += -Wl,-soname,libminijail.so + CC_LIBRARY(libminijailpreload.so): libminijailpreload.o $(CORE_OBJECT_FILES) + clean: CLEAN(libminijailpreload.so) + +--- a/common.mk ++++ b/common.mk +@@ -323,7 +323,7 @@ COMMON_CFLAGS := -Wall -Wunused -Wno-unused-parameter -Werror -Wformat=2 \ + -fno-strict-aliasing $(SSP_CFLAGS) -O1 + CXXFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CXXDRIVER)) -std=gnu++14 + CFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CDRIVER)) -std=gnu11 +-CPPFLAGS += -D_FORTIFY_SOURCE=2 ++CPPFLAGS += + + # Enable large file support. + CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE diff --git a/sys-apps/minijail/metadata.xml b/sys-apps/minijail/metadata.xml index 7b5b4ce46bdf..b60ec207b068 100644 --- a/sys-apps/minijail/metadata.xml +++ b/sys-apps/minijail/metadata.xml @@ -7,4 +7,7 @@ chutzpah@gentoo.org + + google/minijail + diff --git a/sys-apps/minijail/minijail-18.ebuild b/sys-apps/minijail/minijail-18.ebuild new file mode 100644 index 000000000000..237a6aa5dafb --- /dev/null +++ b/sys-apps/minijail/minijail-18.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info toolchain-funcs + +DESCRIPTION="helper binary and library for sandboxing & restricting privs of service" +HOMEPAGE="https://android.googlesource.com/platform/external/minijail" +# Use GitHub mirror as Gitiles doesn't generate stable tarballs. +SRC_URI="https://github.com/google/${PN}/archive/linux-v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-linux-v${PV}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" +IUSE="+seccomp test" +RESTRICT="!test? ( test )" + +RDEPEND="sys-libs/libcap-ng:=" +DEPEND=" + ${RDEPEND} + test? ( + >=dev-cpp/gtest-1.8.0:= + ) +" +BDEPEND="test? ( virtual/pkgconfig )" + +PATCHES=( + "${FILESDIR}/${PN}-18-makefile.patch" + "${FILESDIR}/${PN}-17-no-werror.patch" +) + +pkg_pretend() { + local CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS + ~SECCOMP ~SECCOMP_FILTER ~CGROUPS" + check_extra_config +} + +src_configure() { + export LIBDIR="/usr/$(get_libdir)" + export USE_seccomp="$(usex seccomp)" + export USE_SYSTEM_GTEST=yes + if use test; then + export GTEST_CXXFLAGS="$($(tc-getPKG_CONFIG) --cflags gtest_main)" + export GTEST_LIBS="$($(tc-getPKG_CONFIG) --libs gtest_main)" + else + export GTEST_CXXFLAGS='' GTEST_LIBS='' + fi + export VERBOSE=1 +} + +src_compile() { + tc-env_build emake all parse_seccomp_policy +} + +src_test() { + GTEST_FILTER="-NamespaceTest.test_tmpfs_userns:NamespaceTest.test_namespaces" \ + tc-env_build emake tests +} + +src_install() { + dosbin minijail0 + dolib.so libminijail{,preload}.so + dobin parse_seccomp_policy + + doman minijail0.[15] + dodoc README.md + + local include_dir="/usr/include" + + "${S}"/platform2_preinstall.sh "${PV}" "${include_dir}" + insinto "/usr/$(get_libdir)/pkgconfig" + doins libminijail.pc + + insinto "${include_dir}" + doins libminijail.h scoped_minijail.h +} diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest index 799827617533..f29dcebbbc70 100644 --- a/sys-apps/net-tools/Manifest +++ b/sys-apps/net-tools/Manifest @@ -1,4 +1,4 @@ DIST net-tools-2.10.tar.xz 229616 BLAKE2B 0d11a5c12f6447282c65ee74428c1b9f6da9fd6d26ca558813d002fac8a4f03fd25a26231a5f4e45f88d821e9a8281e3be1fea4a832bd09afbc2239634a1c25d SHA512 aa8f631772da6c16b165065fc5929a206504f2dce19e74a4ffc680f09b40f3a9180bd4bbeaac67e0b32693358b01383bae4fbfcb6061180c130e9e0801d536bf EBUILD net-tools-2.10.ebuild 1950 BLAKE2B 8f12838ebcf1af75100b13078dd31160a53afe202eae74a7aa6bda795f0cdc82cf6fff152143c355fb394b831be266ed978f06df161cf5da037b01dad38e7af8 SHA512 52acd14c62cdd931f1bf623582602b2a72f17ee94648cee0d82540df7152f76c1229cb58e6e0093ef1f3bf0da0031b3ab24608a50765dd2fa218ffe8c01fb10c EBUILD net-tools-9999.ebuild 1951 BLAKE2B 9215c09731a57973481a58236779c8236c861c5531b9fd551fbaea655b17de50417d0a8f034a12378c010e4ebd967ae2a885dfc9398dfda8720c7f4a7768ab4d SHA512 c9d70eca24bfa2a75a146447ed60ad5a5e591a9d976fc6fca459884dbfe4d106f590f66ef903e7b35de937c80ca7f6c13a374b181a11cb53a7a238a641666768 -MISC metadata.xml 758 BLAKE2B 4b48cf808b718f43de859726556f703d980d66aeaf8840057576d99edb2e676c4cf68b3cc4732cc114049bc7d465d1717c70bc9e805584673f4b12e210a0190a SHA512 f1e99c1fc28f25ca0f9051e3e7eaade834362b1cd0b9c01bd492b896da3df9c51d66fa31114189149e0a1827bee785d7c7361b34e2b76abc6865871cf800b9d1 +MISC metadata.xml 811 BLAKE2B df3d114fdc2dd51932b9b226727951f9d259a9670c419db8f002afd4975ee6418c57b8d40209c000a3da55916322eb65ad6c74836880bc148d219769012482f2 SHA512 68555b69dd814ceb03680d065e4828c80bce3ad28afcac48d325ca6238cfe41471fbf4a55df5f5339b67f2f9ead3ba3391c11dfebbaf00206acaffb255b00b3b diff --git a/sys-apps/net-tools/metadata.xml b/sys-apps/net-tools/metadata.xml index ec740c59a0d8..cde5f2fe4393 100644 --- a/sys-apps/net-tools/metadata.xml +++ b/sys-apps/net-tools/metadata.xml @@ -14,5 +14,6 @@ cpe:/a:net-tools_project:net-tools net-tools + ecki/net-tools diff --git a/sys-apps/prctl/Manifest b/sys-apps/prctl/Manifest index 8b90f8daa2ce..14fbb290d927 100644 --- a/sys-apps/prctl/Manifest +++ b/sys-apps/prctl/Manifest @@ -2,5 +2,5 @@ AUX Makefile.am 70 BLAKE2B 9c2735d35e8a0c707d5fefd6721c5a8678266b64e0fa157e3ebac AUX configure.ac 200 BLAKE2B 3ec747f56bb304484671171dd61c72cac8b264563955b7759b0c5f42f1ec03c490f400df0bc381c87c006316cb00a1687dd4dd5d83471c0699266cf23a727788 SHA512 ae8a75d3a37cb33fa8958f2de48549b99fc0b6f5c15fab8d7b9478e38e0dbd6d31e4bbdc876a50d52598d8b7964a544c0eb2e4677b3b32e7034acab98d8d6fd7 AUX prctl-1.6-no-implicits.patch 381 BLAKE2B 4374744647de591232e9da6398465a5b9f31f75027f57ce7da5d2294321c6ee17d6bb3c4a108131602bdab7f6643aff2778313c764d659e15093a6cee1081fad SHA512 b01e17872a6c098ddbd4720cf62cd83d485fd1095a9da47c2f79cc09b50648a02bde2aeb38b8dec03d5be794223c898f2c753f576068540252071209e1701812 DIST prctl-1.6.tar.gz 18876 BLAKE2B 9f26fec1d178141d7e5aa7390dc0403ab1774d711a12588074ee6dbf62c980ab3713179b2f476f20cac0d7e4b027899b144fa67164021dd13b10be3dc087fb2f SHA512 c5b70abbb76f76f4a4c53cebcbd34fa4e87d7db2278a2ea17128da30dea958cc4e4d75b641cb3b9fbd8fa56fee482e97dbae5e61c697e80ef4d13f4b6d28cfda -EBUILD prctl-1.6-r1.ebuild 512 BLAKE2B 7f77f32e15d411351669dada41afaaf30aca7ad660a7868568916e7cea92bf83dd600714bda0c3f0efe0a92bba03079ac1f4ae200111b6a282c8558e6f3a3877 SHA512 2b62a0760bceb2982745ff95fbbec92585fa5d4cea0a29ca72558baf431e0171ddb2c34c9c0c8e730353ff1e0b2ebd48df60a4bb836c2ede4db0005b8b3b99e2 +EBUILD prctl-1.6-r1.ebuild 510 BLAKE2B d265d978ecd7b5461f3eed3024c92c0874fae266f334288b558bc8b4c86b6f720922b20dfb91cd4cb77a2af49fee87b628453e2109ecf072f8c85981de25f322 SHA512 85a16b31cc43a4b0851eb826625326ba2cd97eff23f91354f2df6ca874003ead19adebd43ec24667171fdaef1d15631b675e7ab10696e6ff7952c707bc535f03 MISC metadata.xml 315 BLAKE2B 9ddfc05f649cfa225adcd11d6203383e91c3511115796ab1d8ddb978f2306aec6352bb909eef7fb86fcef94398a9fe8eb7477be918909e853b3ed572ba6831f8 SHA512 ef13e51aa0948b465631169a5d2ffbd06bd949b686b9cbc3320b74e615539060ed5e2612bf87693e6d9e939f8260109ec68ed447f462aabac439fd194c66766f diff --git a/sys-apps/prctl/prctl-1.6-r1.ebuild b/sys-apps/prctl/prctl-1.6-r1.ebuild index f775370a0af0..18a3e6855365 100644 --- a/sys-apps/prctl/prctl-1.6-r1.ebuild +++ b/sys-apps/prctl/prctl-1.6-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~x86" +KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ~x86" PATCHES=( "${FILESDIR}"/${P}-no-implicits.patch diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index ac33ef0cf70e..fe2026ef0f10 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -3,18 +3,11 @@ AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254 AUX su-l.pamd 140 BLAKE2B 34f00c8814d454c8caa6bd5f0dd0bb89b24c12dbc0e39e852dc45965c4fae4dcfd0ab1def2364163908d416f9306c5193357c0be3a559d35574ef9a56fa645a4 SHA512 4490b7e516a9c306e991c0f719f742c5a13841d28a57385fc96482663f409025aa7ecc3a3855c20099547702ecd7a160b308761e28316f90d4d6622eea1ba21f AUX util-linux-2.38.1-check-for-sys-pidfd.h.patch 1764 BLAKE2B 4d71d6b708ad7a1d1f01c6c0df5c57db12ea699e4449d83ae6df55c47b62380079d5b118bb081d229d118f06fb1881b36185979f9a03f4fd1defcc253887bdc4 SHA512 294b8b7f002772dcabd69d956390f9bdca1837563dd673ea1114a915fb94beec7e3c6bc1927712f1dae46eecd1cc10c3788b12dcddadc35dd92782ce600479ac AUX util-linux-2.38.1-more-posix-exit-on-eof.patch 1216 BLAKE2B ee99884ef388a342aeceff4b6988b45cfe21dfc41fa3d978f1a4b57b35682d5cb0ca48c060d9694368ed06651661984eddb9ae70a00f7eb360fad9798caaddc5 SHA512 78136beaf600f99a5404222b6d6d7499ea40fc4e6401a36bd51e8c4183b925004a0f37a079b13b9c1c0824a7f22f43a16c8358c5e8ddfe55dd0019de58579195 -AUX util-linux-2.39-check-for-mount_setattr.patch 3032 BLAKE2B c522135ea8f5e418db243bbe0ce7582e1bcabde6761bbbb9fea0e17f5174fdda0ed14378bec91bc289e5aaee4a585a49bc50b7dd0e6600f495c34a9385e77e2f SHA512 339cf169bcb12777f5d4c580ac8c87127d615573d83cd18331866a2e99e308c68456b8904f562e0c9551b79fbb7f24f139e6d407400f3d34457211b1b9ce0ff3 -AUX util-linux-2.39-mount-dont-call-hooks.patch 2508 BLAKE2B 22fb8dd92a4480525a383802bbaa2fe300a9cb54d8e82c76e7974fd49bad0f123335fff9f21c84825f0b6f654831e30c588ee6ebf3ff14f91993580eeff0ce1d SHA512 7bbfcc275a7d74d14d2a621d815dd2fc0424864ce97decaf3ec2a73a414c5f490b7f4659b6e4a1bae612005d14592efd6cc558d678a88ae7d869ff46bfd4c9a5 -AUX util-linux-2.39-mount-parse-options-user.patch 1549 BLAKE2B a6b77aa14d31ed05fc096d84297303558ef2cc7c641eea7a70cfe425dfe418f9f31df0cb60466215af72d620966a002689bd9891dfc1541c01e4212aa5ddd51d SHA512 0ec00e2f8bc1cb22bb295e9090d9963684240afa031d2c6fb1e5e2fcea75a6fca527e21d8abe6c363ec8d9a500470a197ed2d573c6b327286ecf638c604c7941 -AUX util-linux-2.39-tests-for-mount_setattr.patch 388 BLAKE2B b96c38ffe2dd119914af60d8ee4465e0de0217a98185b46873253a3d86e8638e1a22f5bd3155ec83101d4f26a07eafa84ebba9363381dd681c6ce6627c3dcb77 SHA512 4d38274342a599ec6ca3124c86067dbf4a92c0bc1bf987d4f2400393bf68e71d9ba46860da76e717aac68ed6aac099b1da63354f38c4d9236062121d1da13356 DIST util-linux-2.38.1.tar.sign 833 BLAKE2B 2468c6b8c881d7a17666aac954edfd421085111937f5d0daada37a679e9bbfe61fc98bb57cca9bf7bea20be483f38e2a758039f9baf5b1a901852e2b5dd014d8 SHA512 d8b3e936065ae1dc105b8ce773c874bb037ebf84ee571676509543f79c39950180e7f252c6b0d4500119568ed4ac3aa7117793de839f983e9287f26649e91dad DIST util-linux-2.38.1.tar.xz 7495904 BLAKE2B a0e86ca62f82adaccc01ad6ec5a058dac429b81c310989cbad136f96c2770c60bbd4287067817520e8e0653146a10f13128e0af32122402bab416e1c2d6680b8 SHA512 07f11147f67dfc6c8bc766dfc83266054e6ede776feada0566b447d13276b6882ee85c6fe53e8d94a17c03332106fc0549deca3cf5f2e92dda554e9bc0551957 DIST util-linux-2.39.1.tar.sign 833 BLAKE2B 8c1e7089bcec1f47f5c7b4ba60ca1c35955bdad99683f0682f6ba08171d3102079e7584989ea764e60096e0d64e5f9ffc8757c7feba23f79dafdb7942396a96a SHA512 6d6cabd24ebe3ce7437d98d08793b0b27d6240f2a28e08e216b4b1d358c9024fa1cec6d17df6cf7f024f97647cd31990db94716a575b08ad15f3a0b75797912b DIST util-linux-2.39.1.tar.xz 8351164 BLAKE2B 1c2f3a77414dc9e99d17c426ca710524f898b6fd13bee120c08ceb375e475044ff6f2668f58bd799d0e3befe36de6cc1e161a1be7102e4590a8e372b6547ec1c SHA512 8fe2c9014f6161330610f7470b870855cecbd3fab9c187b75d8f22e16573c82516050479be39cfb9f7dd6d7ef1cc298d31d839b194dda5ec4daf0d1197ac71e9 -DIST util-linux-2.39.tar.sign 833 BLAKE2B f4b35d35f1d20094169c8651d127c6d1f37b0946bc72c40f4824d77f8c117a23ae2633ac2449e91ba316d4cac6e4f3c2afb9fd410302683384988dc794062d9e SHA512 f5df4f7e5c39995ad3c7b52f06bfc7759e53d4df82b2b42f09d4570faeff5c156e83e42be053b00b0bfb4a71e27bfa580fb996a92225eb8a0df46d9f296ef4ef -DIST util-linux-2.39.tar.xz 8103428 BLAKE2B 39d415b6e303c21d2e5566bd29dd1803c67fbaed079fab85fab620db727a69c96f9c705a3671a639185c78ea1e70f374e21ef8694115ce42fa30c86b546023d1 SHA512 3d59a0f114c06be19ef7f86fca37ba5b9073823d011b3fc37997ddb00124b4505ea32903b78798a64dffbccf0ba645a692678ee845cc65a5b321824448a82a94 EBUILD util-linux-2.38.1-r2.ebuild 10536 BLAKE2B ea36003f87fb328c0e3c478543a07fc0469e59859172f605a0ef879bfe65e4fc55e1c4caf2d86dda2306ff752754f162a4970b67abd9dd23ff98576cc3fc7c44 SHA512 075a4a012eb9464f4871baecdaf32a14c4e29fac0b6b04dfa8d55c90c69fd192f23fc248ae757fc231d8dfc57f1be168f1213d6de15170d27636c769bd03f451 -EBUILD util-linux-2.39-r4.ebuild 10892 BLAKE2B b49d96439baae129c8b153b3ed820acb0c6d48210493262914712366738b9236ed46095464c9cc64621615260deed072c10685c3ce4abd04a57402f68b10f37b SHA512 44efb4db61260d7f9aa108d7ea4338d1191da344a9da7191f527cf50031aa83605b358e05b8675c9165d2e855e7fec073f78e3e29f56c3cd65d84d04505b027c EBUILD util-linux-2.39.1.ebuild 10872 BLAKE2B 57d4cd78ff1a0ad3b009bfb75da02b40c2bb779d1e1ac6b33d636d03297fc45d2d8419d0ce17e4544086986186cd9faa0d9c60f30c4eb33187c95cbb4f700887 SHA512 19b6d34350d5c94a791df86c36f980a80671ccd8965defdfb98dbfc3e0605e30205374b7949175c2a0b8ddd3a8aa4446dc0ac126679c5f0ecf3bf65425169698 EBUILD util-linux-9999.ebuild 10680 BLAKE2B 7d9a476479a453dd134da66f4273fde6aa171b1b0e74f5cbd4c6d70cf435d63c2c80e50e3f15b3c57ca462bc123f6e4fbc010660a6c81d00a28366bbcd426312 SHA512 375c5999803ae4352cfe32c4d7556eb98d6d416a909d75aad7df976f98256b6dfc722c755ce9a55bd95babf8a4b12f36d665d21117e27fcdcb2e9bb9aa34fc6c MISC metadata.xml 1553 BLAKE2B 1c4a18f6d91be4c90bf2505745cae42f6d249a1295c6a46fc1b8ea08297842b4d3a2aa232e679a167af9fef26730ed71f651b2f71b58cbfe66bd7a5cd3743c3b SHA512 e01d390c983ac47b9a6684f70b11cc796cde1355ae7d4c12406b3d6fc5b0897a9471720844e74fceee1648f4c7d685e6b12f157adc1ad951506acefb7441635c diff --git a/sys-apps/util-linux/files/util-linux-2.39-check-for-mount_setattr.patch b/sys-apps/util-linux/files/util-linux-2.39-check-for-mount_setattr.patch deleted file mode 100644 index c1eb3748f782..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.39-check-for-mount_setattr.patch +++ /dev/null @@ -1,98 +0,0 @@ -https://bugs.gentoo.org/906797 -https://github.com/util-linux/util-linux/pull/2248 - -From 1bd85b64632280d6bf0e86b4ff29da8b19321c5f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sat, 20 May 2023 06:38:20 +0200 -Subject: [PATCH] libmount: check for availability of mount_setattr -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If mount_setattr is not available but needed fall back to the legacy -mount API. - -Fixes #2247 - -Signed-off-by: Thomas Weißschuh ---- a/libmount/src/hook_mount.c -+++ b/libmount/src/hook_mount.c -@@ -510,6 +510,15 @@ static inline int fsopen_is_supported(void) - return rc; - } - -+static inline int mount_setattr_is_supported(void) -+{ -+ int rc; -+ -+ errno = 0; -+ rc = mount_setattr(-1, NULL, 0, NULL, 0); -+ return !(rc == -1 && errno == ENOSYS); -+} -+ - /* - * open_tree() and fsopen() - */ -@@ -675,9 +684,14 @@ static int hook_prepare(struct libmnt_context *cxt, - /* call mount_setattr() */ - if (!rc - && cxt->helper == NULL -- && (set != 0 || clr != 0 || (flags & MS_REMOUNT))) -+ && (set != 0 || clr != 0 || (flags & MS_REMOUNT))) { -+ if (!mount_setattr_is_supported()) { -+ hookset_deinit(cxt, hs); -+ return 1; -+ } - rc = mnt_context_append_hook(cxt, hs, MNT_STAGE_MOUNT, NULL, - hook_set_vfsflags); -+ } - - /* call move_mount() to attach target */ - if (!rc -@@ -688,9 +702,14 @@ static int hook_prepare(struct libmnt_context *cxt, - hook_attach_target); - - /* set propagation (has to be attached to VFS) */ -- if (!rc && mnt_optlist_get_propagation(ol)) -+ if (!rc && mnt_optlist_get_propagation(ol)) { -+ if (!mount_setattr_is_supported()) { -+ hookset_deinit(cxt, hs); -+ return 1; -+ } - rc = mnt_context_append_hook(cxt, hs, MNT_STAGE_MOUNT_POST, NULL, - hook_set_propagation); -+ } - - DBG(HOOK, ul_debugobj(hs, "prepare mount done [rc=%d]", rc)); - return rc; -diff --git a/tests/expected/mount/fallback-mount_setattr b/tests/expected/mount/fallback-mount_setattr -new file mode 100644 -index 0000000000..3e18ebf09e ---- /dev/null -+++ b/tests/expected/mount/fallback-mount_setattr -@@ -0,0 +1 @@ -+private ---- a/tests/ts/mount/fallback -+++ b/tests/ts/mount/fallback -@@ -68,5 +68,21 @@ $TS_CMD_UMOUNT $MOUNTPOINT - ts_finalize_subtest - - -+ts_init_subtest "mount_setattr" -+"$TS_CMD_MOUNT" "$DEVICE" "$MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG -+ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts" -+$TS_HELPER_ENOSYS -s mount_setattr -- \ -+ "$TS_CMD_MOUNT" -o remount,ro "$MOUNTPOINT" \ -+ >> $TS_OUTPUT 2>> $TS_ERRLOG -+$TS_CMD_FINDMNT --kernel --mountpoint "$MOUNTPOINT" --options "ro" &> /dev/null -+[ "$?" == "0" ] || ts_die "Cannot find read-only in $MOUNTPOINT in /proc/self/mountinfo" -+$TS_HELPER_ENOSYS -s mount_setattr -- \ -+ "$TS_CMD_MOUNT" --make-slave "$MOUNTPOINT" \ -+ >> $TS_OUTPUT 2>> $TS_ERRLOG -+$TS_CMD_FINDMNT -n --kernel --mountpoint "$MOUNTPOINT" -o PROPAGATION >> $TS_OUTPUT -+$TS_CMD_UMOUNT $MOUNTPOINT -+ts_finalize_subtest -+ -+ - ts_finalize - diff --git a/sys-apps/util-linux/files/util-linux-2.39-mount-dont-call-hooks.patch b/sys-apps/util-linux/files/util-linux-2.39-mount-dont-call-hooks.patch deleted file mode 100644 index 96dfb1f2c234..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.39-mount-dont-call-hooks.patch +++ /dev/null @@ -1,79 +0,0 @@ -https://github.com/util-linux/util-linux/issues/2267 -https://github.com/storaged-project/libblockdev/pull/889 -https://bugzilla.redhat.com/show_bug.cgi?id=2189241 -https://github.com/util-linux/util-linux/commit/f94a7760ed7ce81389a6059f020238981627a70d - -From f94a7760ed7ce81389a6059f020238981627a70d Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 25 May 2023 11:48:24 +0200 -Subject: [PATCH] libmount: don't call hooks after mount. helper - -In case more filesystems are specified (or when libmount follows -/{etc,proc}/filesystems) then the library may try to use and -initialize the new API because for some filesystems, we need -exec(/sbin/mount.) and for another fsopen(). - -The hooks that use the API have to smart and detect that the mount -operation was done in external /sbin/mount. helper. And in this -case, the new API file descriptors must be ignored. - -The exception is propagation flags, mount(8) can set the flags after -exec(/sbin/mount.), for example, "mount -t ntfs --make-private". - -Fixes: https://github.com/util-linux/util-linux/issues/2267 -Signed-off-by: Karel Zak ---- a/libmount/src/context_mount.c -+++ b/libmount/src/context_mount.c -@@ -508,6 +508,8 @@ static int do_mount(struct libmnt_context *cxt, const char *try_type) - assert(cxt->fs); - assert((cxt->flags & MNT_FL_MOUNTFLAGS_MERGED)); - -+ mnt_context_reset_status(cxt); -+ - if (try_type) { - rc = mnt_context_prepare_helper(cxt, "mount", try_type); - if (rc) ---- a/libmount/src/hook_mount.c -+++ b/libmount/src/hook_mount.c -@@ -239,6 +239,10 @@ static int hook_create_mount(struct libmnt_context *cxt, - int rc = 0; - - assert(cxt); -+ -+ if (mnt_context_helper_executed(cxt)) -+ return 0; -+ - assert(cxt->fs); - - api = get_sysapi(cxt); -@@ -309,6 +313,9 @@ static int hook_reconfigure_mount(struct libmnt_context *cxt, - - assert(cxt); - -+ if (mnt_context_helper_executed(cxt)) -+ return 0; -+ - api = get_sysapi(cxt); - assert(api); - assert(api->fd_tree >= 0); -@@ -379,6 +386,9 @@ static int hook_set_vfsflags(struct libmnt_context *cxt, - uint64_t set = 0, clr = 0; - int rc = 0; - -+ if (mnt_context_helper_executed(cxt)) -+ return 0; -+ - DBG(HOOK, ul_debugobj(hs, "setting VFS flags")); - - ol = mnt_context_get_optlist(cxt); -@@ -471,6 +481,9 @@ static int hook_attach_target(struct libmnt_context *cxt, - const char *target; - int rc = 0; - -+ if (mnt_context_helper_executed(cxt)) -+ return 0; -+ - target = mnt_fs_get_target(cxt->fs); - if (!target) - return -EINVAL; - diff --git a/sys-apps/util-linux/files/util-linux-2.39-mount-parse-options-user.patch b/sys-apps/util-linux/files/util-linux-2.39-mount-parse-options-user.patch deleted file mode 100644 index e02d02c7f503..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.39-mount-parse-options-user.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://bugs.gentoo.org/906797#c4 -https://bugs.gentoo.org/906859 -https://github.com/util-linux/util-linux/issues/2238 -https://github.com/util-linux/util-linux/commit/c0267687fd7b41b00d523d1985182d7eb574effd - -From c0267687fd7b41b00d523d1985182d7eb574effd Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Mon, 22 May 2023 15:00:25 +0200 -Subject: [PATCH] libmount: fix options prepend/insert and merging - - * the order of the new options should not be changed - (for example prepend "a,b,c" to list with "d" has to generate "a,b,c,d", not "c,b,a,d") - - * make sure that options map is defined when merging options - -Fixes: https://github.com/util-linux/util-linux/issues/2238 -Signed-off-by: Karel Zak ---- a/libmount/src/optlist.c -+++ b/libmount/src/optlist.c -@@ -338,6 +338,7 @@ int mnt_optlist_merge_opts(struct libmnt_optlist *ls) - - /* remove inverted option */ - else if (opt->ent && x->ent -+ && opt->map == x->map - && opt->ent->id == x->ent->id - && (opt->ent->mask & MNT_INVERT - || x->ent->mask & MNT_INVERT)) -@@ -520,6 +521,8 @@ static int optlist_add_optstr(struct libmnt_optlist *ls, const char *optstr, - if (!opt) - return -ENOMEM; - opt->src = MNT_OPTSRC_STRING; -+ if (where) -+ where = &opt->opts; - } - - optlist_cleanup_cache(ls); -@@ -622,6 +625,8 @@ static int optlist_add_flags(struct libmnt_optlist *ls, unsigned long flags, - if (!opt) - return -ENOMEM; - opt->src = MNT_OPTSRC_FLAG; -+ if (where) -+ where = &opt->opts; - } - - optlist_cleanup_cache(ls); - diff --git a/sys-apps/util-linux/files/util-linux-2.39-tests-for-mount_setattr.patch b/sys-apps/util-linux/files/util-linux-2.39-tests-for-mount_setattr.patch deleted file mode 100644 index 0b0ade4e181c..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.39-tests-for-mount_setattr.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://github.com/util-linux/util-linux/pull/2248 -https://bugs.gentoo.org/906797 - ---- a/tests/helpers/test_enosys.c -+++ b/tests/helpers/test_enosys.c -@@ -68,6 +68,7 @@ const struct syscall syscalls[] = { - { "move_mount", __NR_move_mount }, - { "open_tree", __NR_open_tree }, - { "fsopen", __NR_fsopen }, -+ { "mount_setattr", __NR_mount_setattr }, - }; - - int main(int argc, char **argv) diff --git a/sys-apps/util-linux/util-linux-2.39-r4.ebuild b/sys-apps/util-linux/util-linux-2.39-r4.ebuild deleted file mode 100644 index ee28e8b217dd..000000000000 --- a/sys-apps/util-linux/util-linux-2.39-r4.ebuild +++ /dev/null @@ -1,400 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) - -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ - pam python-r1 multilib-minimal multiprocessing systemd - -MY_PV="${PV/_/-}" -MY_P="${PN}-${MY_PV}" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" - inherit autotools git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/karelzak.asc - inherit verify-sig - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos" - fi - - SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" - SRC_URI+=" verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.sign )" -fi - -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux" - -LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain" -SLOT="0" -IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode" - -# Most lib deps here are related to programs rather than our libs, -# so we rarely need to specify ${MULTILIB_USEDEP}. -RDEPEND=" - virtual/libcrypt:= - audit? ( >=sys-process/audit-2.6:= ) - caps? ( sys-libs/libcap-ng ) - cramfs? ( sys-libs/zlib:= ) - cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) - hardlink? ( dev-libs/libpcre2:= ) - ncurses? ( - sys-libs/ncurses:=[unicode(+)?] - magic? ( sys-apps/file:0= ) - ) - nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) - pam? ( sys-libs/pam ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - rtas? ( sys-libs/librtas ) - selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) - slang? ( sys-libs/slang ) - !build? ( systemd? ( sys-apps/systemd ) ) - udev? ( virtual/libudev:= )" -BDEPEND=" - virtual/pkgconfig - nls? ( - app-text/po4a - sys-devel/gettext - ) - test? ( sys-devel/bc ) -" -DEPEND=" - ${RDEPEND} - virtual/os-headers - acct-group/root -" -RDEPEND+=" - hardlink? ( !app-arch/hardlink ) - logger? ( !>=app-admin/sysklogd-2.0[logger] ) - kill? ( - !sys-apps/coreutils[kill] - !sys-process/procps[kill] - ) - su? ( - !=sys-apps/shadow-4.7-r2[su] - ) - !net-wireless/rfkill -" - -if [[ ${PV} == 9999 ]] ; then - # Required for man-page generation - BDEPEND+=" dev-ruby/asciidoctor" -else - BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-karelzak-20230517 )" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${P}-check-for-mount_setattr.patch" - "${FILESDIR}/${P}-tests-for-mount_setattr.patch" - "${FILESDIR}/${P}-mount-parse-options-user.patch" - "${FILESDIR}/${P}-mount-dont-call-hooks.patch" -) - -pkg_pretend() { - if use su && ! use suid ; then - elog "su will be installed as suid despite USE=-suid (bug #832092)" - elog "To use su without suid, see e.g. Portage's suidctl feature." - fi -} - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - return - fi - - if use verify-sig ; then - mkdir "${T}"/verify-sig || die - pushd "${T}"/verify-sig &>/dev/null || die - - # Upstream sign the decompressed .tar - # Let's do it separately in ${T} then cleanup to avoid external - # effects on normal unpack. - cp "${DISTDIR}"/${MY_P}.tar.xz . || die - xz -d ${MY_P}.tar.xz || die - verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign - - popd &>/dev/null || die - rm -r "${T}"/verify-sig || die - fi - - default -} - -src_prepare() { - default - - if use test ; then - # Prevent uuidd test failure due to socket path limit, bug #593304 - sed -i \ - -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \ - tests/ts/uuid/uuidd || die "Failed to fix uuidd test" - - # Known-failing tests - # TODO: investigate these - local known_failing_tests=( - # Subtest 'options-maximum-size-8192' fails - hardlink/options - - # Fails in sandbox - lsns/ioctl_ns - - lsfd/mkfds-symlink - lsfd/mkfds-rw-character-device - ) - - local known_failing_test - for known_failing_test in "${known_failing_tests[@]}" ; do - einfo "Removing known-failing test: ${known_failing_test}" - rm tests/ts/${known_failing_test} || die - done - - fi - - if [[ ${PV} == 9999 ]] ; then - po/update-potfiles - eautoreconf - else - elibtoolize - fi -} - -python_configure() { - local myeconfargs=( - "${commonargs[@]}" - --disable-all-programs - --disable-bash-completion - --without-systemdsystemunitdir - --with-python - --enable-libblkid - --enable-libmount - --enable-pylibmount - ) - - mkdir "${BUILD_DIR}" || die - pushd "${BUILD_DIR}" >/dev/null || die - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - popd >/dev/null || die -} - -multilib_src_configure() { - # The scanf test in a run-time test which fails while cross-compiling. - # Blindly assume a POSIX setup since we require libmount, and libmount - # itself fails when the scanf test fails. bug #531856 - tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms - - # bug #485486 - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) - # bug #545042 - export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) - - # Undo bad ncurses handling by upstream. Fall back to pkg-config. - # bug #601530 - export NCURSES6_CONFIG=false NCURSES5_CONFIG=false - export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false - - # Avoid automagic dependency on ppc* - export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas) - - # configure args shared by python and non-python builds - local commonargs=( - --localstatedir="${EPREFIX}/var" - --runstatedir="${EPREFIX}/run" - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" - ) - - local myeconfargs=( - "${commonargs[@]}" - --with-bashcompletiondir="$(get_bashcompdir)" - --without-python - $(multilib_native_use_enable suid makeinstall-chown) - $(multilib_native_use_enable suid makeinstall-setuid) - $(multilib_native_use_with readline) - $(multilib_native_use_with slang) - $(multilib_native_use_with systemd) - $(multilib_native_use_with udev) - $(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic') - $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') - $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') - $(multilib_native_use_with audit) - $(tc-has-tls || echo --disable-tls) - $(use_enable nls) - $(use_enable nls poman) - $(use_enable unicode widechar) - $(use_enable static-libs static) - $(use_with ncurses tinfo) - $(use_with selinux) - ) - - if multilib_is_native_abi ; then - myeconfargs+=( - --disable-chfn-chsh - --disable-login - --disable-newgrp - --disable-nologin - --disable-pylibmount - --disable-raw - --disable-vipw - --enable-agetty - --enable-bash-completion - --enable-line - --enable-partx - --enable-rename - --enable-rfkill - --enable-schedutils - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - $(use_enable caps setpriv) - $(use_enable cramfs) - $(use_enable fdformat) - $(use_enable hardlink) - $(use_enable kill) - $(use_enable logger) - $(use_enable ncurses pg) - $(use_enable su) - $(use_enable tty-helpers mesg) - $(use_enable tty-helpers wall) - $(use_enable tty-helpers write) - $(use_with cryptsetup) - ) - if [[ ${PV} == *9999 ]] ; then - myeconfargs+=( --enable-asciidoc ) - else - # Upstream is shipping pre-generated man-pages for releases - myeconfargs+=( --disable-asciidoc ) - fi - else - myeconfargs+=( - --disable-all-programs - --disable-asciidoc - --disable-bash-completion - --without-systemdsystemunitdir - --disable-poman - - # build libraries - --enable-libuuid - --enable-libblkid - --enable-libsmartcols - --enable-libfdisk - --enable-libmount - ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - - if multilib_is_native_abi && use python ; then - python_foreach_impl python_configure - fi -} - -src_configure() { - append-lfs-flags - multilib-minimal_src_configure -} - -python_compile() { - pushd "${BUILD_DIR}" >/dev/null || die - emake all - popd >/dev/null || die -} - -multilib_src_compile() { - emake all - - if multilib_is_native_abi && use python ; then - python_foreach_impl python_compile - fi -} - -python_test() { - pushd "${BUILD_DIR}" >/dev/null || die - emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" - popd >/dev/null || die -} - -multilib_src_test() { - emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" - if multilib_is_native_abi && use python ; then - python_foreach_impl python_test - fi -} - -python_install() { - pushd "${BUILD_DIR}" >/dev/null || die - emake DESTDIR="${D}" install - python_optimize - popd >/dev/null || die -} - -multilib_src_install() { - if multilib_is_native_abi && use python ; then - python_foreach_impl python_install - fi - - # This needs to be called AFTER python_install call, bug #689190 - emake DESTDIR="${D}" install - - if multilib_is_native_abi ; then - # Need the libs in / - gen_usr_ldscript -a blkid fdisk mount smartcols uuid - fi -} - -multilib_src_install_all() { - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} - - # e2fsprogs-libs didn't install .la files, and .pc work fine - find "${ED}" -name "*.la" -delete || die - - if use pam ; then - # See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt - newpamd "${FILESDIR}/runuser.pamd" runuser - newpamd "${FILESDIR}/runuser-l.pamd" runuser-l - - newpamd "${FILESDIR}/su-l.pamd" su-l - fi - - if use su && ! use suid ; then - # Always force suid su, even when USE=-suid, as su is useless - # for the overwhelming-majority case without suid. - # Users who wish to truly have a no-suid su can strip it out - # via e.g. Portage's suidctl or some other hook. - # See bug #832092 - fperms u+s /bin/su - fi - - # Note: - # Bash completion for "runuser" command is provided by same file which - # would also provide bash completion for "su" command. However, we don't - # use "su" command from this package. - # This triggers a known QA warning which we ignore for now to magically - # keep bash completion for "su" command which shadow package does not - # provide. - - local ver=$(tools/git-version-gen .tarballversion) - local major=$(ver_cut 1 ${ver}) - local minor=$(ver_cut 2 ${ver}) - local release=$(ver_cut 3 ${ver}) - export QA_PKGCONFIG_VERSION="${major}.${minor}.${release:-0}" -} - -pkg_postinst() { - if ! use tty-helpers ; then - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." - fi - - if [[ -z ${REPLACING_VERSIONS} ]] ; then - elog "The agetty util now clears the terminal by default. You" - elog "might want to add --noclear to your /etc/inittab lines." - fi -} -- cgit v1.2.3