diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 05:31:47 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 05:31:47 +0000 |
commit | f2f4f7c4b42b0eed0f9f81610e7ef4e93f943dfb (patch) | |
tree | 9cca076b3df5ba0f64e1338da8ea5dcbf5fa5713 /debian/patches | |
parent | Adding upstream version 2.9.4. (diff) | |
download | sssd-f2f4f7c4b42b0eed0f9f81610e7ef4e93f943dfb.tar.xz sssd-f2f4f7c4b42b0eed0f9f81610e7ef4e93f943dfb.zip |
Adding debian version 2.9.4-1.debian/2.9.4-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/default-to-socket-activated-services.diff | 20 | ||||
-rw-r--r-- | debian/patches/fix-shebang-on-sss_analyze.patch | 22 | ||||
-rw-r--r-- | debian/patches/fix-whitespace-test.diff | 13 | ||||
-rw-r--r-- | debian/patches/series | 3 |
4 files changed, 58 insertions, 0 deletions
diff --git a/debian/patches/default-to-socket-activated-services.diff b/debian/patches/default-to-socket-activated-services.diff new file mode 100644 index 0000000..afcdab5 --- /dev/null +++ b/debian/patches/default-to-socket-activated-services.diff @@ -0,0 +1,20 @@ +--- a/src/examples/sssd.conf ++++ b/src/examples/sssd.conf +@@ -1,5 +1,4 @@ + [sssd] +-services = nss, pam + domains = shadowutils + + [nss] +--- a/src/confdb/confdb.h ++++ b/src/confdb/confdb.h +@@ -47,8 +47,7 @@ + #define SSSD_MIN_ID 1 + #define CONFDB_DEFAULT_SHELL_FALLBACK "/bin/sh" + #define CONFDB_FALLBACK_CONFIG \ +- "[sssd]\n" \ +- "services = nss\n" ++ "[sssd]\n" + + + /* Configuration options */ diff --git a/debian/patches/fix-shebang-on-sss_analyze.patch b/debian/patches/fix-shebang-on-sss_analyze.patch new file mode 100644 index 0000000..9eadaf2 --- /dev/null +++ b/debian/patches/fix-shebang-on-sss_analyze.patch @@ -0,0 +1,22 @@ +From: Sergio Durigan Junior <sergiodj@debian.org> +Date: Wed, 22 Jun 2022 10:56:45 -0400 +Subject: Fix shebang on sss_analyze + +s/python/python3/ + +Forwarded: not-needed +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/sssd/+bug/1979453 +--- + src/tools/analyzer/sss_analyze | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/analyzer/sss_analyze b/src/tools/analyzer/sss_analyze +index 3f1beaf..6d4b5b3 100755 +--- a/src/tools/analyzer/sss_analyze ++++ b/src/tools/analyzer/sss_analyze +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + from sssd import sss_analyze + diff --git a/debian/patches/fix-whitespace-test.diff b/debian/patches/fix-whitespace-test.diff new file mode 100644 index 0000000..f88e793 --- /dev/null +++ b/debian/patches/fix-whitespace-test.diff @@ -0,0 +1,13 @@ +diff --git a/src/tests/whitespace_test b/src/tests/whitespace_test +index f055ed4c2..fa95494be 100755 +--- a/src/tests/whitespace_test ++++ b/src/tests/whitespace_test +@@ -16,7 +16,7 @@ fi + + { + # Look for lines with trailing whitespace in all files tracked by Git +- git grep -n -I '\s\+$' -- "$(git rev-parse --show-toplevel)" || ++ git grep --full-name -n -I '\s\+$' -- "$(git rev-parse --show-toplevel)" || + # Don't fail if no such lines were found anywhere + [[ $? == 1 ]] + } | diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..cf4c5c2 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +fix-whitespace-test.diff +default-to-socket-activated-services.diff +fix-shebang-on-sss_analyze.patch |