From 491ea5250fc4ec41914b7ad720fd5e70bc9c7b6a Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Thu, 29 Aug 2024 21:43:13 +0200 Subject: [PATCH 1/6] Makefile: drop non-existent oidc-tokensh bash completion There is no actual bash completion implemented for oidc-tokensh, which leads to error messages in some package management systems. Drop installing a symlink for the not-implemented completion. --- Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c32bd75d..222ad495 100644 --- a/Makefile +++ b/Makefile @@ -560,7 +560,7 @@ install_conf: $(CONFIG_PATH)/oidc-agent/$(PROVIDERCONFIGD) $(CONFIG_PATH)/oidc-a @echo "Installed config files" .PHONY: install_bash -install_bash: $(BASH_COMPLETION_PATH)/$(AGENT) $(BASH_COMPLETION_PATH)/$(GEN) $(BASH_COMPLETION_PATH)/$(ADD) $(BASH_COMPLETION_PATH)/$(CLIENT) $(BASH_COMPLETION_PATH)/$(AGENT_SERVICE) $(BASH_COMPLETION_PATH)/$(KEYCHAIN) $(BASH_COMPLETION_PATH)/$(TOKENSH) +install_bash: $(BASH_COMPLETION_PATH)/$(AGENT) $(BASH_COMPLETION_PATH)/$(GEN) $(BASH_COMPLETION_PATH)/$(ADD) $(BASH_COMPLETION_PATH)/$(CLIENT) $(BASH_COMPLETION_PATH)/$(AGENT_SERVICE) $(BASH_COMPLETION_PATH)/$(KEYCHAIN) @echo "Installed bash completion" .PHONY: install_man @@ -700,9 +700,6 @@ $(BASH_COMPLETION_PATH)/$(CLIENT): $(BASH_COMPLETION_PATH) $(BASH_COMPLETION_PATH)/$(KEYCHAIN): $(BASH_COMPLETION_PATH) @ln -s $(AGENT) $@ -$(BASH_COMPLETION_PATH)/$(TOKENSH): $(BASH_COMPLETION_PATH) - @ln -s $(AGENT) $@ - $(BASH_COMPLETION_PATH)/$(AGENT_SERVICE): $(CONFDIR)/bash-completion/oidc-agent-service $(BASH_COMPLETION_PATH) @install -p -m 644 $< $@ @@ -826,7 +823,6 @@ uninstall_bashcompletion: @$(rm) $(BASH_COMPLETION_PATH)/$(AGENT) @$(rm) $(BASH_COMPLETION_PATH)/$(AGENT_SERVICE) @$(rm) $(BASH_COMPLETION_PATH)/$(KEYCHAIN) - @$(rm) $(BASH_COMPLETION_PATH)/$(TOKENSH) @echo "Uninstalled bash completion" endif From 644fadcc861ec40a0260607aec698f820818049f Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Thu, 29 Aug 2024 21:49:32 +0200 Subject: [PATCH 2/6] Makefile: fix install permissions for static library --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c32bd75d..774edcde 100644 --- a/Makefile +++ b/Makefile @@ -755,7 +755,7 @@ $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_ @install -p -m 644 $< $@ $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH) - @install -p $< $@ + @install -p -m 644 $< $@ endif From 83bac9feef8b69c35b96eebea88099053fa7f64d Mon Sep 17 00:00:00 2001 From: Gabriel Zachmann Date: Fri, 30 Aug 2024 07:26:03 +0200 Subject: [PATCH 3/6] change packaging branch from test-ellert-spec back to latest --- .gitlab-ci-scripts/local-before-script.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci-scripts/local-before-script.sh b/.gitlab-ci-scripts/local-before-script.sh index 2bf51b55..8146f944 100755 --- a/.gitlab-ci-scripts/local-before-script.sh +++ b/.gitlab-ci-scripts/local-before-script.sh @@ -7,8 +7,8 @@ echo "======== oidc-agent-local-before-script starting=======" export VERSION=`cat VERSION` # clone the packages file of this repo: # Try with VERSION -echo "Trying to use branch for packaging: ${PACKAGING_BRANCH}/test-ellert-spec" -git clone -b ${PACKAGING_BRANCH}/test-ellert-spec http://codebase.helmholtz.cloud/m-team/oidc/oidc-agent.git delme || { +echo "Trying to use branch for packaging: ${PACKAGING_BRANCH}/latest" +git clone -b ${PACKAGING_BRANCH}/latest http://codebase.helmholtz.cloud/m-team/oidc/oidc-agent.git delme || { exit 10 } From a14a079b93e8feab5c77093ba3a990fe276fa72d Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Fri, 30 Aug 2024 21:25:57 +0200 Subject: [PATCH 4/6] oidc-agent-service: fix passing of oidc-agent options Options are kept in a string separated by whitespace, and would be forced to be a single option when quoting that string again. fixes #593 --- src/oidc-agent-service/oidc-agent-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/oidc-agent-service/oidc-agent-service b/src/oidc-agent-service/oidc-agent-service index a183c911..79daa7b3 100755 --- a/src/oidc-agent-service/oidc-agent-service +++ b/src/oidc-agent-service/oidc-agent-service @@ -34,7 +34,7 @@ function echo_vars() { } function start() { - json=$(${OIDC_AGENT} -a "${SOCK}" "${OIDC_AGENT_OPTS}" --pid-file="${PID_FILE}" --json) + json=$(${OIDC_AGENT} -a "${SOCK}" ${OIDC_AGENT_OPTS} --pid-file="${PID_FILE}" --json) OIDCD_PID=$(${ECHO} "${json}" | "${JQ}" -r ".dpid") echo_vars } From 90f169aecbc9338a7ca554c9f049982db6f7557d Mon Sep 17 00:00:00 2001 From: Gabriel Zachmann Date: Sat, 31 Aug 2024 20:40:49 +0200 Subject: [PATCH 5/6] 5.2.1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7cbea073..26d99a28 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.2.0 \ No newline at end of file +5.2.1 From eddc3e8b2bb9bff13b7836cd51d65cf517f08114 Mon Sep 17 00:00:00 2001 From: zachmann Date: Sat, 31 Aug 2024 20:46:25 +0200 Subject: [PATCH 6/6] changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86c3aed1..882ea2cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,14 @@ +## oidc-agent 5.2.1 + +### Bugfixes + +- Fixed permissions on static lib +- Removed bash completion for `oidc-tokensh` +- Fixed options passing from `oidc-agent-service` to `oidc-agent` + ## oidc-agent 5.2.0 ### Features