Merge pull request #595 from indigo-dc/prerel

5.2.1

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

CHANGELOG.md

@@ -12,6 +12,14 @@
 <!-- ### Dependencies -->
 <!--  -->
 
+## 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

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 $< $@
 
@@ -755,7 +752,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
 
@@ -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

VERSION

@@ -1 +1 @@
-5.2.0
+5.2.1

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
 }