(address . guix-patches@gnu.org)(name . Timotej Lazar)(address . timotej.lazar@araneo.si)
20220925165720.19746-1-timotej.lazar@araneo.si
* gnu/packages/sssd.scm (sssd): Update to 2.7.4.
* gnu/packages/patches/sssd-optional-systemd.patch: Update patch.
---
.../patches/sssd-optional-systemd.patch | 24 +++++++++----------
gnu/packages/sssd.scm | 4 ++--
2 files changed, 14 insertions(+), 14 deletions(-)
Toggle diff (77 lines)
diff --git a/gnu/packages/patches/sssd-optional-systemd.patch b/gnu/packages/patches/sssd-optional-systemd.patch
index 0784fdc7aa..e6d74e79fa 100644
--- a/gnu/packages/patches/sssd-optional-systemd.patch
+++ b/gnu/packages/patches/sssd-optional-systemd.patch
@@ -2,7 +2,7 @@ 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 b96a23c05..28ac2f194 100644
+index b9fe3caf8..51ec3a151 100644
--- a/src/tools/analyzer/modules/request.py
+++ b/src/tools/analyzer/modules/request.py
@@ -1,8 +1,6 @@
@@ -14,7 +14,7 @@ index b96a23c05..28ac2f194 100644
from sssd.parser import SubparsersAction
from sssd.parser import Option
-@@ -77,8 +75,10 @@ class RequestAnalyzer:
+@@ -76,8 +74,10 @@ class RequestAnalyzer:
Instantiated source object
"""
if args.source == "journald":
@@ -25,7 +25,7 @@ index b96a23c05..28ac2f194 100644
source = Files(args.logdir)
return source
-@@ -143,7 +143,7 @@ class RequestAnalyzer:
+@@ -142,7 +142,7 @@ class RequestAnalyzer:
self.consumed_logs.append(line.rstrip(line[-1]))
else:
# files source includes newline
@@ -34,12 +34,12 @@ index b96a23c05..28ac2f194 100644
print(line, end='')
else:
print(line)
-@@ -225,7 +225,7 @@ class RequestAnalyzer:
- source.set_component(component, False)
- self.done = ""
- for line in self.matched_line(source, patterns):
-- if isinstance(source, Journald):
-+ if type(source).__name__ == 'Journald':
- print(line)
- else:
- self.print_formatted(line, args.verbose)
+@@ -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)
diff --git a/gnu/packages/sssd.scm b/gnu/packages/sssd.scm
index 98b819070f..dbeb0ee143 100644
--- a/gnu/packages/sssd.scm
+++ b/gnu/packages/sssd.scm
@@ -154,7 +154,7 @@ (define-public ding-libs
(define-public sssd
(package
(name "sssd")
- (version "2.7.3")
+ (version "2.7.4")
(source
(origin
(method git-fetch)
@@ -163,7 +163,7 @@ (define-public sssd
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "18kcg82gcf5wgmaq5w9fszv9sg3d93yqm39p1npr8kw8b9203n4r"))
+ (base32 "1946pfwyv1ci0m4flrhwkksq42p14n7kcng6fbq6sy4lcn5g3yml"))
(patches (search-patches "sssd-optional-systemd.patch"
"sssd-system-directories.patch"))))
(build-system gnu-build-system)
--
2.37.3