gentoo auto-resync : 28:06:2024 - 07:59:59

7 files changed, 200 insertions, 3 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 5811f548449b..11e4a8264a71 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index e6c55a62d514..f1232af05e1f 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -12,7 +12,9 @@ AUX mit-krb5kpropd.confd 84 BLAKE2B e3f47a3c520af14794c2fe11368651ba56e8aa059bab
 AUX mit-krb5kpropd.initd-r2 608 BLAKE2B 9737f5ff711b8e30444c14ca871e01f2c45e9aecdab99d3dcfd8c16bae65ed05fc732f2007c65f0abfab10cf766035c03c557d217f750ab06f804b639722b27e SHA512 28b9d9bc9d132d8bd87d5fd9e74103d4772f26cba48d28ad53f40ade037a5ac91e07c01aa3180d50c3624673bf4e534f76689b03feb4888cdd9198755576b6a7
 AUX mit-krb5kpropd.service 128 BLAKE2B 31d002c16987bd6fc42e22e64dd9bd1f9db36655dd5170a4f9f16c6a889a4303a4dc276aca09b3a213a1de3e6ab759c66790141708ec95c4393bbbe79e8fb16f SHA512 b7419d1c728eda86fbab2fbf83794ae754e3cdaec7dcdc12c2105e3a75f9903c25fe8fee48f57acf6f0a8c62d27f7934fae81c0cbd67b997541aef7060a4de46
 AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad2a60beebe83bd766d42261bd44c712df14608a1e5e922715780a6c4aa8ad294c34ba4e8fc336a24d038fd3 SHA512 4e7ae175425e0787a1d5ff959471a88bf5af4cd6e213dc6d4048902fab7547c1186a082370b523f9549f5096acfab1fb03b4839e42bd80dc539130ae4bb3ea55
-AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
+AUX mit-krb5kpropd_at.service 141 BLAKE2B 2f6741a55551e0f8673cd78480b7775f3e9a1fedda7af110d68f7577aa2711addc7ec8cbb20a5bc13c6bab560d6e7e854ce2ef9e81bbee487a700eec6f9be1c9 SHA512 7f21497a6045d2e0ad8f6f14c275bb895ce9317764e71c5290b0846688479ce9ba49e14ef73f6debda5f6ffe730b4da28a380717b09fe0d60d102ba44efcb170
 DIST krb5-1.21.2.tar.gz 8622513 BLAKE2B 2afb3ff962a343bc07182fdab0c0ffb221632ff38baab74278cfc721ae72deacc260221470de36e420584f00b780e13221d2e511d4831bca8e1270b7f3d9e824 SHA512 4e09296b412383d53872661718dbfaa90201e0d85f69db48e57a8d4bd73c95a90c7ec7b6f0f325f6bc967f8d203b256b071c0191facf080aca0e2caec5d0ac49
+DIST krb5-1.21.3.tar.gz 9136145 BLAKE2B e909a55eaedab68e5c829bb7bbd26cec5db2d7b8d97f3b034de94d8f957003f16977ac619afee3b862f288e59f05c5e44f41e65b8883961c8b22a26e2f4733bc SHA512 87bc06607f4d95ff604169cea22180703a42d667af05f66f1569b8bd592670c42820b335e5c279e8b4f066d1e7da20f1948a1e4def7c5d295c170cbfc7f49c71
 EBUILD mit-krb5-1.21.2.ebuild 4000 BLAKE2B 6cb733c9b3b614f2bd2c5e631fc47b2befd249dca726995d47d0a3571ca30b2ffd5f629214ef158556eb19b2fdd308dde58629f3a9001c3d65176d9e8e98377d SHA512 fbb6dd5a80c8d442047007770a49900bbede48059184c194046e34f14cd5d427702ef29b33aa9396a5a72593cb12869908865cd0f573b0aa7717b53dcac764b1
