subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: net\-misc\/oidc\-agent\/"

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2024-04-08 Thread Marek Szuba

commit: 968c960aa36b23813987a64de48b760322a47cac
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Apr  8 13:13:34 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Apr  8 13:15:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=968c960a

net-misc/oidc-agent: add 5.1.0

Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/Manifest|   1 +
 net-misc/oidc-agent/oidc-agent-5.1.0.ebuild | 102 
 2 files changed, 103 insertions(+)

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index a1f1b3d20bb2..969d1714e0e4 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,2 +1,3 @@
 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
+DIST oidc-agent-5.1.0.tar.gz 1803314 BLAKE2B 
8ce1de7ec6dffa3155200664a93433db4f4a116325d8ce60885d534b3d2367e40577b6b22987e817d92f0020fea97e2224947b27ba10847bb0c347dcdf3a
 SHA512 
f3ecda4445478ea02e833b0b9ed75a517c1ff91f5b0c2cb258cc3a7eacb62cb75b56697e15fa755d9cf45e7a0293c8bd2f6ab8d998dd8680726c4143b1e011bc

diff --git a/net-misc/oidc-agent/oidc-agent-5.1.0.ebuild 
b/net-misc/oidc-agent/oidc-agent-5.1.0.ebuild
new file mode 100644
index ..6517defe32b2
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-5.1.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tmpfiles 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}-5.0.1_install-perms.patch
+   "${FILESDIR}"/${PN}-5.0.1_webkit41.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() {
+   tmpfiles_process ${PN}.conf
+
+   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 old_ver
+   for old_ver in ${REPLACING_VERSIONS}; do
+   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 "Furthermore,

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2023-12-26 Thread Sam James

commit: 058e77be3720539048ff38dd21fb4a8dbb623736
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 26 19:07:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 26 19:07:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=058e77be

net-misc/oidc-agent: Stabilize 5.0.1 amd64, #920732

Signed-off-by: Sam James  gentoo.org>

 net-misc/oidc-agent/oidc-agent-5.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild 
b/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild
index 9a69211000e7..1df884f36c47 100644
--- a/net-misc/oidc-agent/oidc-agent-5.0.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

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2023-10-24 Thread Marek Szuba

commit: c30d477a9e8c57ebeda57aa1caa11548e1a4219b
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Oct 24 23:21:25 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Oct 24 23:21:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c30d477a

net-misc/oidc-agent: call tmpfiles_process in pkg_postinst()

Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/oidc-agent-5.0.1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild 
b/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild
index 9852ffb3f2b7..9a69211000e7 100644
--- a/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit xdg-utils
+inherit tmpfiles xdg-utils
 
 DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command 
line"
 HOMEPAGE="https://github.com/indigo-dc/oidc-agent;
@@ -68,6 +68,8 @@ src_install() {
 }
 
 pkg_postinst() {
+   tmpfiles_process ${PN}.conf
+
xdg_desktop_database_update
 
if [[ -z "${REPLACING_VERSIONS}" ]]; then

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2023-10-24 Thread Marek Szuba

commit: c8020feb8866994f37756a171634cb462faa6a18
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Oct 24 21:42:57 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Oct 24 23:16:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8020feb

net-misc/oidc-agent: stabilize 4.5.2 for amd64

Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/oidc-agent-4.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild 
b/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild
index d42def7c515c..10d657339258 100644
--- a/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.5.2.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

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/

2023-10-24 Thread Marek Szuba

commit: f8f0e712d9e454f4b2dc8e10bcee7795cfab6bc5
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Oct 24 22:02:46 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Oct 24 23:16:36 2023 +
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  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..
--- 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 ..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 ..d950fc879fb8
--- /dev/null
+++

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/

2023-07-29 Thread Marek Szuba

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

net-misc/oidc-agent: add 4.5.2

Signed-off-by: Marek Szuba  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 ..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 ..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
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2023-05-29 Thread Sam James

commit: 5a41cf481da5c00816cd4eaf34a8b932bd6d4fee
Author: Sam James  gentoo  org>
AuthorDate: Mon May 29 23:49:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 29 23:49:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a41cf48

net-misc/oidc-agent: Keyword 4.5.1 arm64, #907156

Signed-off-by: Sam James  gentoo.org>

 net-misc/oidc-agent/oidc-agent-4.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a117b42a7ccd..22da2bbb4431 100644
--- a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.5.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 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/

2023-05-19 Thread Marek Szuba

commit: 0eed873e4ffe138aa0b13031dda2673007329cf0
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri May 19 08:50:36 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri May 19 08:50:36 2023 +
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  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..
--- 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..
--- 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
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2023-05-19 Thread Marek Szuba

commit: 73d217176d4a6e10e5949f299f3a93f1956f83dc
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri May 19 08:50:07 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri May 19 08:50:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73d21717

net-misc/oidc-agent: stabilize 4.5.1 for amd64

Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/oidc-agent-4.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 34e8613dbf7d..a117b42a7ccd 100644
--- a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.5.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 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2023-03-27 Thread Marek Szuba

commit: 2ffe2a899b506a6cfccee2fe7abf3174be3ccac8
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Mar 27 21:52:44 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Mar 27 21:52:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ffe2a89

net-misc/oidc-agent: 4.5.1: pass USE_SO vars to all emake calls

Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/oidc-agent-4.5.1.ebuild | 21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

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 d036c301e3b3..34e8613dbf7d 100644
--- a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
@@ -38,17 +38,24 @@ src_prepare() {
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() {
-   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
+   oidc_emake -j1 create_obj_dir_structure create_picobj_dir_structure # 
Bug #880157
+   oidc_emake
 }
 
 src_install() {
-   emake \
+   oidc_emake \
PREFIX="${ED}" \
BIN_AFTER_INST_PATH="/usr" \
INCLUDE_PATH="${ED}"/usr/include \

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/

2023-03-27 Thread Marek Szuba

commit: 8ef39602837854caa38368d4ad5e48fafddf346d
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Mar 27 21:41:09 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Mar 27 21:43:18 2023 +
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  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 ..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

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2023-03-27 Thread Marek Szuba

commit: 84619a5ced76fcceaae7f7505ab598105bbc431b
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Mar 27 20:17:31 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Mar 27 20:18:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84619a5c

net-misc/oidc-agent: stabilize 4.5.0-r1 for amd64

Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 1899a1d911d2..ac7f0f17baf5 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
@@ -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 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/

2023-03-27 Thread Marek Szuba

commit: 1e830287646cb2f0ccdd68b98717402fdde94978
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Mar 27 20:17:45 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Mar 27 20:18:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e830287

net-misc/oidc-agent: drop 4.3.1

Signed-off-by: Marek Szuba  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..
--- 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..
--- 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

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/

2023-03-27 Thread Marek Szuba

commit: e77818288c6c60aced72576c702e7b72f0362965
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Mar 27 20:08:51 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Mar 27 20:18:30 2023 +
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  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..
--- 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

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2023-03-22 Thread Marek Szuba

commit: bf637c6f3255cf9c06cf4761ea8c670fa4e3bc99
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Mar 22 23:42:54 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Mar 22 23:43:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf637c6f

net-misc/oidc-agent: add 4.5.1

Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/Manifest|  1 +
 net-misc/oidc-agent/oidc-agent-4.5.1.ebuild | 89 +
 2 files changed, 90 insertions(+)

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index dd20a86c9c6c..cbb3cef98433 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,2 +1,3 @@
 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/oidc-agent-4.5.1.ebuild 
b/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
new file mode 100644
index ..459b2148429c
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-4.5.1.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
+}

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2023-03-22 Thread Marek Szuba

commit: 8291fc6970be147d1c04a9b3fae4c099525c9c0a
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Mar 22 22:39:25 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Mar 22 23:43:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8291fc69

net-misc/oidc-agent: drop 4.4.0, 4.5.0

Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/Manifest|  1 -
 net-misc/oidc-agent/oidc-agent-4.4.0.ebuild | 87 
 net-misc/oidc-agent/oidc-agent-4.5.0.ebuild | 88 -
 3 files changed, 176 deletions(-)

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 5a8c69bdc393..dd20a86c9c6c 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.4.0.tar.gz 1823801 BLAKE2B 
dd9dcecf825a3e0d52e74dff658bf23beea2327b3ec575257cab6636b56686a15a5d235bad5ee57a41f192292e3b8462918f6223c40a1687f648da55a443eac5
 SHA512 
668cb117a3bd11245967d6956d118d0821f5112d8841b3ccd71d3e911ad7b2ebc3ec749977fab8d35ddd1efecd447e8fa98395598b7f9dea79d02dfeb7563af7
 DIST oidc-agent-4.5.0.tar.gz 1823181 BLAKE2B 
d2023494689ec65837efcd67e325c690ec1b3a03f78dccce853d1c30e312a89d5d43476132830d10aa63ead7b5cfc91b99fcf78fdfa2d46c60e5a62030c77884
 SHA512 
23520dc5556ed54ad2dcf3a14a5183f04b1f8030aafd342cfb5f4e21683058da475335c7b29ae0727bd20405e42fad825614d1b7c86fca5a81e4bf3cae5f64c1

diff --git a/net-misc/oidc-agent/oidc-agent-4.4.0.ebuild 
b/net-misc/oidc-agent/oidc-agent-4.4.0.ebuild
deleted file mode 100644
index 8eb976217b2f..
--- a/net-misc/oidc-agent/oidc-agent-4.4.0.ebuild
+++ /dev/null
@@ -1,87 +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/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 -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
-}

diff --git a/net-misc/oidc-agent/oidc-agent-4.5.0.ebuild 
b/net-misc/oidc-agent/oidc-agent-4.5.0.ebuild
deleted file mode

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/

2023-02-24 Thread Marek Szuba

commit: a344d85fb00bc0a7faa8145463e124b802a4e648
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Feb 24 16:39:48 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Feb 24 16:50:01 2023 +
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  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 ..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 ..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
+}

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2023-01-25 Thread Marek Szuba

commit: c01c103f93a2d94f99921fcedd582f91db7b7799
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Jan 25 21:38:22 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jan 25 21:39:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c01c103f

net-misc/oidc-agent: add 4.5.0

Closes: https://bugs.gentoo.org/891991
Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/Manifest|  1 +
 net-misc/oidc-agent/oidc-agent-4.5.0.ebuild | 88 +
 2 files changed, 89 insertions(+)

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 040d3306abb1..5a8c69bdc393 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,2 +1,3 @@
 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
+DIST oidc-agent-4.5.0.tar.gz 1823181 BLAKE2B 
d2023494689ec65837efcd67e325c690ec1b3a03f78dccce853d1c30e312a89d5d43476132830d10aa63ead7b5cfc91b99fcf78fdfa2d46c60e5a62030c77884
 SHA512 
23520dc5556ed54ad2dcf3a14a5183f04b1f8030aafd342cfb5f4e21683058da475335c7b29ae0727bd20405e42fad825614d1b7c86fca5a81e4bf3cae5f64c1

diff --git a/net-misc/oidc-agent/oidc-agent-4.5.0.ebuild 
b/net-misc/oidc-agent/oidc-agent-4.5.0.ebuild
new file mode 100644
index ..31b20e8c7e2c
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-4.5.0.ebuild
@@ -0,0 +1,88 @@
+# 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=
+   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
+)
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2022-11-10 Thread Marek Szuba

