[Pkg-freeipa-devel] [Git][freeipa-team/freeipa][master] 3 commits: use-raw-strings.diff: Import patch from upstream to fix noise when installing. (LP: #2060298)
Timo Aaltonen (@tjaalton)
gitlab at salsa.debian.org
Sun May 26 19:13:26 BST 2024
Timo Aaltonen pushed to branch master at FreeIPA packaging / freeipa
Commits:
dcb40c78 by Timo Aaltonen at 2024-04-12T13:26:22+03:00
use-raw-strings.diff: Import patch from upstream to fix noise when installing. (LP: #2060298)
- - - - -
a2208a25 by Timo Aaltonen at 2024-04-12T13:31:51+03:00
map-ssh-service.diff: Map sshd service to use ssh.service. (LP: #2061055)
- - - - -
e97d2b13 by Timo Aaltonen at 2024-04-12T14:31:43+03:00
releasing package freeipa version 4.11.1-2
- - - - -
4 changed files:
- debian/changelog
- + debian/patches/map-ssh-service.diff
- debian/patches/series
- + debian/patches/use-raw-strings.diff
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+freeipa (4.11.1-2) unstable; urgency=medium
+
+ * use-raw-strings.diff: Import patch from upstream to fix noise when
+ installing. (LP: #2060298)
+ * map-ssh-service.diff: Map sshd service to use ssh.service. (LP:
+ #2061055)
+
+ -- Timo Aaltonen <tjaalton at debian.org> Fri, 12 Apr 2024 14:31:35 +0300
+
freeipa (4.11.1-1) unstable; urgency=medium
* New upstream release.
=====================================
debian/patches/map-ssh-service.diff
=====================================
@@ -0,0 +1,10 @@
+--- a/ipaplatform/debian/services.py
++++ b/ipaplatform/debian/services.py
+@@ -37,6 +37,7 @@ debian_system_units['ods_signerd'] = deb
+ debian_system_units['rpcgssd'] = 'rpc-gssd.service'
+ debian_system_units['rpcidmapd'] = 'nfs-idmapd.service'
+ debian_system_units['smb'] = 'smbd.service'
++debian_system_units['sshd'] = 'ssh.service'
+
+ # Service classes that implement Debian family-specific behaviour
+
=====================================
debian/patches/series
=====================================
@@ -1,7 +1,9 @@
# upstreamed
+use-raw-strings.diff
# not upstreamable
dnssec-race-wa.diff
fix-sssd-socket-activation.diff
# send upstream
+map-ssh-service.diff
=====================================
debian/patches/use-raw-strings.diff
=====================================
@@ -0,0 +1,106 @@
+commit 2e6fa62f95480e51b6a8da7100c105086e05c2fb
+Author: Alexander Bokovoy <abokovoy at 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 at redhat.com>
+ Reviewed-By: Rob Crittenden <rcritten at 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.
View it on GitLab: https://salsa.debian.org/freeipa-team/freeipa/-/compare/1d1fec838be5ccc339f8809037cb0c2011633ed2...e97d2b134338c9d2eb9fd6c645bb25adb1b9c0a8
--
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/freeipa-team/freeipa/-/compare/1d1fec838be5ccc339f8809037cb0c2011633ed2...e97d2b134338c9d2eb9fd6c645bb25adb1b9c0a8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20240526/f8c84f76/attachment-0001.htm>
More information about the Pkg-freeipa-devel
mailing list