public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/
@ 2021-03-12 16:14 Marek Szuba
  0 siblings, 0 replies; 11+ messages in thread
From: Marek Szuba @ 2021-03-12 16:14 UTC (permalink / raw
  To: gentoo-commits

commit:     1c409adcce61eab53a3398e9af5bd51c6fb4e953
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 15:57:10 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 16:14:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c409adc

net-misc/oidc-agent-4.0.2: do not autodetect liblist.so

One, no automagic. Two, this picks up the library installed by dev-libs/liblist
- which is NOT the correct one.

Closes: https://bugs.gentoo.org/775494
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../files/oidc-agent-4.0.2_makefile-liblist-automagic.patch   | 11 +++++++++++
 net-misc/oidc-agent/oidc-agent-4.0.2.ebuild                   |  6 ++++++
 2 files changed, 17 insertions(+)

diff --git a/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-liblist-automagic.patch b/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-liblist-automagic.patch
new file mode 100644
index 00000000000..1e8765aef9d
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-liblist-automagic.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -58,7 +58,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
+ 
+ ifeq ($(USE_CJSON_SO),1)
+ 	DEFINE_USE_CJSON_SO = -DUSE_CJSON_SO

diff --git a/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild b/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild
index 1bac67f225c..88d48a54d23 100644
--- a/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild
@@ -25,9 +25,15 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.2_install-perms.patch
+	"${FILESDIR}"/${PN}-4.0.2_makefile-liblist-automagic.patch
 	"${FILESDIR}"/${PN}-4.0.2_makefile-toolchain-vars.patch
 )
 
+src_prepare() {
+	default
+	sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
+}
+
 src_compile() {
 	# As of 4.0.2 parallel building still doesn't work
 	emake -j1


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/
@ 2021-04-27  9:28 Marek Szuba
  0 siblings, 0 replies; 11+ messages in thread
From: Marek Szuba @ 2021-04-27  9:28 UTC (permalink / raw
  To: gentoo-commits

commit:     c21e98131e91cc4eb2bacfbb7778f81ae32ad160
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 09:27:44 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 09:27:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c21e9813

net-misc/oidc-agent: drop 3.3.5-r1

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.5_makefile-toolchain-vars.patch | 48 -----------------
 net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild     | 63 ----------------------
 5 files changed, 179 deletions(-)

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 32122374ea2..f32866fb26c 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,2 +1 @@
-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_desktop-category.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.1_desktop-category.patch
deleted file mode 100644
index 49bfcfdb70b..00000000000
--- a/net-misc/oidc-agent/files/oidc-agent-3.3.1_desktop-category.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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
deleted file mode 100644
index 1992ee0ef31..00000000000
--- a/net-misc/oidc-agent/files/oidc-agent-3.3.1_install-perms.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- 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.5_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.5_makefile-toolchain-vars.patch
deleted file mode 100644
index b9d526a2122..00000000000
--- a/net-misc/oidc-agent/files/oidc-agent-3.3.5_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 -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-r1.ebuild b/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
deleted file mode 100644
index 38fd552ac87..00000000000
--- a/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-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
-
-	# 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
-
-	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] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/
@ 2021-07-02 15:25 Marek Szuba
  0 siblings, 0 replies; 11+ messages in thread
From: Marek Szuba @ 2021-07-02 15:25 UTC (permalink / raw
  To: gentoo-commits

commit:     691dff29ae86bfd68d1a817676c908a2dcba138f
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  2 15:21:16 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Jul  2 15:25:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=691dff29

net-misc/oidc-agent: add 4.1.0

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-misc/oidc-agent/Manifest                       |  1 +
 .../files/oidc-agent-4.1.0_install-perms.patch     | 60 ++++++++++++++++
 .../oidc-agent-4.1.0_makefile-toolchain-vars.patch | 52 ++++++++++++++
 net-misc/oidc-agent/oidc-agent-4.1.0.ebuild        | 82 ++++++++++++++++++++++
 4 files changed, 195 insertions(+)

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index f32866fb26c..b05c1bd8662 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1 +1,2 @@
 DIST oidc-agent-4.0.2.tar.gz 802872 BLAKE2B bbee872f0b029f4289a4805d1a5f8fe2fe2b8c297a918cf7821aec6bf4dbe634882425c888cb0e784778b56754af1c8b5a34d5282f84090cccf6315897ccb461 SHA512 fef440cd4b72055d8175f9f33c735235bb87bfca38b53bc4e049b1644f74f6a683d312297efa04cbacfe55190c5d6b588fa37475e5a55acff540909865389037
+DIST oidc-agent-4.1.0.tar.gz 800972 BLAKE2B b3dd30e886dea9bf1731fc770047904f6f8e1a67b723fba496e69c55c7d5d1e18bbfd3f0f3ba4c1a42fe3d8cfadc79c2bd64183afc2eb9cdd6ee1446b62a2486 SHA512 81e5dbac389da342db788aa65f8c10d97f1179322259de2dc379cee38e2f6ac1317ef48ee4c91cbabe363ae54cc9596ddf260591526c7524c78ba02b5d3961cc

diff --git a/net-misc/oidc-agent/files/oidc-agent-4.1.0_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.1.0_install-perms.patch
new file mode 100644
index 00000000000..e0ee26cfa6f
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.1.0_install-perms.patch
@@ -0,0 +1,60 @@
+--- a/Makefile
++++ b/Makefile
+@@ -426,19 +426,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 $< $@
+ 
+ 
+ ## Lib
+@@ -452,24 +452,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.1.0_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-4.1.0_makefile-toolchain-vars.patch
new file mode 100644
index 00000000000..2f42a21afbd
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.1.0_makefile-toolchain-vars.patch
@@ -0,0 +1,52 @@
+--- a/Makefile
++++ b/Makefile
+@@ -89,9 +89,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)
+@@ -102,11 +102,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
+@@ -117,7 +117,7 @@
+ ifeq ($(USE_LIST_SO),1)
+ 	LFLAGS += $(LLIST)
+ endif
+-AGENT_LFLAGS = $(LCURL) $(LMICROHTTPD) $(LFLAGS)
++AGENT_LFLAGS := $(LDFLAGS) $(LCURL) $(LMICROHTTPD) $(LFLAGS)
+ ifndef MAC_OS
+ 	AGENT_LFLAGS += $(LSECRET) $(LGLIB)
+ endif
+@@ -126,12 +126,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.1.0.ebuild b/net-misc/oidc-agent/oidc-agent-4.1.0.ebuild
new file mode 100644
index 00000000000..e433d2b4535
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-4.1.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+	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.1.0_makefile-toolchain-vars.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
+}
+
+#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] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/
@ 2021-11-10 16:49 Marek Szuba
  0 siblings, 0 replies; 11+ messages in thread
From: Marek Szuba @ 2021-11-10 16:49 UTC (permalink / raw
  To: gentoo-commits

commit:     59ce8a53948b74d4dc0971fd42afe761e74058fa
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 16:47:43 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 16:49:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ce8a53

net-misc/oidc-agent: remove 4.0.2-r1

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-r1.ebuild     | 82 ----------------------
 4 files changed, 186 deletions(-)

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index a8b32fc5511..8cfb6a24c90 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,3 +1,2 @@
-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.0.2_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.0.2_install-perms.patch
deleted file mode 100644
index 6184f42d933..00000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.0.2_install-perms.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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
deleted file mode 100644
index 533af1f2a6d..00000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-toolchain-vars.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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-r1.ebuild b/net-misc/oidc-agent/oidc-agent-4.0.2-r1.ebuild
deleted file mode 100644
index 9e463b22821..00000000000
--- a/net-misc/oidc-agent/oidc-agent-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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:=
-	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-liblist-automagic.patch
-	"${FILESDIR}"/${PN}-4.0.2_makefile-toolchain-vars.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
-}
-
-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] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/
@ 2022-01-15 23:36 Marek Szuba
  0 siblings, 0 replies; 11+ messages in thread
