Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.2.2 #602

Merged
merged 8 commits into from
Sep 6, 2024
Merged

5.2.2 #602

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .gitlab-ci-scripts/set-prerelease-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ PREREL=$(git rev-list --count HEAD ^"$MASTER_BRANCH")

# use version file:
VERSION=$(cat $VERSION_FILE)
VERSION_ESCAPED=$(echo ${VERSION} | sed s/\\\./\\\\./g); echo $VER
PR_VERSION="${VERSION}-${DEVSTRING}${PREREL}"
echo "$PR_VERSION" > $VERSION_FILE
echo "$PR_VERSION"
Expand All @@ -72,17 +73,19 @@ TILDE_VERSION="$(echo $PR_VERSION | sed 's/-/~/g')"
| head -n 1 \
| cut -d\( -f 2 \
| cut -d\) -f 1)
DEBIAN_VERSION_ESCAPED=$(echo ${DEBIAN_VERSION} | sed s/\\\./\\\\./g); echo $VER
NEW_DEB_VERSION="${TILDE_VERSION}-1"
sed s%${DEBIAN_VERSION}%${NEW_DEB_VERSION}% -i debian/changelog
sed s%${DEBIAN_VERSION_ESCAPED}%${NEW_DEB_VERSION}% -i debian/changelog
}


# lets see if RPM also needs a version to be set
SPEC_FILES=$(ls rpm/*spec)
[ -z "${SPEC_FILES}" ] || {
[ -z "${VERSION}" ] || {
[ -z "${VERSION_ESCAPED}" ] || {
for SPEC_FILE in $SPEC_FILES; do
grep -q "$VERSION" "$SPEC_FILE" && { # version found, needs update
sed "s/${VERSION}/${TILDE_VERSION}/" -i "$SPEC_FILE"
grep -q "$VERSION_ESCAPED" "$SPEC_FILE" && { # version found, needs update
sed "s/${VERSION_ESCAPED}/${TILDE_VERSION}/" -i "$SPEC_FILE"
}
done
}
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
<!-- ### Dependencies -->
<!-- -->

## oidc-agent 5.2.2

### Bugfixes

- Fixed a bug where `oidc-agent` would crash due to a segmentation fault if `~/.config/oidc-agent/issuer.config` was not present.

## oidc-agent 5.2.1

### Bugfixes
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017 - 2024 Karlsruhe Institute of Technology - Steinbuch Centre for Computing
Copyright (c) 2017 - 2024 Karlsruhe Institute of Technology - Scientific Computing Center

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.2.1
5.2.2
2 changes: 1 addition & 1 deletion src/utils/config/issuerConfig.c
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ static char* updateIssuerConfigFileFormat(char* content) {

static void readIssuerConfigs() {
char* content = readOidcFile(ISSUER_CONFIG_FILENAME);
if (!isJSONArray(content)) { // old config file
if (content && !isJSONArray(content)) { // old config file
content = updateIssuerConfigFileFormat(content);
}
collectJSONIssuers(content);
Expand Down
Loading