* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/
@ 2020-06-19 17:15 Marek Szuba
0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2020-06-19 17:15 UTC (permalink / raw
To: gentoo-commits
commit: f1f6e093d99e20c69802ce6c6e3c64d13f0ecaca
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 17:12:40 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 17:14:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1f6e093
net-misc/oidc-agent: new package
OpenID Connect equivalent of ssh-agent.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
net-misc/oidc-agent/Manifest | 1 +
.../files/oidc-agent-3.3.1_desktop-category.patch | 9 ++++
.../files/oidc-agent-3.3.1_install-perms.patch | 58 +++++++++++++++++++++
.../oidc-agent-3.3.1_makefile-toolchain-vars.patch | 30 +++++++++++
...c-agent-3.3.1_test-suite-buffer-overflows.patch | 51 +++++++++++++++++++
net-misc/oidc-agent/metadata.xml | 19 +++++++
net-misc/oidc-agent/oidc-agent-3.3.1.ebuild | 59 ++++++++++++++++++++++
7 files changed, 227 insertions(+)
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
new file mode 100644
index 00000000000..cd447dca2a2
--- /dev/null
+++ b/net-misc/oidc-agent/Manifest
@@ -0,0 +1 @@
+DIST oidc-agent-3.3.1.tar.gz 764721 BLAKE2B eea09b3b140ca81be0f3dc8f200120287682ddb328275be35bd736249b72eabb40c87ebd168e51c992ccd4b4a02138e17d3e20f3cebfb4d42bde01351aacead1 SHA512 75428bb52c0cf43256fddd3b33895d7c882ced367543763c68a385448dbe29805ee1fc035f3727e743a607ed4af851ae5db24b40cc6801fc31e45b6fec16bd66
diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.1_desktop-category.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.1_desktop-category.patch
new file mode 100644
index 00000000000..49bfcfdb70b
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-3.3.1_desktop-category.patch
@@ -0,0 +1,9 @@
+--- a/config/scheme_handler/oidc-gen.desktop
++++ b/config/scheme_handler/oidc-gen.desktop
+@@ -5,5 +5,5 @@
+ Icon=utilities-terminal
+ Terminal=true
+ Type=Application
+-Categories=Application;Network;
++Categories=Network;
+ MimeType=x-scheme-handler/edu.kit.data.oidc-agent;
diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.1_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.1_install-perms.patch
new file mode 100644
index 00000000000..1992ee0ef31
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-3.3.1_install-perms.patch
@@ -0,0 +1,58 @@
+--- a/Makefile
++++ b/Makefile
+@@ -316,7 +316,7 @@
+
+ ## Bash completion
+ $(BASH_COMPLETION_PATH)/$(AGENT): $(CONFDIR)/bash-completion/oidc-agent $(BASH_COMPLETION_PATH)
+- @install -m 744 $< $@
++ @install -m 644 $< $@
+
+ $(BASH_COMPLETION_PATH)/$(GEN): $(BASH_COMPLETION_PATH)
+ @ln -s $(AGENT) $@
+@@ -332,15 +332,15 @@
+
+ ## Man pages
+ $(MAN_PATH)/man1/$(AGENT).1: $(MANDIR)/$(AGENT).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(MAN_PATH)/man1/$(GEN).1: $(MANDIR)/$(GEN).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(MAN_PATH)/man1/$(ADD).1: $(MANDIR)/$(ADD).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(MAN_PATH)/man1/$(CLIENT).1: $(MANDIR)/$(CLIENT).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(MAN_PATH)/man1/$(KEYCHAIN).1: $(MANDIR)/$(KEYCHAIN).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+
+
+ ## Lib
+@@ -354,20 +354,20 @@
+ @ln -sf $(SHARED_LIB_NAME_SO) $@
+
+ $(INCLUDE_PATH)/oidc-agent/api.h: $(SRCDIR)/$(CLIENT)/api.h $(INCLUDE_PATH)/oidc-agent
+- @install $< $@
++ @install -m 644 $< $@
+
+ $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent
+- @install $< $@
++ @install -m 644 $< $@
+
+ $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent
+- @install $< $@
++ @install -m 644 $< $@
+
+ $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH)
+- @install $< $@
++ @install -m 644 $< $@
+
+ ## scheme handler
+ $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop
+- @install -D $< $@
++ @install -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/files/oidc-agent-3.3.1_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.1_makefile-toolchain-vars.patch
new file mode 100644
index 00000000000..0cdf44fba8c
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-3.3.1_makefile-toolchain-vars.patch
@@ -0,0 +1,30 @@
+1. Support user-provided values of CC, CFLAGS and LDFLAGS
+2. Do not force the use of a static version of libsodium
+
+--- a/Makefile
++++ b/Makefile
+@@ -54,20 +54,20 @@
+ endif
+
+ # Compiler options
+-CC = gcc
++CC := $(CC)
+ # compiling flags here
+-CFLAGS = -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra
++CFLAGS := $(CFLAGS) -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra
+ ifndef MAC_OS
+ CFLAGS += $(shell pkg-config --cflags libsecret-1)
+ endif
+ TEST_CFLAGS = $(CFLAGS) -I.
+
+ # Linker options
+-LINKER = gcc
++LINKER := $(CC)
+ ifdef MAC_OS
+ LFLAGS = -lsodium -largp
+ else
+-LFLAGS = -l:libsodium.a -lseccomp
++LFLAGS := $(LDFLAGS) -lsodium -lseccomp
+ endif
+ ifdef HAS_CJSON
+ LFLAGS += -lcjson
diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.1_test-suite-buffer-overflows.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.1_test-suite-buffer-overflows.patch
new file mode 100644
index 00000000000..b43f20c0686
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-3.3.1_test-suite-buffer-overflows.patch
@@ -0,0 +1,51 @@
+--- a/test/src/utils/stringUtils/tc_strelim.c
++++ b/test/src/utils/stringUtils/tc_strelim.c
+@@ -7,7 +7,7 @@
+
+ START_TEST(test_noFound) {
+ const char* const str = "abcdeffedcba";
+- char s[strlen(str)];
++ char s[strlen(str) + 1];
+ strcpy(s, str);
+ ck_assert_str_eq(strelim(s, 'x'), str);
+ }
+--- a/test/src/utils/stringUtils/tc_strelimIfAfter.c
++++ b/test/src/utils/stringUtils/tc_strelimIfAfter.c
+@@ -7,7 +7,7 @@
+
+ START_TEST(test_noElim) {
+ const char* const str = "abcdeffedcba";
+- char s[strlen(str)];
++ char s[strlen(str) + 1];
+ strcpy(s, str);
+ ck_assert_str_eq(strelimIfAfter(s, 'b', 'x'), str);
+ }
+@@ -15,7 +15,7 @@
+
+ START_TEST(test_noFound) {
+ const char* const str = "abcdeffedcba";
+- char s[strlen(str)];
++ char s[strlen(str) + 1];
+ strcpy(s, str);
+ ck_assert_str_eq(strelimIfAfter(s, 'x', 'a'), str);
+ }
+--- a/test/src/utils/stringUtils/tc_strelimIfFollowed.c
++++ b/test/src/utils/stringUtils/tc_strelimIfFollowed.c
+@@ -7,7 +7,7 @@
+
+ START_TEST(test_noElim) {
+ const char* const str = "abcdeffedcba";
+- char s[strlen(str)];
++ char s[strlen(str) + 1];
+ strcpy(s, str);
+ ck_assert_str_eq(strelimIfFollowed(s, 'b', 'x'), str);
+ }
+@@ -15,7 +15,7 @@
+
+ START_TEST(test_noFound) {
+ const char* const str = "abcdeffedcba";
+- char s[strlen(str)];
++ char s[strlen(str) + 1];
+ strcpy(s, str);
+ ck_assert_str_eq(strelimIfFollowed(s, 'x', 'a'), str);
+ }
diff --git a/net-misc/oidc-agent/metadata.xml b/net-misc/oidc-agent/metadata.xml
new file mode 100644
index 00000000000..befedd63922
--- /dev/null
+++ b/net-misc/oidc-agent/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
+ </maintainer>
+ <longdescription>
+ oidc-agent is a set of tools to manage OpenID Connect tokens and make them
+ easily usable from the command line. We followed the ssh-agent design, so users
+ can handle OIDC tokens in a similar way as they do with ssh keys.
+ oidc-agent is usually started in the beginning of an X-session or a login
+ session. Through use of environment variables the agent can be located and
+ used to handle OIDC tokens.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">indigo-dc/oidc-agent</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
new file mode 100644
index 00000000000..12161b8e904
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="oidc-agent 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"
+IUSE="test"
+
+DEPEND="app-crypt/libsecret
+ dev-libs/libsodium
+ net-libs/libmicrohttpd"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-libs/check )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.3.1_desktop-category.patch
+ "${FILESDIR}"/${PN}-3.3.1_install-perms.patch
+ "${FILESDIR}"/${PN}-3.3.1_makefile-toolchain-vars.patch
+ "${FILESDIR}"/${PN}-3.3.1_test-suite-buffer-overflows.patch
+)
+
+src_compile() {
+ # Parallel building doesn't work
+ emake -j1
+}
+
+src_install() {
+ emake \
+ PREFIX="${ED}" \
+ BIN_AFTER_INST_PATH="/usr" \
+ INCLUDE_PATH="${ED}"/usr/include \
+ LIB_PATH="${ED}"/usr/$(get_libdir) \
+ install
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+
+ 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
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/
@ 2020-09-23 12:02 Marek Szuba
0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2020-09-23 12:02 UTC (permalink / raw
To: gentoo-commits
commit: 49ec02e2a9c5581af83dfd9544cbc24ceeec4b67
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 11:54:10 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 12:02:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49ec02e2
net-misc/oidc-agent: bump to 3.3.5
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
net-misc/oidc-agent/Manifest | 1 +
.../oidc-agent-3.3.5_makefile-toolchain-vars.patch | 48 ++++++++++++++++++
net-misc/oidc-agent/oidc-agent-3.3.5.ebuild | 59 ++++++++++++++++++++++
3 files changed, 108 insertions(+)
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index cd447dca2a2..2a5395fd9d7 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1 +1,2 @@
DIST oidc-agent-3.3.1.tar.gz 764721 BLAKE2B eea09b3b140ca81be0f3dc8f200120287682ddb328275be35bd736249b72eabb40c87ebd168e51c992ccd4b4a02138e17d3e20f3cebfb4d42bde01351aacead1 SHA512 75428bb52c0cf43256fddd3b33895d7c882ced367543763c68a385448dbe29805ee1fc035f3727e743a607ed4af851ae5db24b40cc6801fc31e45b6fec16bd66
+DIST oidc-agent-3.3.5.tar.gz 766803 BLAKE2B 4998820283d38e3cee76ab7c308075b74da735f6b2c05ed562c5d61006c5ba85f1c44d7e2c0bfb5e4ee60017835ecf331f8b82a45aa5d0105b7933eeec1025a0 SHA512 c58d9e61a99bf870ce4be0e4fde3faa90b8197d0714626412d162c2e09cca18df734a062b792f7fc92323b50677c64df4aeda5ee42a5ea4e44731ad0e15c8030
diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.5_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.5_makefile-toolchain-vars.patch
new file mode 100644
index 00000000000..b9d526a2122
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-3.3.5_makefile-toolchain-vars.patch
@@ -0,0 +1,48 @@
+1. Support user-provided values of CC, CFLAGS and LDFLAGS
+2. Do not force the use of a static version of libsodium
+
+--- a/Makefile
++++ b/Makefile
+@@ -54,20 +54,20 @@
+ 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
+ CFLAGS += $(shell pkg-config --cflags libsecret-1)
+ endif
+ TEST_CFLAGS = $(CFLAGS) -I.
+
+ # Linker options
+-LINKER = gcc
++LINKER := $(CC)
+ ifdef MAC_OS
+ LFLAGS = -lsodium -largp
+ else
+-LFLAGS = -l:libsodium.a -lseccomp -fno-common
++LFLAGS := $(LDFLAGS) -lsodium -lseccomp -fno-common
+ endif
+ ifdef HAS_CJSON
+ LFLAGS += -lcjson
+@@ -81,7 +81,7 @@
+ ifdef MAC_OS
+ CLIENT_LFLAGS = -L$(APILIB) -largp -loidc-agent.$(LIBVERSION)
+ else
+-CLIENT_LFLAGS = -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lseccomp
++CLIENT_LFLAGS = $(LDFLAGS) -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lseccomp
+ endif
+ ifdef HAS_CJSON
+ CLIENT_LFLAGS += -lcjson
+@@ -478,7 +478,7 @@
+ ifdef MAC_OS
+ @gcc -dynamiclib -fpic -Wl, -o $@ $(PIC_OBJECTS) -lc
+ else
+- @gcc -shared -fpic -Wl,-soname,$(SONAME) -o $@ $(PIC_OBJECTS) -lc
++ @$(LINKER) -shared -fpic -Wl,-soname,$(SONAME) $(LDFLAGS) -o $@ $(PIC_OBJECTS) -lc
+ endif
+
+ .PHONY: shared_lib
diff --git a/net-misc/oidc-agent/oidc-agent-3.3.5.ebuild b/net-misc/oidc-agent/oidc-agent-3.3.5.ebuild
new file mode 100644
index 00000000000..8c424ae08fe
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-3.3.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic xdg-utils
+
+DESCRIPTION="oidc-agent 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"
+IUSE="test"
+
+DEPEND="app-crypt/libsecret
+ dev-libs/libsodium
+ net-libs/libmicrohttpd
+ sys-libs/libseccomp"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-libs/check )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.3.1_desktop-category.patch
+ "${FILESDIR}"/${PN}-3.3.1_install-perms.patch
+ "${FILESDIR}"/${PN}-3.3.5_makefile-toolchain-vars.patch
+)
+
+src_compile() {
+ # Parallel building doesn't work
+ emake -j1
+}
+
+src_install() {
+ emake \
+ PREFIX="${ED}" \
+ BIN_AFTER_INST_PATH="/usr" \
+ INCLUDE_PATH="${ED}"/usr/include \
+ LIB_PATH="${ED}"/usr/$(get_libdir) \
+ install
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+
+ 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
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/
@ 2021-03-11 10:26 Marek Szuba
0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2021-03-11 10:26 UTC (permalink / raw
To: gentoo-commits
commit: 602b39eb0b0b5914bfbf2eaef294a3526aeac86c
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 11 10:14:43 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 10:26:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=602b39eb
net-misc/oidc-agent: bump to 4.0.2
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
net-misc/oidc-agent/Manifest | 1 +
.../files/oidc-agent-4.0.2_install-perms.patch | 60 +++++++++++++++++
.../oidc-agent-4.0.2_makefile-toolchain-vars.patch | 43 ++++++++++++
net-misc/oidc-agent/oidc-agent-4.0.2.ebuild | 76 ++++++++++++++++++++++
4 files changed, 180 insertions(+)
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 2a5395fd9d7..1e6f8d3e6ae 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,2 +1,3 @@
DIST oidc-agent-3.3.1.tar.gz 764721 BLAKE2B eea09b3b140ca81be0f3dc8f200120287682ddb328275be35bd736249b72eabb40c87ebd168e51c992ccd4b4a02138e17d3e20f3cebfb4d42bde01351aacead1 SHA512 75428bb52c0cf43256fddd3b33895d7c882ced367543763c68a385448dbe29805ee1fc035f3727e743a607ed4af851ae5db24b40cc6801fc31e45b6fec16bd66
DIST oidc-agent-3.3.5.tar.gz 766803 BLAKE2B 4998820283d38e3cee76ab7c308075b74da735f6b2c05ed562c5d61006c5ba85f1c44d7e2c0bfb5e4ee60017835ecf331f8b82a45aa5d0105b7933eeec1025a0 SHA512 c58d9e61a99bf870ce4be0e4fde3faa90b8197d0714626412d162c2e09cca18df734a062b792f7fc92323b50677c64df4aeda5ee42a5ea4e44731ad0e15c8030
+DIST oidc-agent-4.0.2.tar.gz 802872 BLAKE2B bbee872f0b029f4289a4805d1a5f8fe2fe2b8c297a918cf7821aec6bf4dbe634882425c888cb0e784778b56754af1c8b5a34d5282f84090cccf6315897ccb461 SHA512 fef440cd4b72055d8175f9f33c735235bb87bfca38b53bc4e049b1644f74f6a683d312297efa04cbacfe55190c5d6b588fa37475e5a55acff540909865389037
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.0.2_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.0.2_install-perms.patch
new file mode 100644
index 00000000000..6184f42d933
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.0.2_install-perms.patch
@@ -0,0 +1,60 @@
+--- a/Makefile
++++ b/Makefile
+@@ -411,19 +411,19 @@
+
+ ## Man pages
+ $(MAN_PATH)/man1/$(AGENT).1: $(MANDIR)/$(AGENT).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(AGENTSERVER_MAN_PATH)/man1/$(AGENTSERVER).1: $(MANDIR)/$(AGENTSERVER).1 $(AGENTSERVER_MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(MAN_PATH)/man1/$(GEN).1: $(MANDIR)/$(GEN).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(MAN_PATH)/man1/$(ADD).1: $(MANDIR)/$(ADD).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(MAN_PATH)/man1/$(CLIENT).1: $(MANDIR)/$(CLIENT).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(MAN_PATH)/man1/$(KEYCHAIN).1: $(MANDIR)/$(KEYCHAIN).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(PROMPT_MAN_PATH)/man1/$(PROMPT).1: $(MANDIR)/$(PROMPT).1 $(PROMPT_MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+
+
+ ## Lib
+@@ -437,24 +437,24 @@
+ @ln -sf $(SHARED_LIB_NAME_SO) $@
+
+ $(INCLUDE_PATH)/oidc-agent/api.h: $(SRCDIR)/$(CLIENT)/api.h $(INCLUDE_PATH)/oidc-agent
+- @install $< $@
++ @install -m 644 $< $@
+
+ $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent
+- @install $< $@
++ @install -m 644 $< $@
+
+ $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent
+- @install $< $@
++ @install -m 644 $< $@
+
+ $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH)
+- @install $< $@
++ @install -m 644 $< $@
+
+ $(INCLUDE_PATH)/oidc-agent/export_symbols.h: $(SRCDIR)/$(CLIENT)/export_symbols.h $(INCLUDE_PATH)/oidc-agent
+- @install $< $@
++ @install -m 644 $< $@
+
+
+ ## scheme handler
+ $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop
+- @install -D $< $@
++ @install -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/files/oidc-agent-4.0.2_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-toolchain-vars.patch
new file mode 100644
index 00000000000..533af1f2a6d
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-toolchain-vars.patch
@@ -0,0 +1,43 @@
+--- a/Makefile
++++ b/Makefile
+@@ -74,9 +74,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)
+@@ -87,11 +87,11 @@
+ TEST_CFLAGS = $(CFLAGS) -I.
+
+ # Linker options
+-LINKER = gcc
++LINKER := $(CC)
+ ifdef MAC_OS
+ LFLAGS = -lsodium -largp
+ else
+-LFLAGS = -lsodium -lseccomp -fno-common
++LFLAGS := $(LDFLAGS) -lsodium -lseccomp -fno-common
+ ifndef NODPKG
+ LFLAGS +=$(shell dpkg-buildflags --get LDFLAGS)
+ endif
+@@ -112,12 +112,12 @@
+ ifdef MAC_OS
+ CLIENT_LFLAGS = -L$(APILIB) -largp -loidc-agent.$(LIBVERSION) -lsodium
+ else
+-CLIENT_LFLAGS = -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lsodium -lseccomp
++CLIENT_LFLAGS := $(LDFLAGS) -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -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_FLAGS += $(shell dpkg-buildflags --get LDFLAGS)
diff --git a/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild b/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild
new file mode 100644
index 00000000000..1bac67f225c
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="app-crypt/libsecret
+ dev-libs/libsodium
+ net-libs/libmicrohttpd
+ sys-libs/libseccomp"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-libs/check )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.0.2_install-perms.patch
+ "${FILESDIR}"/${PN}-4.0.2_makefile-toolchain-vars.patch
+)
+
+src_compile() {
+ # As of 4.0.2 parallel building still doesn't work
+ emake -j1
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/
@ 2021-03-11 10:26 Marek Szuba
0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2021-03-11 10:26 UTC (permalink / raw
To: gentoo-commits
commit: 65e866d383e6c664838b0acf0bb185d5f9f5f94d
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 11 10:17:44 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 10:26:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65e866d3
net-misc/oidc-agent: remove old
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
net-misc/oidc-agent/Manifest | 1 -
.../oidc-agent-3.3.1_makefile-toolchain-vars.patch | 48 -----------------
...c-agent-3.3.1_test-suite-buffer-overflows.patch | 51 ------------------
net-misc/oidc-agent/oidc-agent-3.3.1.ebuild | 63 ----------------------
4 files changed, 163 deletions(-)
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 1e6f8d3e6ae..32122374ea2 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,3 +1,2 @@
-DIST oidc-agent-3.3.1.tar.gz 764721 BLAKE2B eea09b3b140ca81be0f3dc8f200120287682ddb328275be35bd736249b72eabb40c87ebd168e51c992ccd4b4a02138e17d3e20f3cebfb4d42bde01351aacead1 SHA512 75428bb52c0cf43256fddd3b33895d7c882ced367543763c68a385448dbe29805ee1fc035f3727e743a607ed4af851ae5db24b40cc6801fc31e45b6fec16bd66
DIST oidc-agent-3.3.5.tar.gz 766803 BLAKE2B 4998820283d38e3cee76ab7c308075b74da735f6b2c05ed562c5d61006c5ba85f1c44d7e2c0bfb5e4ee60017835ecf331f8b82a45aa5d0105b7933eeec1025a0 SHA512 c58d9e61a99bf870ce4be0e4fde3faa90b8197d0714626412d162c2e09cca18df734a062b792f7fc92323b50677c64df4aeda5ee42a5ea4e44731ad0e15c8030
DIST oidc-agent-4.0.2.tar.gz 802872 BLAKE2B bbee872f0b029f4289a4805d1a5f8fe2fe2b8c297a918cf7821aec6bf4dbe634882425c888cb0e784778b56754af1c8b5a34d5282f84090cccf6315897ccb461 SHA512 fef440cd4b72055d8175f9f33c735235bb87bfca38b53bc4e049b1644f74f6a683d312297efa04cbacfe55190c5d6b588fa37475e5a55acff540909865389037
diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.1_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.1_makefile-toolchain-vars.patch
deleted file mode 100644
index dda1ab25221..00000000000
--- a/net-misc/oidc-agent/files/oidc-agent-3.3.1_makefile-toolchain-vars.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-1. Support user-provided values of CC, CFLAGS and LDFLAGS
-2. Do not force the use of a static version of libsodium
-
---- a/Makefile
-+++ b/Makefile
-@@ -54,20 +54,20 @@
- endif
-
- # Compiler options
--CC = gcc
-+CC := $(CC)
- # compiling flags here
--CFLAGS = -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra
-+CFLAGS := $(CFLAGS) -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra
- ifndef MAC_OS
- CFLAGS += $(shell pkg-config --cflags libsecret-1)
- endif
- TEST_CFLAGS = $(CFLAGS) -I.
-
- # Linker options
--LINKER = gcc
-+LINKER := $(CC)
- ifdef MAC_OS
- LFLAGS = -lsodium -largp
- else
--LFLAGS = -l:libsodium.a -lseccomp
-+LFLAGS := $(LDFLAGS) -lsodium -lseccomp
- endif
- ifdef HAS_CJSON
- LFLAGS += -lcjson
-@@ -81,7 +81,7 @@
- ifdef MAC_OS
- CLIENT_LFLAGS = -L$(APILIB) -largp -loidc-agent.$(LIBVERSION)
- else
--CLIENT_LFLAGS = -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lseccomp
-+CLIENT_LFLAGS = $(LDFLAGS) -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lseccomp
- endif
- ifdef HAS_CJSON
- CLIENT_LFLAGS += -lcjson
-@@ -478,7 +478,7 @@
- ifdef MAC_OS
- @gcc -dynamiclib -fpic -Wl, -o $@ $(PIC_OBJECTS) -lc
- else
-- @gcc -shared -fpic -Wl,-soname,$(SONAME) -o $@ $(PIC_OBJECTS) -lc
-+ @$(LINKER) -shared -fpic -Wl,-soname,$(SONAME) $(LDFLAGS) -o $@ $(PIC_OBJECTS) -lc
- endif
-
- .PHONY: shared_lib
diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.1_test-suite-buffer-overflows.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.1_test-suite-buffer-overflows.patch
deleted file mode 100644
index b43f20c0686..00000000000
--- a/net-misc/oidc-agent/files/oidc-agent-3.3.1_test-suite-buffer-overflows.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/test/src/utils/stringUtils/tc_strelim.c
-+++ b/test/src/utils/stringUtils/tc_strelim.c
-@@ -7,7 +7,7 @@
-
- START_TEST(test_noFound) {
- const char* const str = "abcdeffedcba";
-- char s[strlen(str)];
-+ char s[strlen(str) + 1];
- strcpy(s, str);
- ck_assert_str_eq(strelim(s, 'x'), str);
- }
---- a/test/src/utils/stringUtils/tc_strelimIfAfter.c
-+++ b/test/src/utils/stringUtils/tc_strelimIfAfter.c
-@@ -7,7 +7,7 @@
-
- START_TEST(test_noElim) {
- const char* const str = "abcdeffedcba";
-- char s[strlen(str)];
-+ char s[strlen(str) + 1];
- strcpy(s, str);
- ck_assert_str_eq(strelimIfAfter(s, 'b', 'x'), str);
- }
-@@ -15,7 +15,7 @@
-
- START_TEST(test_noFound) {
- const char* const str = "abcdeffedcba";
-- char s[strlen(str)];
-+ char s[strlen(str) + 1];
- strcpy(s, str);
- ck_assert_str_eq(strelimIfAfter(s, 'x', 'a'), str);
- }
---- a/test/src/utils/stringUtils/tc_strelimIfFollowed.c
-+++ b/test/src/utils/stringUtils/tc_strelimIfFollowed.c
-@@ -7,7 +7,7 @@
-
- START_TEST(test_noElim) {
- const char* const str = "abcdeffedcba";
-- char s[strlen(str)];
-+ char s[strlen(str) + 1];
- strcpy(s, str);
- ck_assert_str_eq(strelimIfFollowed(s, 'b', 'x'), str);
- }
-@@ -15,7 +15,7 @@
-
- START_TEST(test_noFound) {
- const char* const str = "abcdeffedcba";
-- char s[strlen(str)];
-+ char s[strlen(str) + 1];
- strcpy(s, str);
- ck_assert_str_eq(strelimIfFollowed(s, 'x', 'a'), str);
- }
diff --git a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
deleted file mode 100644
index 2ca56ed3f68..00000000000
--- a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="app-crypt/libsecret
- dev-libs/libsodium
- net-libs/libmicrohttpd
- sys-libs/libseccomp"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-libs/check )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.3.1_desktop-category.patch
- "${FILESDIR}"/${PN}-3.3.1_install-perms.patch
- "${FILESDIR}"/${PN}-3.3.1_makefile-toolchain-vars.patch
- "${FILESDIR}"/${PN}-3.3.1_test-suite-buffer-overflows.patch
-)
-
-src_compile() {
- # Bug #728840
- append-flags -fcommon
-
- # Parallel building doesn't work
- emake -j1
-}
-
-src_install() {
- emake \
- PREFIX="${ED}" \
- BIN_AFTER_INST_PATH="/usr" \
- INCLUDE_PATH="${ED}"/usr/include \
- LIB_PATH="${ED}"/usr/$(get_libdir) \
- install
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-
- 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
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/
@ 2021-11-10 16:49 Marek Szuba
0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2021-11-10 16:49 UTC (permalink / raw
To: gentoo-commits
commit: 0fe174ba9bf8ab790501dd496eef63a787d39796
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 16:45:25 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 16:49:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fe174ba
net-misc/oidc-agent: add 4.2.2
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
net-misc/oidc-agent/Manifest | 1 +
.../oidc-agent-4.2.2_makefile-toolchain-vars.patch | 43 ++++++++++++
net-misc/oidc-agent/oidc-agent-4.2.2.ebuild | 78 ++++++++++++++++++++++
3 files changed, 122 insertions(+)
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index fcd02ee8f70..a8b32fc5511 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,2 +1,3 @@
DIST oidc-agent-4.0.2.tar.gz 802872 BLAKE2B bbee872f0b029f4289a4805d1a5f8fe2fe2b8c297a918cf7821aec6bf4dbe634882425c888cb0e784778b56754af1c8b5a34d5282f84090cccf6315897ccb461 SHA512 fef440cd4b72055d8175f9f33c735235bb87bfca38b53bc4e049b1644f74f6a683d312297efa04cbacfe55190c5d6b588fa37475e5a55acff540909865389037
DIST oidc-agent-4.1.1.tar.gz 801103 BLAKE2B dcb82a537787ae6ced577843c67acdd4e3fa315d017222067b2914837dfffccae27ddbdeeeaf4e8ca70c7e2744e03df5964d3ba318efd4460c73252bfd3f8e95 SHA512 e383e054623dc3b8fe73ec02df44faa05d4b69aaed47c7925f6f92d25cbc5301173fbc607b6198bc70f99e634e582fbae7c5570812086a8e5694d40ce6d2c2d1
+DIST oidc-agent-4.2.2.tar.gz 823169 BLAKE2B 5ce071c1ac6e65ab7de869e9963884e60142dc1c93e8eb3eb00c144527754199867238eb45ca2cba814dedf7e55b2aedf66f45e613697ebc3262598fca0312e5 SHA512 852eb5c6c071aafa58366e5e867f95908cac2fa0c3b6924e021cc81825b0bba0549e74742eff0ef5a9bbb16173e21c94ba7b618150a42b585968b4cd4663409e
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.2.2_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-4.2.2_makefile-toolchain-vars.patch
new file mode 100644
index 00000000000..2df3afce8e6
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.2.2_makefile-toolchain-vars.patch
@@ -0,0 +1,43 @@
+--- 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
++LFLAGS := $(LDFLAGS) $(LSODIUM) $(LSECCOMP) -fno-common
+ 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/oidc-agent-4.2.2.ebuild b/net-misc/oidc-agent/oidc-agent-4.2.2.ebuild
new file mode 100644
index 00000000000..53f71352886
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-4.2.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 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.2_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
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/
@ 2021-12-15 13:23 Marek Szuba
0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2021-12-15 13:23 UTC (permalink / raw
To: gentoo-commits
commit: a7d74a19f06f366cf668857188f50790fb03ac74
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 15 12:59:54 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Dec 15 13:23:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7d74a19
net-misc/oidc-agent: add 4.2.4, drop 4.2.2
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
net-misc/oidc-agent/Manifest | 2 +-
...hain-vars.patch => oidc-agent-4.2.4_makefile-toolchain-vars.patch} | 4 ++--
.../oidc-agent/{oidc-agent-4.2.2.ebuild => oidc-agent-4.2.4.ebuild} | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 8cfb6a24c90e..897a3e39eefd 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,2 +1,2 @@
DIST oidc-agent-4.1.1.tar.gz 801103 BLAKE2B dcb82a537787ae6ced577843c67acdd4e3fa315d017222067b2914837dfffccae27ddbdeeeaf4e8ca70c7e2744e03df5964d3ba318efd4460c73252bfd3f8e95 SHA512 e383e054623dc3b8fe73ec02df44faa05d4b69aaed47c7925f6f92d25cbc5301173fbc607b6198bc70f99e634e582fbae7c5570812086a8e5694d40ce6d2c2d1
-DIST oidc-agent-4.2.2.tar.gz 823169 BLAKE2B 5ce071c1ac6e65ab7de869e9963884e60142dc1c93e8eb3eb00c144527754199867238eb45ca2cba814dedf7e55b2aedf66f45e613697ebc3262598fca0312e5 SHA512 852eb5c6c071aafa58366e5e867f95908cac2fa0c3b6924e021cc81825b0bba0549e74742eff0ef5a9bbb16173e21c94ba7b618150a42b585968b4cd4663409e
+DIST oidc-agent-4.2.4.tar.gz 823459 BLAKE2B 71c2fd983031641c5ed39ba3f1771bf283ab56eae6bba426da5308a7c9fcf2ce48103220375b9881e255eeddf05d50d58e2dee047b0b4436451c8d39b0cd55e6 SHA512 6f4f79823869197a0b74cd757b72e1d060ed9f1d9be477f815989b723a86285b200bd72b95f07a4698e754b9ad7aae48cee72603e1a6eaab71590cc63c2bae3d
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.2.2_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-4.2.4_makefile-toolchain-vars.patch
similarity index 89%
rename from net-misc/oidc-agent/files/oidc-agent-4.2.2_makefile-toolchain-vars.patch
rename to net-misc/oidc-agent/files/oidc-agent-4.2.4_makefile-toolchain-vars.patch
index 2df3afce8e68..7d4bc3b30744 100644
--- a/net-misc/oidc-agent/files/oidc-agent-4.2.2_makefile-toolchain-vars.patch
+++ b/net-misc/oidc-agent/files/oidc-agent-4.2.4_makefile-toolchain-vars.patch
@@ -21,8 +21,8 @@
ifdef MAC_OS
LFLAGS = $(LSODIUM) $(LARGP)
else
--LFLAGS = $(LSODIUM) $(LSECCOMP) -fno-common
-+LFLAGS := $(LDFLAGS) $(LSODIUM) $(LSECCOMP) -fno-common
+-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
diff --git a/net-misc/oidc-agent/oidc-agent-4.2.2.ebuild b/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild
similarity index 97%
rename from net-misc/oidc-agent/oidc-agent-4.2.2.ebuild
rename to net-misc/oidc-agent/oidc-agent-4.2.4.ebuild
index 53f713528866..ff691320302b 100644
--- a/net-misc/oidc-agent/oidc-agent-4.2.2.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild
@@ -27,7 +27,7 @@ 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.2_makefile-toolchain-vars.patch
+ "${FILESDIR}"/${PN}-4.2.4_makefile-toolchain-vars.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/
@ 2022-02-03 17:31 Marek Szuba
0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2022-02-03 17:31 UTC (permalink / raw
To: gentoo-commits
commit: bcc6a6173c0312eb7288092942412c4fd2f63740
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 3 17:29:59 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Feb 3 17:30:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcc6a617
net-misc/oidc-agent: support building against musl
Closes: https://bugs.gentoo.org/832552
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
net-misc/oidc-agent/files/oidc-agent-4.2.6_sighandler_t.patch | 11 +++++++++++
net-misc/oidc-agent/oidc-agent-4.2.6.ebuild | 10 ++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
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.6.ebuild b/net-misc/oidc-agent/oidc-agent-4.2.6.ebuild
index fc0c23c79b2e..de01a2e4dbb2 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"
@@ -18,7 +18,8 @@ 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() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/
@ 2022-07-12 22:20 Marek Szuba
0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2022-07-12 22:20 UTC (permalink / raw
To: gentoo-commits
commit: fa952569e950f51a73409409dfafc2a2abd1a6ad
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 21:34:59 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 22:20:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa952569
net-misc/oidc-agent: add 4.3.1
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
net-misc/oidc-agent/Manifest | 1 +
.../files/oidc-agent-4.3.1_install-perms.patch | 59 +++++++++++++++
.../files/oidc-agent-4.3.1_liblist-automagic.patch | 11 +++
.../oidc-agent-4.3.1_prompt-user-ldflags.patch | 11 +++
net-misc/oidc-agent/oidc-agent-4.3.1.ebuild | 86 ++++++++++++++++++++++
5 files changed, 168 insertions(+)
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 19d96f9eb2f8..3b61e20a7a2b 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1 +1,2 @@
DIST oidc-agent-4.2.6.tar.gz 824079 BLAKE2B f7cf810254eae00acc1b4c036fe58dda1c62b3db4d7d02a5782269485200a6a4c1d650a6cfac5f6a0e5764a1b2e19d4885eb7744c84724f927aa6d9f18f5bb55 SHA512 6f23cb13c917ce389eea3bb55e802834ff7c1bf1c421264fdcce27eb5a20b11a498d8d76c002eb92bbf3618942803ddb9937f59d19ff1aff6fe9ca07df40d0bb
+DIST oidc-agent-4.3.1.tar.gz 2124200 BLAKE2B 4108f50688fd0d2043105972a7a7fbab58a74b6a36e0d0a739be5b42a29c3b6bedb29b2273038d49b77fc3245a51f8cf998a12fee5e39096dd5e35ec72660b05 SHA512 3b598f760b1932a07bb243ce7c978a99c209ffbe5594cbb9e084c430c11c089ff0f7be113f73b165bd5f6b382d0ab30dd230c4c9fab6e210a327af20715e6d60
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.3.1_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.3.1_install-perms.patch
new file mode 100644
index 000000000000..940191322345
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.3.1_install-perms.patch
@@ -0,0 +1,59 @@
+--- a/Makefile
++++ b/Makefile
+@@ -644,19 +644,19 @@
+
+ ## Man pages
+ $(MAN_PATH)/man1/$(AGENT).1: $(MANDIR)/$(AGENT).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(MAN_PATH)/man1/$(GEN).1: $(MANDIR)/$(GEN).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(MAN_PATH)/man1/$(ADD).1: $(MANDIR)/$(ADD).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(MAN_PATH)/man1/$(CLIENT).1: $(MANDIR)/$(CLIENT).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(MAN_PATH)/man1/$(AGENT_SERVICE).1: $(MANDIR)/$(AGENT_SERVICE).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(MAN_PATH)/man1/$(KEYCHAIN).1: $(MANDIR)/$(KEYCHAIN).1 $(MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+ $(PROMPT_MAN_PATH)/man1/$(PROMPT).1: $(MANDIR)/$(PROMPT).1 $(PROMPT_MAN_PATH)/man1
+- @install $< $@
++ @install -m 644 $< $@
+
+ endif
+
+@@ -673,16 +673,16 @@
+ @ln -sf $(SHARED_LIB_NAME_SO) $@
+
+ $(INCLUDE_PATH)/oidc-agent/%.h: $(SRCDIR)/api/%.h $(INCLUDE_PATH)/oidc-agent
+- @install $< $@
++ @install -m 644 $< $@
+
+ $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent
+- @install $< $@
++ @install -m 644 $< $@
+
+ $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent
+- @install $< $@
++ @install -m 644 $< $@
+
+ $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH)
+- @install $< $@
++ @install -m 644 $< $@
+
+ endif
+
+@@ -690,7 +690,7 @@
+
+ ## scheme handler
+ $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop
+- @install -D $< $@
++ @install -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/files/oidc-agent-4.3.1_liblist-automagic.patch b/net-misc/oidc-agent/files/oidc-agent-4.3.1_liblist-automagic.patch
new file mode 100644
index 000000000000..ac9ec72c84c9
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.3.1_liblist-automagic.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -80,7 +80,7 @@
+
+ # 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_CJSON_SO ?= 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_LIST_SO ?= 0
+ USE_ARGP_SO ?= 0
+
+ ifeq ($(USE_CJSON_SO),1)
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.3.1_prompt-user-ldflags.patch b/net-misc/oidc-agent/files/oidc-agent-4.3.1_prompt-user-ldflags.patch
new file mode 100644
index 000000000000..cd1b99ee72b5
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.3.1_prompt-user-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -154,7 +154,7 @@
+ LINKER := $(CC)
+ LINKER_XX := $(CXX)
+ ifndef ANY_MSYS
+-PROMPT_LFLAGS = $(CPPFLAGS) $(LSODIUM)
++PROMPT_LFLAGS := $(CPPFLAGS) $(LDFLAGS) $(LSODIUM)
+ endif
+ ifdef MAC_OS
+ LFLAGS = $(LSODIUM) $(LARGP)
diff --git a/net-misc/oidc-agent/oidc-agent-4.3.1.ebuild b/net-misc/oidc-agent/oidc-agent-4.3.1.ebuild
new file mode 100644
index 000000000000..017cd56ec18a
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-4.3.1.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/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.3.1_install-perms.patch
+ "${FILESDIR}"/${PN}-4.3.1_liblist-automagic.patch
+ "${FILESDIR}"/${PN}-4.3.1_prompt-user-ldflags.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
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/
@ 2023-02-24 16:50 Marek Szuba
0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2023-02-24 16:50 UTC (permalink / raw
To: gentoo-commits
commit: a344d85fb00bc0a7faa8145463e124b802a4e648
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 16:39:48 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 16:50:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a344d85f
net-misc/oidc-agent: migrate to net-libs/webkit-gtk:4.1
Builds and tests fine against this version.
Closes: https://bugs.gentoo.org/893708
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../files/oidc-agent-4.5.0_webkit41.patch | 11 +++
net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild | 89 ++++++++++++++++++++++
2 files changed, 100 insertions(+)
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.5.0_webkit41.patch b/net-misc/oidc-agent/files/oidc-agent-4.5.0_webkit41.patch
new file mode 100644
index 000000000000..d445fafcb3c7
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.5.0_webkit41.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -179,7 +179,7 @@
+ CPPFLAGS += -fPIC
+ ifndef MAC_OS
+ ifndef ANY_MSYS
+-CPPFLAGS += $(shell pkg-config --cflags --libs gtk+-3.0 webkit2gtk-4.0) -lstdc++
++CPPFLAGS += $(shell pkg-config --cflags --libs gtk+-3.0 webkit2gtk-4.1) -lstdc++
+ endif
+ endif
+ ifndef MAC_OS
diff --git a/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild b/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild
new file mode 100644
index 000000000000..459b2148429c
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild
@@ -0,0 +1,89 @@
+# 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 ~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.4.0_deps-automagic.patch
+ "${FILESDIR}"/${PN}-4.4.0_install-perms.patch
+ "${FILESDIR}"/${PN}-4.5.0_webkit41.patch
+)
+
+src_prepare() {
+ xdg_environment_reset
+ default
+ sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
+}
+
+src_compile() {
+ local -x USE_CJSON_SO=1
+ use elibc_musl && local -x USE_ARGP_SO=1
+ emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157
+ 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
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/
@ 2023-03-27 20:18 Marek Szuba
0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2023-03-27 20:18 UTC (permalink / raw
To: gentoo-commits
commit: 1e830287646cb2f0ccdd68b98717402fdde94978
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 27 20:17:45 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Mar 27 20:18:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e830287
net-misc/oidc-agent: drop 4.3.1
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
net-misc/oidc-agent/Manifest | 1 -
.../files/oidc-agent-4.3.1_install-perms.patch | 59 ---------------
.../files/oidc-agent-4.3.1_liblist-automagic.patch | 11 ---
.../oidc-agent-4.3.1_prompt-user-ldflags.patch | 11 ---
net-misc/oidc-agent/oidc-agent-4.3.1.ebuild | 86 ----------------------
5 files changed, 168 deletions(-)
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index cbb3cef98433..ebb82bb12cd8 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,3 +1,2 @@
-DIST oidc-agent-4.3.1.tar.gz 2124200 BLAKE2B 4108f50688fd0d2043105972a7a7fbab58a74b6a36e0d0a739be5b42a29c3b6bedb29b2273038d49b77fc3245a51f8cf998a12fee5e39096dd5e35ec72660b05 SHA512 3b598f760b1932a07bb243ce7c978a99c209ffbe5594cbb9e084c430c11c089ff0f7be113f73b165bd5f6b382d0ab30dd230c4c9fab6e210a327af20715e6d60
DIST oidc-agent-4.5.0.tar.gz 1823181 BLAKE2B d2023494689ec65837efcd67e325c690ec1b3a03f78dccce853d1c30e312a89d5d43476132830d10aa63ead7b5cfc91b99fcf78fdfa2d46c60e5a62030c77884 SHA512 23520dc5556ed54ad2dcf3a14a5183f04b1f8030aafd342cfb5f4e21683058da475335c7b29ae0727bd20405e42fad825614d1b7c86fca5a81e4bf3cae5f64c1
DIST oidc-agent-4.5.1.tar.gz 1823853 BLAKE2B d73ce4405ead08ddc0433a5c3b660b08037eecbde5f1e0358cad8731d0787e63ffae4b1317ecfe824a951e07a82d600fa4180557d93d0ce5a382e8c8f39289d6 SHA512 9afffbfcb00c610b04f97c59d610799a4ce45b1c40a61e388c6ab8b550381725602e43d219ce475a9d0425c1bc07b49ca982379286e9f48ebae1e19ca4587779
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.3.1_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.3.1_install-perms.patch
deleted file mode 100644
index 940191322345..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.3.1_install-perms.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -644,19 +644,19 @@
-
- ## Man pages
- $(MAN_PATH)/man1/$(AGENT).1: $(MANDIR)/$(AGENT).1 $(MAN_PATH)/man1
-- @install $< $@
-+ @install -m 644 $< $@
- $(MAN_PATH)/man1/$(GEN).1: $(MANDIR)/$(GEN).1 $(MAN_PATH)/man1
-- @install $< $@
-+ @install -m 644 $< $@
- $(MAN_PATH)/man1/$(ADD).1: $(MANDIR)/$(ADD).1 $(MAN_PATH)/man1
-- @install $< $@
-+ @install -m 644 $< $@
- $(MAN_PATH)/man1/$(CLIENT).1: $(MANDIR)/$(CLIENT).1 $(MAN_PATH)/man1
-- @install $< $@
-+ @install -m 644 $< $@
- $(MAN_PATH)/man1/$(AGENT_SERVICE).1: $(MANDIR)/$(AGENT_SERVICE).1 $(MAN_PATH)/man1
-- @install $< $@
-+ @install -m 644 $< $@
- $(MAN_PATH)/man1/$(KEYCHAIN).1: $(MANDIR)/$(KEYCHAIN).1 $(MAN_PATH)/man1
-- @install $< $@
-+ @install -m 644 $< $@
- $(PROMPT_MAN_PATH)/man1/$(PROMPT).1: $(MANDIR)/$(PROMPT).1 $(PROMPT_MAN_PATH)/man1
-- @install $< $@
-+ @install -m 644 $< $@
-
- endif
-
-@@ -673,16 +673,16 @@
- @ln -sf $(SHARED_LIB_NAME_SO) $@
-
- $(INCLUDE_PATH)/oidc-agent/%.h: $(SRCDIR)/api/%.h $(INCLUDE_PATH)/oidc-agent
-- @install $< $@
-+ @install -m 644 $< $@
-
- $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent
-- @install $< $@
-+ @install -m 644 $< $@
-
- $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent
-- @install $< $@
-+ @install -m 644 $< $@
-
- $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH)
-- @install $< $@
-+ @install -m 644 $< $@
-
- endif
-
-@@ -690,7 +690,7 @@
-
- ## scheme handler
- $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop
-- @install -D $< $@
-+ @install -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/files/oidc-agent-4.3.1_liblist-automagic.patch b/net-misc/oidc-agent/files/oidc-agent-4.3.1_liblist-automagic.patch
deleted file mode 100644
index ac9ec72c84c9..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.3.1_liblist-automagic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -80,7 +80,7 @@
-
- # 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_CJSON_SO ?= 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_LIST_SO ?= 0
- USE_ARGP_SO ?= 0
-
- ifeq ($(USE_CJSON_SO),1)
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.3.1_prompt-user-ldflags.patch b/net-misc/oidc-agent/files/oidc-agent-4.3.1_prompt-user-ldflags.patch
deleted file mode 100644
index cd1b99ee72b5..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.3.1_prompt-user-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -154,7 +154,7 @@
- LINKER := $(CC)
- LINKER_XX := $(CXX)
- ifndef ANY_MSYS
--PROMPT_LFLAGS = $(CPPFLAGS) $(LSODIUM)
-+PROMPT_LFLAGS := $(CPPFLAGS) $(LDFLAGS) $(LSODIUM)
- endif
- ifdef MAC_OS
- LFLAGS = $(LSODIUM) $(LARGP)
diff --git a/net-misc/oidc-agent/oidc-agent-4.3.1.ebuild b/net-misc/oidc-agent/oidc-agent-4.3.1.ebuild
deleted file mode 100644
index ae2c0102654a..000000000000
--- a/net-misc/oidc-agent/oidc-agent-4.3.1.ebuild
+++ /dev/null
@@ -1,86 +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:=
- 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.3.1_install-perms.patch
- "${FILESDIR}"/${PN}-4.3.1_liblist-automagic.patch
- "${FILESDIR}"/${PN}-4.3.1_prompt-user-ldflags.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
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/
@ 2023-03-27 20:18 Marek Szuba
0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2023-03-27 20:18 UTC (permalink / raw
To: gentoo-commits
commit: e77818288c6c60aced72576c702e7b72f0362965
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 27 20:08:51 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Mar 27 20:18:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7781828
net-misc/oidc-agent: drop the deps_automagic patch
The version compatible with 4.5.1 got left out of the version-bump
commit, and in general not needed if all USE_FOO_SO variables are
set by the ebuilds.
Closes: https://bugs.gentoo.org/902895
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../oidc-agent/files/oidc-agent-4.4.0_deps-automagic.patch | 13 -------------
net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild | 2 +-
net-misc/oidc-agent/oidc-agent-4.5.1.ebuild | 3 ++-
3 files changed, 3 insertions(+), 15 deletions(-)
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
deleted file mode 100644
index f8131d23bafa..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.4.0_deps-automagic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/oidc-agent-4.5.0-r1.ebuild b/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild
index 459b2148429c..1899a1d911d2 100644
--- a/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild
@@ -28,7 +28,6 @@ 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
"${FILESDIR}"/${PN}-4.5.0_webkit41.patch
)
@@ -41,6 +40,7 @@ src_prepare() {
src_compile() {
local -x USE_CJSON_SO=1
+ local -x USE_LIST_SO=0
use elibc_musl && local -x USE_ARGP_SO=1
emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157
emake
diff --git a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild b/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
index 459b2148429c..d036c301e3b3 100644
--- a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
@@ -28,7 +28,6 @@ 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
"${FILESDIR}"/${PN}-4.5.0_webkit41.patch
)
@@ -41,6 +40,8 @@ src_prepare() {
src_compile() {
local -x USE_CJSON_SO=1
+ local -x USE_LIST_SO=0
+ local -x USE_MUSTACHE_SO=0
use elibc_musl && local -x USE_ARGP_SO=1
emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157
emake
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/
@ 2023-05-19 8:52 Marek Szuba
0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2023-05-19 8:52 UTC (permalink / raw
To: gentoo-commits
commit: 0eed873e4ffe138aa0b13031dda2673007329cf0
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri May 19 08:50:36 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri May 19 08:50:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eed873e
net-misc/oidc-agent: drop 4.5.0-r1
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 ----
net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild | 89 ----------------------
3 files changed, 103 deletions(-)
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index ebb82bb12cd8..f8c5d74b05e4 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,2 +1 @@
-DIST oidc-agent-4.5.0.tar.gz 1823181 BLAKE2B d2023494689ec65837efcd67e325c690ec1b3a03f78dccce853d1c30e312a89d5d43476132830d10aa63ead7b5cfc91b99fcf78fdfa2d46c60e5a62030c77884 SHA512 23520dc5556ed54ad2dcf3a14a5183f04b1f8030aafd342cfb5f4e21683058da475335c7b29ae0727bd20405e42fad825614d1b7c86fca5a81e4bf3cae5f64c1
DIST oidc-agent-4.5.1.tar.gz 1823853 BLAKE2B d73ce4405ead08ddc0433a5c3b660b08037eecbde5f1e0358cad8731d0787e63ffae4b1317ecfe824a951e07a82d600fa4180557d93d0ce5a382e8c8f39289d6 SHA512 9afffbfcb00c610b04f97c59d610799a4ce45b1c40a61e388c6ab8b550381725602e43d219ce475a9d0425c1bc07b49ca982379286e9f48ebae1e19ca4587779
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
deleted file mode 100644
index f8131d23bafa..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.4.0_deps-automagic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/oidc-agent-4.5.0-r1.ebuild b/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild
deleted file mode 100644
index 3b4667ef6d70..000000000000
--- a/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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 ~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.4.0_deps-automagic.patch
- "${FILESDIR}"/${PN}-4.4.0_install-perms.patch
- "${FILESDIR}"/${PN}-4.5.0_webkit41.patch
-)
-
-src_prepare() {
- xdg_environment_reset
- default
- sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
-}
-
-src_compile() {
- local -x USE_CJSON_SO=1
- use elibc_musl && local -x USE_ARGP_SO=1
- emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157
- 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
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2023-05-19 8:52 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-11 10:26 [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/ Marek Szuba
-- strict thread matches above, loose matches on Subject: below --
2023-05-19 8:52 Marek Szuba
2023-03-27 20:18 Marek Szuba
2023-03-27 20:18 Marek Szuba
2023-02-24 16:50 Marek Szuba
2022-07-12 22:20 Marek Szuba
2022-02-03 17:31 Marek Szuba
2021-12-15 13:23 Marek Szuba
2021-11-10 16:49 Marek Szuba
2021-03-11 10:26 Marek Szuba
2020-09-23 12:02 Marek Szuba
2020-06-19 17:15 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox