| 1 |
commit: 691dff29ae86bfd68d1a817676c908a2dcba138f |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 2 15:21:16 2021 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 2 15:25:25 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=691dff29 |
| 7 |
|
| 8 |
net-misc/oidc-agent: add 4.1.0 |
| 9 |
|
| 10 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 11 |
|
| 12 |
net-misc/oidc-agent/Manifest | 1 + |
| 13 |
.../files/oidc-agent-4.1.0_install-perms.patch | 60 ++++++++++++++++ |
| 14 |
.../oidc-agent-4.1.0_makefile-toolchain-vars.patch | 52 ++++++++++++++ |
| 15 |
net-misc/oidc-agent/oidc-agent-4.1.0.ebuild | 82 ++++++++++++++++++++++ |
| 16 |
4 files changed, 195 insertions(+) |
| 17 |
|
| 18 |
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest |
| 19 |
index f32866fb26c..b05c1bd8662 100644 |
| 20 |
--- a/net-misc/oidc-agent/Manifest |
| 21 |
+++ b/net-misc/oidc-agent/Manifest |
| 22 |
@@ -1 +1,2 @@ |
| 23 |
DIST oidc-agent-4.0.2.tar.gz 802872 BLAKE2B bbee872f0b029f4289a4805d1a5f8fe2fe2b8c297a918cf7821aec6bf4dbe634882425c888cb0e784778b56754af1c8b5a34d5282f84090cccf6315897ccb461 SHA512 fef440cd4b72055d8175f9f33c735235bb87bfca38b53bc4e049b1644f74f6a683d312297efa04cbacfe55190c5d6b588fa37475e5a55acff540909865389037 |
| 24 |
+DIST oidc-agent-4.1.0.tar.gz 800972 BLAKE2B b3dd30e886dea9bf1731fc770047904f6f8e1a67b723fba496e69c55c7d5d1e18bbfd3f0f3ba4c1a42fe3d8cfadc79c2bd64183afc2eb9cdd6ee1446b62a2486 SHA512 81e5dbac389da342db788aa65f8c10d97f1179322259de2dc379cee38e2f6ac1317ef48ee4c91cbabe363ae54cc9596ddf260591526c7524c78ba02b5d3961cc |
| 25 |
|
| 26 |
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 |
| 27 |
new file mode 100644 |
| 28 |
index 00000000000..e0ee26cfa6f |
| 29 |
--- /dev/null |
| 30 |
+++ b/net-misc/oidc-agent/files/oidc-agent-4.1.0_install-perms.patch |
| 31 |
@@ -0,0 +1,60 @@ |
| 32 |
+--- a/Makefile |
| 33 |
++++ b/Makefile |
| 34 |
+@@ -426,19 +426,19 @@ |
| 35 |
+ |
| 36 |
+ ## Man pages |
| 37 |
+ $(MAN_PATH)/man1/$(AGENT).1: $(MANDIR)/$(AGENT).1 $(MAN_PATH)/man1 |
| 38 |
+- @install $< $@ |
| 39 |
++ @install -m 644 $< $@ |
| 40 |
+ $(MAN_PATH)/man1/$(GEN).1: $(MANDIR)/$(GEN).1 $(MAN_PATH)/man1 |
| 41 |
+- @install $< $@ |
| 42 |
++ @install -m 644 $< $@ |
| 43 |
+ $(MAN_PATH)/man1/$(ADD).1: $(MANDIR)/$(ADD).1 $(MAN_PATH)/man1 |
| 44 |
+- @install $< $@ |
| 45 |
++ @install -m 644 $< $@ |
| 46 |
+ $(MAN_PATH)/man1/$(CLIENT).1: $(MANDIR)/$(CLIENT).1 $(MAN_PATH)/man1 |
| 47 |
+- @install $< $@ |
| 48 |
++ @install -m 644 $< $@ |
| 49 |
+ $(MAN_PATH)/man1/$(AGENT_SERVICE).1: $(MANDIR)/$(AGENT_SERVICE).1 $(MAN_PATH)/man1 |
| 50 |
+- @install $< $@ |
| 51 |
++ @install -m 644 $< $@ |
| 52 |
+ $(MAN_PATH)/man1/$(KEYCHAIN).1: $(MANDIR)/$(KEYCHAIN).1 $(MAN_PATH)/man1 |
| 53 |
+- @install $< $@ |
| 54 |
++ @install -m 644 $< $@ |
| 55 |
+ $(PROMPT_MAN_PATH)/man1/$(PROMPT).1: $(MANDIR)/$(PROMPT).1 $(PROMPT_MAN_PATH)/man1 |
| 56 |
+- @install $< $@ |
| 57 |
++ @install -m 644 $< $@ |
| 58 |
+ |
| 59 |
+ |
| 60 |
+ ## Lib |
| 61 |
+@@ -452,24 +452,24 @@ |
| 62 |
+ @ln -sf $(SHARED_LIB_NAME_SO) $@ |
| 63 |
+ |
| 64 |
+ $(INCLUDE_PATH)/oidc-agent/api.h: $(SRCDIR)/$(CLIENT)/api.h $(INCLUDE_PATH)/oidc-agent |
| 65 |
+- @install $< $@ |
| 66 |
++ @install -m 644 $< $@ |
| 67 |
+ |
| 68 |
+ $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent |
| 69 |
+- @install $< $@ |
| 70 |
++ @install -m 644 $< $@ |
| 71 |
+ |
| 72 |
+ $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent |
| 73 |
+- @install $< $@ |
| 74 |
++ @install -m 644 $< $@ |
| 75 |
+ |
| 76 |
+ $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH) |
| 77 |
+- @install $< $@ |
| 78 |
++ @install -m 644 $< $@ |
| 79 |
+ |
| 80 |
+ $(INCLUDE_PATH)/oidc-agent/export_symbols.h: $(SRCDIR)/$(CLIENT)/export_symbols.h $(INCLUDE_PATH)/oidc-agent |
| 81 |
+- @install $< $@ |
| 82 |
++ @install -m 644 $< $@ |
| 83 |
+ |
| 84 |
+ |
| 85 |
+ ## scheme handler |
| 86 |
+ $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop |
| 87 |
+- @install -D $< $@ |
| 88 |
++ @install -m 644 -D $< $@ |
| 89 |
+ @echo "Exec=x-terminal-emulator -e bash -c \"$(BIN_AFTER_INST_PATH)/bin/$(GEN) --codeExchange=%u; exec bash\"" >> $@ |
| 90 |
+ |
| 91 |
+ ## Xsession |
| 92 |
|
| 93 |
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 |
| 94 |
new file mode 100644 |
| 95 |
index 00000000000..2f42a21afbd |
| 96 |
--- /dev/null |
| 97 |
+++ b/net-misc/oidc-agent/files/oidc-agent-4.1.0_makefile-toolchain-vars.patch |
| 98 |
@@ -0,0 +1,52 @@ |
| 99 |
+--- a/Makefile |
| 100 |
++++ b/Makefile |
| 101 |
+@@ -89,9 +89,9 @@ |
| 102 |
+ endif |
| 103 |
+ |
| 104 |
+ # Compiler options |
| 105 |
+-CC = gcc |
| 106 |
++CC := $(CC) |
| 107 |
+ # compiling flags here |
| 108 |
+-CFLAGS = -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra -fno-common |
| 109 |
++CFLAGS := $(CFLAGS) -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra -fno-common |
| 110 |
+ ifndef MAC_OS |
| 111 |
+ ifndef NODPKG |
| 112 |
+ CFLAGS +=$(shell dpkg-buildflags --get CPPFLAGS) |
| 113 |
+@@ -102,11 +102,11 @@ |
| 114 |
+ TEST_CFLAGS = $(CFLAGS) -I. |
| 115 |
+ |
| 116 |
+ # Linker options |
| 117 |
+-LINKER = gcc |
| 118 |
++LINKER := $(CC) |
| 119 |
+ ifdef MAC_OS |
| 120 |
+ LFLAGS = $(LSODIUM) $(LARGP) |
| 121 |
+ else |
| 122 |
+-LFLAGS = $(LSODIUM) $(LSECCOMP) -fno-common |
| 123 |
++LFLAGS := $(LDFLAGS) $(LSODIUM) $(LSECCOMP) -fno-common |
| 124 |
+ ifndef NODPKG |
| 125 |
+ LFLAGS +=$(shell dpkg-buildflags --get LDFLAGS) |
| 126 |
+ endif |
| 127 |
+@@ -117,7 +117,7 @@ |
| 128 |
+ ifeq ($(USE_LIST_SO),1) |
| 129 |
+ LFLAGS += $(LLIST) |
| 130 |
+ endif |
| 131 |
+-AGENT_LFLAGS = $(LCURL) $(LMICROHTTPD) $(LFLAGS) |
| 132 |
++AGENT_LFLAGS := $(LDFLAGS) $(LCURL) $(LMICROHTTPD) $(LFLAGS) |
| 133 |
+ ifndef MAC_OS |
| 134 |
+ AGENT_LFLAGS += $(LSECRET) $(LGLIB) |
| 135 |
+ endif |
| 136 |
+@@ -126,12 +126,12 @@ |
| 137 |
+ ifdef MAC_OS |
| 138 |
+ CLIENT_LFLAGS = -L$(APILIB) $(LARGP) $(LAGENT) $(LSODIUM) |
| 139 |
+ else |
| 140 |
+-CLIENT_LFLAGS = -L$(APILIB) $(LAGENT) $(LSODIUM) $(LSECCOMP) |
| 141 |
++CLIENT_LFLAGS := $(LDFLAGS) -L$(APILIB) $(LAGENT) $(LSODIUM) $(LSECCOMP) |
| 142 |
+ ifndef NODPKG |
| 143 |
+ CLIENT_LFLAGS += $(shell dpkg-buildflags --get LDFLAGS) |
| 144 |
+ endif |
| 145 |
+ endif |
| 146 |
+-LIB_LFLAGS = -lc $(LSODIUM) |
| 147 |
++LIB_LFLAGS := $(LDFLAGS) -lc $(LSODIUM) |
| 148 |
+ ifndef MAC_OS |
| 149 |
+ ifndef NODPKG |
| 150 |
+ LIB_LFLAGS += $(shell dpkg-buildflags --get LDFLAGS) |
| 151 |
|
| 152 |
diff --git a/net-misc/oidc-agent/oidc-agent-4.1.0.ebuild b/net-misc/oidc-agent/oidc-agent-4.1.0.ebuild |
| 153 |
new file mode 100644 |
| 154 |
index 00000000000..e433d2b4535 |
| 155 |
--- /dev/null |
| 156 |
+++ b/net-misc/oidc-agent/oidc-agent-4.1.0.ebuild |
| 157 |
@@ -0,0 +1,82 @@ |
| 158 |
+# Copyright 1999-2021 Gentoo Authors |
| 159 |
+# Distributed under the terms of the GNU General Public License v2 |
| 160 |
+ |
| 161 |
+EAPI=7 |
| 162 |
+ |
| 163 |
+inherit xdg-utils |
| 164 |
+ |
| 165 |
+DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line" |
| 166 |
+HOMEPAGE="https://github.com/indigo-dc/oidc-agent" |
| 167 |
+SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 168 |
+ |
| 169 |
+LICENSE="MIT" |
| 170 |
+SLOT="0" |
| 171 |
+KEYWORDS="~amd64 ~riscv" |
| 172 |
+IUSE="test" |
| 173 |
+ |
| 174 |
+DEPEND="app-crypt/libsecret |
| 175 |
+ dev-libs/libsodium |
| 176 |
+ net-libs/libmicrohttpd |
| 177 |
+ sys-libs/libseccomp" |
| 178 |
+RDEPEND="${DEPEND}" |
| 179 |
+BDEPEND="test? ( dev-libs/check )" |
| 180 |
+ |
| 181 |
+RESTRICT="!test? ( test )" |
| 182 |
+ |
| 183 |
+PATCHES=( |
| 184 |
+ "${FILESDIR}"/${PN}-4.0.2_makefile-liblist-automagic.patch |
| 185 |
+ "${FILESDIR}"/${PN}-4.1.0_install-perms.patch |
| 186 |
+ "${FILESDIR}"/${PN}-4.1.0_makefile-toolchain-vars.patch |
| 187 |
+) |
| 188 |
+ |
| 189 |
+src_prepare() { |
| 190 |
+ default |
| 191 |
+ sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile" |
| 192 |
+} |
| 193 |
+ |
| 194 |
+#src_compile() { |
| 195 |
+ # As of 4.0.2 parallel building still doesn't work |
| 196 |
+# emake -j1 |
| 197 |
+#} |
| 198 |
+ |
| 199 |
+src_install() { |
| 200 |
+ emake \ |
| 201 |
+ PREFIX="${ED}" \ |
| 202 |
+ BIN_AFTER_INST_PATH="/usr" \ |
| 203 |
+ INCLUDE_PATH="${ED}"/usr/include \ |
| 204 |
+ LIB_PATH="${ED}"/usr/$(get_libdir) \ |
| 205 |
+ install |
| 206 |
+ |
| 207 |
+ # This file is not compatible with Gentoo and in any case, we generally |
| 208 |
+ # let the users load such agents themselves. |
| 209 |
+ rm -f "${ED}"/etc/X11/Xsession.d/91${PN} |
| 210 |
+} |
| 211 |
+ |
| 212 |
+pkg_postinst() { |
| 213 |
+ xdg_desktop_database_update |
| 214 |
+ |
| 215 |
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then |
| 216 |
+ elog |
| 217 |
+ elog "You should use oidc-gen to initially generate your account configuration" |
| 218 |
+ elog "before it can be loaded into oidc-agent using oidc-add. For details, please" |
| 219 |
+ elog "consult the man page of oidc-gen, or full documentation at" |
| 220 |
+ elog " https://indigo-dc.gitbooks.io/oidc-agent/" |
| 221 |
+ elog |
| 222 |
+ else |
| 223 |
+ local new_major_ver old_ver |
| 224 |
+ new_major_ver=$(ver_cut 1) |
| 225 |
+ for old_ver in ${REPLACING_VERSIONS}; do |
| 226 |
+ if [[ $(ver_cut 1 ${old_ver}) != ${new_major_ver} ]]; then |
| 227 |
+ ewarn |
| 228 |
+ ewarn "You are upgrading from a different major version. Please restart any running instances of ${PN}" |
| 229 |
+ ewarn "to make sure they are compatible with the updated clients." |
| 230 |
+ ewarn |
| 231 |
+ break |
| 232 |
+ fi |
| 233 |
+ done |
| 234 |
+ fi |
| 235 |
+} |
| 236 |
+ |
| 237 |
+pkg_postrm() { |
| 238 |
+ xdg_desktop_database_update |
| 239 |
+} |
Archives