From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 22 15:36:46 2017 Received: (at submit) by debbugs.gnu.org; 22 Jun 2017 19:36:46 +0000 Received: from localhost ([127.0.0.1]:33490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dO7uH-0004e6-Qg for submit@debbugs.gnu.org; Thu, 22 Jun 2017 15:36:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46153) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dO7uD-0004dr-9U for submit@debbugs.gnu.org; Thu, 22 Jun 2017 15:36:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dO7u7-0001WM-8d for submit@debbugs.gnu.org; Thu, 22 Jun 2017 15: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.5 required=5.0 tests=BAYES_05,FREEMAIL_FROM autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:34906) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dO7u7-0001WB-4r for submit@debbugs.gnu.org; Thu, 22 Jun 2017 15:36:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37116) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dO7u5-0005Z5-JR for guix-patches@gnu.org; Thu, 22 Jun 2017 15:36:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dO7u1-0001PM-TW for guix-patches@gnu.org; Thu, 22 Jun 2017 15:36:33 -0400 Received: from mail-wr0-f170.google.com ([209.85.128.170]:32974) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dO7u1-0001Oj-Mr for guix-patches@gnu.org; Thu, 22 Jun 2017 15:36:29 -0400 Received: by mail-wr0-f170.google.com with SMTP id r103so36974485wrb.0 for ; Thu, 22 Jun 2017 12:36:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=klegVx8QSA0At27uqvXDDaV4/frNINlZyMrYnW4PeRA=; b=DPnc3qwdDDYjwmnddzA4rbyiFEIJDlpXI+ykCsQw6UDhD36GPGVZ8utGhjbcafMkBO wZ3Dj2jua6TarPxi84A50zEfmA7sPL5QvCVvgHLvzHvOy1mozk9W0zWmfrYCrBir0+fV UpPSA/fEg+DM/DNga0PvrQRj0DCei+gx1ntK0hs8gg7MaL+HrOhii5VS7h+IUNlvFetE UyS8BRCKrmsw8RjCa0LXzoy3WtAhEnfD74RXKrVNspeQD1ecAi8ZuVG5J4yOxdjb1Ai1 jOrJeK7B67ADxWJe2IV+k+Jp5ZuWJfTQ/ijnDoRKyQmJtC0AOvd5sQs0B3p5u+CbDuxl Q6Qw== X-Gm-Message-State: AKS2vOyTKv+UpeSDMCJLNTmX2+DkNhONsB4pRwlEreVv0nFnb8+8ceJE tE2+ho3AljEyEH5Z X-Received: by 10.80.218.135 with SMTP id q7mr3896438edj.85.1498160188207; Thu, 22 Jun 2017 12:36:28 -0700 (PDT) Received: from localhost.localdomain (50709B36.static.ziggozakelijk.nl. [80.112.155.54]) by smtp.gmail.com with ESMTPSA id x26sm1254820edx.63.2017.06.22.12.36.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Jun 2017 12:36:27 -0700 (PDT) From: Jelle Licht To: guix-patches@gnu.org Subject: [PATCH] gnu: ansible: Apply experimental patch to deal with wrapping of ansible script. Date: Thu, 22 Jun 2017 21:36:20 +0200 Message-Id: <20170622193620.3381-1-jlicht@fsfe.org> X-Mailer: git-send-email 2.13.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: Jelle Licht 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: -4.0 (----) See for the rationale. * gnu/packages/patches/ansible-wrap-program-hack.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/admin.scm (ansible)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 5 ++++- gnu/packages/patches/ansible-wrap-program-hack.patch | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/ansible-wrap-program-hack.patch diff --git a/gnu/local.mk b/gnu/local.mk index 88ea8daf4..bed24a841 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -501,6 +501,7 @@ dist_patch_DATA = \ %D%/packages/patches/aegis-test-fixup-1.patch \ %D%/packages/patches/aegis-test-fixup-2.patch \ %D%/packages/patches/agg-am_c_prototype.patch \ + %D%/packages/patches/ansible-wrap-program-hack.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 35679495f..81a53413f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1366,7 +1366,10 @@ of supported upstream metrics systems simultaneously.") (uri (pypi-uri "ansible" version)) (sha256 (base32 - "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd")))) + "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd")) + ;; FIXME: Remove once wrapping ansible works properly + ;; See http://lists.gnu.org/archive/html/bug-guix/2017-05/msg00015.html + (patches (search-patches "ansible-wrap-program-hack.patch")))) (build-system python-build-system) (native-inputs `(("python2-pycrypto" ,python2-pycrypto) diff --git a/gnu/packages/patches/ansible-wrap-program-hack.patch b/gnu/packages/patches/ansible-wrap-program-hack.patch new file mode 100644 index 000000000..bc7eb9d31 --- /dev/null +++ b/gnu/packages/patches/ansible-wrap-program-hack.patch @@ -0,0 +1,17 @@ +--- ansible-2.3.0.0/bin/ansible 2017-04-12 16:08:05.000000000 +0200 ++++ ansible-2.3.0.0-fixed/bin/ansible 2017-05-21 20:11:18.720872385 +0200 +@@ -75,7 +75,13 @@ + # sometimes add that + target = target[:-1] + +- if len(target) > 1: ++ if target[-1] == "real" and target[0].startswith('.'): ++ target = target[:-1] ++ target[0] = target[0][1:] ++ if len(target) > 1 and target[1] != "real" : ++ sub = target[1] ++ myclass = "%sCLI" % sub.capitalize() ++ elif len(target) > 2 and target[2] == "real" : + sub = target[1] + myclass = "%sCLI" % sub.capitalize() + elif target[0] == 'ansible': -- 2.13.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 26 05:39:58 2017 Received: (at 27452) by debbugs.gnu.org; 26 Jun 2017 09:39:58 +0000 Received: from localhost ([127.0.0.1]:38022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPQUw-0005lR-42 for submit@debbugs.gnu.org; Mon, 26 Jun 2017 05:39:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37720) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPQUs-0005lC-O4 for 27452@debbugs.gnu.org; Mon, 26 Jun 2017 05:39:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dPQUj-0006Py-0v for 27452@debbugs.gnu.org; Mon, 26 Jun 2017 05:39:49 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:58664) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPQUi-0006Pm-Sx; Mon, 26 Jun 2017 05:39:44 -0400 Received: from [193.50.110.179] (port=35934 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dPQUg-0002U0-5O; Mon, 26 Jun 2017 05:39:42 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Jelle Licht Subject: Re: [bug#27452] [PATCH] gnu: ansible: Apply experimental patch to deal with wrapping of ansible script. References: <20170622193620.3381-1-jlicht@fsfe.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 8 Messidor an 225 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-unknown-linux-gnu Date: Mon, 26 Jun 2017 11:39:39 +0200 In-Reply-To: <20170622193620.3381-1-jlicht@fsfe.org> (Jelle Licht's message of "Thu, 22 Jun 2017 21:36:20 +0200") Message-ID: <87a84v6qas.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (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-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 27452 Cc: 27452@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: -5.0 (-----) Hello, Jelle Licht skribis: > See fo= r the > rationale. > > * gnu/packages/patches/ansible-wrap-program-hack.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add it. > * gnu/packages/admin.scm (ansible)[source]: Use it. > --- > gnu/local.mk | 1 + > gnu/packages/admin.scm | 5 ++++- > gnu/packages/patches/ansible-wrap-program-hack.patch | 17 ++++++++++++++= +++ > 3 files changed, 22 insertions(+), 1 deletion(-) > create mode 100644 gnu/packages/patches/ansible-wrap-program-hack.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 88ea8daf4..bed24a841 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -501,6 +501,7 @@ dist_patch_DATA =3D \ > %D%/packages/patches/aegis-test-fixup-1.patch \ > %D%/packages/patches/aegis-test-fixup-2.patch \ > %D%/packages/patches/agg-am_c_prototype.patch \ > + %D%/packages/patches/ansible-wrap-program-hack.patch \ > %D%/packages/patches/antiword-CVE-2014-8123.patch \ > %D%/packages/patches/apr-skip-getservbyname-test.patch \ > %D%/packages/patches/aspell-default-dict-dir.patch \ > diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm > index 35679495f..81a53413f 100644 > --- a/gnu/packages/admin.scm > +++ b/gnu/packages/admin.scm > @@ -1366,7 +1366,10 @@ of supported upstream metrics systems simultaneous= ly.") > (uri (pypi-uri "ansible" version)) > (sha256 > (base32 > - "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd")))) > + "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd")) > + ;; FIXME: Remove once wrapping ansible works properly > + ;; See http://lists.gnu.org/archive/html/bug-guix/2017-05/msg0001= 5.html > + (patches (search-patches "ansible-wrap-program-hack.patch")))) > (build-system python-build-system) > (native-inputs > `(("python2-pycrypto" ,python2-pycrypto) > diff --git a/gnu/packages/patches/ansible-wrap-program-hack.patch b/gnu/p= ackages/patches/ansible-wrap-program-hack.patch > new file mode 100644 > index 000000000..bc7eb9d31 > --- /dev/null > +++ b/gnu/packages/patches/ansible-wrap-program-hack.patch > @@ -0,0 +1,17 @@ > +--- ansible-2.3.0.0/bin/ansible 2017-04-12 16:08:05.000000000 +0200 > ++++ ansible-2.3.0.0-fixed/bin/ansible 2017-05-21 20:11:18.720872385 +0200 > +@@ -75,7 +75,13 @@ Could you move the FIXME and URL to the .patch file, and also add a sentence explaining what it does? OK with these changes, thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 26 06:47:13 2017 Received: (at 27452) by debbugs.gnu.org; 26 Jun 2017 10:47:13 +0000 Received: from localhost ([127.0.0.1]:38062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPRY1-0007Ow-CJ for submit@debbugs.gnu.org; Mon, 26 Jun 2017 06:47:13 -0400 Received: from mail.fsfe.org ([217.69.89.162]:52588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPRXx-0007Og-Sg for 27452@debbugs.gnu.org; Mon, 26 Jun 2017 06:47:12 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.fsfe.org (Postfix) with ESMTP id 636D763BADA for <27452@debbugs.gnu.org>; Mon, 26 Jun 2017 12:47:03 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail.fsfe.org Received: from mail.fsfe.org ([127.0.0.1]) by localhost (cavendish.fsfeurope.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id v8mr1JSUUq3v for <27452@debbugs.gnu.org>; Mon, 26 Jun 2017 12:47:03 +0200 (CEST) Received: by mail-it0-f45.google.com with SMTP id m68so14989846ith.1 for <27452@debbugs.gnu.org>; Mon, 26 Jun 2017 03:47:02 -0700 (PDT) X-Gm-Message-State: AKS2vOz6rl5AzGkNN+XxW6nruRA8yFYQ8a16Xs8+JuZ26XoJ/W2Xq09A hpORBvg/QfgJfxtkYH3xvAzH6Ei1Xw== X-Received: by 10.36.210.194 with SMTP id z185mr21747519itf.112.1498474019395; Mon, 26 Jun 2017 03:46:59 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.172.66 with HTTP; Mon, 26 Jun 2017 03:46:58 -0700 (PDT) In-Reply-To: <87a84v6qas.fsf@gnu.org> References: <20170622193620.3381-1-jlicht@fsfe.org> <87a84v6qas.fsf@gnu.org> From: Jelle Licht Date: Mon, 26 Jun 2017 12:46:58 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [bug#27452] [PATCH] gnu: ansible: Apply experimental patch to deal with wrapping of ansible script. To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= Content-Type: multipart/alternative; boundary="94eb2c0554faa1d9d10552daab63" X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 27452 Cc: 27452@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: -5.0 (-----) --94eb2c0554faa1d9d10552daab63 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello, 2017-06-26 11:39 GMT+02:00 Ludovic Court=C3=A8s : > Hello, > > Jelle Licht skribis: > > > See > for the > > rationale. > > > > * gnu/packages/patches/ansible-wrap-program-hack.patch: New file. > > * gnu/local.mk (dist_patch_DATA): Add it. > > * gnu/packages/admin.scm (ansible)[source]: Use it. > > --- > > gnu/local.mk | 1 + > > gnu/packages/admin.scm | 5 ++++- > > gnu/packages/patches/ansible-wrap-program-hack.patch | 17 > +++++++++++++++++ > > 3 files changed, 22 insertions(+), 1 deletion(-) > > create mode 100644 gnu/packages/patches/ansible-wrap-program-hack.patc= h > > > > diff --git a/gnu/local.mk b/gnu/local.mk > > index 88ea8daf4..bed24a841 100644 > > --- a/gnu/local.mk > > +++ b/gnu/local.mk > > @@ -501,6 +501,7 @@ dist_patch_DATA =3D > \ > > %D%/packages/patches/aegis-test-fixup-1.patch \ > > %D%/packages/patches/aegis-test-fixup-2.patch \ > > %D%/packages/patches/agg-am_c_prototype.patch \ > > + %D%/packages/patches/ansible-wrap-program-hack.patch \ > > %D%/packages/patches/antiword-CVE-2014-8123.patch \ > > %D%/packages/patches/apr-skip-getservbyname-test.patch \ > > %D%/packages/patches/aspell-default-dict-dir.patch \ > > diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm > > index 35679495f..81a53413f 100644 > > --- a/gnu/packages/admin.scm > > +++ b/gnu/packages/admin.scm > > @@ -1366,7 +1366,10 @@ of supported upstream metrics systems > simultaneously.") > > (uri (pypi-uri "ansible" version)) > > (sha256 > > (base32 > > - "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd")))) > > + "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd")) > > + ;; FIXME: Remove once wrapping ansible works properly > > + ;; See http://lists.gnu.org/archive/h > tml/bug-guix/2017-05/msg00015.html > > + (patches (search-patches "ansible-wrap-program-hack.patch")))) > > (build-system python-build-system) > > (native-inputs > > `(("python2-pycrypto" ,python2-pycrypto) > > diff --git a/gnu/packages/patches/ansible-wrap-program-hack.patch > b/gnu/packages/patches/ansible-wrap-program-hack.patch > > new file mode 100644 > > index 000000000..bc7eb9d31 > > --- /dev/null > > +++ b/gnu/packages/patches/ansible-wrap-program-hack.patch > > @@ -0,0 +1,17 @@ > > +--- ansible-2.3.0.0/bin/ansible 2017-04-12 16:08:05.000000000 +02= 00 > > ++++ ansible-2.3.0.0-fixed/bin/ansible 2017-05-21 > 20:11:18.720872385 +0200 > > +@@ -75,7 +75,13 @@ > > Could you move the FIXME and URL to the .patch file, and also add a > sentence explaining what it does? > I am not familiar enough with .patch files to know what you expect me to do. I should add these comments /in/ the .patch file? > > OK with these changes, thanks! > > Ludo=E2=80=99. > --94eb2c0554faa1d9d10552daab63 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello,