commit: c19055e5e1153dd1dc92c9774ae5a0e264a4ff88
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Nov 10 22:46:49 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Nov 10 22:46:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c19055e5

net-misc/oidc-agent: explicitly create object dirs before compiling

Closes: https://bugs.gentoo.org/880157
Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/oidc-agent-4.4.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-misc/oidc-agent/oidc-agent-4.4.0.ebuild 
b/net-misc/oidc-agent/oidc-agent-4.4.0.ebuild
index 8ea806798a9c..8eb976217b2f 100644
--- a/net-misc/oidc-agent/oidc-agent-4.4.0.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.4.0.ebuild
@@ -40,6 +40,7 @@ src_prepare() {
 
 src_compile() {
use elibc_musl && local -x USE_ARGP_SO=1
+   emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug 
#880157
emake
 }

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/

2022-10-13 Thread Marek Szuba

commit: 35b28325282b9c6e7aba68507950d067b632dd92
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Oct 13 09:04:26 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Oct 13 09:31:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b28325

net-misc/oidc-agent: add 4.4.0

Signed-off-by: Marek Szuba  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 ..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 ..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 ..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

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/

2022-09-01 Thread Marek Szuba

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

net-misc/oidc-agent: drop 4.2.6

Signed-off-by: Marek Szuba  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..
--- 
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..
--- 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..
---

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2022-09-01 Thread Sam James

commit: 1264e284fb8ee772834e6b96dc6cfbe64597d3cd
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep  1 19:11:33 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep  1 19:11:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1264e284

net-misc/oidc-agent: Stabilize 4.3.1 amd64, #867874

Signed-off-by: Sam James  gentoo.org>

 net-misc/oidc-agent/oidc-agent-4.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/oidc-agent/oidc-agent-4.3.1.ebuild 
b/net-misc/oidc-agent/oidc-agent-4.3.1.ebuild
index 017cd56ec18a..ae2c0102654a 100644
--- a/net-misc/oidc-agent/oidc-agent-4.3.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.3.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 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/

2022-07-12 Thread Marek Szuba

commit: fa952569e950f51a73409409dfafc2a2abd1a6ad
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Jul 12 21:34:59 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Jul 12 22:20:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa952569

net-misc/oidc-agent: add 4.3.1

Signed-off-by: Marek Szuba  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 ..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 ..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 ..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

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/

2022-02-24 Thread Marek Szuba

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

net-misc/oidc-agent: drop 4.2.4

Signed-off-by: Marek Szuba  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..
--- 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..
--- 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

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2022-02-24 Thread Jakov Smolić

commit: 9fabf23a014f22fa2fc672dc59aff0fd7f5ee114
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Feb 24 09:36:41 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Feb 24 09:36:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fabf23a

net-misc/oidc-agent: Stabilize 4.2.6 amd64, #833976

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/oidc-agent/oidc-agent-4.2.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 de01a2e4dbb2..0d3056b5e583 100644
--- a/net-misc/oidc-agent/oidc-agent-4.2.6.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.2.6.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 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/

2022-02-03 Thread Marek Szuba

commit: bcc6a6173c0312eb7288092942412c4fd2f63740
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Feb  3 17:29:59 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Feb  3 17:30:57 2022 +
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  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 ..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() {

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/

2022-01-15 Thread Marek Szuba

commit: e3200e0c432b4e32f8e7a04da04f974b9ea8a184
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Jan 15 23:31:49 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Jan 15 23:36:35 2022 +
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  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..
--- 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..
--- 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 \
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2022-01-15 Thread Agostino Sarubbo

commit: 550ce8a76ab7d93b61c934003a8c4d9aca5b8720
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Jan 15 08:35:35 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Jan 15 08:35:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=550ce8a7

net-misc/oidc-agent: amd64 stable wrt bug #831213

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/oidc-agent/oidc-agent-4.2.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild 
b/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild
index ff691320302b..a24c2290d64e 100644
--- a/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2022-01-14 Thread Marek Szuba

commit: 91b88e091facf9a0816f9bc226aaa8eda569
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Jan 14 11:39:26 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Jan 14 15:35:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91b88e09

net-misc/oidc-agent: add 4.2.6, remove 4.2.5

Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/Manifest| 2 +-
 .../oidc-agent/{oidc-agent-4.2.5.ebuild => oidc-agent-4.2.6.ebuild} | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index ea2e0728a55b..599330e2dcd6 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,3 +1,3 @@
 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.5.tar.gz 823881 BLAKE2B 
533917fdb739ef529c1ca4e06b30a64361710c958b2b6e7a23a6d9c1f1195263ec98f1211cda5dbe9d77f6df7ca0509d29c4e0d595825a908d605ea5ececa8be
 SHA512 
983e59dc3b97b1800733c98fc7ba5e33405a84cb66be7006932c88cb3ccdbfbc9f12d274c1f61294b0fb7ec93fecd2165196f7cc9e056bda0c23a974479f6aa2
+DIST oidc-agent-4.2.6.tar.gz 824079 BLAKE2B 
f7cf810254eae00acc1b4c036fe58dda1c62b3db4d7d02a5782269485200a6a4c1d650a6cfac5f6a0e5764a1b2e19d4885eb7744c84724f927aa6d9f18f5bb55
 SHA512 
6f23cb13c917ce389eea3bb55e802834ff7c1bf1c421264fdcce27eb5a20b11a498d8d76c002eb92bbf3618942803ddb9937f59d19ff1aff6fe9ca07df40d0bb

diff --git a/net-misc/oidc-agent/oidc-agent-4.2.5.ebuild 
b/net-misc/oidc-agent/oidc-agent-4.2.6.ebuild
similarity index 97%
rename from net-misc/oidc-agent/oidc-agent-4.2.5.ebuild
rename to net-misc/oidc-agent/oidc-agent-4.2.6.ebuild
index eb58ba92f64c..fc0c23c79b2e 100644
--- a/net-misc/oidc-agent/oidc-agent-4.2.5.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.2.6.ebuild
@@ -27,7 +27,6 @@ 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() {

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2022-01-03 Thread Marek Szuba

commit: 81ee61d1f858dceeae35044cf560255ad51270b6
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Jan  3 23:03:01 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Jan  3 23:14:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81ee61d1

net-misc/oidc-agent: add 4.2.5

Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/Manifest|  1 +
 net-misc/oidc-agent/oidc-agent-4.2.5.ebuild | 78 +
 2 files changed, 79 insertions(+)

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 897a3e39eefd..ea2e0728a55b 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,2 +1,3 @@
 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.5.tar.gz 823881 BLAKE2B 
533917fdb739ef529c1ca4e06b30a64361710c958b2b6e7a23a6d9c1f1195263ec98f1211cda5dbe9d77f6df7ca0509d29c4e0d595825a908d605ea5ececa8be
 SHA512 
983e59dc3b97b1800733c98fc7ba5e33405a84cb66be7006932c88cb3ccdbfbc9f12d274c1f61294b0fb7ec93fecd2165196f7cc9e056bda0c23a974479f6aa2

diff --git a/net-misc/oidc-agent/oidc-agent-4.2.5.ebuild 
b/net-misc/oidc-agent/oidc-agent-4.2.5.ebuild
new file mode 100644
index ..eb58ba92f64c
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-4.2.5.ebuild
@@ -0,0 +1,78 @@
+# 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
+}

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/

2021-12-15 Thread Marek Szuba

commit: a7d74a19f06f366cf668857188f50790fb03ac74
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Dec 15 12:59:54 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Dec 15 13:23:02 2021 +
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  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() {

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/

2021-11-10 Thread Marek Szuba

commit: 59ce8a53948b74d4dc0971fd42afe761e74058fa
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Nov 10 16:47:43 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Nov 10 16:49:16 2021 +
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  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..000
--- 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..000
--- 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)
-@@

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2021-11-10 Thread Marek Szuba

commit: 975a26468018e060027b927fd07cd020828429ae
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Nov 10 16:48:51 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Nov 10 16:49:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=975a2646

net-misc/oidc-agent-4.1.1-r1: remove outdated comment

Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild | 5 -
 1 file changed, 5 deletions(-)

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
index efb002fd48f..a4b1287eadf 100644
--- a/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild
@@ -34,11 +34,6 @@ src_prepare() {
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}" \

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/

2021-11-10 Thread Marek Szuba

commit: 0fe174ba9bf8ab790501dd496eef63a787d39796
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Nov 10 16:45:25 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Nov 10 16:49:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fe174ba

net-misc/oidc-agent: add 4.2.2

Signed-off-by: Marek Szuba  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 000..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 000..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}
+}
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2021-09-20 Thread Marek Szuba

