summaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2022-12-01 14:27:13 +0100
committerRicardo Wurmus <rekado@elephly.net>2022-12-01 14:27:13 +0100
commit4df7a71b25f87814866531f425c054cd5f5496ed (patch)
treece61ec1bd7d7c8f0ccd79f064935ac58849d5ab7 /gnu/packages/patches
parenta712c07d6ada1160855c583556e854ccb48c47e1 (diff)
gnu: sssd: Update to 2.8.1.
* gnu/packages/sssd.scm (sssd): Update to 2.8.1. [source]: Remove obsolete patch. * gnu/packages/patches/sssd-optional-systemd.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove patch.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/sssd-optional-systemd.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/gnu/packages/patches/sssd-optional-systemd.patch b/gnu/packages/patches/sssd-optional-systemd.patch
deleted file mode 100644
index e6d74e79fa..0000000000
--- a/gnu/packages/patches/sssd-optional-systemd.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Allow running sss_analyze without Python modules for systemd.
-Upstream PR: https://github.com/SSSD/sssd/pull/6125
-
-diff --git a/src/tools/analyzer/modules/request.py b/src/tools/analyzer/modules/request.py
-index b9fe3caf8..51ec3a151 100644
---- a/src/tools/analyzer/modules/request.py
-+++ b/src/tools/analyzer/modules/request.py
-@@ -1,8 +1,6 @@
- import re
- import logging
-
--from sssd.source_files import Files
--from sssd.source_journald import Journald
- from sssd.parser import SubparsersAction
- from sssd.parser import Option
-
-@@ -76,8 +74,10 @@ class RequestAnalyzer:
- Instantiated source object
- """
- if args.source == "journald":
-+ from sssd.source_journald import Journald
- source = Journald()
- else:
-+ from sssd.source_files import Files
- source = Files(args.logdir)
- return source
-
-@@ -142,7 +142,7 @@ class RequestAnalyzer:
- self.consumed_logs.append(line.rstrip(line[-1]))
- else:
- # files source includes newline
-- if isinstance(source, Files):
-+ if type(source).__name__ == 'Files':
- print(line, end='')
- else:
- print(line)
-@@ -240,7 +240,7 @@ class RequestAnalyzer:
- self.print_formatted_verbose(source, patterns)
- else:
- for line in self.matched_line(source, patterns):
-- if isinstance(source, Journald):
-+ if type(source).__name__ == 'Journald':
- print(line)
- else:
- self.print_formatted(line)