+EBUILD mit-krb5-1.21.3.ebuild 4109 BLAKE2B 05cb66d8afb969dc7abe37265b2dd97bdc305a20a12e93f49e10faca819a98ddcd6ad777ffc070cc32a7de6f0f1bafecfa767bad3d6c07af8625a3ee53daa73d SHA512 2c2bc0d65a0ba63dac2daa7c5b87e8fc319820fd40979c63d5658cd8a1d529ee23e0810031a84d923537fe798a3f4736c0d69cabee2ececaacc2c00adf2af3df
 MISC metadata.xml 886 BLAKE2B 4db2f2acb4740d9d8d4dea745ebe583e373ccf6c6e8b33206305ebadc971e3132d4f0811407755ab4d9053bf2993d763a59b9104169d90c776cc7e3fd20ea9b1 SHA512 783772b00fc4d6f1da7b074bab380ed7448af7e5bfb8ff1dcbb098ee8f5fc16ac441da300c455b016e09025c65754bf540dc27bdc13198d93740e0110d1f5dc2
diff --git a/app-crypt/mit-krb5/files/mit-krb5kpropd_at.service b/app-crypt/mit-krb5/files/mit-krb5kpropd_at.service
index f826eb33cb33..62553f58f15f 100644
--- a/app-crypt/mit-krb5/files/mit-krb5kpropd_at.service
+++ b/app-crypt/mit-krb5/files/mit-krb5kpropd_at.service
@@ -5,4 +5,3 @@ Conflicts=mit-krb5kpropd.service
 [Service]
 ExecStart=/usr/sbin/kpropd
 StandardInput=socket
-StandardError=syslog
diff --git a/app-crypt/mit-krb5/mit-krb5-1.21.3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.21.3.ebuild
new file mode 100644
index 000000000000..ee78db3cce99
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.21.3.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+inherit autotools flag-o-matic python-any-r1 systemd toolchain-funcs multilib-minimal
+
+MY_P="${P/mit-}"
+P_DIR=$(ver_cut 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}/src
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux test xinetd"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	!!app-crypt/heimdal
+	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
+	lmdb? ( dev-db/lmdb:= )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
+	pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	xinetd? ( sys-apps/xinetd )
+	"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-alternatives/yacc
+	cpu_flags_x86_aes? (
+		amd64? ( dev-lang/yasm )
+		x86? ( dev-lang/yasm )
+	)
+	doc? ( virtual/latex-base )
+	test? ( dev-util/cmocka )
+	"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	"${FILESDIR}/${PN}_dont_create_rundir.patch"
+	"${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	default
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# lto-type-mismatch (bug #854225)
+	filter-lto
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	AR="$(tc-getAR)" \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		$(use_enable nls) \
+		$(use_enable pkinit) \
+		$(use_with lmdb) \
+		$(use_with keyutils) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--enable-thread-support \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		dodoc "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.ldif"
+		dodoc "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.openldap.ldif"
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+}
diff --git a/app-crypt/sbctl/Manifest b/app-crypt/sbctl/Manifest
index 66cb47cc17df..7bba525a6c85 100644
--- a/app-crypt/sbctl/Manifest
+++ b/app-crypt/sbctl/Manifest
@@ -1,4 +1,5 @@
 AUX sbctl-0.13-no-installkernel-error.patch 896 BLAKE2B aa75eacbe2ce3b99f6491d33284c8fad4594ad09998714015e82ccead7d975c9f8f521c63857ec80879620448405ff4b4701cf02d5d49f27a3cf49734203ee76 SHA512 cc9b45ecde8703d56d0603e6061ba0407277a1ea0d5429565123e134926ad250f45f537d129fb1a559ede3544b72dea233ac6641bc7c8c87d1cb9d7c3bb8bc1e