commit: fe3d90f3956fe5cd90ff0702471e6b9006a9d1e7
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Sep 20 09:22:17 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Sep 20 09:22:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe3d90f3

net-misc/oidc-agent: stabilize 4.1.1-r1 for amd64

Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index eb94432fdc1..efb002fd48f 100644
--- a/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.1.1-r1.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 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2021-08-18 Thread Sam James

commit: c3b5d338aa00a11b3c9174531e96e87c1825b235
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 18 14:56:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 18 14:56:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3b5d338

net-misc/oidc-agent: add missing subslot deps (mainly libsodium)

Signed-off-by: Sam James  gentoo.org>

 .../{oidc-agent-4.0.2.ebuild => oidc-agent-4.0.2-r1.ebuild}   | 4 ++--
 .../{oidc-agent-4.1.1.ebuild => oidc-agent-4.1.1-r1.ebuild}   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild 
b/net-misc/oidc-agent/oidc-agent-4.0.2-r1.ebuild
similarity index 97%
rename from net-misc/oidc-agent/oidc-agent-4.0.2.ebuild
rename to net-misc/oidc-agent/oidc-agent-4.0.2-r1.ebuild
index 4e919397b10..9e463b22821 100644
--- a/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.0.2-r1.ebuild
@@ -15,8 +15,8 @@ KEYWORDS="amd64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret
-   dev-libs/libsodium
-   net-libs/libmicrohttpd
+   dev-libs/libsodium:=
+   net-libs/libmicrohttpd:=
sys-libs/libseccomp"
 RDEPEND="${DEPEND}"
 BDEPEND="test? ( dev-libs/check )"

