diff --git a/files/0001-fusermount-Support-a-stateless-configuration.patch b/files/0001-fusermount-Support-a-stateless-configuration.patch --- a/files/0001-fusermount-Support-a-stateless-configuration.patch +++ b/files/0001-fusermount-Support-a-stateless-configuration.patch @@ -1,18 +1,18 @@ -From fa6226e0380cbce79c118f9d7c603b6044aaada7 Mon Sep 17 00:00:00 2001 -From: Ikey Doherty -Date: Thu, 17 Mar 2016 15:22:01 +0000 +From a50938bc42da56b8e49b57969d371c064207af36 Mon Sep 17 00:00:00 2001 +From: Pierre-Yves +Date: Tue, 24 Jul 2018 16:07:04 +0200 Subject: [PATCH] fusermount: Support a stateless configuration -Signed-off-by: Ikey Doherty +Signed-off-by: Pierre-Yves --- - util/fusermount.c | 23 ++++++++++++++++------- - 1 file changed, 16 insertions(+), 7 deletions(-) + util/fusermount.c | 25 +++++++++++++++++-------- + 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/util/fusermount.c b/util/fusermount.c -index 26a0b75..438e405 100644 +index 245aeea..e2f6d91 100644 --- a/util/fusermount.c +++ b/util/fusermount.c -@@ -36,6 +36,7 @@ +@@ -38,6 +38,7 @@ #define FUSE_DEV_NEW "/dev/fuse" #define FUSE_VERSION_FILE_OLD "/proc/fs/fuse/version" #define FUSE_CONF "/etc/fuse.conf" @@ -20,7 +20,7 @@ #ifndef MS_DIRSYNC #define MS_DIRSYNC 128 -@@ -525,7 +526,7 @@ static void strip_line(char *line) +@@ -527,7 +528,7 @@ static void strip_line(char *line) memmove(line, s, strlen(s)+1); } @@ -29,7 +29,7 @@ { int tmp; if (strcmp(line, "user_allow_other") == 0) -@@ -535,12 +536,20 @@ static void parse_line(char *line, int linenum) +@@ -537,12 +538,20 @@ static void parse_line(char *line, int linenum) else if(line[0]) fprintf(stderr, "%s: unknown parameter in %s at line %i: '%s'\n", @@ -52,7 +52,7 @@ if (fp != NULL) { int linenum = 1; char line[256]; -@@ -549,12 +558,12 @@ static void read_conf(void) +@@ -551,12 +560,12 @@ static void read_conf(void) if (isnewline) { if (line[strlen(line)-1] == '\n') { strip_line(line); @@ -67,7 +67,7 @@ isnewline = 1; } -@@ -562,13 +571,13 @@ static void read_conf(void) +@@ -564,11 +573,11 @@ static void read_conf(void) linenum ++; } if (!isnewline) { @@ -75,14 +75,21 @@ + fprintf(stderr, "%s: reading %s: missing newline at end of file\n", progname, fuse_conf); } + if (ferror(fp)) { +- fprintf(stderr, "%s: reading %s: read failed\n", progname, FUSE_CONF); ++ fprintf(stderr, "%s: reading %s: read failed\n", progname, fuse_conf); + exit(1); + } fclose(fp); - } else if (errno != ENOENT) { +@@ -577,7 +586,7 @@ static void read_conf(void) + errno != ENAMETOOLONG && errno != ENOTDIR && + errno != EOVERFLOW); fprintf(stderr, "%s: failed to open %s: %s\n", - progname, FUSE_CONF, strerror(errno)); + progname, fuse_conf, strerror(errno)); + if (fatal) + exit(1); } - } - -- -2.7.3 +2.18.0 diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : fuse -version : 2.9.7 -release : 11 +version : 2.9.8 +release : 12 source : - - https://github.com/libfuse/libfuse/releases/download/fuse-2.9.7/fuse-2.9.7.tar.gz : 832432d1ad4f833c20e13b57cf40ce5277a9d33e483205fc63c78111b3358874 + - https://github.com/libfuse/libfuse/releases/download/fuse-2.9.8/fuse-2.9.8.tar.gz : 12347b4220a8d36f9896d1aec58790327ec0036237a14051ca14ece2057d8fcc license : LGPL-2.0 summary : File Systems in User Space component : system.utils diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -19,12 +19,18 @@ system.utils - /sbin - /usr/bin - /usr/lib64/lib*.so.* + /sbin/mount.fuse + /usr/bin/fusermount + /usr/bin/ulockmgr_server + /usr/lib64/libfuse.so.2 + /usr/lib64/libfuse.so.2.9.8 + /usr/lib64/libulockmgr.so.1 + /usr/lib64/libulockmgr.so.1.0.1 /usr/lib64/udev/rules.d/99-fuse.rules /usr/share/defaults/fuse/fuse.conf - /usr/share/man + /usr/share/man/man1/fusermount.1 + /usr/share/man/man1/ulockmgr_server.1 + /usr/share/man/man8/mount.fuse.8 @@ -34,21 +40,31 @@ programming.devel - fuse + fuse - /usr/include/ - /usr/lib64/lib*.so - /usr/lib64/pkgconfig/*.pc + /usr/include/fuse.h + /usr/include/fuse/cuse_lowlevel.h + /usr/include/fuse/fuse.h + /usr/include/fuse/fuse_common.h + /usr/include/fuse/fuse_common_compat.h + /usr/include/fuse/fuse_compat.h + /usr/include/fuse/fuse_lowlevel.h + /usr/include/fuse/fuse_lowlevel_compat.h + /usr/include/fuse/fuse_opt.h + /usr/include/ulockmgr.h + /usr/lib64/libfuse.so + /usr/lib64/libulockmgr.so + /usr/lib64/pkgconfig/fuse.pc - - 2017-08-04 - 2.9.7 + + 2018-07-24 + 2.9.8 Packaging update Pierre-Yves pyu@riseup.net - + \ No newline at end of file