From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kei Kebreau Subject: Re: ntfs-3g: Does it build? Date: Sat, 18 Feb 2017 14:51:21 -0500 Message-ID: <87tw7rffba.fsf@openmailbox.org> References: <20170218183255.7c1368a7@scratchpost.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cfB38-0007kW-Pf for guix-devel@gnu.org; Sat, 18 Feb 2017 14:52:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cfB35-0002nr-LK for guix-devel@gnu.org; Sat, 18 Feb 2017 14:52:06 -0500 Received: from lb1.openmailbox.org ([5.79.108.160]:35705 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cfB35-0002nE-8P for guix-devel@gnu.org; Sat, 18 Feb 2017 14:52:03 -0500 In-Reply-To: <20170218183255.7c1368a7@scratchpost.org> (Danny Milosavljevic's message of "Sat, 18 Feb 2017 18:32:55 +0100") 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: Danny Milosavljevic Cc: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Danny Milosavljevic writes: > Hi, > > does ntfs-3g build for you using Guix master? > > For me, it doesn't - because of a whitespace problem in the patch > "ntfs-3g-CVE-2017-0358.patch". I was the one who created that file. Try this patch. It should fix the whitespace problem. I suspect the issue was that I removed some spaces before the tabs in the code part of the patch, thinking that they were insignificant. Clearly I was mistaken. --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=0001-gnu-ntfs-3g-Fix-whitespace-in-patch.patch Content-Transfer-Encoding: quoted-printable From=20fff6fb313073aa9121df8ad75c02b896483f433a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 18 Feb 2017 14:47:07 -0500 Subject: [PATCH] gnu: ntfs-3g: Fix whitespace in patch. * gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch: Fix whitespace. =2D-- gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch | 24 ++++++++++++--------= ---- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch b/gnu/package= s/patches/ntfs-3g-CVE-2017-0358.patch index 6edd676e3..7e5d2a3c9 100644 =2D-- a/gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch +++ b/gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch @@ -6,21 +6,21 @@ diff -ur ntfs-3g.old/src/lowntfs-3g.c ntfs-3g/src/lowntfs= -3g.c --- ntfs-3g.old/src/lowntfs-3g.c 2017-02-09 15:01:04.074331542 -0500 +++ ntfs-3g/src/lowntfs-3g.c 2017-02-09 15:06:35.757580937 -0500 @@ -3827,13 +3827,14 @@ =2D struct stat st; =2D pid_t pid; =2D const char *cmd =3D "/sbin/modprobe"; + struct stat st; + pid_t pid; + const char *cmd =3D "/sbin/modprobe"; + char *env =3D (char*)NULL; =2D struct timespec req =3D { 0, 100000000 }; /* 100 msec */ =2D fuse_fstype fstype; =2D=20=20=20=20=20=20=20=20 =2D if (!stat(cmd, &st) && !geteuid()) { =2D pid =3D fork(); =2D if (!pid) { + struct timespec req =3D { 0, 100000000 }; /* 100 msec */ + fuse_fstype fstype; +=20=20=20=20=20=20=20=20=20 + if (!stat(cmd, &st) && !geteuid()) { + pid =3D fork(); + if (!pid) { - execl(cmd, cmd, "fuse", NULL); + execle(cmd, cmd, "fuse", NULL, &env); =2D _exit(1); =2D } else if (pid !=3D -1) =2D waitpid(pid, NULL, 0); + _exit(1); + } else if (pid !=3D -1) + waitpid(pid, NULL, 0); diff -ur ntfs-3g.old/src/ntfs-3g.c ntfs-3g/src/ntfs-3g.c --- ntfs-3g.old/src/ntfs-3g.c 2017-02-09 15:01:04.074331542 -0500 +++ ntfs-3g/src/ntfs-3g.c 2017-02-09 15:06:26.077252571 -0500 =2D-=20 2.11.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAliopbkACgkQ5qXuPBlG eg0INQ/9G7Zedl0SJyihirxqUuVlQW8MHiFQ2H4bOp81apy3V15AFflIQDij12wN IFrkyVaXo1/pPidxrQkPp+2vPqBsbRC95I3HIHkUm3wBY0AhoD9WY8Pyg/3zmU3a u/KT3lgK4odogC6R1LjbVMVEHxVedhDtVnQfyQaCbMTyeFFiKp/i5ctRvXNniPgh 7JHK6n6JK7pbTHrdKeIQyPEC1XhNRRFiugAqoLsd1nDOstcR1adH6LIJJ0tdpxj2 xvE06C4nZjihuIJZHUbza9O1Y5IbDdWHnESc+BFTmdLlCHakqDVvsPDWDSVrYLXY QznVB8591EGT+Gf9kxEMGh6quX5MAzHye0ZDT2WEXz12/sKi6jAAn/HXG+jVJXTB SimMDfDh7TcGwXJv0HhF1kbg89RrwX2In+oQwejPd22pBTkSqsV8Yzi4shGY6t5e C0WbB0rsqbT/z2eSHhsX07YqqdNprtuM/D2AJ/VPd5ZsER0zkAfDOPPwvB8aPGDj 0BnD3PdsU7CEWBXSHVpFTnc/aT9YsUJOPSo/LPquYOb8Oh7bBabiFSBjPw0JvjJu Yu0O7m4Z5/4Xob3GH1fbtdQ9TQXqXAUdW3sB8JEmmVUz+Oh/HRNu3/ZFhkKU1RWV HHbrFyJIlzcZ2biRMVg+v7gTdMO9VY7+VNNMJFVBzwPp1iNbn6A= =aFuj -----END PGP SIGNATURE----- --==-=-=--