diff --git a/net-misc/oidc-agent/oidc-agent-4.1.1.ebuild 
b/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild
similarity index 97%
rename from net-misc/oidc-agent/oidc-agent-4.1.1.ebuild
rename to net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild
index e433d2b4535..eb94432fdc1 100644
--- a/net-misc/oidc-agent/oidc-agent-4.1.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret
-   dev-libs/libsodium
-   net-libs/libmicrohttpd
+   dev-libs/libsodium:=
+   net-libs/libmicrohttpd:=
sys-libs/libseccomp"
 RDEPEND="${DEPEND}"
 BDEPEND="test? ( dev-libs/check )"

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2021-08-03 Thread Marek Szuba

commit: b07986201b317977b6e6f4ee5e1ca38f418a4e2b
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Aug  3 13:23:51 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Aug  3 15:42:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0798620

net-misc/oidc-agent: add 4.1.1, drop 4.1.0

Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/Manifest| 2 +-
 .../oidc-agent/{oidc-agent-4.1.0.ebuild => oidc-agent-4.1.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index b05c1bd8662..fcd02ee8f70 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,2 +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
+DIST oidc-agent-4.1.1.tar.gz 801103 BLAKE2B 
dcb82a537787ae6ced577843c67acdd4e3fa315d017222067b2914837dfffccae27ddbdeeeaf4e8ca70c7e2744e03df5964d3ba318efd4460c73252bfd3f8e95
 SHA512 
e383e054623dc3b8fe73ec02df44faa05d4b69aaed47c7925f6f92d25cbc5301173fbc607b6198bc70f99e634e582fbae7c5570812086a8e5694d40ce6d2c2d1

diff --git a/net-misc/oidc-agent/oidc-agent-4.1.0.ebuild 
b/net-misc/oidc-agent/oidc-agent-4.1.1.ebuild
similarity index 100%
rename from net-misc/oidc-agent/oidc-agent-4.1.0.ebuild
rename to net-misc/oidc-agent/oidc-agent-4.1.1.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/

2021-07-02 Thread Marek Szuba

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

net-misc/oidc-agent: add 4.1.0

Signed-off-by: Marek Szuba  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 000..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 000..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
+@@

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2021-06-27 Thread Marek Szuba

commit: 53b08229af38ca401940c5531f897600fd6abf5e
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Jun 27 17:05:23 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Jun 27 17:24:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53b08229

net-misc/oidc-agent: keyword 4.0.2 for ~riscv

Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/oidc-agent-4.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 31efe94451d..4e919397b10 100644
--- a/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.0.2.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"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/

2021-04-27 Thread Marek Szuba

commit: c21e98131e91cc4eb2bacfbb7778f81ae32ad160
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Apr 27 09:27:44 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Apr 27 09:27:44 2021 +
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  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..000
--- 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..000
--- 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..000
--- 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)
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2021-04-21 Thread Sam James

