gentoo auto-resync : 10:11:2024 - 03:03:09

3 files changed, 169 insertions, 2 deletions

diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 714075b924f0..2d409fb4444d 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,5 +1,6 @@
 DIST libsecret-0.21.1.tar.xz 190796 BLAKE2B 862c2aac0c519d2607c1c5b057d1e0d00d3d5bce06744ab8c6e074393ede2f154af9ab3ee988820c936c8c22dba205ee7bd570287aaa47e64fde21ae3a7dfc2b SHA512 e201b2292280c355d08f8bd2d90d6d785d7b618c82e731eb9c051599a24d8f6a0cc3e271b1876d738f4a15aab24c2b6607b6d15d4335a990e74bb0371fe941ae
 DIST libsecret-0.21.4.tar.xz 206636 BLAKE2B c2f938e667b229e3dbe05e4193459b24f79d874348fda39423712ef92fa0c056129eaf646fbcfab1d7a1ae40982909f4882b5e66c294a2ba648fdd07c88e5909 SHA512 4731d9b2809a867f59e0702a55d1577ee0a968826c3df40717b1a6f6ea3f9d94ed95457dd82070d2914f5b1911d49fd6ae340bec6f4bcf88b6c804782ae7a24e
 EBUILD libsecret-0.21.1.ebuild 3632 BLAKE2B 9ea840eb408ebac6ab30c2a2f33d51a888c04794b2b0b369b12b2e640ece9fd12942f1a7d42f4c9ca8667f004230f903003f7160b9d5c4ade7714a19267ce2a5 SHA512 52e39f15751e5b30166107a00bf63114091b6bc445d9a031b72ca33f700117fb915d0c581f6a2ab5c53c2ae6325ec6a384cdbaf17976c11306736355230c6607
+EBUILD libsecret-0.21.4-r1.ebuild 3971 BLAKE2B 3260709583467ddca09d188531568cc415d5071f72031de0d06d30844bac125410015ac47cdd87ee9fce0ab024d35a58969b2400b0d21e79cb88ba8b5073d2a2 SHA512 5166a4f5299db595950f314b1fcfe15df572ad4efe5111372547676fedccb3da2f63f8c933fed80612a5324026b04136dc2305b76e0b22a697b6f31978b6bb7d
 EBUILD libsecret-0.21.4.ebuild 3941 BLAKE2B a621ea9ee9ae823a3a0df32668f19c79981f754633a0746040eb7d643a6790f78413dd3f670fcdcc9c98aec71ca22945baa9a2f33a8e400d495f8a62ae2efad6 SHA512 b74fdf1cb92ef42e09357625fb661b6f279b795d470fa6a84cc5d83d359c6e1b5d8783b4ce920ab19a35c90e2901d7818897bee0e997585f754e44f4383d1664
