Page MenuHomeSolus
Files F10974690

D3392.id8379.diff
No OneTemporary
Actions

D3392.id8379.diff
View Options

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 <ikey@solus-project.com>
-Date: Thu, 17 Mar 2016 15:22:01 +0000
+From a50938bc42da56b8e49b57969d371c064207af36 Mon Sep 17 00:00:00 2001
+From: Pierre-Yves <pyu@riseup.net>
+Date: Tue, 24 Jul 2018 16:07:04 +0200
Subject: [PATCH] fusermount: Support a stateless configuration
-Signed-off-by: Ikey Doherty <ikey@solus-project.com>
+Signed-off-by: Pierre-Yves <pyu@riseup.net>
---
- 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 @@
</Description>
<PartOf>system.utils</PartOf>
<Files>
- <Path fileType="executable">/sbin</Path>
- <Path fileType="executable">/usr/bin</Path>
- <Path fileType="library">/usr/lib64/lib*.so.*</Path>
+ <Path fileType="executable">/sbin/mount.fuse</Path>
+ <Path fileType="executable">/usr/bin/fusermount</Path>
+ <Path fileType="executable">/usr/bin/ulockmgr_server</Path>
+ <Path fileType="library">/usr/lib64/libfuse.so.2</Path>
+ <Path fileType="library">/usr/lib64/libfuse.so.2.9.8</Path>
+ <Path fileType="library">/usr/lib64/libulockmgr.so.1</Path>
+ <Path fileType="library">/usr/lib64/libulockmgr.so.1.0.1</Path>
<Path fileType="library">/usr/lib64/udev/rules.d/99-fuse.rules</Path>
<Path fileType="data">/usr/share/defaults/fuse/fuse.conf</Path>
- <Path fileType="man">/usr/share/man</Path>
+ <Path fileType="man">/usr/share/man/man1/fusermount.1</Path>
+ <Path fileType="man">/usr/share/man/man1/ulockmgr_server.1</Path>
+ <Path fileType="man">/usr/share/man/man8/mount.fuse.8</Path>
</Files>
</Package>
<Package>
@@ -34,21 +40,31 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="11">fuse</Dependency>
+ <Dependency release="12">fuse</Dependency>
</RuntimeDependencies>
<Files>
- <Path fileType="header">/usr/include/</Path>
- <Path fileType="library">/usr/lib64/lib*.so</Path>
- <Path fileType="data">/usr/lib64/pkgconfig/*.pc</Path>
+ <Path fileType="header">/usr/include/fuse.h</Path>
+ <Path fileType="header">/usr/include/fuse/cuse_lowlevel.h</Path>
+ <Path fileType="header">/usr/include/fuse/fuse.h</Path>
+ <Path fileType="header">/usr/include/fuse/fuse_common.h</Path>
+ <Path fileType="header">/usr/include/fuse/fuse_common_compat.h</Path>
+ <Path fileType="header">/usr/include/fuse/fuse_compat.h</Path>
+ <Path fileType="header">/usr/include/fuse/fuse_lowlevel.h</Path>
+ <Path fileType="header">/usr/include/fuse/fuse_lowlevel_compat.h</Path>
+ <Path fileType="header">/usr/include/fuse/fuse_opt.h</Path>
+ <Path fileType="header">/usr/include/ulockmgr.h</Path>
+ <Path fileType="library">/usr/lib64/libfuse.so</Path>
+ <Path fileType="library">/usr/lib64/libulockmgr.so</Path>
+ <Path fileType="data">/usr/lib64/pkgconfig/fuse.pc</Path>
</Files>
</Package>
<History>
- <Update release="11">
- <Date>2017-08-04</Date>
- <Version>2.9.7</Version>
+ <Update release="12">
+ <Date>2018-07-24</Date>
+ <Version>2.9.8</Version>
<Comment>Packaging update</Comment>
<Name>Pierre-Yves</Name>
<Email>pyu@riseup.net</Email>
</Update>
</History>
-</PISI>
+</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Sun, Jul 23, 1:43 AM (2 w, 5 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5827456
Default Alt Text
D3392.id8379.diff (6 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.