2017-06-26 11:39 GMT+02:00 Ludovic Court=C3=A8s <ludo@gnu.org>= :
Hello,

Jelle Licht <jlicht= @fsfe.org> skribis:

> See <http://lists.gnu.org/ar= chive/html/bug-guix/2017-05/msg00015.html> for the
> rationale.
>
> * gnu/packages/patches/ansible-wrap-program-hack.patch: New file.=
> * gnu/local.mk (dist_patch_DATA): Add it.
> * gnu/packages/admin.scm (ansible)[source]: Use it.
> ---
>=C2=A0 gnu/local.mk=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0|=C2=A0 1 +
>=C2=A0 gnu/packages/admin.scm=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2= =A0 5 ++++-
>=C2=A0 gnu/packages/patches/ansible-wrap-program-hack.patch | 17 += ++++++++++++++++
>=C2=A0 3 files changed, 22 insertions(+), 1 deletion(-)
>=C2=A0 create mode 100644 gnu/packages/patches/ansible-wrap-progra= m-hack.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 88ea8daf4..bed24a841 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -501,6 +501,7 @@ dist_patch_DATA =3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0\
>=C2=A0 =C2=A0 %D%/packages/patches/aegis-test-fixup-1.patch=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 \
>=C2=A0 =C2=A0 %D%/packages/patches/aegis-test-fixup-2.patch=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 \
>=C2=A0 =C2=A0 %D%/packages/patches/agg-am_c_prototype.patch=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 \
> +=C2=A0 %D%/packages/patches/ansible-wrap-program-hack.patch=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0\
>=C2=A0 =C2=A0 %D%/packages/patches/antiword-CVE-2014-8123.patch=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 \
>=C2=A0 =C2=A0 %D%/packages/patches/apr-skip-getservbyname-test.pat= ch=C2=A0 =C2=A0 =C2=A0\
>=C2=A0 =C2=A0 %D%/packages/patches/aspell-default-dict-dir.patch= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0\
> diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
> index 35679495f..81a53413f 100644
> --- a/gnu/packages/admin.scm
> +++ b/gnu/packages/admin.scm
> @@ -1366,7 +1366,10 @@ of supported upstream metrics systems simultane= ously.")
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(uri (pypi-uri "ansible" ve= rsion))
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(sha256
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (base32
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"1xdr82fy8gahxh3586wm5k1bxksy<= wbr>s7yl1f2n24shrk8gf99qyjyd"))))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"1xdr82fy8gahxh3586wm5k1bxksy<= wbr>s7yl1f2n24shrk8gf99qyjyd"))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0;; FIXME: Remove once wrapping ansible wor= ks properly
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0;; See http://lists.gnu.org/archive/html/bug-guix/2017-05/msg00015.h= tml
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0(patches (search-patches "ansible-wra= p-program-hack.patch"))))
>=C2=A0 =C2=A0 =C2=A0 (build-system python-build-system)
>=C2=A0 =C2=A0 =C2=A0 (native-inputs
>=C2=A0 =C2=A0 =C2=A0 =C2=A0`(("python2-pycrypto" ,python2-pyc= rypto)
> diff --git a/gnu/packages/patches/ansible-wrap-program-hack.patch= b/gnu/packages/patches/ansible-wrap-program-hack.patch
> new file mode 100644
> index 000000000..bc7eb9d31
> --- /dev/null
> +++ b/gnu/packages/patches/ansible-wrap-program-hack.patch
> @@ -0,0 +1,17 @@
> +--- ansible-2.3.0.0/bin/ansible=C2=A0 =C2=A0 =C2=A0 2017-04-12 16:08:= 05.000000000 +0200
> ++++ ansible-2.3.0.0-fixed/bin/ansible=C2=A0 =C2=A0 =C2=A0 =C2=A0= 2017-05-21 20:11:18.720872385 +0200
> +@@ -75,7 +75,13 @@

Could you move the FIXME and URL to the .patch file, and also a= dd a
sentence explaining what it does?

I am = not familiar enough with .patch files to know what you expect me to do.
I should add these comments /in/ the .patch file?

OK with these changes, thanks!

Ludo=E2=80=99.

--94eb2c0554faa1d9d10552daab63-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 26 12:12:02 2017 Received: (at 27452) by debbugs.gnu.org; 26 Jun 2017 16:12:02 +0000 Received: from localhost ([127.0.0.1]:39321 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPWcM-0001wP-Ec for submit@debbugs.gnu.org; Mon, 26 Jun 2017 12:12:02 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53830) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPWcK-0001vu-V1 for 27452@debbugs.gnu.org; Mon, 26 Jun 2017 12:12:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dPWcC-0003pa-7p for 27452@debbugs.gnu.org; Mon, 26 Jun 2017 12:11:55 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:35650) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPWcC-0003pL-4c; Mon, 26 Jun 2017 12:11:52 -0400 Received: from [193.50.110.179] (port=38782 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dPWcB-0003Fn-Jm; Mon, 26 Jun 2017 12:11:51 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Jelle Licht Subject: Re: [bug#27452] [PATCH] gnu: ansible: Apply experimental patch to deal with wrapping of ansible script. References: <20170622193620.3381-1-jlicht@fsfe.org> <87a84v6qas.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 8 Messidor an 225 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-unknown-linux-gnu Date: Mon, 26 Jun 2017 18:11:49 +0200 In-Reply-To: (Jelle Licht's message of "Mon, 26 Jun 2017 12:46:58 +0200") Message-ID: <87efu66856.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (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-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 27452 Cc: 27452@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: -5.0 (-----) Jelle Licht skribis: > I am not familiar enough with .patch files to know what you expect me to = do.=20 > I should add these comments /in/ the .patch file? Yes, at the top of the file, please. You can look for examples in the other files in there. HTH! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 26 15:17:31 2017 Received: (at 27452) by debbugs.gnu.org; 26 Jun 2017 19:17:31 +0000 Received: from localhost ([127.0.0.1]:39477 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPZVp-00082r-Lh for submit@debbugs.gnu.org; Mon, 26 Jun 2017 15:17:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47884) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPZVl-00082c-Nh for 27452@debbugs.gnu.org; Mon, 26 Jun 2017 15:17:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dPZVc-0005yh-DT for 27452@debbugs.gnu.org; Mon, 26 Jun 2017 15:17:20 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:38528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPZVc-0005yZ-9n; Mon, 26 Jun 2017 15:17:16 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:39224 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dPZVb-0000UH-Hq; Mon, 26 Jun 2017 15:17:15 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Jelle Licht Subject: Re: [bug#27452] [PATCH] gnu: ansible: Apply experimental patch to deal with wrapping of ansible script. References: <20170622193620.3381-1-jlicht@fsfe.org> <87a84v6qas.fsf@gnu.org> <87efu66856.fsf@gnu.org> <8760fitzzv.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 8 Messidor an 225 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-unknown-linux-gnu Date: Mon, 26 Jun 2017 21:17:11 +0200 In-Reply-To: <8760fitzzv.fsf@gmail.com> (Jelle Licht's message of "Mon, 26 Jun 2017 19:33:56 +0200") Message-ID: <87vania79k.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 27452 Cc: Jelle Licht , 27452@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: -5.0 (-----) Jelle Licht skribis: > From 1c5ac5bac497f415e20540a193e36dc02d012bf2 Mon Sep 17 00:00:00 2001 > From: Jelle Licht > Date: Thu, 22 Jun 2017 21:26:49 +0200 > Subject: [PATCH] gnu: ansible: Apply experimental patch to deal with wrapping > of ansible script. > > See for the > rationale. > > * gnu/packages/patches/ansible-wrap-program-hack.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add it. > * gnu/packages/admin.scm (ansible)[source]: Use it. Perfect, thanks! :-) Ludo'. From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 27 01:35:13 2017 Received: (at 27452) by debbugs.gnu.org; 27 Jun 2017 05:35:13 +0000 Received: from localhost ([127.0.0.1]:39858 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPj9Z-0007ip-IF for submit@debbugs.gnu.org; Tue, 27 Jun 2017 01:35:13 -0400 Received: from mout02.posteo.de ([185.67.36.142]:38965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPXtm-0003qq-Or for 27452@debbugs.gnu.org; Mon, 26 Jun 2017 13:34:09 -0400 Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3wxGPf2TGhzyvF; Mon, 26 Jun 2017 19:33:58 +0200 (CEST) References: <20170622193620.3381-1-jlicht@fsfe.org> <87a84v6qas.fsf@gnu.org> <87efu66856.fsf@gnu.org> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Jelle Licht To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#27452] [PATCH] gnu: ansible: Apply experimental patch to deal with wrapping of ansible script. In-reply-to: <87efu66856.fsf@gnu.org> Date: Mon, 26 Jun 2017 19:33:56 +0200 Message-ID: <8760fitzzv.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 27452 X-Mailman-Approved-At: Tue, 27 Jun 2017 01:35:07 -0400 Cc: Jelle Licht , 27452@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: 0.3 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Ludovic Courtès writes: > Jelle Licht skribis: > >> I am not familiar enough with .patch files to know what you expect me to do. >> I should add these comments /in/ the .patch file? > > Yes, at the top of the file, please. You can look for examples in the > other files in there. > > HTH! > > Ludo’. Thanks for the pointers. Attached you will find the updated patch. Jelle. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-ansible-Apply-experimental-patch-to-deal-with-wr.patch >From 1c5ac5bac497f415e20540a193e36dc02d012bf2 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Thu, 22 Jun 2017 21:26:49 +0200 Subject: [PATCH] gnu: ansible: Apply experimental patch to deal with wrapping of ansible script. See for the rationale. * gnu/packages/patches/ansible-wrap-program-hack.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/admin.scm (ansible)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 3 ++- .../patches/ansible-wrap-program-hack.patch | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/ansible-wrap-program-hack.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5d024de07..f3092d580 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -501,6 +501,7 @@ dist_patch_DATA = \ %D%/packages/patches/aegis-test-fixup-1.patch \ %D%/packages/patches/aegis-test-fixup-2.patch \ %D%/packages/patches/agg-am_c_prototype.patch \ + %D%/packages/patches/ansible-wrap-program-hack.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 96ca6a76d..2cc5200a0 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1366,7 +1366,8 @@ of supported upstream metrics systems simultaneously.") (uri (pypi-uri "ansible" version)) (sha256 (base32 - "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd")))) + "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd")) + (patches (search-patches "ansible-wrap-program-hack.patch")))) (build-system python-build-system) (native-inputs `(("python2-pycrypto" ,python2-pycrypto) diff --git a/gnu/packages/patches/ansible-wrap-program-hack.patch b/gnu/packages/patches/ansible-wrap-program-hack.patch new file mode 100644 index 000000000..c2e102839 --- /dev/null +++ b/gnu/packages/patches/ansible-wrap-program-hack.patch @@ -0,0 +1,22 @@ +Ansible changes its behaviour depending on the name of the script that it is +called as. Make it deal with guix' .real wrapper scripts. + +FIXME: Remove once wrapping ansible works properly. +See http://lists.gnu.org/archive/html/bug-guix/2017-05/msg00015.html. +--- ansible-2.3.0.0/bin/ansible 2017-04-12 16:08:05.000000000 +0200 ++++ ansible-2.3.0.0-fixed/bin/ansible 2017-05-21 20:11:18.720872385 +0200 +@@ -75,7 +75,13 @@ + # sometimes add that + target = target[:-1] + +- if len(target) > 1: ++ if target[-1] == "real" and target[0].startswith('.'): ++ target = target[:-1] ++ target[0] = target[0][1:] ++ if len(target) > 1 and target[1] != "real" : ++ sub = target[1] ++ myclass = "%sCLI" % sub.capitalize() ++ elif len(target) > 2 and target[2] == "real" : + sub = target[1] + myclass = "%sCLI" % sub.capitalize() + elif target[0] == 'ansible': -- 2.13.1 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 29 08:55:34 2017 Received: (at 27452-done) by debbugs.gnu.org; 29 Jun 2017 12:55:34 +0000 Received: from localhost ([127.0.0.1]:43551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQYyr-0003Z4-Rh for submit@debbugs.gnu.org; Thu, 29 Jun 2017 08:55:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQYyo-0003Ym-9F for 27452-done@debbugs.gnu.org; Thu, 29 Jun 2017 08:55:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQYyf-0002et-0B for 27452-done@debbugs.gnu.org; Thu, 29 Jun 2017 08:55:24 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:37853) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQYyZ-0002aD-Q6; Thu, 29 Jun 2017 08:55:15 -0400 Received: from [193.50.110.126] (port=54750 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dQYyZ-0001fZ-6F; Thu, 29 Jun 2017 08:55:15 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Jelle Licht Subject: Re: [bug#27452] [PATCH] gnu: ansible: Apply experimental patch to deal with wrapping of ansible script. References: <20170622193620.3381-1-jlicht@fsfe.org> <87a84v6qas.fsf@gnu.org> <87efu66856.fsf@gnu.org> <8760fitzzv.fsf@gmail.com> Date: Thu, 29 Jun 2017 14:55:13 +0200 In-Reply-To: <8760fitzzv.fsf@gmail.com> (Jelle Licht's message of "Mon, 26 Jun 2017 19:33:56 +0200") Message-ID: <871sq3oswe.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 27452-done Cc: Jelle Licht , 27452-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: -5.0 (-----) Jelle Licht skribis: >>>From 1c5ac5bac497f415e20540a193e36dc02d012bf2 Mon Sep 17 00:00:00 2001 > From: Jelle Licht > Date: Thu, 22 Jun 2017 21:26:49 +0200 > Subject: [PATCH] gnu: ansible: Apply experimental patch to deal with wrapping > of ansible script. > > See for the > rationale. > > * gnu/packages/patches/ansible-wrap-program-hack.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add it. > * gnu/packages/admin.scm (ansible)[source]: Use it. Committed, thanks! Ludo'. From unknown Tue Jun 24 13:55:27 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 28 Jul 2017 11:24:05 +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