+AUX sbctl-0.14-installkernel-bashism.patch 1361 BLAKE2B 7caebd45b6f3ae4810a1111dbcc6cb15724c7e9c8853a5dd022b10ad52416afc5645e03c70b130ae8c3dc8b484b76756d964badfce47b60671a50c37881bf72d SHA512 e450ddea3578e1d54e52af965b69b16e608464fb40f850ca39925a91db8b3ed03d83413759b0b5675d90d9354fd226309a22b2b2b559a1fd98f4f8aad52cf61a
 DIST sbctl-0.13-deps.tar.xz 21415148 BLAKE2B cf16f7dd3341f7fef273d542f879d5e0a60b8b648fcd1efc8c85a66f0342b0631c5d273417777ecdd4231709ba6ef59592d40adc70a55b59af1aa36987019492 SHA512 f969ca335f14b9f3df52188e00ea68dbd69eef3bcbf71bbd162d0487f28f040ab14ce755ef56b554e7bde3e1c587f0f09ee7b4331edf5baa380b904694f0ad9f
 DIST sbctl-0.13.tar.gz 1642040 BLAKE2B 569f42ca5694a4db0b1b66ef58dc255ec337a99f8025c61c58d5b54860e09f543e29e63b0e3adf65e3883abacabf6c1554e8849a8b25569ea05414d86fe0cfc4 SHA512 02c1f3e745f83f0e0a2fe90974f940a314aadbe26bd0d0c3e314bb3720b72c74715a26c891f8b22023f40eb8d1d8d24a7d2b1bc1c5d60f9781971f7e97224a4c
 DIST sbctl-0.13.tar.gz.sig 566 BLAKE2B e0996fc4732501b1e66b7c65c9f4523a0c9f4b714e8b985bf5ad8b6d662dff99ddd4f4269374cf8e9e206c1ae8884ad312cd20cc8fcf33ed0af1ca0d1d81e967 SHA512 9435943dda069a5ae5629ab1880158349127654f122a2e5251cf8625db00cb12e85a671c24dda630c2e9beb312cc1c6cf2c24edc7d3a37e6b22ddb871e5c8682
@@ -6,5 +7,5 @@ DIST sbctl-0.14-deps.tar.xz 114919252 BLAKE2B a2baa7cca501d924c1353404725999fb83
 DIST sbctl-0.14.tar.gz 17809255 BLAKE2B a59eb3c5a32cb73cb2993c785d16798cbc83b70186eda8c8ce064a17fc338d3e70b93b277ad55c20991952e8d807c77f2a23ae4467c045019ba717ba342d5442 SHA512 a541324ec0b42503f5b5837b18e5f3076aa6fbe3c32041c3362945be52c281c6d057a856512cd134df37bf133106061af34d2b4fbfc377852ae4a86078e65fd8
 DIST sbctl-0.14.tar.gz.sig 566 BLAKE2B a5ec700d7ebf42393114c7b193483218df285977622f8ca6c2fb50b622478889647083b34c008fe8618244232416b374f099dd0ca7fce0f961949ef8b9cddbd8 SHA512 8508cc4a77e8bd08d77b2119d59c65d8724ace4576e1d233d0801c0b470afaac96981915c86a185ad0a29e94b7ad6aae1c6c3d52574f353d75d20d11cd503b0f
 EBUILD sbctl-0.13-r1.ebuild 1097 BLAKE2B 77f40f0c608b9f84a6a28f1a2cc2077664e7fc0e3aa5a08023935ceb797e36ed92b2637c558a3dd3587bcd255c394ec75cf80ff80cb5ecfcc98e0983ed677771 SHA512 594e65a3c57ae5bef6045916514b79c47370525c539346e578b760ee32da146b18ff8890b757c1c55acad78c2b29dd4edaf14218256dbb684383673cdfd82d14
