From 5004e1a1a62ada20f28dc1e6cee4d8b75ca33dfd Mon Sep 17 00:00:00 2001 From: Jan Pazdziora Date: Wed, 20 Dec 2023 12:14:14 +0100 Subject: [PATCH] Revert "Workaround https://bugzilla.redhat.com/show_bug.cgi?id=2253761." This reverts commit 83a8d6b872b54deb72946e62da74ab93b48ab397. New build ipsilon-3.0.4-11.fc39 contains the fix. --- src/Dockerfile.idp | 5 +---- src/bug-2253761.patch | 24 ------------------------ 2 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 src/bug-2253761.patch diff --git a/src/Dockerfile.idp b/src/Dockerfile.idp index f2f776d..26ce204 100644 --- a/src/Dockerfile.idp +++ b/src/Dockerfile.idp @@ -1,8 +1,5 @@ FROM registry.fedoraproject.org/fedora:39 -RUN dnf install -y /usr/sbin/ipa-client-install /usr/sbin/ipsilon-server-install ipsilon-authform ipsilon-saml2 ipsilon-openidc ipsilon-infosssd sqlite openssl patch && dnf clean all -# Workaround https://bugzilla.redhat.com/show_bug.cgi?id=2253761 -COPY bug-2253761.patch /tmp -RUN patch -p0 < /tmp/bug-2253761.patch +RUN dnf install -y /usr/sbin/ipa-client-install /usr/sbin/ipsilon-server-install ipsilon-authform ipsilon-saml2 ipsilon-openidc ipsilon-infosssd sqlite openssl && dnf clean all COPY init-data ipa-client-enroll ipsilon-server-configure ipsilon-server-wait-for-sp populate-data-volume /usr/sbin/ COPY ipa-client-enroll.service ipsilon-server-configure.service ipsilon-server-wait-for-sp.service populate-data-volume.service /usr/lib/systemd/system/ RUN ln -s /usr/lib/systemd/system/ipa-client-enroll.service /usr/lib/systemd/system/default.target.wants/ diff --git a/src/bug-2253761.patch b/src/bug-2253761.patch deleted file mode 100644 index 73158e7..0000000 --- a/src/bug-2253761.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- /usr/lib/python3.12/site-packages/ipsilon/tools/dbupgrade.py 2022-07-06 23:12:19.000000000 +0200 -+++ /usr/lib/python3.12/site-packages/ipsilon/tools/dbupgrade.py 2023-12-09 11:28:48.909577153 +0100 -@@ -82,8 +82,7 @@ - loader=FileSystemLoader( - os.path.join(cherrypy.config['base.dir'], - 'templates')), -- autoescape=True, -- extensions=['jinja2.ext.autoescape']) -+ autoescape=True) - root = Root('default', template_env) - - # Handle the session store if that is Sql ---- /usr/libexec/ipsilon/ipsilon 2023-08-12 02:00:00.000000000 +0200 -+++ /usr/libexec/ipsilon/ipsilon 2023-12-09 11:28:52.697502930 +0100 -@@ -73,8 +73,7 @@ - os.path.join(cherrypy.config['base.dir'], - default_template_dir))) - template_env = Environment(loader=ChoiceLoader(template_loaders), -- autoescape=True, -- extensions=['jinja2.ext.autoescape']) -+ autoescape=True) - - transchars = string.punctuation.replace('-', '').replace('.', '') - if six.PY2: