commit: 35b28325282b9c6e7aba68507950d067b632dd92 Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Thu Oct 13 09:04:26 2022 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Thu Oct 13 09:31:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b28325
net-misc/oidc-agent: add 4.4.0 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> net-misc/oidc-agent/Manifest | 1 + .../files/oidc-agent-4.4.0_deps-automagic.patch | 13 ++++ .../files/oidc-agent-4.4.0_install-perms.patch | 59 +++++++++++++++ net-misc/oidc-agent/oidc-agent-4.4.0.ebuild | 86 ++++++++++++++++++++++ 4 files changed, 159 insertions(+) diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest index a0f914e226fc..040d3306abb1 100644 --- a/net-misc/oidc-agent/Manifest +++ b/net-misc/oidc-agent/Manifest @@ -1 +1,2 @@ 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 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 +}