-EBUILD sbctl-0.14.ebuild 1031 BLAKE2B fa2e03eee278837ea66c5a071f62f0c4c3898f36b0301a8863e950aaaf99075a04c64d13f67ef6cc9bfc0f15d99516557c1ca06f586e490fab635ef61435c8b5 SHA512 f63a686caaff2319ead6738fb3da90d3b8b966ae855f7173772d3f90c776503316c7b18beb6ff6fc7180e6f0533a76307e6de83077703ff18ac89f3aad78a529
+EBUILD sbctl-0.14-r1.ebuild 1098 BLAKE2B e57f11a6a3ed0ea80f2fd77317828846bb38d68b3a203eaff1d62b6de44b26adcf555dd41b7d12da4a566ad3ead5fa68a43f682f99e832d581dd17ac28bebb67 SHA512 f0bf436d40cc7ab2e7d2a590781a83bc23a587b40494a95f48a3e8d700b9578608ec36fe09217702d046f73a0b49d136206d1e310a99ef545c7033fd1e550697
 MISC metadata.xml 395 BLAKE2B 97800aba6234078f4a8cb45403e13ce6b0c38c27480d8b351d8d28c11daee6672c920d8a713bde6ff861e15137df4c4c4991fe717008d81a1e4fa3e3299a5cdc SHA512 3c6022f6d5fe33aa7d22469ea24c46adafa90d12024f9f13f76ca55d1d7930560a31640247ac8ceef54eb6789654f06733e685ef2b8a68e68816784215f165f2
diff --git a/app-crypt/sbctl/files/sbctl-0.14-installkernel-bashism.patch b/app-crypt/sbctl/files/sbctl-0.14-installkernel-bashism.patch
new file mode 100644
index 000000000000..bc1b988769fc
--- /dev/null
+++ b/app-crypt/sbctl/files/sbctl-0.14-installkernel-bashism.patch
@@ -0,0 +1,37 @@
+From 1167500b9da76febe85342e09b1bf9eeaf367ca6 Mon Sep 17 00:00:00 2001
+From: MithicSpirit <rpc01234@gmail.com>
+Date: Fri, 10 May 2024 17:51:59 -0400
+Subject: [PATCH] nit(91-sbctl.install): consistent syntax for tests
+
+Unifies usage of testing commands like `[]`, `test`, and `[[]]` to just
+use `[]` everywhere. This also improves compatibility, as `[[]]` is not
+available in POSIX sh.
+
+Bug: https://bugs.gentoo.org/934768
+Signed-off-by: Steffen Winter <steffen.winter@proton.me>
+--- a/contrib/kernel-install/91-sbctl.install
++++ b/contrib/kernel-install/91-sbctl.install
+@@ -31,7 +31,7 @@ add)
+ 
+ 	# exit without error if keys don't exist
+ 	# https://github.com/Foxboron/sbctl/issues/187
+-	if ! test -d /usr/share/secureboot/keys; then
++	if ! [ -d /usr/share/secureboot/keys ]; then
+ 		echo "Secureboot key directory doesn't exist, not signing!"
+ 		exit 0
+ 	fi
+@@ -39,10 +39,10 @@ add)
+ 	sbctl sign -s "$IMAGE_FILE" 1>/dev/null
+ 	;;
+ remove)
+-	if [[ -e "$IMAGE_FILE" ]]; then
+-	    [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] &&
+-		printf 'sbctl: Removing kernel %s from signing database\n' "$IMAGE_FILE"
+-	    sbctl remove-file "$IMAGE_FILE" 1>/dev/null
++	if [ -e "$IMAGE_FILE" ]; then
++		[ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] &&
++			printf 'sbctl: Removing kernel %s from signing database\n' "$IMAGE_FILE"
++		sbctl remove-file "$IMAGE_FILE" 1>/dev/null
+ 	fi
+ 	;;
+ esac
diff --git a/app-crypt/sbctl/sbctl-0.14.ebuild b/app-crypt/sbctl/sbctl-0.14-r1.ebuild
index 97f67663daf4..8cdded303c60 100644
--- a/app-crypt/sbctl/sbctl-0.14.ebuild
+++ b/app-crypt/sbctl/sbctl-0.14-r1.ebuild
@@ -20,6 +20,10 @@ BDEPEND="app-text/asciidoc
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/foxboron.asc"
 
+PATCHES=(
+	"${FILESDIR}/sbctl-0.14-installkernel-bashism.patch"
+)
+
 src_unpack() {
 	if use verify-sig; then
 		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sig}