From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: [PATCH] gnu: w3m: Switch to Debian's actively maintained fork of w3m. Date: Fri, 4 Nov 2016 11:48:56 -0400 Message-ID: <20161104154856.GD14769@jasmine> References: <87mvhgw4w0.fsf@openmailbox.org> <20161103221718.123dc755@centurylink.net> <20161104040309.GA5474@jasmine> <8760o31il3.fsf@gnu.org> <87d1ibwb3s.fsf@openmailbox.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="48TaNjbzBVislYPb" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c2gjp-0006tH-5h for guix-devel@gnu.org; Fri, 04 Nov 2016 11:49:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c2gjk-0004uu-Rd for guix-devel@gnu.org; Fri, 04 Nov 2016 11:49:05 -0400 Content-Disposition: inline In-Reply-To: <87d1ibwb3s.fsf@openmailbox.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Kei Kebreau Cc: guix-devel@gnu.org --48TaNjbzBVislYPb Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Nov 04, 2016 at 10:52:55AM -0400, Kei Kebreau wrote: > > Leo Famulari skribis: > >> I think we build from their Git repo: > >> > >> https://anonscm.debian.org/cgit/collab-maint/w3m.git > >> > >> They even offer non-Debian-ized release tags, such as > >> . > Here it is! Thanks! > From cc7a61d61160817ceb395b648b18c885175441e8 Mon Sep 17 00:00:00 2001 > From: Kei Kebreau > Date: Fri, 4 Nov 2016 10:48:53 -0400 > Subject: [PATCH] gnu: w3m: Switch to Debian's actively maintained fork of= w3m. >=20 > Fixes some security issues seen here: > >=20 > * gnu/packages/w3m.scm (w3m): Switch to Debian's actively maintained > fork of w3m. No need to rewrite the commit title here :) > [source]: Use Debian's git tree. Remove obsolete patches. > [arguments]: Remove unnecessary modification of %standard-phases. > * gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch: Delete file. > * gnu/packages/patches/w3m-disable-weak-ciphers.patch: Delete file. > * gnu/packages/patches/w3m-force-ssl_verify_server-on.patch: Delete file. > * gnu/packages/patches/w3m-libgc.patch: Delete file. Or: * gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch, gnu/packages/patches/w3m-disable-weak-ciphers.patch, gnu/packages/patches/w3m-force-ssl_verify_server-on.patch, gnu/packages/patches/w3m-libgc.patch: Delete files. By the way, I double-checked that all these patches are indeed integrated into the release tag used by this package definition. > (define-public w3m > @@ -36,33 +37,16 @@ > (name "w3m") > (version "0.5.3") This should reflect the tag used in (commit). > (source (origin > - (method url-fetch) > - (uri (string-append "mirror://sourceforge/" name "/" name "= /" > - name "-" version "/" > - name "-" version ".tar.gz")) > - (sha256 > - (base32 > - "1qx9f0kprf92r1wxl3sacykla0g04qsi0idypzz24b7xy9ix5579")) > - > - ;; cf. https://bugs.archlinux.org/task/33397 > - (patches (search-patches "w3m-libgc.patch" > - "w3m-force-ssl_verify_server-on.pa= tch" > - "w3m-disable-sslv2-and-sslv3.patch" > - "w3m-disable-weak-ciphers.patch"))= )) > + (method git-fetch) > + ;; Debian's fork of w3m is the only one that is still main= tained. > + (uri (git-reference > + (url "https://anonscm.debian.org/cgit/collab-maint/w= 3m.git") > + (commit "v0.5.3+git20161031"))) > - (substitute* '("scripts/w3mmail.cgi.in" > - "scripts/dirlist.cgi.in") > - (("@PERL@") (which "perl")))) Does this @PERL@ get patched correctly? Thanks for taking this on! --48TaNjbzBVislYPb Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCAAGBQJYHK3oAAoJECZG+jC6yn8IIwAP/R4DlFuxWeO/XkuiPMSv3xrw 9LL4jjq4QYoEb3AtRtVLx4eTGKYc6I9H0s94H9UBV4bub1kf24BRzxEWzenaZaU7 uqK8+dHCtavwrsKfmU/9lNiYtL9XtJ6q3lF8Aet6tNZNhg0SjNRlrfTgPDIRQt2z qcjOJghBo7mveg96BGQ6171ODNm7NJ8iTQZvoXCxeqF/TrPM9kVXOASsZHWfoDDE UZT4k7ucABxZBftaoxKSLsSFUfDP8PVcJKPYFy5D8qiejXZFoVvMPYzYOkhNTZOa qjDzav5vhz2E3I5NIYT9fVRlgenE8YUnnmima5twI2XJ0iJ6/Q3BGljf3Xyz51Ik KpsSvy3HyYW9FK6A4nG8kfMPFfwBTBKmQjMv0rEcF7NeUrjUymkTXaQ35EmL7MiG XmNVnJ6trpPA0YFBm3QaNSA/Y9hME7b8wkywSBE4LunCaZQyLlyKrcAD4zzzhISR +kbc4tJ7sbbEmI/1893qizJ8BdEagRAOo822/BAWA0SvU701NG6NMOvCDOKb11ma qhl1M+v7JcO3svOpPmO7FBD+N9bquUCqASoiL56EYNOTEnkzZJO5EUBNPcZJVIHb qT0RvjRcSc67YZYSHLw4+vxA+FVTxSXAcKvbJf5W+HcISH6cl3SlKPaBhiGWXXl1 3/0WLmd7xQPssYTNCjPe =GJkK -----END PGP SIGNATURE----- --48TaNjbzBVislYPb--