From patchwork Sun Sep 25 16:57:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 42932 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 32CC527BBEA; Sun, 25 Sep 2022 17:59:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8DCCF27BBE9 for ; Sun, 25 Sep 2022 17:59:21 +0100 (BST) Received: from localhost ([::1]:33650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocUyO-0003dQ-Og for patchwork@mira.cbaines.net; Sun, 25 Sep 2022 12:59:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocUy6-0003dC-FD for guix-patches@gnu.org; Sun, 25 Sep 2022 12:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocUy6-000365-7O for guix-patches@gnu.org; Sun, 25 Sep 2022 12:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ocUy5-0007NR-Ty for guix-patches@gnu.org; Sun, 25 Sep 2022 12:59:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58079] [PATCH] gnu: sssd: Update to 2.7.4. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Sep 2022 16:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58079 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58079@debbugs.gnu.org Cc: Timotej Lazar X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166412508228287 (code B ref -1); Sun, 25 Sep 2022 16:59:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Sep 2022 16:58:02 +0000 Received: from localhost ([127.0.0.1]:48463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocUx8-0007MA-17 for submit@debbugs.gnu.org; Sun, 25 Sep 2022 12:58:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:37800) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocUx6-0007Lm-En for submit@debbugs.gnu.org; Sun, 25 Sep 2022 12:58:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocUx4-0002kD-W6 for guix-patches@gnu.org; Sun, 25 Sep 2022 12:58:00 -0400 Received: from araneo.si ([2001:15c0:2110:3400::2]:43084) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocUx2-000300-3p for guix-patches@gnu.org; Sun, 25 Sep 2022 12:57:57 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 7c6d2e3a for ; Sun, 25 Sep 2022 16:57:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=20180623; bh=91jKT71+xEC8k5WIHBd3/mQ5WLM=; b=RCA4Yv//LbxMKVrt VopVL/BusegLGo9nof4rHWjzpLQlm431qygbd2m0R3QtGJ3Wsfu6ZOHX+H98ei+X qZXAwKVNjybRNFRDIhDBlr8kICHDKFCWy/8uh5ZqsKxqzQDfkUOBvY1QI8FG3Z2Z xRmHTuIxWbC29h7xY662Rsr7R5D1lypAkszCvEF1tqxc5Z7W3KjjCpSTxVJlQqEU VCusiiJXLfS5X8hCxlJjr0GrWNcWLGlqwfoM7LIO/ttjBeudfyCpsg6bY6wHbsrP 0HCL6V7aAk3LuloVInTdwwGMzBmC9Gaut+mWlSeiGEF7lCtBL2CtaL54ZzKPR91X ucDYsQ== Received: by araneo.si (OpenSMTPD) with ESMTPSA id e36cf5fc (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 25 Sep 2022 16:57:48 +0000 (UTC) From: Timotej Lazar Date: Sun, 25 Sep 2022 18:57:22 +0200 Message-Id: <20220925165720.19746-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Received-SPF: pass client-ip=2001:15c0:2110:3400::2; envelope-from=timotej.lazar@araneo.si; helo=araneo.si X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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(-) 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)