-MISC metadata.xml 753 BLAKE2B d5443d99217f25701661fead61c655a14171ba91421d01b1d6871b7f31ba8d229b3b7e3016317e3c8cc67ca246dfe6598d71e6ca25f599e07f95507c4c067eb6 SHA512 67dcafbfee4b47f0daa50dd2442449ea4e144e723b80b56faf29667e32ef7a2b0fd8515d43f033f091bb140470fb0bbf25cd9255344c58aa8319e13d85e29d76
+MISC metadata.xml 812 BLAKE2B d36ccd893f4781a8de0189c3afa0c6f4c5c4cc75bb8bf0ed15878a687313aa727973a3d223613064c0d174d24b9b644123b08b2639514f553392f0aa563e4e47 SHA512 7d688d62a72da7bdb98cdd60c16bee970510eba4e6e0a2234bfc7ab561738f35bb117dc9c0141c1966dec1653ca4227150b85bfb19e4387d7e9629c3e4a5804c
diff --git a/app-crypt/libsecret/libsecret-0.21.4-r1.ebuild b/app-crypt/libsecret/libsecret-0.21.4-r1.ebuild
new file mode 100644
index 000000000000..3abed3946b52
--- /dev/null
+++ b/app-crypt/libsecret/libsecret-0.21.4-r1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit bash-completion-r1 gnome2 meson-multilib python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+crypt +gcrypt gnutls gtk-doc +introspection pam test test-rust tpm +vala"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	vala? ( introspection )
+	gtk-doc? ( crypt )
+	crypt? ( || ( gcrypt gnutls ) )
+"
+
+DEPEND="
+	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
+	gcrypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.8.2:0=[${MULTILIB_USEDEP}] )
+	pam? (
+		sys-libs/pam
+		sys-libs/pam_wrapper )
+	tpm? ( >=app-crypt/tpm2-tss-3.0.3:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="virtual/secret-service"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gi-docgen-2021.7
+	)
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
+		test-rust? ( introspection? ( >=dev-libs/gjs-1.32 ) )
+		tpm? (
+			app-crypt/swtpm
+			app-crypt/tpm2-abrmd
+			>=app-crypt/tpm2-tss-3.2.0:=
+		)
+	)
+	vala? ( $(vala_depend) )
+"
+
+dbus_run() {
+	(
+		# start isolated dbus session bus
+		dbus_data=$(dbus-launch --sh-syntax) || exit
+		eval "${dbus_data}"
+
+		$@
+		ret=${?}
+
+		kill "${DBUS_SESSION_BUS_PID}"
+		exit "${ret}"
+	) || die
+}
+
+tpm2_run_with_emulator() {
+	export XDG_CONFIG_HOME=${T}/.config/swtpm
+	"${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files --overwrite || die
+
+	mkdir -p ${XDG_CONFIG_HOME}/mytpm1 || die
+	swtpm_setup_args=(
+		--tpm2
+		--tpmstate ${XDG_CONFIG_HOME}/mytpm1
+		--createek
+		--allow-signing
+		--decryption
+		--create-ek-cert
+		--create-platform-cert
+		--lock-nvram
+		--overwrite
+		--display
+	)
+	swtpm_setup "${swtpm_setup_args[@]}" || die
+
+	swtpm_socket_args=(
+		--tpm2
+		--tpmstate dir=${XDG_CONFIG_HOME}/mytpm1
+		--flags startup-clear
+		--ctrl type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket.ctrl
+		--server type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+		--pid file=${XDG_CONFIG_HOME}/mytpm1/swtpm.pid
+		--daemon
+	)
+	swtpm socket "${swtpm_socket_args[@]}" || die
+
+	tpm2_abrmd_args=(
+		--logger=stdout
+		--tcti=swtpm:path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+		--session
+		--flush-all
+	)
+	tpm2-abrmd "${tpm2_abrmd_args[@]}" &
+	export TCTI=tabrmd:bus_type=session
+
+	$@ || die
+
+	# When swtpm dies, tmp2-abrmd will exit
+	kill $(< ${XDG_CONFIG_HOME}/mytpm1/swtpm.pid) || die
+}
+
+python_check_deps() {
+	if use introspection; then
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_setup
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_true manpage)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_bool introspection)
+		-Dbashcompdir="$(get_bashcompdir)"
+		$(meson_native_enabled bash_completion)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool pam)
+	)
+
+	if use crypt ; then
+		use gcrypt && emesonargs+=( -Dcrypto=libgcrypt )
+		use gnutls && emesonargs+=( -Dcrypto=gnutls )
+	else
+		emesonargs+=( -Dcrypto=disabled )
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if use tpm; then
+		dbus_run tpm2_run_with_emulator virtx meson test -C "${BUILD_DIR}"
+	else
+		virtx dbus-run-session meson test -C "${BUILD_DIR}"
+	fi
+}
diff --git a/app-crypt/libsecret/metadata.xml b/app-crypt/libsecret/metadata.xml
index ad92e2ecff7a..933dcfcc68ba 100644
--- a/app-crypt/libsecret/metadata.xml
+++ b/app-crypt/libsecret/metadata.xml
@@ -6,7 +6,8 @@
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
   <use>
-    <flag name="crypt">Enable Backend library to implement transport encryption via <pkg>dev-libs/libgcrypt</pkg></flag>
+    <flag name="crypt">Enable transport encryption</flag>
+    <flag name="gcrypt">Enable Backend library to implement transport encryption via <pkg>dev-libs/libgcrypt</pkg></flag>
     <flag name="gnutls">Enable Backend library to implement transport encryption via <pkg>net-libs/gnutls</pkg></flag>
     <flag name="pam">Build PAM module</flag>
     <flag name="tpm">Enable Trusted Platform Module support via <pkg>app-crypt/tpm2-tss</pkg></flag>