Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

[mailman3] Fix the patch file and how it is applied

Browse source 
Signed-off-by: Michal Konecny <mkonecny@redhat.com>
This commit is contained in:
Michal Konecny 2024-06-21 11:53:54 +02:00
parent d0e06d1ab0
commit 0fbd79a26e
2 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
roles/mailman3/files/django_mailman3_patch/django-mailman3-fedora-oidc.patch
View file

@ -1,7 +1,7 @@
diff --git a/django_mailman3/lib/auth/fedora/provider.py b/django_mailman3/lib/auth/fedora/provider.py diff --git django_mailman3/lib/auth/fedora/provider.py django_mailman3/lib/auth/fedora/provider.py
index b371fbb..966dda0 100644 index b371fbb..966dda0 100644
--- a/django_mailman3/lib/auth/fedora/provider.py --- django_mailman3/lib/auth/fedora/provider.py
+++ b/django_mailman3/lib/auth/fedora/provider.py +++ django_mailman3/lib/auth/fedora/provider.py
@@ -18,59 +18,71 @@ @@ -18,59 +18,71 @@
# #
# Author: Aurelien Bompard <abompard@fedoraproject.org> # Author: Aurelien Bompard <abompard@fedoraproject.org>
@ -121,10 +121,10 @@ index b371fbb..966dda0 100644
verified=True, primary=False)) verified=True, primary=False))
return ret return ret
diff --git a/django_mailman3/lib/auth/fedora/urls.py b/django_mailman3/lib/auth/fedora/urls.py diff --git django_mailman3/lib/auth/fedora/urls.py django_mailman3/lib/auth/fedora/urls.py
index ca371a8..54dd656 100644 index ca371a8..54dd656 100644
--- a/django_mailman3/lib/auth/fedora/urls.py --- django_mailman3/lib/auth/fedora/urls.py
+++ b/django_mailman3/lib/auth/fedora/urls.py +++ django_mailman3/lib/auth/fedora/urls.py
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
-# Copyright (C) 2012-2023 by the Free Software Foundation, Inc. -# Copyright (C) 2012-2023 by the Free Software Foundation, Inc.
@ -152,10 +152,10 @@ index ca371a8..54dd656 100644
- name='fedora_callback'), - name='fedora_callback'),
-] -]
+urlpatterns = default_urlpatterns(FedoraProvider) +urlpatterns = default_urlpatterns(FedoraProvider)
diff --git a/django_mailman3/lib/auth/fedora/views.py b/django_mailman3/lib/auth/fedora/views.py diff --git django_mailman3/lib/auth/fedora/views.py django_mailman3/lib/auth/fedora/views.py
index 505f9f7..4b1779e 100644 index 505f9f7..4b1779e 100644
--- a/django_mailman3/lib/auth/fedora/views.py --- django_mailman3/lib/auth/fedora/views.py
+++ b/django_mailman3/lib/auth/fedora/views.py +++ django_mailman3/lib/auth/fedora/views.py
@@ -18,107 +18,60 @@ @@ -18,107 +18,60 @@
# #
# Author: Aurelien Bompard <abompard@fedoraproject.org> # Author: Aurelien Bompard <abompard@fedoraproject.org>
@ -310,10 +310,10 @@ index 505f9f7..4b1779e 100644
- return ret - return ret
+oauth2_login = OAuth2LoginView.adapter_view(FedoraAdapter) +oauth2_login = OAuth2LoginView.adapter_view(FedoraAdapter)
+oauth2_callback = OAuth2CallbackView.adapter_view(FedoraAdapter) +oauth2_callback = OAuth2CallbackView.adapter_view(FedoraAdapter)
diff --git a/django_mailman3/tests/test_lib_auth_fedora_provider.py b/django_mailman3/tests/test_lib_auth_fedora_provider.py diff --git django_mailman3/tests/test_lib_auth_fedora_provider.py django_mailman3/tests/test_lib_auth_fedora_provider.py
index 29c5508..851dce4 100644 index 29c5508..851dce4 100644
--- a/django_mailman3/tests/test_lib_auth_fedora_provider.py --- django_mailman3/tests/test_lib_auth_fedora_provider.py
+++ b/django_mailman3/tests/test_lib_auth_fedora_provider.py +++ django_mailman3/tests/test_lib_auth_fedora_provider.py
@@ -15,14 +15,13 @@ @@ -15,14 +15,13 @@
# #
# You should have received a copy of the GNU General Public License along with # You should have received a copy of the GNU General Public License along with

3
roles/mailman3/tasks/main.yml
View file

@ -31,8 +31,7 @@
- name: Apply django_mailman3 patch - name: Apply django_mailman3 patch
ansible.posix.patch: ansible.posix.patch:
src: django_mailman3_patch/django-mailman3-fedora-oidc.patch src: django_mailman3_patch/django-mailman3-fedora-oidc.patch
basedir: /usr/lib/python3.9/site-packages/django_mailman3/ basedir: /usr/lib/python3.9/site-packages/
strip: 1
- name: Set the mailman conffile - name: Set the mailman conffile
ansible.builtin.template: ansible.builtin.template: