gentoo auto-resync : 13:10:2022 - 13:42:21

4 files changed, 162 insertions, 0 deletions

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 68fa5c2653bd..78e17808f6d9 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,6 +1,10 @@
 AUX oidc-agent-4.3.1_install-perms.patch 1776 BLAKE2B ff7c68cf08fcf9a1d70b0c30295bd9a66d118589c0fbef7dac2ec1d64cdf863293bbf5061ba0ca3be765bfa76fc9109eb848c2d17f82036483aa1dacd0c6b2bb SHA512 acafaf1625f709d0cfcd682bf4322c2dea86dbd194d45d3799051289a92a8736692bee16ab538d1825363785bd5f5d834f2ef02159c48182d89787d559b80f22
 AUX oidc-agent-4.3.1_liblist-automagic.patch 427 BLAKE2B 05a0dd5f9671eb3535475bc77174e158e22646b48c8eb8509213e3a84795df76e4de628c06b80e3798983d8f1072f0a98c6961f86d1593c83c25b2be40437983 SHA512 b117c61055333efb5b845fd54c97aabefb6f3bce33edaf4ab27b94d39438d4907cb7f8a96384bc859593a3a3b784507019b204aa96145d69445bafeb3e0292a1
 AUX oidc-agent-4.3.1_prompt-user-ldflags.patch 254 BLAKE2B 3f734560136de87c8ffec760e5b1608c1e5d3326aba7a19e1907c13df72cec8835e0c818cf05c2bc53ed3e86627453701cf5d13163fbc1366f33d0876de54477 SHA512 38957ed8fb90c3f9cac0995ba125203b76476d427817163a6133b6fa1f312732c586b361a588b67f5fce961cc297918d3285570713be2d7afc7e9176680fd1ca
+AUX oidc-agent-4.4.0_deps-automagic.patch 471 BLAKE2B 83f909d57475a0895bb2305ec7ae1dbe4c54883331eb5e492084bb0816d074658f81ac9683cd375efb0ec51e419590374823e093c3eb5935061f8a2a36bf2184 SHA512 8a559f08bc0aacc4f8152429ca1dc186d88416061d4275780cd373cd92bd72a1ff1f6d667f497dd357eec5fce0caf32d0310644415a92368447c07dc59c6e5fa
+AUX oidc-agent-4.4.0_install-perms.patch 1848 BLAKE2B 787e803e7e62ec6f6f00563a82e571707d4b2febc3fa3967870497b6515ff90247be00408451f0fe0d6805ca07d13cf797330865b22cf05e4b339303d7af6234 SHA512 b5be70a9bdee0bd0e4f9fa3c04a1e3763a34a6785b66b1ab9f336939522593046dd6b3e833c6152a2f764adf0e035ac52857aeb4fd42188006c06d4f261c0c24
 DIST oidc-agent-4.3.1.tar.gz 2124200 BLAKE2B 4108f50688fd0d2043105972a7a7fbab58a74b6a36e0d0a739be5b42a29c3b6bedb29b2273038d49b77fc3245a51f8cf998a12fee5e39096dd5e35ec72660b05 SHA512 3b598f760b1932a07bb243ce7c978a99c209ffbe5594cbb9e084c430c11c089ff0f7be113f73b165bd5f6b382d0ab30dd230c4c9fab6e210a327af20715e6d60
+DIST oidc-agent-4.4.0.tar.gz 1823801 BLAKE2B dd9dcecf825a3e0d52e74dff658bf23beea2327b3ec575257cab6636b56686a15a5d235bad5ee57a41f192292e3b8462918f6223c40a1687f648da55a443eac5 SHA512 668cb117a3bd11245967d6956d118d0821f5112d8841b3ccd71d3e911ad7b2ebc3ec749977fab8d35ddd1efecd447e8fa98395598b7f9dea79d02dfeb7563af7
 EBUILD oidc-agent-4.3.1.ebuild 2216 BLAKE2B ae16e593d7441e6fab5d5c974eaa3e7a2cf1717b8158010bda31e711b2202704978899809c86e12876ac78ea99987a6eec240f3f71cf1cea5fea92f1415bfba5 SHA512 28be275cb6621d9b22e532e7bc4d5af0f5704e89a8a324a453ebe926f6e96b52f90714c1d9f73d9c47b582dbf6218c8ffef6c4d0de78a019497e9ebcbf3c9a6f
+EBUILD oidc-agent-4.4.0.ebuild 2179 BLAKE2B 1e62882a49b77f3cd1c4234d5087d48324ffdfaafe9d579853351039857a72989ecf383a6674bdc518898af5aabd1aff1191f7be45ddc2305148fe5ddcc848a6 SHA512 0f13efd2fc7ede443f78628ca59cc9da5946a7c80477865a777717b10fd78a45b724d24166b07ea9f708f9eeb866f777edbe12be5f2bc6493cfc1af567cb991a
 MISC metadata.xml 780 BLAKE2B 8a2538e5b233383449dc76e49a4d68f950ad3982874e657664ee027fd71a12f18a9a86f38efd6452732305783cd175b761a7702d1a21b97200b1991d20624fd7 SHA512 a4ba3692ce9304b119ea331f83f702bba0956f0013bbe239bca376dea7ccf72a5bb639f06006cf2d65f8ea4b2817173ef26f1c086ab5482095eff34fea026d3f
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.4.0_deps-automagic.patch b/net-misc/oidc-agent/files/oidc-agent-4.4.0_deps-automagic.patch
new file mode 100644
index 000000000000..f8131d23bafa
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.4.0_deps-automagic.patch
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -78,8 +78,8 @@
+ TESTSRCDIR = test/src
+ TESTBINDIR = test/bin
+ 
+-USE_CJSON_SO ?= $(shell /sbin/ldconfig -N -v $(sed 's/:/ /g' <<< $LD_LIBRARY_PATH) 2>/dev/null | grep -i libcjson >/dev/null && echo 1 || echo 0)
+-USE_LIST_SO ?= $(shell /sbin/ldconfig -N -v $(sed 's/:/ /g' <<< $LD_LIBRARY_PATH) 2>/dev/null | grep -i liblist >/dev/null && echo 1 || echo 0)
++USE_CJSON_SO ?= 0
++USE_LIST_SO ?= 0
+ USE_ARGP_SO ?= 0
+ 
+ ifeq ($(USE_CJSON_SO),1)
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.4.0_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.4.0_install-perms.patch
new file mode 100644
index 000000000000..aee7184dd4a0
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.4.0_install-perms.patch
@@ -0,0 +1,59 @@
+--- a/Makefile
++++ b/Makefile
+@@ -656,19 +656,19 @@
+ 
+ ## Man pages
+ $(MAN_PATH)/man1/$(AGENT).1: $(MANDIR)/$(AGENT).1 $(MAN_PATH)/man1
+-	@install -p $< $@
++	@install -p -m 644 $< $@
+ $(MAN_PATH)/man1/$(GEN).1: $(MANDIR)/$(GEN).1 $(MAN_PATH)/man1
+-	@install -p $< $@
++	@install -p -m 644 $< $@
+ $(MAN_PATH)/man1/$(ADD).1: $(MANDIR)/$(ADD).1 $(MAN_PATH)/man1
+-	@install -p $< $@
++	@install -p -m 644 $< $@
+ $(MAN_PATH)/man1/$(CLIENT).1: $(MANDIR)/$(CLIENT).1 $(MAN_PATH)/man1
+-	@install -p $< $@
++	@install -p -m 644 $< $@
+ $(MAN_PATH)/man1/$(AGENT_SERVICE).1: $(MANDIR)/$(AGENT_SERVICE).1 $(MAN_PATH)/man1
+-	@install -p $< $@
++	@install -p -m 644 $< $@
+ $(MAN_PATH)/man1/$(KEYCHAIN).1: $(MANDIR)/$(KEYCHAIN).1 $(MAN_PATH)/man1
+-	@install -p $< $@
++	@install -p -m 644 $< $@
+ $(PROMPT_MAN_PATH)/man1/$(PROMPT).1: $(MANDIR)/$(PROMPT).1 $(PROMPT_MAN_PATH)/man1
+-	@install -p $< $@
++	@install -p -m 644 $< $@
+ 
+ endif
+ 
+@@ -685,16 +685,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
+ 
+@@ -702,7 +702,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.4.0.ebuild b/net-misc/oidc-agent/oidc-agent-4.4.0.ebuild
new file mode 100644
index 000000000000..8ea806798a9c
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-4.4.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 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 ~riscv"
+IUSE="test"
+
+DEPEND="app-crypt/libsecret
+	dev-libs/cJSON:=
+	dev-libs/libsodium:=
+	media-gfx/qrencode
+	net-libs/libmicrohttpd:=
+	net-libs/webkit-gtk:4=
+	sys-libs/libseccomp
+	elibc_musl? ( sys-libs/argp-standalone )"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-libs/check )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4.0_deps-automagic.patch
+	"${FILESDIR}"/${PN}-4.4.0_install-perms.patch
+)
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
+}
+
+src_compile() {
+	use elibc_musl && local -x USE_ARGP_SO=1
+	emake
+}
+
+src_install() {
+	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
+}