pool/fuse
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 126962 from filesystems

Browse Source 
- avoid autoreconf to avoid breaking on updates of auto* tools (forwarded request 126861 from coolo)

OBS-URL: https://build.opensuse.org/request/show/126962
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fuse?expand=0&rev=53
This commit is contained in:
Stephan Kulow 2012-07-03 11:50:11 +00:00 committed by Git OBS Bridge
commit 98350ecbc7
5 changed files with 1370 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
fix-pthread-in-fuse.pc.patch
View File

@ -18,7 +18,7 @@ Reported by Werner Fink
Index: fuse-2.9.0/ChangeLog
===================================================================
--- fuse-2.9.0.orig/ChangeLog 2012-04-20 16:29:19.000000000 +0200
+++ fuse-2.9.0/ChangeLog 2012-05-16 17:51:34.000000000 +0200
+++ fuse-2.9.0/ChangeLog 2012-07-02 09:29:09.904005554 +0200
@@ -1,3 +1,10 @@
+2012-05-16 Miklos Szeredi <miklos@szeredi.hu>
+
@ -32,8 +32,8 @@ Index: fuse-2.9.0/ChangeLog
* Released 2.9.0
Index: fuse-2.9.0/configure.in
===================================================================
--- fuse-2.9.0.orig/configure.in 2012-05-16 17:51:33.000000000 +0200
+++ fuse-2.9.0/configure.in 2012-05-16 17:51:34.000000000 +0200
--- fuse-2.9.0.orig/configure.in 2012-07-02 09:27:31.886602524 +0200
+++ fuse-2.9.0/configure.in 2012-07-02 09:29:09.915005039 +0200
@@ -62,11 +62,10 @@ AC_CHECK_FUNCS([fork setxattr fdatasync
AC_CHECK_MEMBERS([struct stat.st_atim])
AC_CHECK_MEMBERS([struct stat.st_atimespec])
@ -59,7 +59,7 @@ Index: fuse-2.9.0/configure.in
Index: fuse-2.9.0/fuse.pc.in
===================================================================
--- fuse-2.9.0.orig/fuse.pc.in 2012-04-10 15:28:55.000000000 +0200
+++ fuse-2.9.0/fuse.pc.in 2012-05-16 17:51:34.000000000 +0200
+++ fuse-2.9.0/fuse.pc.in 2012-07-02 09:29:09.915005039 +0200
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: fuse
Description: Filesystem in Userspace
@ -71,7 +71,7 @@ Index: fuse-2.9.0/fuse.pc.in
Index: fuse-2.9.0/lib/Makefile.am
===================================================================
--- fuse-2.9.0.orig/lib/Makefile.am 2012-04-20 12:01:56.000000000 +0200
+++ fuse-2.9.0/lib/Makefile.am 2012-05-16 17:51:34.000000000 +0200
+++ fuse-2.9.0/lib/Makefile.am 2012-07-02 09:29:09.916004992 +0200
@@ -36,7 +36,7 @@ libfuse_la_SOURCES = \
$(iconv_source) \
$(mount_source)
@ -81,3 +81,46 @@ Index: fuse-2.9.0/lib/Makefile.am
-Wl,--version-script,$(srcdir)/fuse_versionscript
if NETBSD
Index: fuse-2.9.0/configure
===================================================================
--- fuse-2.9.0.orig/configure 2012-07-02 09:27:54.000000000 +0200
+++ fuse-2.9.0/configure 2012-07-02 09:29:47.969220381 +0200
@@ -12114,7 +12114,6 @@ _ACEOF
fi
-libfuse_libs="-pthread"
LIBS=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
$as_echo_n "checking for library containing dlopen... " >&6; }
@@ -12228,7 +12227,7 @@ if test "$ac_res" != no; then :
fi
-libfuse_libs="$libfuse_libs $LIBS"
+libfuse_libs=$LIBS
LIBS=
# Check whether --with-libiconv-prefix was given.
@@ -13205,7 +13204,7 @@ _ACEOF
fi
-libfuse_libs="$libfuse_libs $LTLIBICONV"
+libfuse_libs=$libfuse_libs $LTLIBICONV
if test "$am_cv_func_iconv" = yes; then
ICONV_TRUE=
ICONV_FALSE='#'
Index: fuse-2.9.0/lib/Makefile.in
===================================================================
--- fuse-2.9.0.orig/lib/Makefile.in 2012-04-20 14:43:38.000000000 +0200
+++ fuse-2.9.0/lib/Makefile.in 2012-07-02 09:29:51.589050623 +0200
@@ -283,7 +283,7 @@ libfuse_la_SOURCES = \
$(iconv_source) \
$(mount_source)
-libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:9:0 \
+libfuse_la_LDFLAGS = -pthread @libfuse_libs@ -version-number 2:9:0 \
-Wl,--version-script,$(srcdir)/fuse_versionscript
@NETBSD_TRUE@libfuse_la_LIBADD = -lperfuse -lpuffs

1240
fuse-gnu_source.patch
View File

File diff suppressed because it is too large Load Diff

5
fuse.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jul 2 07:38:49 UTC 2012 - coolo@suse.com
- avoid autoreconf to avoid breaking on updates of auto* tools
-------------------------------------------------------------------
Sat May 26 16:14:26 UTC 2012 - jengelh@inai.de

2
fuse.spec
View File

@ -37,7 +37,6 @@ Requires: util-linux >= 2.18
%else
Requires: util-linux(fake+no-canonicalize)
%endif
BuildRequires: libtool
BuildRequires: pkgconfig
%if 0%{?suse_version} >= 1000
Supplements: filesystem(fuse)
@ -142,7 +141,6 @@ http://fuse.sourceforge.net/wiki
%patch5 -p1
%build
autoreconf -fiv
export CFLAGS="$RPM_OPT_FLAGS -g -fno-strict-aliasing"
export MOUNT_FUSE_PATH=%{_sbindir}
%configure --with-pic \

81
fusermount-compile-as-pie.patch
View File

@ -1,7 +1,7 @@
Index: fuse-2.9.0/util/Makefile.am
===================================================================
--- fuse-2.9.0.orig/util/Makefile.am
+++ fuse-2.9.0/util/Makefile.am
--- fuse-2.9.0.orig/util/Makefile.am 2012-07-02 09:27:27.057828998 +0200
+++ fuse-2.9.0/util/Makefile.am 2012-07-02 09:28:25.920068349 +0200
@@ -10,6 +10,8 @@ noinst_PROGRAMS = mount.fuse
# copying it over.
fusermount_SOURCES = fusermount.c mount_util.c
@ -11,3 +11,80 @@ Index: fuse-2.9.0/util/Makefile.am
BUILT_SOURCES = mount_util.c
mount_util.c: $(top_srcdir)/lib/mount_util.c
@cp $(top_srcdir)/lib/mount_util.c .
Index: fuse-2.9.0/util/Makefile.in
===================================================================
--- fuse-2.9.0.orig/util/Makefile.in 2012-07-02 09:27:27.000000000 +0200
+++ fuse-2.9.0/util/Makefile.in 2012-07-02 09:28:54.629721894 +0200
@@ -59,6 +59,9 @@ fusermount_LDADD = $(LDADD)
AM_V_lt = $(am__v_lt_$(V))
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
am__v_lt_0 = --silent
+fusermount_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(fusermount_CFLAGS) \
+ $(CFLAGS) $(fusermount_LDFLAGS) $(LDFLAGS) -o $@
am_mount_fuse_OBJECTS = mount.fuse.$(OBJEXT)
mount_fuse_OBJECTS = $(am_mount_fuse_OBJECTS)
mount_fuse_LDADD = $(LDADD)
@@ -237,6 +240,8 @@ AM_CPPFLAGS = -D_FILE_OFFSET_BITS=64
# copying it over.
fusermount_SOURCES = fusermount.c mount_util.c
fusermount_CPPFLAGS = -I$(top_srcdir)/lib
+fusermount_CFLAGS = -fPIE $(AM_CFLAGS)
+fusermount_LDFLAGS = -pie $(AM_LDFLAGS)
BUILT_SOURCES = mount_util.c
mount_fuse_SOURCES = mount.fuse.c
ulockmgr_server_SOURCES = ulockmgr_server.c
@@ -332,7 +337,7 @@ clean-noinstPROGRAMS:
rm -f $$list
fusermount$(EXEEXT): $(fusermount_OBJECTS) $(fusermount_DEPENDENCIES)
@rm -f fusermount$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(fusermount_OBJECTS) $(fusermount_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(fusermount_LINK) $(fusermount_OBJECTS) $(fusermount_LDADD) $(LIBS)
mount.fuse$(EXEEXT): $(mount_fuse_OBJECTS) $(mount_fuse_DEPENDENCIES)
@rm -f mount.fuse$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(mount_fuse_OBJECTS) $(mount_fuse_LDADD) $(LIBS)
@@ -376,36 +381,36 @@ distclean-compile:
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
fusermount-fusermount.o: fusermount.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fusermount-fusermount.o -MD -MP -MF $(DEPDIR)/fusermount-fusermount.Tpo -c -o fusermount-fusermount.o `test -f 'fusermount.c' || echo '$(srcdir)/'`fusermount.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(fusermount_CFLAGS) $(CFLAGS) -MT fusermount-fusermount.o -MD -MP -MF $(DEPDIR)/fusermount-fusermount.Tpo -c -o fusermount-fusermount.o `test -f 'fusermount.c' || echo '$(srcdir)/'`fusermount.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fusermount-fusermount.Tpo $(DEPDIR)/fusermount-fusermount.Po
@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fusermount.c' object='fusermount-fusermount.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fusermount-fusermount.o `test -f 'fusermount.c' || echo '$(srcdir)/'`fusermount.c
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(fusermount_CFLAGS) $(CFLAGS) -c -o fusermount-fusermount.o `test -f 'fusermount.c' || echo '$(srcdir)/'`fusermount.c
fusermount-fusermount.obj: fusermount.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fusermount-fusermount.obj -MD -MP -MF $(DEPDIR)/fusermount-fusermount.Tpo -c -o fusermount-fusermount.obj `if test -f 'fusermount.c'; then $(CYGPATH_W) 'fusermount.c'; else $(CYGPATH_W) '$(srcdir)/fusermount.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(fusermount_CFLAGS) $(CFLAGS) -MT fusermount-fusermount.obj -MD -MP -MF $(DEPDIR)/fusermount-fusermount.Tpo -c -o fusermount-fusermount.obj `if test -f 'fusermount.c'; then $(CYGPATH_W) 'fusermount.c'; else $(CYGPATH_W) '$(srcdir)/fusermount.c'; fi`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fusermount-fusermount.Tpo $(DEPDIR)/fusermount-fusermount.Po
@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fusermount.c' object='fusermount-fusermount.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fusermount-fusermount.obj `if test -f 'fusermount.c'; then $(CYGPATH_W) 'fusermount.c'; else $(CYGPATH_W) '$(srcdir)/fusermount.c'; fi`
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(fusermount_CFLAGS) $(CFLAGS) -c -o fusermount-fusermount.obj `if test -f 'fusermount.c'; then $(CYGPATH_W) 'fusermount.c'; else $(CYGPATH_W) '$(srcdir)/fusermount.c'; fi`
fusermount-mount_util.o: mount_util.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fusermount-mount_util.o -MD -MP -MF $(DEPDIR)/fusermount-mount_util.Tpo -c -o fusermount-mount_util.o `test -f 'mount_util.c' || echo '$(srcdir)/'`mount_util.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(fusermount_CFLAGS) $(CFLAGS) -MT fusermount-mount_util.o -MD -MP -MF $(DEPDIR)/fusermount-mount_util.Tpo -c -o fusermount-mount_util.o `test -f 'mount_util.c' || echo '$(srcdir)/'`mount_util.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fusermount-mount_util.Tpo $(DEPDIR)/fusermount-mount_util.Po
@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mount_util.c' object='fusermount-mount_util.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fusermount-mount_util.o `test -f 'mount_util.c' || echo '$(srcdir)/'`mount_util.c
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(fusermount_CFLAGS) $(CFLAGS) -c -o fusermount-mount_util.o `test -f 'mount_util.c' || echo '$(srcdir)/'`mount_util.c
fusermount-mount_util.obj: mount_util.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fusermount-mount_util.obj -MD -MP -MF $(DEPDIR)/fusermount-mount_util.Tpo -c -o fusermount-mount_util.obj `if test -f 'mount_util.c'; then $(CYGPATH_W) 'mount_util.c'; else $(CYGPATH_W) '$(srcdir)/mount_util.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(fusermount_CFLAGS) $(CFLAGS) -MT fusermount-mount_util.obj -MD -MP -MF $(DEPDIR)/fusermount-mount_util.Tpo -c -o fusermount-mount_util.obj `if test -f 'mount_util.c'; then $(CYGPATH_W) 'mount_util.c'; else $(CYGPATH_W) '$(srcdir)/mount_util.c'; fi`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fusermount-mount_util.Tpo $(DEPDIR)/fusermount-mount_util.Po
@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mount_util.c' object='fusermount-mount_util.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fusermount-mount_util.obj `if test -f 'mount_util.c'; then $(CYGPATH_W) 'mount_util.c'; else $(CYGPATH_W) '$(srcdir)/mount_util.c'; fi`
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(fusermount_CPPFLAGS) $(CPPFLAGS) $(fusermount_CFLAGS) $(CFLAGS) -c -o fusermount-mount_util.obj `if test -f 'mount_util.c'; then $(CYGPATH_W) 'mount_util.c'; else $(CYGPATH_W) '$(srcdir)/mount_util.c'; fi`
ulockmgr_server-ulockmgr_server.o: ulockmgr_server.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ulockmgr_server_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ulockmgr_server-ulockmgr_server.o -MD -MP -MF $(DEPDIR)/ulockmgr_server-ulockmgr_server.Tpo -c -o ulockmgr_server-ulockmgr_server.o `test -f 'ulockmgr_server.c' || echo '$(srcdir)/'`ulockmgr_server.c