Switch to 2.20.1

guimard · Nov 19, 2024 · 57caab8 · 57caab8
1 parent 5f161f2
commit 57caab8
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 351 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -1,10 +1,10 @@
 name: Build and Publish Docker Images
 
 env:
-  VERSION: 2.20.0
+  VERSION: 2.20.1
   PGVERSION: 15
   DEBIANRELEASE: bookworm
-  DOCKERREVISION: 4
+  DOCKERREVISION: 1
 
 on:
   push:

diff --git a/Changes.md b/Changes.md
@@ -1,6 +1,9 @@
 # Changes
 
-## v2.20.0-4
+## v2.20.1-0
+* Update to 2.20.1
+
+## v2.20.0-4 _(2024A-11-14)_
 
 * Fix SAML regression
 * Fix Captcha rule bug

diff --git a/base-no-s6/Dockerfile b/base-no-s6/Dockerfile
@@ -82,7 +82,6 @@ RUN echo "# Install packages from ${DEBIAN_VERSION} (${LLNGDIST})" && \
     perl -000 -MJSON -i -ne '$_=JSON::from_json($_);$_->{reloadUrls}={};print JSON->new->pretty->canonical->encode($_)' /var/lib/lemonldap-ng/conf/lmConf-1.json && \
     perl -i -pe 's/\r//g' /usr/share/perl5/Lemonldap/NG/Common/Conf/DefaultValues.pm && \
     echo "patch no-none.patch" && patch -p1 <no-none.patch && \
-    echo "patch fix-handler.patch" && patch -p1 <fix-handler.patch && \
     rm -f *.patch
 
 #COPY syslogopt.patch .

diff --git a/base-no-s6/fix-handler.patch b/base-no-s6/fix-handler.patch
diff --git a/base/Dockerfile b/base/Dockerfile
@@ -94,7 +94,6 @@ RUN echo "# Install packages from ${DEBIAN_VERSION} (${LLNGDIST})" && \
     perl -000 -MJSON -i -ne '$_=JSON::from_json($_);$_->{reloadUrls}={};print JSON->new->pretty->canonical->encode($_)' /var/lib/lemonldap-ng/conf/lmConf-1.json && \
     perl -i -pe 's/\r//g' /usr/share/perl5/Lemonldap/NG/Common/Conf/DefaultValues.pm && \
     echo "patch no-none.patch" && patch -p1 <no-none.patch && \
-    echo "patch fix-handler.patch" && patch -p1 <fix-handler.patch && \
     rm -f *.patch
 
 #COPY syslogopt.patch .

diff --git a/base/fix-handler.patch b/base/fix-handler.patch
diff --git a/portal/Dockerfile b/portal/Dockerfile
@@ -36,8 +36,7 @@ COPY *.patch /
 
 RUN for p in appgrid.patch jwt-type.patch app-scope.patch ignorepollers.patch \
     fixedLogout.patch more-logs.patch \
-    matrix-token.patch redirect-ajax.patch recaptcha3.patch \
-    saml-regression.patch captcha-fix.patch \
+    matrix-token.patch redirect-ajax.patch \
     metadata-ttl.patch \
     ; do echo patch $p && patch -p1 < $p; done && \
     rm -f /*.patch && \

diff --git a/portal/captcha-fix.patch b/portal/captcha-fix.patch
diff --git a/portal/recaptcha3.patch b/portal/recaptcha3.patch
diff --git a/portal/saml-regression.patch b/portal/saml-regression.patch
diff --git a/uwsgi-portal/Dockerfile b/uwsgi-portal/Dockerfile
@@ -34,8 +34,7 @@ COPY *.patch /
 
 RUN for p in appgrid.patch jwt-type.patch app-scope.patch ignorepollers.patch \
     fixedLogout.patch more-logs.patch \
-    matrix-token.patch redirect-ajax.patch recaptcha3.patch \
-    saml-regression.patch captcha-fix.patch \
+    matrix-token.patch redirect-ajax.patch \
     metadata-ttl.patch \
     ; do echo patch $p && patch -p1 < $p; done && \
     rm -f /*.patch && \

diff --git a/uwsgi-portal/captcha-fix.patch b/uwsgi-portal/captcha-fix.patch
diff --git a/uwsgi-portal/recaptcha3.patch b/uwsgi-portal/recaptcha3.patch