commit: 92f04b9dd72904865c0450fbec68a5607004110c
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 21 18:53:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 21 18:53:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f04b9d

net-misc/oidc-agent: Stabilize 4.0.2 amd64, #784353

Signed-off-by: Sam James  gentoo.org>

 net-misc/oidc-agent/oidc-agent-4.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 09f73ed0802..31efe94451d 100644
--- a/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.0.2.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"
+KEYWORDS="amd64"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/

2021-03-12 Thread Marek Szuba

commit: 1c409adcce61eab53a3398e9af5bd51c6fb4e953
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Mar 12 15:57:10 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Mar 12 16:14:21 2021 +
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  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 000..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

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/

2021-03-11 Thread Marek Szuba

commit: 65e866d383e6c664838b0acf0bb185d5f9f5f94d
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Mar 11 10:17:44 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Mar 11 10:26:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65e866d3

net-misc/oidc-agent: remove old

Signed-off-by: Marek Szuba  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..000
--- 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..000
--- 
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

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/

2021-03-11 Thread Marek Szuba

commit: 602b39eb0b0b5914bfbf2eaef294a3526aeac86c
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Mar 11 10:14:43 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Mar 11 10:26:06 2021 +
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  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 000..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 000..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

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2020-10-07 Thread Marek Szuba

