ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: sssd: Update to 2.7.4.

Browse source 
* gnu/packages/sssd.scm (sssd): Update to 2.7.4.
* gnu/packages/patches/sssd-optional-systemd.patch: Update patch.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Timotej Lazar 2022-09-25 18:57:22 +02:00 committed by Ludovic Courtès
parent a0c83aa04b
commit 3a5ae8c070
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/patches/sssd-optional-systemd.patch
View file

@ -2,7 +2,7 @@ Allow running sss_analyze without Python modules for systemd.
Upstream PR: https://github.com/SSSD/sssd/pull/6125 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 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 --- a/src/tools/analyzer/modules/request.py
+++ b/src/tools/analyzer/modules/request.py +++ b/src/tools/analyzer/modules/request.py
@@ -1,8 +1,6 @@ @@ -1,8 +1,6 @@
@ -14,7 +14,7 @@ index b96a23c05..28ac2f194 100644
from sssd.parser import SubparsersAction from sssd.parser import SubparsersAction
from sssd.parser import Option from sssd.parser import Option
@@ -77,8 +75,10 @@ class RequestAnalyzer: @@ -76,8 +74,10 @@ class RequestAnalyzer:
Instantiated source object Instantiated source object
""" """
if args.source == "journald": if args.source == "journald":
@ -25,7 +25,7 @@ index b96a23c05..28ac2f194 100644
source = Files(args.logdir) source = Files(args.logdir)
return source return source
@@ -143,7 +143,7 @@ class RequestAnalyzer: @@ -142,7 +142,7 @@ class RequestAnalyzer:
self.consumed_logs.append(line.rstrip(line[-1])) self.consumed_logs.append(line.rstrip(line[-1]))
else: else:
# files source includes newline # files source includes newline
@ -34,12 +34,12 @@ index b96a23c05..28ac2f194 100644
print(line, end='') print(line, end='')
else: else:
print(line) print(line)
@@ -225,7 +225,7 @@ class RequestAnalyzer: @@ -240,7 +240,7 @@ class RequestAnalyzer:
source.set_component(component, False) self.print_formatted_verbose(source, patterns)
self.done = "" else:
for line in self.matched_line(source, patterns): for line in self.matched_line(source, patterns):
- if isinstance(source, Journald): - if isinstance(source, Journald):
+ if type(source).__name__ == 'Journald': + if type(source).__name__ == 'Journald':
print(line) print(line)
else: else:
self.print_formatted(line, args.verbose) self.print_formatted(line)

4
gnu/packages/sssd.scm
View file

@ -154,7 +154,7 @@ (define-public ding-libs
(define-public sssd (define-public sssd
(package (package
(name "sssd") (name "sssd")
(version "2.7.3") (version "2.7.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -163,7 +163,7 @@ (define-public sssd
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "18kcg82gcf5wgmaq5w9fszv9sg3d93yqm39p1npr8kw8b9203n4r")) (base32 "1946pfwyv1ci0m4flrhwkksq42p14n7kcng6fbq6sy4lcn5g3yml"))
(patches (search-patches "sssd-optional-systemd.patch" (patches (search-patches "sssd-optional-systemd.patch"
"sssd-system-directories.patch")))) "sssd-system-directories.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)