From: Marek Szuba @ 2022-01-15 23:36 UTC (permalink / raw
  To: gentoo-commits

commit:     e3200e0c432b4e32f8e7a04da04f974b9ea8a184
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 15 23:31:49 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Jan 15 23:36:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3200e0c

net-misc/oidc-agent: drop 4.1.1-r1

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-misc/oidc-agent/Manifest                       |  1 -
 .../oidc-agent-4.1.0_makefile-toolchain-vars.patch | 52 ---------------
 net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild     | 77 ----------------------
 3 files changed, 130 deletions(-)

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 599330e2dcd6..ae0127b7b1d4 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,3 +1,2 @@
-DIST oidc-agent-4.1.1.tar.gz 801103 BLAKE2B dcb82a537787ae6ced577843c67acdd4e3fa315d017222067b2914837dfffccae27ddbdeeeaf4e8ca70c7e2744e03df5964d3ba318efd4460c73252bfd3f8e95 SHA512 e383e054623dc3b8fe73ec02df44faa05d4b69aaed47c7925f6f92d25cbc5301173fbc607b6198bc70f99e634e582fbae7c5570812086a8e5694d40ce6d2c2d1
 DIST oidc-agent-4.2.4.tar.gz 823459 BLAKE2B 71c2fd983031641c5ed39ba3f1771bf283ab56eae6bba426da5308a7c9fcf2ce48103220375b9881e255eeddf05d50d58e2dee047b0b4436451c8d39b0cd55e6 SHA512 6f4f79823869197a0b74cd757b72e1d060ed9f1d9be477f815989b723a86285b200bd72b95f07a4698e754b9ad7aae48cee72603e1a6eaab71590cc63c2bae3d
 DIST oidc-agent-4.2.6.tar.gz 824079 BLAKE2B f7cf810254eae00acc1b4c036fe58dda1c62b3db4d7d02a5782269485200a6a4c1d650a6cfac5f6a0e5764a1b2e19d4885eb7744c84724f927aa6d9f18f5bb55 SHA512 6f23cb13c917ce389eea3bb55e802834ff7c1bf1c421264fdcce27eb5a20b11a498d8d76c002eb92bbf3618942803ddb9937f59d19ff1aff6fe9ca07df40d0bb

diff --git a/net-misc/oidc-agent/files/oidc-agent-4.1.0_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-4.1.0_makefile-toolchain-vars.patch
deleted file mode 100644
index 2f42a21afbd6..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.1.0_makefile-toolchain-vars.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -89,9 +89,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)
-@@ -102,11 +102,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
-@@ -117,7 +117,7 @@
- ifeq ($(USE_LIST_SO),1)
- 	LFLAGS += $(LLIST)
- endif
--AGENT_LFLAGS = $(LCURL) $(LMICROHTTPD) $(LFLAGS)
-+AGENT_LFLAGS := $(LDFLAGS) $(LCURL) $(LMICROHTTPD) $(LFLAGS)
- ifndef MAC_OS
- 	AGENT_LFLAGS += $(LSECRET) $(LGLIB)
- endif
-@@ -126,12 +126,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.1.1-r1.ebuild b/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild
deleted file mode 100644
index a4b1287eadfa..000000000000
--- a/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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:=
-	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.1.0_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] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/
@ 2022-02-24 13:51 Marek Szuba
  0 siblings, 0 replies; 11+ messages in thread
