From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPRYr-0005bP-Tg for guix-patches@gnu.org; Mon, 26 Jun 2017 06:48:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dPRYn-0003rK-Vn for guix-patches@gnu.org; Mon, 26 Jun 2017 06:48:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:35385) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dPRYn-0003rD-Ru for guix-patches@gnu.org; Mon, 26 Jun 2017 06:48:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dPRYn-0007QB-L6 for guix-patches@gnu.org; Mon, 26 Jun 2017 06:48:01 -0400 Subject: [bug#27452] [PATCH] gnu: ansible: Apply experimental patch to deal with wrapping of ansible script. Resent-Message-ID: MIME-Version: 1.0 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 Message-ID: Content-Type: multipart/alternative; boundary="94eb2c0554faa1d9d10552daab63" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 27452@debbugs.gnu.org --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--