commit: f8f0e712d9e454f4b2dc8e10bcee7795cfab6bc5 Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Tue Oct 24 22:02:46 2023 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Tue Oct 24 23:16:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8f0e712
net-misc/oidc-agent: add 5.0.1, drop 4.5.1 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> net-misc/oidc-agent/Manifest | 2 +- .../files/oidc-agent-4.4.0_install-perms.patch | 59 ---------------------- .../files/oidc-agent-5.0.1_install-perms.patch | 11 ++++ .../files/oidc-agent-5.0.1_webkit41.patch | 11 ++++ ...-agent-4.5.1.ebuild => oidc-agent-5.0.1.ebuild} | 17 ++++--- 5 files changed, 33 insertions(+), 67 deletions(-) diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest index e6022652a197..a1f1b3d20bb2 100644 --- a/net-misc/oidc-agent/Manifest +++ b/net-misc/oidc-agent/Manifest @@ -1,2 +1,2 @@ -DIST oidc-agent-4.5.1.tar.gz 1823853 BLAKE2B d73ce4405ead08ddc0433a5c3b660b08037eecbde5f1e0358cad8731d0787e63ffae4b1317ecfe824a951e07a82d600fa4180557d93d0ce5a382e8c8f39289d6 SHA512 9afffbfcb00c610b04f97c59d610799a4ce45b1c40a61e388c6ab8b550381725602e43d219ce475a9d0425c1bc07b49ca982379286e9f48ebae1e19ca4587779 DIST oidc-agent-4.5.2.tar.gz 1766905 BLAKE2B 0558778a5162fbbbe29be9a476838d745abf4825e7274487637f368d521e03f6f165ec82129f37f135a6cf3d3d43bb9349574b88763a508bb683cdc8882230d2 SHA512 04c9ddb258c132781eaa875412f0a8d48d2127e5b78ba262eb0240dac05025db62f5d357e4b5c35a9009960b30d63ce96156c8dcf3b5eac4257c02d37578e676 +DIST oidc-agent-5.0.1.tar.gz 1802435 BLAKE2B 75bc66bb2c6cc89293c7ad155d35b7a7adb73ad7f8a5aadeb029b43a095e2a80f0fc4505737a0c53c60e6f601acbcab990ad4b572b659050fe36e5dd2e7c4092 SHA512 caffa9d7733690917472d2d48ca58092ab722c5f049750de37169dc0a76ccbe374ae3fb5e56b8c578465e84a2f40795eaa26018281b4f851f7a7c94571d2a124 diff --git a/net-misc/oidc-agent/files/oidc-agent-4.4.0_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.4.0_install-perms.patch deleted file mode 100644 index aee7184dd4a0..000000000000 --- a/net-misc/oidc-agent/files/oidc-agent-4.4.0_install-perms.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -656,19 +656,19 @@ - - ## Man pages - $(MAN_PATH)/man1/$(AGENT).1: $(MANDIR)/$(AGENT).1 $(MAN_PATH)/man1 -- @install -p $< $@ -+ @install -p -m 644 $< $@ - $(MAN_PATH)/man1/$(GEN).1: $(MANDIR)/$(GEN).1 $(MAN_PATH)/man1 -- @install -p $< $@ -+ @install -p -m 644 $< $@ - $(MAN_PATH)/man1/$(ADD).1: $(MANDIR)/$(ADD).1 $(MAN_PATH)/man1 -- @install -p $< $@ -+ @install -p -m 644 $< $@ - $(MAN_PATH)/man1/$(CLIENT).1: $(MANDIR)/$(CLIENT).1 $(MAN_PATH)/man1 -- @install -p $< $@ -+ @install -p -m 644 $< $@ - $(MAN_PATH)/man1/$(AGENT_SERVICE).1: $(MANDIR)/$(AGENT_SERVICE).1 $(MAN_PATH)/man1 -- @install -p $< $@ -+ @install -p -m 644 $< $@ - $(MAN_PATH)/man1/$(KEYCHAIN).1: $(MANDIR)/$(KEYCHAIN).1 $(MAN_PATH)/man1 -- @install -p $< $@ -+ @install -p -m 644 $< $@ - $(PROMPT_MAN_PATH)/man1/$(PROMPT).1: $(MANDIR)/$(PROMPT).1 $(PROMPT_MAN_PATH)/man1 -- @install -p $< $@ -+ @install -p -m 644 $< $@ - - endif - -@@ -685,16 +685,16 @@ - @ln -sf $(SHARED_LIB_NAME_SO) $@ - - $(INCLUDE_PATH)/oidc-agent/%.h: $(SRCDIR)/api/%.h $(INCLUDE_PATH)/oidc-agent -- @install -p $< $@ -+ @install -p -m 644 $< $@ - - $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent -- @install -p $< $@ -+ @install -p -m 644 $< $@ - - $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent -- @install -p $< $@ -+ @install -p -m 644 $< $@ - - $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH) -- @install -p $< $@ -+ @install -p -m 644 $< $@ - - endif - -@@ -702,7 +702,7 @@ - - ## scheme handler - $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop -- @install -p -D $< $@ -+ @install -p -m 644 -D $< $@ - @echo "Exec=x-terminal-emulator -e bash -c \"$(BIN_AFTER_INST_PATH)/bin/$(GEN) --codeExchange=%u; exec bash\"" >> $@ - - ## Xsession diff --git a/net-misc/oidc-agent/files/oidc-agent-5.0.1_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-5.0.1_install-perms.patch new file mode 100644 index 000000000000..6b19950e420e --- /dev/null +++ b/net-misc/oidc-agent/files/oidc-agent-5.0.1_install-perms.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -739,7 +739,7 @@ + @install -p -m 644 $< $@ + + $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH) +- @install -p $< $@ ++ @install -p -m 644 $< $@ + + endif + diff --git a/net-misc/oidc-agent/files/oidc-agent-5.0.1_webkit41.patch b/net-misc/oidc-agent/files/oidc-agent-5.0.1_webkit41.patch new file mode 100644 index 000000000000..d950fc879fb8 --- /dev/null +++ b/net-misc/oidc-agent/files/oidc-agent-5.0.1_webkit41.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -185,7 +185,7 @@ + CPPFLAGS += -fPIC + ifndef MAC_OS + ifndef ANY_MSYS +-WEBKITGTK ?= webkit2gtk-4.0 ++WEBKITGTK ?= webkit2gtk-4.1 + CPPFLAGS += $(shell pkg-config --cflags --libs gtk+-3.0 $(WEBKITGTK)) -lstdc++ + endif + endif diff --git a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild b/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild similarity index 78% rename from net-misc/oidc-agent/oidc-agent-4.5.1.ebuild rename to net-misc/oidc-agent/oidc-agent-5.0.1.ebuild index 22da2bbb4431..9852ffb3f2b7 100644 --- a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild +++ b/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv" +KEYWORDS="~amd64 ~arm64 ~riscv" IUSE="test" DEPEND="app-crypt/libsecret @@ -28,8 +28,8 @@ BDEPEND="test? ( dev-libs/check )" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${PN}-4.4.0_install-perms.patch - "${FILESDIR}"/${PN}-4.5.0_webkit41.patch + "${FILESDIR}"/${PN}-5.0.1_install-perms.patch + "${FILESDIR}"/${PN}-5.0.1_webkit41.patch ) src_prepare() { @@ -78,12 +78,15 @@ pkg_postinst() { elog " https://indigo-dc.gitbooks.io/oidc-agent/"; elog else - local new_major_ver old_ver - new_major_ver=$(ver_cut 1) + local old_ver for old_ver in ${REPLACING_VERSIONS}; do - if [[ $(ver_cut 1 ${old_ver}) != ${new_major_ver} ]]; then + if [[ $(ver_cut 1 ${old_ver}) != 5 ]]; then + ewarn "${PN} 5 is a major release with quite some usability improvements but unfortunately also some breaking changes." + ewarn "Please consult" + ewarn " https://indigo-dc.gitbook.io/oidc-agent/oidc-agent5"; + ewarn "for instructions on how to upgrade your configuration to this version" ewarn - ewarn "You are upgrading from a different major version. Please restart any running instances of ${PN}" + ewarn "Furthermore, please restart any running instances of ${PN}" ewarn "to make sure they are compatible with the updated clients." ewarn break
