gentoo auto-resync : 29:07:2023 - 22:40:34

6 files changed, 135 insertions, 2 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8165dbf29846..f8caf6732b64 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 5d71e9786fad..b98a9367ab1f 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -3,5 +3,5 @@ AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e9149
 DIST ModemManager-1.18.12.tar.xz 2589020 BLAKE2B e82db0a62d29753e22b9f9c09e60d8f5dca070cbac27b6df54ff8cd166cbb837dca3b162ac06afea0e75abdc8d407253a28cee58dacd739d4b485fa9f5485acb SHA512 7ee3b091ca2350a1d52f1ff0c0657c9f279594ffbff5ea57be59ca024331cafbac34901ca9ed4ef2b71e8c51b594526f921d3aeee6e8748cd0532a16218c5d6c
 DIST ModemManager-1.20.6.tar.bz2 1467367 BLAKE2B 6fc6e678fac966ccd6697e469152e3b0fa93d868d16985828e01b4890ba35beacc8f1c5a47a74bf8586035088c6f61124d12214d022e30dbc3b9196b0dd6f28e SHA512 2c5c121d6a74a7dc0922231a88ba64e350e947a57dae25ce7e8c58b6041b60fd5c4ff395e641beef3447b0239e1e60c15c2752e47e77a648a1bea9ef5f3ac577
 EBUILD modemmanager-1.18.12.ebuild 4180 BLAKE2B cba28e03affa852644e493dbeb7328c930a8d5a1b1223861fda4fb7e4b73575cfa8e6276c3760f79b3406cfa7bfa1491f5b10cbac930b3c1a134bd4ca426f2c5 SHA512 2714aef91de730ce26b36074cb4dd7a0fdc6959f876826b0fc9c6e02b2b960fa3097205861ebf4aec1e04dca115d92003113ca7f1f3a9bd0fdfbfce5ba8d8d8a
-EBUILD modemmanager-1.20.6.ebuild 3100 BLAKE2B 485d2b10f8cd928c08a2e7da1e1e8b6bebcf79499f9f8bccf1b3fb9ed7a774361e6c8f4d161ce59ac9e245b931316f7770d19773d566b29be4229fcfa3c3e2dd SHA512 1ccf92f0491e7b845fe800cf4f67bb31bf7f2c1cbf505915a804ff32a8b103f65ef70d4bc4b9655a42520810971bec356c134520e93d2f90bce50396c431702d
+EBUILD modemmanager-1.20.6.ebuild 3166 BLAKE2B 820ba8c51f24d30b0d7da0a8e2dd19a0a4cc4ca8cb6aadab331d01bbf3dcd06727ce3de2bbabc414bfafed37a0e0d61b74c1f4f28a71f286d916238788b3693b SHA512 ffc19fdc83139d5ffd5b12ee86a22c53f0078c81fba4d9279012f18b0c24d373ba836c3a0faae3f35678639d89b2694d9aa05ce66518d3b331cc3a24f0b1a44b
 MISC metadata.xml 617 BLAKE2B 944bfa9441d2facd85d2129a456faf997c450b3625909cbd6d4811d6941b359a6a84ac7cff83df711edc89a3a7ebe65d49c443e879c3ae88eb655d897138e2a7 SHA512 c0b26dcb4e8ad77e9a2d1c0fc2b131cd99f0875f4b7d9fde85dd6330a892ff4a57f713bf6cafa8b807ed8ad93729b17106eede2e9c9d9bfde0b523203ed046b5