commit: 01abbfeb8a950daa7d2578a2e704d92a5cf6b236
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Oct  7 16:29:14 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Oct  7 16:54:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01abbfeb

net-misc/oidc-agent: fix description

Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/oidc-agent-3.3.1.ebuild| 2 +-
 net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild 
b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
index ca748e52e6d..2ca56ed3f68 100644
--- a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic xdg-utils
 
-DESCRIPTION="oidc-agent for managing OpenID Connect tokens on the command line"
+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"
 

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
index 5d92fd75b2c..1a5486a56b5 100644
--- a/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic xdg-utils
 
-DESCRIPTION="oidc-agent for managing OpenID Connect tokens on the command line"
+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"

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2020-09-25 Thread Marek Szuba

commit: e506b412bc9046644e806af5df402ea808a2014f
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Sep 25 13:18:48 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Sep 25 14:25:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e506b412

net-misc/oidc-agent: do not install incompatible Xsession.d file

Signed-off-by: Marek Szuba  gentoo.org>

 .../{oidc-agent-3.3.5.ebuild => oidc-agent-3.3.5-r1.ebuild}   | 4 
 1 file changed, 4 insertions(+)

diff --git a/net-misc/oidc-agent/oidc-agent-3.3.5.ebuild 
b/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
similarity index 89%
rename from net-misc/oidc-agent/oidc-agent-3.3.5.ebuild
rename to net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
index 8c424ae08fe..5d92fd75b2c 100644
--- a/net-misc/oidc-agent/oidc-agent-3.3.5.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
@@ -41,6 +41,10 @@ src_install() {
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() {

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/

2020-09-23 Thread Marek Szuba

commit: 49ec02e2a9c5581af83dfd9544cbc24ceeec4b67
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Sep 23 11:54:10 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Sep 23 12:02:28 2020 +
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  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 000..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 000..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() {
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/

2020-09-07 Thread Marek Szuba

commit: 5f717280766c3995fa3b232a084c48c5a7c088ae
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Sep  7 16:42:15 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Sep  7 16:49:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f717280

net-misc/oidc-agent: respect CC while linking the shared library

Signed-off-by: Marek Szuba  gentoo.org>

 .../oidc-agent/files/oidc-agent-3.3.1_makefile-toolchain-vars.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 1441cdc1319..dda1ab25221 100644
--- 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
@@ -42,7 +42,7 @@
@gcc -dynamiclib -fpic -Wl, -o $@ $(PIC_OBJECTS) -lc
  else
 -  @gcc -shared -fpic -Wl,-soname,$(SONAME) -o $@ $(PIC_OBJECTS) -lc
-+  @gcc -shared -fpic -Wl,-soname,$(SONAME) $(LDFLAGS) -o $@ 
$(PIC_OBJECTS) -lc
++  @$(LINKER) -shared -fpic -Wl,-soname,$(SONAME) $(LDFLAGS) -o $@ 
$(PIC_OBJECTS) -lc
  endif
  
  .PHONY: shared_lib

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/

2020-09-07 Thread Marek Szuba

commit: 141f1b5254fdbb263ba1d3a5697da791f359ffc7
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Sep  7 14:30:53 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Sep  7 14:36:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=141f1b52

net-misc/oidc-agent: fix LDFLAGS propagation

Upstream uses three different sets of linker flags: one for
liboidc-agent.so (declared inline), one for oidc-token (CLIENT_LFLAGS)
and one for everything else (LFLAGS). The previous version of the
toolchain patch only injected LDFLAGS into the latter, hence QA warnings
for the former two.

Closes: https://bugs.gentoo.org/740778
Signed-off-by: Marek Szuba  gentoo.org>

 .../oidc-agent-3.3.1_makefile-toolchain-vars.patch | 18 ++
 1 file changed, 18 insertions(+)

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
index 0cdf44fba8c..1441cdc1319 100644
--- 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
@@ -28,3 +28,21 @@
  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
++  @gcc -shared -fpic -Wl,-soname,$(SONAME) $(LDFLAGS) -o $@ 
$(PIC_OBJECTS) -lc
+ endif
+ 
+ .PHONY: shared_lib

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2020-06-22 Thread Marek Szuba

commit: 70277577e9337aad4abfbdf7c92df8597494a37a
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Jun 22 11:36:34 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Jun 22 11:36:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70277577

net-misc/oidc-agent: depend on sys-libs/libseccomp

Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/oidc-agent-3.3.1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild 
b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
index df7deda15a9..ca748e52e6d 100644
--- a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
@@ -16,7 +16,8 @@ IUSE="test"
 
 DEPEND="app-crypt/libsecret
dev-libs/libsodium
-   net-libs/libmicrohttpd"
+   net-libs/libmicrohttpd
+   sys-libs/libseccomp"
 RDEPEND="${DEPEND}"
 BDEPEND="test? ( dev-libs/check )"

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/

2020-06-22 Thread Marek Szuba

commit: 5336c3be1d3729dc6c9d6e306a1415a3995d844e
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Jun 22 11:19:45 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Jun 22 11:31:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5336c3be

net-misc/oidc-agent: append -fcommon to compiler flags

Closes: https://bugs.gentoo.org/728840
Signed-off-by: Marek Szuba  gentoo.org>

 net-misc/oidc-agent/oidc-agent-3.3.1.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild 
b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
index 12161b8e904..df7deda15a9 100644
--- a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit xdg-utils
+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;
@@ -30,6 +30,9 @@ PATCHES=(
 )
 
 src_compile() {
+   # Bug #728840
+   append-flags -fcommon
+
# Parallel building doesn't work
emake -j1
 }

[gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/

2020-06-19 Thread Marek Szuba

commit: f1f6e093d99e20c69802ce6c6e3c64d13f0ecaca
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Jun 19 17:12:40 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Jun 19 17:14:59 2020 +
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  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 000..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 000..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 000..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 000..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

52 matches

Mail list logo