From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- net-misc/oidc-agent/Manifest | 6 +- .../oidc-agent-4.2.4_makefile-toolchain-vars.patch | 43 ------------ .../files/oidc-agent-4.2.6_sighandler_t.patch | 11 +++ net-misc/oidc-agent/oidc-agent-4.2.4.ebuild | 78 ---------------------- net-misc/oidc-agent/oidc-agent-4.2.6.ebuild | 12 +++- 5 files changed, 22 insertions(+), 128 deletions(-) delete mode 100644 net-misc/oidc-agent/files/oidc-agent-4.2.4_makefile-toolchain-vars.patch create mode 100644 net-misc/oidc-agent/files/oidc-agent-4.2.6_sighandler_t.patch delete mode 100644 net-misc/oidc-agent/oidc-agent-4.2.4.ebuild (limited to 'net-misc/oidc-agent') diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest index c4293771e205..1d344b31f28c 100644 --- a/net-misc/oidc-agent/Manifest +++ b/net-misc/oidc-agent/Manifest @@ -1,8 +1,6 @@ AUX oidc-agent-4.0.2_makefile-liblist-automagic.patch 448 BLAKE2B df7716192364c71619af14cdd88323a2b6ac7b382d76326aacafa0814dc141416fdda87fc3a11eae8c333e0ac4fcad4386d2e902e13a300a12bd5cbe25df11d7 SHA512 b1145a26fe837a06291067c62bb939b76993e10194a0fc155cfc892677e4f432e0744410dee23eaf14f3a04a9a0c5d8629abaa7c40e3e1abe28ccb2868a41ceb AUX oidc-agent-4.1.0_install-perms.patch 1911 BLAKE2B a74915c1ea19c4d8fcfc09b30c60259e361776c458d0f52885ba4399f0599a8094caced14f59cd024331a4d09efe9298061b914faf4e74a700975e2afb7890df SHA512 9390b4ee8a5baccd8de0f5b22c18ea6d2c0a3c83e70b3e3f44af87cf563ec332ce40c6f5cb4f0f7065cb6b17317442daa22de125139823b4b99428c0624fa08d -AUX oidc-agent-4.2.4_makefile-toolchain-vars.patch 1216 BLAKE2B 52a0b1141772b4c0be288909657a8215db635f9a95cadf542d36c421a6fd7a71a38996f691d94838f4f37d28fd49ac7921e4371c13a7d702d07ba75f67a7693f SHA512 1664e44399a7152b632376d6d44ae8ccf360145f705709af24011ca0e637e976393a49898b0666eebba9ccddc7525d38c464e16768c34e8972709739c567eb16 -DIST oidc-agent-4.2.4.tar.gz 823459 BLAKE2B 71c2fd983031641c5ed39ba3f1771bf283ab56eae6bba426da5308a7c9fcf2ce48103220375b9881e255eeddf05d50d58e2dee047b0b4436451c8d39b0cd55e6 SHA512 6f4f79823869197a0b74cd757b72e1d060ed9f1d9be477f815989b723a86285b200bd72b95f07a4698e754b9ad7aae48cee72603e1a6eaab71590cc63c2bae3d +AUX oidc-agent-4.2.6_sighandler_t.patch 263 BLAKE2B 02e1c70854ec573ca462e45abf5724799cfd9c1f474477e22d54e752db5cddc9ea819c750761685462412e877cb7df63471915da0655692d851158ec7b448df1 SHA512 56ffdd1c0ea6f79aeb9f6ee4a490d1b31c68780c3f2b2ced06af0685d588a25bba35f12422f9d7f18cade4f5d63246cdf062c36aad169b20033ceabbc515392a DIST oidc-agent-4.2.6.tar.gz 824079 BLAKE2B f7cf810254eae00acc1b4c036fe58dda1c62b3db4d7d02a5782269485200a6a4c1d650a6cfac5f6a0e5764a1b2e19d4885eb7744c84724f927aa6d9f18f5bb55 SHA512 6f23cb13c917ce389eea3bb55e802834ff7c1bf1c421264fdcce27eb5a20b11a498d8d76c002eb92bbf3618942803ddb9937f59d19ff1aff6fe9ca07df40d0bb -EBUILD oidc-agent-4.2.4.ebuild 2072 BLAKE2B b91b60f3c7111cbf82cb5151d9ad36ae0a2e2a16dfe1e03177b43a01b567d57624eabe1b8f73a4d710218d0b2b82ce7815fd2b790f18a47d2bd47d43c5988f2c SHA512 83f314dabcbd38324765ade248ee675adbe7f9609a45472af0a55ebae6bd84fafb46b27cc2332a4bf544e1d9289b99604cdd55af0f34ebdbb66b8c3c852dfbc1 -EBUILD oidc-agent-4.2.6.ebuild 2016 BLAKE2B 273087c56bb3719e2a0ed8a11b7cc0d5712245903afe5fe4ed35054ed7aecdf25806888c35568e92d974e3f06fd726d87dd6ad3d58495874f19691a638d44573 SHA512 8688ad81aa4077e0c1513e880f2e494c627934d88f3370698b469a601768582919aee279e5d372e445f466ed4bd691785944026d93fbb31d5638ce9f65c7fda5 +EBUILD oidc-agent-4.2.6.ebuild 2202 BLAKE2B 8911f7e67eb3930ff21bb14aa45ad95b78aec5bcc8fc1ffbb5820817be9dadf9ea146441a4148eaf30bce6464c3a9d8ad8c2e4adf653098081eb5132ab0a3677 SHA512 ed38d53f84ed28f983b0960b820af34d66410314ca8dcdb1a73e9d18ceed2c69fdc2094b3c3d2faf9bbd8efb7a61673c0b0131d306d2334025179fe2a5beade2 MISC metadata.xml 780 BLAKE2B 8a2538e5b233383449dc76e49a4d68f950ad3982874e657664ee027fd71a12f18a9a86f38efd6452732305783cd175b761a7702d1a21b97200b1991d20624fd7 SHA512 a4ba3692ce9304b119ea331f83f702bba0956f0013bbe239bca376dea7ccf72a5bb639f06006cf2d65f8ea4b2817173ef26f1c086ab5482095eff34fea026d3f diff --git a/net-misc/oidc-agent/files/oidc-agent-4.2.4_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-4.2.4_makefile-toolchain-vars.patch deleted file mode 100644 index 7d4bc3b30744..000000000000 --- a/net-misc/oidc-agent/files/oidc-agent-4.2.4_makefile-toolchain-vars.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -92,9 +92,9 @@ - endif - - # Compiler options --CC = gcc -+CC := $(CC) - # compiling flags here --CFLAGS = -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra -fno-common -+CFLAGS := $(CFLAGS) -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra -fno-common - ifndef MAC_OS - ifndef NODPKG - CFLAGS +=$(shell dpkg-buildflags --get CPPFLAGS) -@@ -106,11 +106,11 @@ - TEST_CFLAGS = $(CFLAGS) -I. - - # Linker options --LINKER = gcc -+LINKER := $(CC) - ifdef MAC_OS - LFLAGS = $(LSODIUM) $(LARGP) - else --LFLAGS = $(LSODIUM) $(LSECCOMP) -fno-common -Wl,-z,now -+LFLAGS := $(LDFLAGS) $(LSODIUM) $(LSECCOMP) -fno-common -Wl,-z,now - ifndef NODPKG - LFLAGS +=$(shell dpkg-buildflags --get LDFLAGS) - endif -@@ -130,12 +130,12 @@ - ifdef MAC_OS - CLIENT_LFLAGS = -L$(APILIB) $(LARGP) $(LAGENT) $(LSODIUM) - else --CLIENT_LFLAGS = -L$(APILIB) $(LAGENT) $(LSODIUM) $(LSECCOMP) -+CLIENT_LFLAGS := $(LDFLAGS) -L$(APILIB) $(LAGENT) $(LSODIUM) $(LSECCOMP) - ifndef NODPKG - CLIENT_LFLAGS += $(shell dpkg-buildflags --get LDFLAGS) - endif - endif --LIB_LFLAGS = -lc $(LSODIUM) -+LIB_LFLAGS := $(LDFLAGS) -lc $(LSODIUM) - ifndef MAC_OS - ifndef NODPKG - LIB_LFLAGS += $(shell dpkg-buildflags --get LDFLAGS) diff --git a/net-misc/oidc-agent/files/oidc-agent-4.2.6_sighandler_t.patch b/net-misc/oidc-agent/files/oidc-agent-4.2.6_sighandler_t.patch new file mode 100644 index 000000000000..d450d0ec2c7a --- /dev/null +++ b/net-misc/oidc-agent/files/oidc-agent-4.2.6_sighandler_t.patch @@ -0,0 +1,11 @@ +--- a/src/oidc-gen/gen_signal_handler.c ++++ b/src/oidc-gen/gen_signal_handler.c +@@ -12,7 +12,7 @@ + + static char* global_state = NULL; + #ifndef __APPLE__ +-static __sighandler_t old_sigint; ++static sighandler_t old_sigint; + #else + static sig_t old_sigint; + #endif diff --git a/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild b/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild deleted file mode 100644 index a24c2290d64e..000000000000 --- a/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# 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/libsodium:= - media-gfx/qrencode - net-libs/libmicrohttpd:= - sys-libs/libseccomp" -RDEPEND="${DEPEND}" -BDEPEND="test? ( dev-libs/check )" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.0.2_makefile-liblist-automagic.patch - "${FILESDIR}"/${PN}-4.1.0_install-perms.patch - "${FILESDIR}"/${PN}-4.2.4_makefile-toolchain-vars.patch -) - -src_prepare() { - default - sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile" -} - -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 -} diff --git a/net-misc/oidc-agent/oidc-agent-4.2.6.ebuild b/net-misc/oidc-agent/oidc-agent-4.2.6.ebuild index fc0c23c79b2e..0d3056b5e583 100644 --- a/net-misc/oidc-agent/oidc-agent-4.2.6.ebuild +++ b/net-misc/oidc-agent/oidc-agent-4.2.6.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit xdg-utils +inherit flag-o-matic xdg-utils DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line" HOMEPAGE="https://github.com/indigo-dc/oidc-agent" @@ -11,14 +11,15 @@ SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~riscv" IUSE="test" DEPEND="app-crypt/libsecret dev-libs/libsodium:= media-gfx/qrencode net-libs/libmicrohttpd:= - sys-libs/libseccomp" + sys-libs/libseccomp + elibc_musl? ( sys-libs/argp-standalone )" RDEPEND="${DEPEND}" BDEPEND="test? ( dev-libs/check )" @@ -27,11 +28,16 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-4.0.2_makefile-liblist-automagic.patch "${FILESDIR}"/${PN}-4.1.0_install-perms.patch + "${FILESDIR}"/${PN}-4.2.6_sighandler_t.patch ) src_prepare() { default sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile" + + # Bug #832552 + append-cflags -D_GNU_SOURCE + use elibc_musl && append-ldflags -largp } src_install() { -- cgit v1.2.3