From: Marek Szuba @ 2022-02-24 13:51 UTC (permalink / raw
  To: gentoo-commits

commit:     f2a0e2fddefa685fb80d57992e1de093984b250c
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 13:47:03 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 13:47:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2a0e2fd

net-misc/oidc-agent: drop 4.2.4

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-misc/oidc-agent/Manifest                       |  1 -
 .../oidc-agent-4.2.4_makefile-toolchain-vars.patch | 43 ------------
 net-misc/oidc-agent/oidc-agent-4.2.4.ebuild        | 78 ----------------------
 3 files changed, 122 deletions(-)

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index ae0127b7b1d4..19d96f9eb2f8 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,2 +1 @@
-DIST oidc-agent-4.2.4.tar.gz 823459 BLAKE2B 71c2fd983031641c5ed39ba3f1771bf283ab56eae6bba426da5308a7c9fcf2ce48103220375b9881e255eeddf05d50d58e2dee047b0b4436451c8d39b0cd55e6 SHA512 6f4f79823869197a0b74cd757b72e1d060ed9f1d9be477f815989b723a86285b200bd72b95f07a4698e754b9ad7aae48cee72603e1a6eaab71590cc63c2bae3d
 DIST oidc-agent-4.2.6.tar.gz 824079 BLAKE2B f7cf810254eae00acc1b4c036fe58dda1c62b3db4d7d02a5782269485200a6a4c1d650a6cfac5f6a0e5764a1b2e19d4885eb7744c84724f927aa6d9f18f5bb55 SHA512 6f23cb13c917ce389eea3bb55e802834ff7c1bf1c421264fdcce27eb5a20b11a498d8d76c002eb92bbf3618942803ddb9937f59d19ff1aff6fe9ca07df40d0bb

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/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
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/
@ 2022-09-01 23:22 Marek Szuba
  0 siblings, 0 replies; 11+ messages in thread
From: Marek Szuba @ 2022-09-01 23:22 UTC (permalink / raw
  To: gentoo-commits

commit:     658d4bf6d525f5dd47f23ab4e4ebe525612f7206
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 23:18:20 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 23:18:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=658d4bf6

net-misc/oidc-agent: drop 4.2.6

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-misc/oidc-agent/Manifest                       |  1 -
 ...dc-agent-4.0.2_makefile-liblist-automagic.patch | 11 ---
 .../files/oidc-agent-4.1.0_install-perms.patch     | 60 ----------------
 .../files/oidc-agent-4.2.6_sighandler_t.patch      | 11 ---
 net-misc/oidc-agent/oidc-agent-4.2.6.ebuild        | 83 ----------------------
 5 files changed, 166 deletions(-)

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 3b61e20a7a2b..a0f914e226fc 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,2 +1 @@
-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.0.2_makefile-liblist-automagic.patch b/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-liblist-automagic.patch
deleted file mode 100644
index 1e8765aef9d0..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-liblist-automagic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -58,7 +58,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
- 
- ifeq ($(USE_CJSON_SO),1)
- 	DEFINE_USE_CJSON_SO = -DUSE_CJSON_SO

diff --git a/net-misc/oidc-agent/files/oidc-agent-4.1.0_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.1.0_install-perms.patch
deleted file mode 100644
index e0ee26cfa6f2..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.1.0_install-perms.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -426,19 +426,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 $< $@
- 
- 
- ## Lib
-@@ -452,24 +452,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.2.6_sighandler_t.patch b/net-misc/oidc-agent/files/oidc-agent-4.2.6_sighandler_t.patch
deleted file mode 100644
index d450d0ec2c7a..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.2.6_sighandler_t.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 0d3056b5e583..000000000000
--- a/net-misc/oidc-agent/oidc-agent-4.2.6.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~riscv"
-IUSE="test"
-
-DEPEND="app-crypt/libsecret
-	dev-libs/libsodium:=
-	media-gfx/qrencode
-	net-libs/libmicrohttpd:=
-	sys-libs/libseccomp
-	elibc_musl? ( sys-libs/argp-standalone )"
-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.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() {
-	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] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/
@ 2022-10-13  9:31 Marek Szuba
  0 siblings, 0 replies; 11+ messages in thread
From: Marek Szuba @ 2022-10-13  9:31 UTC (permalink / raw
  To: gentoo-commits

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
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/
@ 2023-03-27 21:43 Marek Szuba
  0 siblings, 0 replies; 11+ messages in thread
From: Marek Szuba @ 2023-03-27 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     8ef39602837854caa38368d4ad5e48fafddf346d
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 27 21:41:09 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Mar 27 21:43:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ef39602

net-misc/oidc-agent: restore the deps_automagic patch for 4.5.0

Odd issues observed afterwards. Let's leave this one as it was before
and only make changes in 4.5.1+.

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 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

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/oidc-agent-4.5.0-r1.ebuild b/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild
index ac7f0f17baf5..3b4667ef6d70 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,6 +28,7 @@ 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
 )
@@ -40,7 +41,6 @@ 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


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/
@ 2023-07-29 17:24 Marek Szuba
  0 siblings, 0 replies; 11+ messages in thread
From: Marek Szuba @ 2023-07-29 17:24 UTC (permalink / raw
  To: gentoo-commits

commit:     7d11b13abb866d68a6a43c145cede898a3e50419
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 29 15:00:54 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Jul 29 17:24:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d11b13a

net-misc/oidc-agent: add 4.5.2

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-misc/oidc-agent/Manifest                       |  1 +
 .../files/oidc-agent-4.5.2_install-perms.patch     | 32 +++++++
 net-misc/oidc-agent/oidc-agent-4.5.2.ebuild        | 97 ++++++++++++++++++++++
 3 files changed, 130 insertions(+)

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index f8c5d74b05e4..e6022652a197 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1 +1,2 @@
 DIST oidc-agent-4.5.1.tar.gz 1823853 BLAKE2B d73ce4405ead08ddc0433a5c3b660b08037eecbde5f1e0358cad8731d0787e63ffae4b1317ecfe824a951e07a82d600fa4180557d93d0ce5a382e8c8f39289d6 SHA512 9afffbfcb00c610b04f97c59d610799a4ce45b1c40a61e388c6ab8b550381725602e43d219ce475a9d0425c1bc07b49ca982379286e9f48ebae1e19ca4587779
+DIST oidc-agent-4.5.2.tar.gz 1766905 BLAKE2B 0558778a5162fbbbe29be9a476838d745abf4825e7274487637f368d521e03f6f165ec82129f37f135a6cf3d3d43bb9349574b88763a508bb683cdc8882230d2 SHA512 04c9ddb258c132781eaa875412f0a8d48d2127e5b78ba262eb0240dac05025db62f5d357e4b5c35a9009960b30d63ce96156c8dcf3b5eac4257c02d37578e676

diff --git a/net-misc/oidc-agent/files/oidc-agent-4.5.2_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.5.2_install-perms.patch
new file mode 100644
index 000000000000..b83c934e75d9
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.5.2_install-perms.patch
@@ -0,0 +1,32 @@
+--- a/Makefile
++++ b/Makefile
+@@ -698,16 +698,16 @@
+ 	@ln -sf $(SHARED_LIB_NAME_SO) $@
+ 
+ $(INCLUDE_PATH)/oidc-agent/%.h: $(SRCDIR)/api/%.h $(INCLUDE_PATH)/oidc-agent
+-	@install -p $< $@
++	@install -p -m 644 $< $@
+ 
+ $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent
+-	@install -p $< $@
++	@install -p -m 644 $< $@
+ 
+ $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent
+-	@install -p $< $@
++	@install -p -m 644 $< $@
+ 
+ $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH)
+-	@install -p $< $@
++	@install -p -m 644 $< $@
+ 
+ endif
+ 
+@@ -715,7 +715,7 @@
+ 
+ ## scheme handler
+ $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop
+-	@install -p -D $< $@
++	@install -p -m 644 -D $< $@
+ 	@echo "Exec=x-terminal-emulator -e bash -c \"$(BIN_AFTER_INST_PATH)/bin/$(GEN) --codeExchange=%u; exec bash\"" >> $@
+ 
+ ## Xsession

diff --git a/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild b/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild
new file mode 100644
index 000000000000..d42def7c515c
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line"
+HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
+SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="test"
+
+DEPEND="app-crypt/libsecret
+	dev-libs/cJSON:=
+	dev-libs/libsodium:=
+	media-gfx/qrencode
+	net-libs/libmicrohttpd:=
+	net-libs/webkit-gtk:4.1=
+	net-misc/curl
+	elibc_musl? ( sys-libs/argp-standalone )"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-libs/check )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.5.0_webkit41.patch
+	"${FILESDIR}"/${PN}-4.5.2_install-perms.patch
+)
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
+}
+
+oidc_emake() {
+	local mymakeargs=(
+		USE_CJSON_SO=1
+		USE_LIST_SO=0
+		USE_MUSTACHE_SO=0
+		USE_ARGP_SO=$(usex elibc_musl 1 0)
+	)
+
+	emake "${mymakeargs[@]}" $@
+}
+
+src_compile() {
+	oidc_emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157
+	oidc_emake
+}
+
+src_install() {
+	oidc_emake \
+		PREFIX="${ED}" \
+		BIN_AFTER_INST_PATH="/usr" \
+		INCLUDE_PATH="${ED}"/usr/include \
+		LIB_PATH="${ED}"/usr/$(get_libdir) \
+		install
+
+	# This file is not compatible with Gentoo and in any case, we generally
+	# let the users load such agents themselves.
+	rm -f "${ED}"/etc/X11/Xsession.d/91${PN}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog
+		elog "You should use oidc-gen to initially generate your account configuration"
+		elog "before it can be loaded into oidc-agent using oidc-add. For details, please"
+		elog "consult the man page of oidc-gen, or full documentation at"
+		elog "    https://indigo-dc.gitbooks.io/oidc-agent/"
+		elog
+	else
+		local new_major_ver old_ver
+		new_major_ver=$(ver_cut 1)
+		for old_ver in ${REPLACING_VERSIONS}; do
+			if [[ $(ver_cut 1 ${old_ver}) != ${new_major_ver} ]]; then
+				ewarn
+				ewarn "You are upgrading from a different major version. Please restart any running instances of ${PN}"
+				ewarn "to make sure they are compatible with the updated clients."
+				ewarn
+				break
+			fi
+		done
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/
@ 2023-10-24 23:16 Marek Szuba
  0 siblings, 0 replies; 11+ messages in thread
From: Marek Szuba @ 2023-10-24 23:16 UTC (permalink / raw
  To: gentoo-commits

commit:     f8f0e712d9e454f4b2dc8e10bcee7795cfab6bc5
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 22:02:46 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 23:16:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8f0e712

net-misc/oidc-agent: add 5.0.1, drop 4.5.1

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-misc/oidc-agent/Manifest                       |  2 +-
 .../files/oidc-agent-4.4.0_install-perms.patch     | 59 ----------------------
 .../files/oidc-agent-5.0.1_install-perms.patch     | 11 ++++
 .../files/oidc-agent-5.0.1_webkit41.patch          | 11 ++++
 ...-agent-4.5.1.ebuild => oidc-agent-5.0.1.ebuild} | 17 ++++---
 5 files changed, 33 insertions(+), 67 deletions(-)

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index e6022652a197..a1f1b3d20bb2 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,2 +1,2 @@
-DIST oidc-agent-4.5.1.tar.gz 1823853 BLAKE2B d73ce4405ead08ddc0433a5c3b660b08037eecbde5f1e0358cad8731d0787e63ffae4b1317ecfe824a951e07a82d600fa4180557d93d0ce5a382e8c8f39289d6 SHA512 9afffbfcb00c610b04f97c59d610799a4ce45b1c40a61e388c6ab8b550381725602e43d219ce475a9d0425c1bc07b49ca982379286e9f48ebae1e19ca4587779
 DIST oidc-agent-4.5.2.tar.gz 1766905 BLAKE2B 0558778a5162fbbbe29be9a476838d745abf4825e7274487637f368d521e03f6f165ec82129f37f135a6cf3d3d43bb9349574b88763a508bb683cdc8882230d2 SHA512 04c9ddb258c132781eaa875412f0a8d48d2127e5b78ba262eb0240dac05025db62f5d357e4b5c35a9009960b30d63ce96156c8dcf3b5eac4257c02d37578e676
+DIST oidc-agent-5.0.1.tar.gz 1802435 BLAKE2B 75bc66bb2c6cc89293c7ad155d35b7a7adb73ad7f8a5aadeb029b43a095e2a80f0fc4505737a0c53c60e6f601acbcab990ad4b572b659050fe36e5dd2e7c4092 SHA512 caffa9d7733690917472d2d48ca58092ab722c5f049750de37169dc0a76ccbe374ae3fb5e56b8c578465e84a2f40795eaa26018281b4f851f7a7c94571d2a124

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
deleted file mode 100644
index aee7184dd4a0..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.4.0_install-perms.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- 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/files/oidc-agent-5.0.1_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-5.0.1_install-perms.patch
new file mode 100644
index 000000000000..6b19950e420e
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-5.0.1_install-perms.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -739,7 +739,7 @@
+ 	@install -p -m 644 $< $@
+ 
+ $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH)
+-	@install -p $< $@
++	@install -p -m 644 $< $@
+ 
+ endif
+ 

