ntfs-3g: Does it build?

ntfs-3g: Does it build?

[Danny Milosavljevic]

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".

Re: ntfs-3g: Does it build?

[Kei Kebreau]

[-- Attachment #1.1: Type: text/plain, Size: 467 bytes --]

Danny Milosavljevic <dannym@scratchpost.org> 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.


[-- Attachment #1.2: 0001-gnu-ntfs-3g-Fix-whitespace-in-patch.patch --]
[-- Type: text/plain, Size: 1873 bytes --]

From fff6fb313073aa9121df8ad75c02b896483f433a Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kei@openmailbox.org>
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.
---
 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/packages/patches/ntfs-3g-CVE-2017-0358.patch
index 6edd676e3..7e5d2a3c9 100644
--- 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 @@
-	struct stat st;
-	pid_t pid;
-	const char *cmd = "/sbin/modprobe";
+ 	struct stat st;
+ 	pid_t pid;
+ 	const char *cmd = "/sbin/modprobe";
 +	char *env = (char*)NULL;
-	struct timespec req = { 0, 100000000 };   /* 100 msec */
-	fuse_fstype fstype;
-        
-	if (!stat(cmd, &st) && !geteuid()) {
-		pid = fork();
-		if (!pid) {
+ 	struct timespec req = { 0, 100000000 };   /* 100 msec */
+ 	fuse_fstype fstype;
+         
+ 	if (!stat(cmd, &st) && !geteuid()) {
+ 		pid = fork();
+ 		if (!pid) {
 -			execl(cmd, cmd, "fuse", NULL);
 +			execle(cmd, cmd, "fuse", NULL, &env);
-			_exit(1);
-		} else if (pid != -1)
-			waitpid(pid, NULL, 0);
+ 			_exit(1);
+ 		} else if (pid != -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
-- 
2.11.1


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: ntfs-3g: Does it build?

[Danny Milosavljevic]

Hi Kei,

I think the empty line except for the whitespace is the only important line - see below. The number of spaces is different.

diff --git a/gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch b/gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch
index 6edd676e3..dfaeca080 100644
--- a/gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch
+++ b/gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch
@@ -12,7 +12,7 @@ diff -ur ntfs-3g.old/src/lowntfs-3g.c ntfs-3g/src/lowntfs-3g.c
 +      char *env = (char*)NULL;
        struct timespec req = { 0, 100000000 };   /* 100 msec */
        fuse_fstype fstype;
-        
+         
        if (!stat(cmd, &st) && !geteuid()) {
                pid = fork();
                if (!pid) {

Re: ntfs-3g: Does it build?

[Kei Kebreau]

[-- Attachment #1: Type: text/plain, Size: 1062 bytes --]

Danny Milosavljevic <dannym@scratchpost.org> writes:

> Hi Kei,
>
> I think the empty line except for the whitespace is the only important line - see below. The number of spaces is different.
>
> diff --git a/gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch b/gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch
> index 6edd676e3..dfaeca080 100644
> --- a/gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch
> +++ b/gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch
> @@ -12,7 +12,7 @@ diff -ur ntfs-3g.old/src/lowntfs-3g.c ntfs-3g/src/lowntfs-3g.c
>  +      char *env = (char*)NULL;
>         struct timespec req = { 0, 100000000 };   /* 100 msec */
>         fuse_fstype fstype;
> -        
> +         
>         if (!stat(cmd, &st) && !geteuid()) {
>                 pid = fork();
>                 if (!pid) {

Indeed. It looks like diff adds an extra space at the beginning of code
lines to leave space for the + and - signs. Applying the patch let
ntfs-3g build again on my side. Was there any change for you using the
patch I just sent?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: ntfs-3g: Does it build?

[Danny Milosavljevic]

> Was there any change for you using the patch I just sent?

That one also works.