From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Bavier Subject: Re: Handling =?utf-8?B?4oCYZmlsZeKAmQ==?= CVE Date: Thu, 13 Nov 2014 12:47:00 -0600 Message-ID: <87h9y3uee3.fsf@gmail.com> References: <87389nl6wi.fsf@gnu.org> <87mw7vhwgz.fsf@gnu.org> <87egt7f052.fsf@yeeloong.lan> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XozPU-0004oQ-4d for guix-devel@gnu.org; Thu, 13 Nov 2014 13:46:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XozPP-0006fs-LO for guix-devel@gnu.org; Thu, 13 Nov 2014 13:46:24 -0500 In-reply-to: <87egt7f052.fsf@yeeloong.lan> 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Mark H Weaver Cc: Guix-devel --=-=-= Mark H Weaver writes: > Finally, 'file' is a propagated-input for 'intltool', which means that > if anyone installs 'intltool' in their profile, they will have the buggy > 'file' in their PATH. The attached patch might be enough to fix this. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-intltool-Make-file-a-regular-input.patch >From fff25ec0451a65ccd5972d16ef96221c85084566 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 13 Nov 2014 12:46:04 -0600 Subject: [PATCH] gnu: intltool: Make file a regular input. * gnu/packages/glib.scm (intltool)[propagated-inputs]: Move file from here... [inputs]: to here. [arguments]: New 'patch-file-references phase. --- gnu/packages/glib.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9076643..212d3b6 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -250,16 +250,21 @@ bindings to call into the C library.") (base32 "01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7")))) (build-system gnu-build-system) + (inputs + `(("file" ,file))) (propagated-inputs `(;; Propagate gettext because users expect it to be there, and so does ;; the `intltool-update' script. ("gettext" ,gnu-gettext) - ;; `file' is used by `intltool-update' too. - ("file" ,file) - ("perl-xml-parser" ,perl-xml-parser) ("perl" ,perl))) + (arguments + `(#:phases (alist-cons-after + 'unpack 'patch-file-references + (lambda _ + (substitute* "intltool-update.in" + (("`file") (string-append "`" (which "file")))))))) (home-page "https://launchpad.net/intltool/+download") (synopsis "Tools to centralise translations of different file formats") (description -- 1.7.9.5 --=-=-= -- Eric Bavier Please avoid sending me Word or PowerPoint attachments. See http://www.gnu.org/philosophy/no-word-attachments.html --=-=-=--