diff --git a/net-misc/oidc-agent/files/oidc-agent-5.0.1_webkit41.patch b/net-misc/oidc-agent/files/oidc-agent-5.0.1_webkit41.patch
new file mode 100644
index 000000000000..d950fc879fb8
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-5.0.1_webkit41.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -185,7 +185,7 @@
+ CPPFLAGS += -fPIC
+ ifndef MAC_OS
+ ifndef ANY_MSYS
+-WEBKITGTK ?= webkit2gtk-4.0
++WEBKITGTK ?= webkit2gtk-4.1
+ CPPFLAGS += $(shell pkg-config --cflags --libs gtk+-3.0 $(WEBKITGTK)) -lstdc++
+ endif
+ endif

diff --git a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild b/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild
similarity index 78%
rename from net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
rename to net-misc/oidc-agent/oidc-agent-5.0.1.ebuild
index 22da2bbb4431..9852ffb3f2b7 100644
--- a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret
@@ -28,8 +28,8 @@ BDEPEND="test? ( dev-libs/check )"
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.0_install-perms.patch
-	"${FILESDIR}"/${PN}-4.5.0_webkit41.patch
+	"${FILESDIR}"/${PN}-5.0.1_install-perms.patch
+	"${FILESDIR}"/${PN}-5.0.1_webkit41.patch
 )
 
 src_prepare() {
@@ -78,12 +78,15 @@ pkg_postinst() {
 		elog "    https://indigo-dc.gitbooks.io/oidc-agent/"
 		elog
 	else
-		local new_major_ver old_ver
-		new_major_ver=$(ver_cut 1)
+		local old_ver
 		for old_ver in ${REPLACING_VERSIONS}; do
-			if [[ $(ver_cut 1 ${old_ver}) != ${new_major_ver} ]]; then
+			if [[ $(ver_cut 1 ${old_ver}) != 5 ]]; then
+				ewarn "${PN} 5 is a major release with quite some usability improvements but unfortunately also some breaking changes."
+				ewarn "Please consult"
+				ewarn "    https://indigo-dc.gitbook.io/oidc-agent/oidc-agent5"
+				ewarn "for instructions on how to upgrade your configuration to this version"
 				ewarn
-				ewarn "You are upgrading from a different major version. Please restart any running instances of ${PN}"
+				ewarn "Furthermore, please restart any running instances of ${PN}"
 				ewarn "to make sure they are compatible with the updated clients."
 				ewarn
 				break


^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-10-24 23:16 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-29 17:24 [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/ Marek Szuba
  -- strict thread matches above, loose matches on Subject: below --
2023-10-24 23:16 Marek Szuba
2023-03-27 21:43 Marek Szuba
2022-10-13  9:31 Marek Szuba
2022-09-01 23:22 Marek Szuba
2022-02-24 13:51 Marek Szuba
2022-01-15 23:36 Marek Szuba
2021-11-10 16:49 Marek Szuba
2021-07-02 15:25 Marek Szuba
2021-04-27  9:28 Marek Szuba
2021-03-12 16:14 Marek Szuba

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox