IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

use-raw-strings.diff: Dropped, upstream.

Browse Source
This commit is contained in:
Timo Aaltonen 2024-12-09 13:05:34 +02:00
parent cc26a6d20d
commit 44deb5b456
3 changed files with 1 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -5,6 +5,7 @@ freeipa (4.12.2-1) UNRELEASED; urgency=medium
- CVE-2024-3183 (Closes: #1077683)
* control: Drop conflicts on systemd-timesyncd as upstream recognizes
it now. (Closes: #1072168)
* use-raw-strings.diff: Dropped, upstream.
-- Timo Aaltonen <tjaalton@debian.org> Mon, 09 Dec 2024 12:17:20 +0200

1
debian/patches/series vendored
View File

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

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

@ -1,106 +0,0 @@
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.