gentoo auto-resync : 02:07:2023 - 05:29:41

5 files changed, 66 insertions, 19 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index fb0f6868ca5a..4e10704dd4ec 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 9e9b2bccb4c2..e7cd2f10b3d5 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,5 +1,4 @@
 AUX apparmor-2.11.1-dynamic-link.patch 391 BLAKE2B a5326bd6d84b5ebe4a61067490b25c39a326c139437d73b3db5928332776b795b2405b4a1f6ee0b3aee3f496589b2d00b47cd4bba41f044c60fc8ad5d1a86102 SHA512 d0ef56293b556b0af74201321b01de5c763763ecfba8dac930f35c6f733667f148c59295c78edfab9d835893f5518a42aa38f16de7464e218fbd57727726713c
-AUX apparmor-3.0.0-makefile.patch 653 BLAKE2B c14bef5b5dd471cfef24303097be44814782e9d533c7e12b4057db1bb3145b86f5f988798fa77dc97976556dbdccf9ee490372e2ce5ce450391841fdf194bcd5 SHA512 8cdd9a0c1489d50f891307b4a9dd13a320b9380b93990630723ae4a7d49766603db2a9568af2ce928d29cc01917b0f5f2e3d6fa0fd72476997fba4b07943b548
 AUX apparmor-3.0.5-makefile.patch 660 BLAKE2B 63facdbb0e13bd5ea6a9f0c1d17a8b472a50fa8aa9f6f98ff45cfb51d01e6d55750ec2a4d1133b87b6c2767d5e44d2ad90b462e0ee41be1854d9da8590f96a68 SHA512 a21573d34329535f268380f86470278b749b2ae440d33f96da2ae5b101bd0d75973e15dfe66d0166b2ee90c3aa0d67ba278be4d7227f08cfa03a6dab8a2f445a
 AUX apparmor-init-1 1235 BLAKE2B dbc333d8a90ec66303594db87b1865488813ad6698a3bcf47a509bdc41a93c886bb6cac60a126d9495e0825f9f76dd927b9b84a84154fc55f84bcfc9c934095b SHA512 06da247b62d6e612e0c48610c8c2e7831b9030659106482c8000758e591f3ce42b175210336b903e07b20eb5ef2cc3eb592424b06fe933449964e9c2262ebf35
 AUX apparmor.service 281 BLAKE2B 3d1ecfdc96ee2491e75e92dc3aae7c2aeeeef3bf6a7ae86f354126fd044e2da316303b3ba63ad6dbc747d59d423ea8e4df0f131090d0d7b405e0d303b3c32a71 SHA512 f6ba92053a93db0654a4290eb358afae4d7669cb89a02242544576d951fe57437c3570d92ac89ce4e9fd96c04c121f44523dd6bb136d58fea11424064375df31
diff --git a/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch b/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch
deleted file mode 100644
index 9c03a4465c36..000000000000
--- a/sys-apps/apparmor/files/apparmor-3.0.0-makefile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-* Avoid installing empty /var/lib/apparmor
-* Install rc.apparmor.functions to Gentoo-appropriate location
-
---- a/Makefile
-+++ b/Makefile
-@@ -407,10 +407,10 @@
- .PHONY: install-indep
- install-indep: indep
- 	install -m 755 -d $(INSTALL_CONFDIR)
-+	install -m 755 -d ${DESTDIR}/usr/libexec
- 	install -m 644 parser.conf $(INSTALL_CONFDIR)
--	install -m 755 -d ${DESTDIR}/var/lib/apparmor
- 	install -m 755 -d $(APPARMOR_BIN_PREFIX)
--	install -m 755 rc.apparmor.functions $(APPARMOR_BIN_PREFIX)
-+	install -m 755 rc.apparmor.functions ${DESTDIR}/usr/libexec
- 	$(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR}
- 	$(MAKE) install_manpages DESTDIR=${DESTDIR}
- 
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 808cee8ca546..5d731832b542 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -4,9 +4,11 @@ DIST sandbox-2.30.tar.xz 455764 BLAKE2B eb3bf46aedda96154a96f31d31469b394fd7ea11
 DIST sandbox-2.31.tar.xz 456368 BLAKE2B 054b0ae229d64a4c9553a8ace64ccf2f1e1fee4c545a5b4135d363368e800f3e3af8930916411e8ef4836f437225ae9f092c1c8d39742482a44029832592590d SHA512 0b97c0e77bee58c50cf5aad6d158be546424bf4bc5f2e9ddd4322ca46c003ddca127c303fbe615ad2fefe519498c7221c5315d3ad98a947ea545c0640bc60649
 DIST sandbox-2.32.tar.xz 456724 BLAKE2B 95eed293ef9427726f62d0d7ac1a0c63bbfd152d71598f6c5f792c8b818999c98600f4d8c71b92c8a90ba9fca595b5619ba408ac5f0edcc012050111d84519e0 SHA512 db0fe755b0bff0888a7861194218e980a73a2c4c0afadb7f0e5bb794dbc8b3d5bfbf7e2510a7167874c9f6fbf7eea428e6eae7b52dcbc91ffbd2aa1b1b54bef8
 DIST sandbox-2.33.tar.xz 458764 BLAKE2B 45bd2ffc8aea2f9923880dd494fc648be6d260524706a4166963181a09e005ae74e8069c0d81b5e71ec092ee2767ef2e1206e68614dfb9fe06f3dc77cb5331fe SHA512 c09d4747b9a5a1b964f4c4cc24ed80fea02091bc4c23918689d9f1645bafb7ac0afb5cfcf92ba1eaffe7afbb7f9d9320cdf4e37a59d0f6b472280f11058f9059
+DIST sandbox-2.34.tar.xz 459008 BLAKE2B 19818928d72bf8875667ef69841a7b78643b2b6a02d7d02d6807d3a23ff10fd6821b5fd6b55fc16b213559efb2d010a9930b70c515c55b22285fb4b35aa1a505 SHA512 7be13bb056da6c361f01e35c50a89878bdb356eb7cc167719435e9893c88e1f3b52253f21fc5554d898f782f725f5a78923d7f6835c7dd32a28e993a9fd520f4
 EBUILD sandbox-2.29.ebuild 1559 BLAKE2B 932256bc928e7bd353bb63314d99dd2910f0d27d162804f318bab5e6d912450b1078ba91c79441b16990726b96fa1fe6302ea1a30c8b27ec416c1226ef440932 SHA512 798034189cde52b59c4a8d613590462a0353253e9b18dd33dda80dd27c1027c3b5dd83901789390665a3a56e287ee365e1af8c50edd7948b8c0ec95809b84465
 EBUILD sandbox-2.30-r1.ebuild 1739 BLAKE2B 69f16b333e7e2dbe6b983789affa8c5a67631da4db1538252bc95cf81a16dd996b9d61b5bdaf2d8488f886cdda9a7d161768ad42fa1778d7d10446e649066365 SHA512 4c30da0c8777a32ecc89a1c1fe71f0dcadeb34308f7b19b2a1ea8641700d0a393c083e27ef725793abf86adb8746520d54c56ba6a9a392f721ef860599bcec5f
 EBUILD sandbox-2.31.ebuild 1745 BLAKE2B 1fd4a6d877782d69ccc010ddb727c918082217dc8ce703b1034a0b36f8202a19360c8b35347e7359e4b50111c597991b705434bafaf15580abd4d2fd4ae78856 SHA512 a6c206f983d388fab464412207bcbf023962d794f522671ccad76f64b4f96353f30b3c7c9ba4dc43f1687f22bfbd8f00263325e3fca315323c6d50286938e934
 EBUILD sandbox-2.32.ebuild 1738 BLAKE2B 427ba45c36b3ede0e4de05fe1913a46d891984d7eb6a6b3b5810e7034eb0a1762063d8257f1fc5cc3fbe9c25729192f5104bde5b885302bf3e594d546d24136d SHA512 54b8a92bea677ed97d7fdc3d39a833b1bb814064ea9641eaf2f5667a11aa43b9a7cf97fa79aa18a40d6b08376744746e4cb1555ee911a4b150d9afc56e4c6562
 EBUILD sandbox-2.33.ebuild 1745 BLAKE2B 1fd4a6d877782d69ccc010ddb727c918082217dc8ce703b1034a0b36f8202a19360c8b35347e7359e4b50111c597991b705434bafaf15580abd4d2fd4ae78856 SHA512 a6c206f983d388fab464412207bcbf023962d794f522671ccad76f64b4f96353f30b3c7c9ba4dc43f1687f22bfbd8f00263325e3fca315323c6d50286938e934
+EBUILD sandbox-2.34.ebuild 1745 BLAKE2B 1fd4a6d877782d69ccc010ddb727c918082217dc8ce703b1034a0b36f8202a19360c8b35347e7359e4b50111c597991b705434bafaf15580abd4d2fd4ae78856 SHA512 a6c206f983d388fab464412207bcbf023962d794f522671ccad76f64b4f96353f30b3c7c9ba4dc43f1687f22bfbd8f00263325e3fca315323c6d50286938e934
 MISC metadata.xml 512 BLAKE2B 2befd96e6697e45e04b9e5c6594d30987f035b52fe2d642e10b67b3a2f9657b63f66f48439cd6df71f07ad6fe112220f195d453595c4bf1ef47561cfb8c0428d SHA512 1869fc1c558817f7c7ace988184b74647a82c94e51f0bdb610011bd6736034188abb778e3c5b852ff39daad5a7ef131b09468353b0764a4957dfe72da4767601
diff --git a/sys-apps/sandbox/sandbox-2.34.ebuild b/sys-apps/sandbox/sandbox-2.34.ebuild
new file mode 100644
index 000000000000..1efc83d19f22
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-2.34.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic multilib-minimal multiprocessing
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
+SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+nnp"
+
+# pax-utils lower bound for bug #265376
+DEPEND=">=app-misc/pax-utils-0.1.19"
+# Avoid folks installing with older file, bug #889046. We still need the
+# >= dep in Portage but this is a safety net if people do partial upgrades.
+RDEPEND="!<sys-apps/file-5.44-r1"
+BDEPEND="app-arch/xz-utils"
+
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" sandbox_death_notice"
+
+sandbox_death_notice() {
+	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
+}
+
+src_prepare() {
+	default
+
+	if ! use nnp ; then
+		sed -i 's:PR_SET_NO_NEW_PRIVS:___disable_nnp_hack:' src/sandbox.c || die
+	fi
+
+	# sandbox uses `__asm__ (".symver "...` which does
+	# not play well with gcc's LTO: https://gcc.gnu.org/PR48200
+	filter-lto
+}
+
+multilib_src_configure() {
+	filter-lfs-flags #90228
+
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_test() {
+	# Default sandbox build will run with --jobs set to # cpus.
+	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+}
+
+multilib_src_install_all() {
+	doenvd "${FILESDIR}"/09sandbox
+
+	dodoc AUTHORS ChangeLog* README.md
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"/var/log/sandbox
+	chown root:portage "${EROOT}"/var/log/sandbox
+	chmod 0770 "${EROOT}"/var/log/sandbox
+}