diff --git a/net-misc/modemmanager/modemmanager-1.20.6.ebuild b/net-misc/modemmanager/modemmanager-1.20.6.ebuild
index 105550bab53c..f306012e1aa1 100644
--- a/net-misc/modemmanager/modemmanager-1.20.6.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.20.6.ebuild
@@ -75,7 +75,8 @@ src_configure() {
 		$(meson_use introspection)
 
 		$(meson_use udev)
-		-Dudevdir="$(get_udevdir)"
+		-Dudevdir="${EPREFIX}$(get_udevdir)"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
 
 		$(meson_use systemd systemd_journal)
 
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 34c2d95324a5..6292a6339277 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,5 +1,8 @@
 AUX oidc-agent-4.4.0_install-perms.patch 1848 BLAKE2B 787e803e7e62ec6f6f00563a82e571707d4b2febc3fa3967870497b6515ff90247be00408451f0fe0d6805ca07d13cf797330865b22cf05e4b339303d7af6234 SHA512 b5be70a9bdee0bd0e4f9fa3c04a1e3763a34a6785b66b1ab9f336939522593046dd6b3e833c6152a2f764adf0e035ac52857aeb4fd42188006c06d4f261c0c24
 AUX oidc-agent-4.5.0_webkit41.patch 294 BLAKE2B 45613429ee2eafcd61547f8d8de7bc0e7a3663e65adf196bb995ac754ccde7619fea5ba599d33429dd40c5f439c0ad73a3337802661f71cbe1de40aac3a6ab2b SHA512 e0fee550af136941832f304cd749c263f688105b7361e83555f49d635eed13cf35f587f7a21dcc76804b40438f3f455e9ceaa3cb0ed07119e17d0e117d58d391
+AUX oidc-agent-4.5.2_install-perms.patch 962 BLAKE2B d31f252f539d8fbb11de0c5040b558bc0b8cba99dda7b5a192de5bfe1f63c1ae0e57b650617cbc34be35f6b3ed7a3c8b5eab93bdc7146c824f20030f93ac5ca3 SHA512 5331dbbd79f5ec2537e75eac0839f8c324078dcdad3394616b8817b337b16c3a8c0cbf45eb30ec6831ee93545dc99a902fec2eb27adf2f3d7a085290415e398c
 DIST oidc-agent-4.5.1.tar.gz 1823853 BLAKE2B d73ce4405ead08ddc0433a5c3b660b08037eecbde5f1e0358cad8731d0787e63ffae4b1317ecfe824a951e07a82d600fa4180557d93d0ce5a382e8c8f39289d6 SHA512 9afffbfcb00c610b04f97c59d610799a4ce45b1c40a61e388c6ab8b550381725602e43d219ce475a9d0425c1bc07b49ca982379286e9f48ebae1e19ca4587779
+DIST oidc-agent-4.5.2.tar.gz 1766905 BLAKE2B 0558778a5162fbbbe29be9a476838d745abf4825e7274487637f368d521e03f6f165ec82129f37f135a6cf3d3d43bb9349574b88763a508bb683cdc8882230d2 SHA512 04c9ddb258c132781eaa875412f0a8d48d2127e5b78ba262eb0240dac05025db62f5d357e4b5c35a9009960b30d63ce96156c8dcf3b5eac4257c02d37578e676
 EBUILD oidc-agent-4.5.1.ebuild 2387 BLAKE2B 86c694fd8123c3760eeb324cab0e2da7bcd73f971bdf32e80a54bc29fc8ace046746c28e326c3c05023cf5cc5f36b6ccc70ea00a2cacf774c36a4ee00c61eae5 SHA512 0ce47243a71b87a01b232562989d24296e5e9a5880024ec4b4c3444c4df12deaeaf17e3a3168ce3d032917e424d4f7e39dd0ee3dd867f449fae5b8b72a5ad557
+EBUILD oidc-agent-4.5.2.ebuild 2388 BLAKE2B 3e6a853d7903edc2b9fcde58ee4676ca51900fa71e78e52032c5103afe28ce1d9fb4c0b5a0c69a1ffcd6dd5d655fcc94cf1fb56aadd5897a7a10f45c44bd647f SHA512 cb13d8bb868f2c9362bb2be3d50ec4637db97d16814a92c3bbce102fe22de337b97fade54b4297bba9bff08f4585df07ee5cba3710274f3dc2e6f8da18535751
 MISC metadata.xml 780 BLAKE2B 8a2538e5b233383449dc76e49a4d68f950ad3982874e657664ee027fd71a12f18a9a86f38efd6452732305783cd175b761a7702d1a21b97200b1991d20624fd7 SHA512 a4ba3692ce9304b119ea331f83f702bba0956f0013bbe239bca376dea7ccf72a5bb639f06006cf2d65f8ea4b2817173ef26f1c086ab5482095eff34fea026d3f
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.5.2_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.5.2_install-perms.patch
new file mode 100644
index 000000000000..b83c934e75d9
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.5.2_install-perms.patch
@@ -0,0 +1,32 @@
+--- a/Makefile
++++ b/Makefile
+@@ -698,16 +698,16 @@
+ 	@ln -sf $(SHARED_LIB_NAME_SO) $@
+ 
+ $(INCLUDE_PATH)/oidc-agent/%.h: $(SRCDIR)/api/%.h $(INCLUDE_PATH)/oidc-agent
+-	@install -p $< $@
++	@install -p -m 644 $< $@
+ 
+ $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent
+-	@install -p $< $@
++	@install -p -m 644 $< $@
+ 
+ $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent
+-	@install -p $< $@
++	@install -p -m 644 $< $@
+ 
+ $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH)
+-	@install -p $< $@
++	@install -p -m 644 $< $@
+ 
+ endif
+ 
+@@ -715,7 +715,7 @@
+ 
+ ## scheme handler
+ $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop
+-	@install -p -D $< $@
++	@install -p -m 644 -D $< $@
+ 	@echo "Exec=x-terminal-emulator -e bash -c \"$(BIN_AFTER_INST_PATH)/bin/$(GEN) --codeExchange=%u; exec bash\"" >> $@
+ 
+ ## Xsession
diff --git a/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild b/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild
new file mode 100644
index 000000000000..d42def7c515c
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line"
+HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
+SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="test"
+
+DEPEND="app-crypt/libsecret
+	dev-libs/cJSON:=
+	dev-libs/libsodium:=
+	media-gfx/qrencode
+	net-libs/libmicrohttpd:=
+	net-libs/webkit-gtk:4.1=
+	net-misc/curl
+	elibc_musl? ( sys-libs/argp-standalone )"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-libs/check )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.5.0_webkit41.patch
+	"${FILESDIR}"/${PN}-4.5.2_install-perms.patch
+)
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
+}
+
+oidc_emake() {
+	local mymakeargs=(
+		USE_CJSON_SO=1
+		USE_LIST_SO=0
+		USE_MUSTACHE_SO=0
+		USE_ARGP_SO=$(usex elibc_musl 1 0)
+	)
+
+	emake "${mymakeargs[@]}" $@
+}
+
+src_compile() {
+	oidc_emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157
+	oidc_emake
+}
+
+src_install() {
+	oidc_emake \
+		PREFIX="${ED}" \
+		BIN_AFTER_INST_PATH="/usr" \
+		INCLUDE_PATH="${ED}"/usr/include \
+		LIB_PATH="${ED}"/usr/$(get_libdir) \
+		install
+
+	# This file is not compatible with Gentoo and in any case, we generally
+	# let the users load such agents themselves.
+	rm -f "${ED}"/etc/X11/Xsession.d/91${PN}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog
+		elog "You should use oidc-gen to initially generate your account configuration"
+		elog "before it can be loaded into oidc-agent using oidc-add. For details, please"
+		elog "consult the man page of oidc-gen, or full documentation at"
+		elog "    https://indigo-dc.gitbooks.io/oidc-agent/"
+		elog
+	else
+		local new_major_ver old_ver
+		new_major_ver=$(ver_cut 1)
+		for old_ver in ${REPLACING_VERSIONS}; do
+			if [[ $(ver_cut 1 ${old_ver}) != ${new_major_ver} ]]; then
+				ewarn
+				ewarn "You are upgrading from a different major version. Please restart any running instances of ${PN}"
+				ewarn "to make sure they are compatible with the updated clients."
+				ewarn
+				break
+			fi
+		done
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}