From unknown Thu Jun 19 16:20:31 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#35229 <35229@debbugs.gnu.org> To: bug#35229 <35229@debbugs.gnu.org> Subject: Status: [PATCH] gnu: docker: Check for error on XFRM. Reply-To: bug#35229 <35229@debbugs.gnu.org> Date: Thu, 19 Jun 2025 23:20:31 +0000 retitle 35229 [PATCH] gnu: docker: Check for error on XFRM. reassign 35229 guix-patches submitter 35229 Danny Milosavljevic severity 35229 normal tag 35229 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 11 10:36:45 2019 Received: (at submit) by debbugs.gnu.org; 11 Apr 2019 14:36:45 +0000 Received: from localhost ([127.0.0.1]:55006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEaom-0004FB-OJ for submit@debbugs.gnu.org; Thu, 11 Apr 2019 10:36:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48150) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEaok-0004Es-3d for submit@debbugs.gnu.org; Thu, 11 Apr 2019 10:36:42 -0400 Received: from lists.gnu.org ([209.51.188.17]:42208) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEaoe-0005ab-UM for submit@debbugs.gnu.org; Thu, 11 Apr 2019 10:36:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34297) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEaod-0004eS-Ps for guix-patches@gnu.org; Thu, 11 Apr 2019 10:36:36 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_40,RCVD_IN_DNSWL_LOW autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEaoc-0005Zs-P8 for guix-patches@gnu.org; Thu, 11 Apr 2019 10:36:35 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:36514) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEaoc-0005YC-Hl for guix-patches@gnu.org; Thu, 11 Apr 2019 10:36:34 -0400 Received: from dayas.3.home (77.117.177.161.wireless.dyn.drei.com [77.117.177.161]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 06CFF3360DD9; Thu, 11 Apr 2019 16:36:30 +0200 (CEST) From: Danny Milosavljevic To: guix-patches@gnu.org Subject: [PATCH] gnu: docker: Check for error on XFRM. Date: Thu, 11 Apr 2019 16:36:28 +0200 Message-Id: <20190411143628.301-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 85.13.145.193 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/patches/docker-use-fewer-modprobes.patch: Check for error = on XFRM. --- .../patches/docker-use-fewer-modprobes.patch | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/gnu/packages/patches/docker-use-fewer-modprobes.patch b/gnu/= packages/patches/docker-use-fewer-modprobes.patch index 2779e1be5d..4e4a45b6ce 100644 --- a/gnu/packages/patches/docker-use-fewer-modprobes.patch +++ b/gnu/packages/patches/docker-use-fewer-modprobes.patch @@ -103,17 +103,35 @@ See . =20 --- docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/ns/init_= linux.go.orig 2019-03-19 11:23:20.738316699 +0100 +++ docker-18.09.0-checkout/vendor/github.com/docker/libnetwork/ns/init_= linux.go 2019-03-19 11:27:57.149753073 +0100 -@@ -100,12 +100,7 @@ +@@ -76,12 +76,8 @@ func NlHandle() *netlink.Handle { + func getSupportedNlFamilies() []int { + fams :=3D []int{syscall.NETLINK_ROUTE} + // NETLINK_XFRM test +- if err :=3D loadXfrmModules(); err !=3D nil { +- if checkXfrmSocket() !=3D nil { +- logrus.Warnf("Could not load necessary modules for IPSEC rules: %v",= err) +- } else { +- fams =3D append(fams, syscall.NETLINK_XFRM) +- } ++ if err :=3D checkXfrmSocket(); err !=3D nil { ++ logrus.Warnf("Could not load necessary modules for IPSEC rules: %v", = err) + } else { + fams =3D append(fams, syscall.NETLINK_XFRM) + } +@@ -99,16 +95,6 @@ func getSupportedNlFamilies() []int { + return fams } =20 - func loadXfrmModules() error { +-func loadXfrmModules() error { - if out, err :=3D exec.Command("modprobe", "-va", "xfrm_user").Combined= Output(); err !=3D nil { - return fmt.Errorf("Running modprobe xfrm_user failed with message: `%= s`, error: %v", strings.TrimSpace(string(out)), err) - } - if out, err :=3D exec.Command("modprobe", "-va", "xfrm_algo").Combined= Output(); err !=3D nil { - return fmt.Errorf("Running modprobe xfrm_algo failed with message: `%= s`, error: %v", strings.TrimSpace(string(out)), err) - } -+ // Those are automatically loaded when someone opens the socket anyway= . - return nil - } -=20 +- return nil +-} +- + // API check on required xfrm modules (xfrm_user, xfrm_algo) + func checkXfrmSocket() error { + fd, err :=3D syscall.Socket(syscall.AF_NETLINK, syscall.SOCK_RAW, sysc= all.NETLINK_XFRM) From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 14 11:17:10 2019 Received: (at 35229) by debbugs.gnu.org; 14 Apr 2019 15:17:10 +0000 Received: from localhost ([127.0.0.1]:32977 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFgsY-0000LP-9V for submit@debbugs.gnu.org; Sun, 14 Apr 2019 11:17:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38837) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFgsW-0000Gj-Oj for 35229@debbugs.gnu.org; Sun, 14 Apr 2019 11:17:09 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40650) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hFgsO-00053e-Ey; Sun, 14 Apr 2019 11:17:03 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=55944 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1hFgsN-0000Sk-Ue; Sun, 14 Apr 2019 11:17:00 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Danny Milosavljevic Subject: Re: [bug#35229] [PATCH] gnu: docker: Check for error on XFRM. References: <20190411143628.301-1-dannym@scratchpost.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 25 Germinal an 227 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sun, 14 Apr 2019 17:16:57 +0200 In-Reply-To: <20190411143628.301-1-dannym@scratchpost.org> (Danny Milosavljevic's message of "Thu, 11 Apr 2019 16:36:28 +0200") Message-ID: <87y34ck45y.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 35229 Cc: 35229@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Danny Milosavljevic skribis: > * gnu/packages/patches/docker-use-fewer-modprobes.patch: Check for error = on > XFRM. I suppose upstream adopted this, right? Go for it! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 14 13:06:07 2019 Received: (at 35229-done) by debbugs.gnu.org; 14 Apr 2019 17:06:08 +0000 Received: from localhost ([127.0.0.1]:33100 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFiZz-0003Xq-K7 for submit@debbugs.gnu.org; Sun, 14 Apr 2019 13:06:07 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:59318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFiZw-0003Xe-9Y for 35229-done@debbugs.gnu.org; Sun, 14 Apr 2019 13:06:06 -0400 Received: from localhost (188-22-89-123.adsl.highway.telekom.at [188.22.89.123]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 8468333602A2; Sun, 14 Apr 2019 19:06:02 +0200 (CEST) Date: Sun, 14 Apr 2019 19:05:55 +0200 From: Danny Milosavljevic To: Ludovic =?ISO-8859-1?Q?Court=E8s?= Subject: Re: [bug#35229] [PATCH] gnu: docker: Check for error on XFRM. Message-ID: <20190414190555.38329fda@scratchpost.org> In-Reply-To: <87y34ck45y.fsf@gnu.org> References: <20190411143628.301-1-dannym@scratchpost.org> <87y34ck45y.fsf@gnu.org> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/mv.gZfnadM/Ja6tZPKT.sl0"; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35229-done Cc: 35229-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/mv.gZfnadM/Ja6tZPKT.sl0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, On Sun, 14 Apr 2019 17:16:57 +0200 Ludovic Court=C3=A8s wrote: > Danny Milosavljevic skribis: >=20 > > * gnu/packages/patches/docker-use-fewer-modprobes.patch: Check for erro= r on > > XFRM. =20 >=20 > I suppose upstream adopted this, right? Go for it! It was a request for change from them in the pull request. The pull reques= t is still pending. But I think it's better to check for errors. So, pushed... --Sig_/mv.gZfnadM/Ja6tZPKT.sl0 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAlyzaHMACgkQ5xo1VCww uqWRSQf+NiFQrOpW+KnZMqPABb/T5ST1s3MUEkzuzJ80wHcvawndmfIS1g9bQtYg VtzgN+k14NjI86FH8KqtykHudGui9w41B0H0nAo4ToAFzb2sKvtnBd3oMc0d7611 YWRhyaITGoMfd4+Ges43IGTbrV8CcTpIOdkIFQDivY8lFnRfLwQb+AM0xCVb6VnE aBLCQORNQPU3r/kX7wDbgjQwoQ6ovNKbccf2m6UpUh9cTQw/jJ3D4EMhVATcnmSj ZVzsxuf7EwudBMFeDMEkjFWxlbWQyAAtkFU8vl78zj19R35Bq9W1KM/I6XZsUNE6 rcbrNdeJL2zr1ONSmfC35kVFciHT5A== =erRn -----END PGP SIGNATURE----- --Sig_/mv.gZfnadM/Ja6tZPKT.sl0-- From unknown Thu Jun 19 16:20:31 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 13 May 2019 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator