use-raw-strings.diff: Import patch from upstream to fix noise when installing. (LP: #2060298)

This commit is contained in:
Timo Aaltonen
2024-04-12 13:15:21 +03:00
parent 1d1fec838b
commit dcb40c7837
3 changed files with 114 additions and 0 deletions

7
debian/changelog vendored
View File

@@ -1,3 +1,10 @@
freeipa (4.11.1-2) UNRELEASED; urgency=medium
* use-raw-strings.diff: Import patch from upstream to fix noise when
installing. (LP: #2060298)
-- Timo Aaltonen <tjaalton@debian.org> Fri, 12 Apr 2024 13:13:16 +0300
freeipa (4.11.1-1) unstable; urgency=medium freeipa (4.11.1-1) unstable; urgency=medium
* New upstream release. * New upstream release.

View File

@@ -1,4 +1,5 @@
# upstreamed # upstreamed
use-raw-strings.diff
# not upstreamable # not upstreamable
dnssec-race-wa.diff dnssec-race-wa.diff

106
debian/patches/use-raw-strings.diff vendored Normal file
View File

@@ -0,0 +1,106 @@
commit 2e6fa62f95480e51b6a8da7100c105086e05c2fb
Author: Alexander Bokovoy <abokovoy@redhat.com>
Date: Wed Apr 3 12:05:20 2024 +0300
Use raw strings for Python 3 compatibility in old API client code
Python 3 enforces checks on \ sequences in strings. Instead of copying
over the new mix of normal and raw strings from the server side, turn
those strings in the remote plugins to raw mode.
Fixes: https://pagure.io/freeipa/issue/9565
Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
diff --git a/ipaclient/remote_plugins/2_164/automember.py b/ipaclient/remote_plugins/2_164/automember.py
index 09b5a8d01..f6b941d64 100644
--- a/ipaclient/remote_plugins/2_164/automember.py
+++ b/ipaclient/remote_plugins/2_164/automember.py
@@ -16,7 +16,7 @@ from ipapython.dnsutil import DNSName
if six.PY3:
unicode = str
-__doc__ = _("""
+__doc__ = _(r"""
Auto Membership Rule.
Bring clarity to the membership of hosts and users by configuring inclusive
diff --git a/ipaclient/remote_plugins/2_164/group.py b/ipaclient/remote_plugins/2_164/group.py
index ed57c4caa..e18003ecb 100644
--- a/ipaclient/remote_plugins/2_164/group.py
+++ b/ipaclient/remote_plugins/2_164/group.py
@@ -16,7 +16,7 @@ from ipapython.dnsutil import DNSName
if six.PY3:
unicode = str
-__doc__ = _("""
+__doc__ = _(r"""
Groups of users
Manage groups of users. By default, new groups are POSIX groups. You
diff --git a/ipaclient/remote_plugins/2_164/hbactest.py b/ipaclient/remote_plugins/2_164/hbactest.py
index b0c49b71b..4b168f3d9 100644
--- a/ipaclient/remote_plugins/2_164/hbactest.py
+++ b/ipaclient/remote_plugins/2_164/hbactest.py
@@ -16,7 +16,7 @@ from ipapython.dnsutil import DNSName
if six.PY3:
unicode = str
-__doc__ = _("""
+__doc__ = _(r"""
Simulate use of Host-based access controls
HBAC rules control who can access what services on what hosts.
diff --git a/ipaclient/remote_plugins/2_164/trust.py b/ipaclient/remote_plugins/2_164/trust.py
index 39a563831..c5c8f60e6 100644
--- a/ipaclient/remote_plugins/2_164/trust.py
+++ b/ipaclient/remote_plugins/2_164/trust.py
@@ -16,7 +16,7 @@ from ipapython.dnsutil import DNSName
if six.PY3:
unicode = str
-__doc__ = _("""
+__doc__ = _(r"""
Cross-realm trusts
Manage trust relationship between IPA and Active Directory domains.
diff --git a/ipaclient/remote_plugins/2_49/automember.py b/ipaclient/remote_plugins/2_49/automember.py
index 39cdac0b4..2615f9abf 100644
--- a/ipaclient/remote_plugins/2_49/automember.py
+++ b/ipaclient/remote_plugins/2_49/automember.py
@@ -16,7 +16,7 @@ from ipapython.dnsutil import DNSName
if six.PY3:
unicode = str
-__doc__ = _("""
+__doc__ = _(r"""
Auto Membership Rule.
Bring clarity to the membership of hosts and users by configuring inclusive
diff --git a/ipaclient/remote_plugins/2_49/group.py b/ipaclient/remote_plugins/2_49/group.py
index 940a113df..4c1515935 100644
--- a/ipaclient/remote_plugins/2_49/group.py
+++ b/ipaclient/remote_plugins/2_49/group.py
@@ -16,7 +16,7 @@ from ipapython.dnsutil import DNSName
if six.PY3:
unicode = str
-__doc__ = _("""
+__doc__ = _(r"""
Groups of users
Manage groups of users. By default, new groups are POSIX groups. You
diff --git a/ipaclient/remote_plugins/2_49/trust.py b/ipaclient/remote_plugins/2_49/trust.py
index e3ef33459..c6936cac8 100644
--- a/ipaclient/remote_plugins/2_49/trust.py
+++ b/ipaclient/remote_plugins/2_49/trust.py
@@ -16,7 +16,7 @@ from ipapython.dnsutil import DNSName
if six.PY3:
unicode = str
-__doc__ = _("""
+__doc__ = _(r"""
Cross-realm trusts
Manage trust relationship between IPA and Active Directory domains.