SOURCES: libfuse-link.patch, kernel-misc-fuse-Makefile.am.patch - ...

[shadzik]

Author: shadzik                      Date: Tue Jul  3 17:17:12 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- udated for libfuse 2.7.0

---- Files affected:
SOURCES:
   libfuse-link.patch (1.2 -> 1.3) , kernel-misc-fuse-Makefile.am.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/libfuse-link.patch
diff -u SOURCES/libfuse-link.patch:1.2 SOURCES/libfuse-link.patch:1.3
--- SOURCES/libfuse-link.patch:1.2	Wed Jan 31 18:12:43 2007
+++ SOURCES/libfuse-link.patch	Tue Jul  3 19:17:07 2007
@@ -1,26 +1,27 @@
---- fuse-2.6.1/util/Makefile.am.orig	2006-12-12 21:38:22.338526000 +0100
-+++ fuse-2.6.1/util/Makefile.am	2006-12-12 21:42:36.913034043 +0100
-@@ -4,6 +4,7 @@
- bin_PROGRAMS = fusermount ulockmgr_server
+--- fuse-2.7.0/util/Makefile.am.orig	2007-07-03 19:07:37.997256742 +0200
++++ fuse-2.7.0/util/Makefile.am	2007-07-03 19:09:22.729253309 +0200
+@@ -5,7 +5,7 @@
+ noinst_PROGRAMS = mount.fuse
  
  fusermount_SOURCES = fusermount.c
-+fusermount_LDADD = $(LIBSELINUX)
- 
- ulockmgr_server_SOURCES = ulockmgr_server.c
- ulockmgr_server_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D_REENTRANT 
---- fuse-2.6.1/configure.in.orig	2006-12-01 12:58:57.000000000 +0100
-+++ fuse-2.6.1/configure.in	2006-12-12 21:42:20.996126989 +0100
-@@ -87,7 +87,9 @@
+-fusermount_LDADD = ../lib/mount_util.o
++fusermount_LDADD = ../lib/mount_util.o $(LIBSELINUX)
+ fusermount_CPPFLAGS = -I../lib
+ mount_fuse_SOURCES = mount.fuse.c
+ 
+--- fuse-2.7.0/configure.in.orig	2007-07-02 13:32:15.000000000 +0200
++++ fuse-2.7.0/configure.in	2007-07-03 19:10:56.654033356 +0200
+@@ -98,5 +98,9 @@
  AM_CONDITIONAL(LINUX, test "$arch" = linux)
  AM_CONDITIONAL(BSD, test "$arch" = bsd)
  
--AC_CHECK_HEADERS(selinux/selinux.h, AC_CHECK_LIB(selinux, getfilecon))
 +LIBSELINUX=
 +AC_CHECK_HEADERS(selinux/selinux.h, AC_CHECK_LIB(selinux, getfilecon, [LIBSELINUX=-lselinux]))
 +AC_SUBST(LIBSELINUX)
- 
++
  AC_CONFIG_FILES([fuse.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile])
  AC_OUTPUT
+
 --- fuse-2.6.1/lib/Makefile.am.orig	2006-12-01 12:59:21.000000000 +0100
 +++ fuse-2.6.1/lib/Makefile.am	2006-12-12 21:51:19.302803339 +0100
 @@ -31,5 +31,6 @@
@@ -30,3 +31,4 @@
 +libulockmgr_la_LIBADD = -lpthread
  
  EXTRA_DIST = fuse_versionscript
+

================================================================
Index: SOURCES/kernel-misc-fuse-Makefile.am.patch
diff -u SOURCES/kernel-misc-fuse-Makefile.am.patch:1.4 SOURCES/kernel-misc-fuse-Makefile.am.patch:1.5
--- SOURCES/kernel-misc-fuse-Makefile.am.patch:1.4	Sat Dec  9 19:27:46 2006
+++ SOURCES/kernel-misc-fuse-Makefile.am.patch	Tue Jul  3 19:17:07 2007
@@ -1,6 +1,6 @@
---- fuse-2.6.1/util/Makefile.am.orig	2006-10-28 09:37:12.000000000 +0200
-+++ fuse-2.6.1/util/Makefile.am	2006-12-09 19:18:05.731925390 +0100
-@@ -9,15 +9,6 @@
+--- fuse-2.7.0/util/Makefile.am.orig	2007-04-25 18:06:47.000000000 +0200
++++ fuse-2.7.0/util/Makefile.am	2007-07-03 19:06:14.006315824 +0200
+@@ -13,15 +13,6 @@
  ulockmgr_server_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D_REENTRANT 
  ulockmgr_server_LDFLAGS = -pthread
  
@@ -13,10 +13,10 @@
 -		mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true; \
 -	fi
 -
- EXTRA_DIST = mount.fuse udev.rules init_script
+ EXTRA_DIST = udev.rules init_script
  
  MOUNT_FUSE_PATH = @MOUNT_FUSE_PATH@
-@@ -29,10 +20,6 @@
+@@ -33,10 +24,6 @@
  	$(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
  	$(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
  	$(INSTALL_PROGRAM) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
@@ -27,3 +27,11 @@
  
  install-data-local:
  	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
+@@ -46,7 +33,3 @@
+ 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+ 	rm -f $(DESTDIR)$(UDEV_RULES_PATH)/99-fuse.rules
+ 	rm -f $(DESTDIR)$(INIT_D_PATH)/fuse
+-	@if test -x /usr/sbin/update-rc.d; then \
+-		echo "/usr/sbin/update-rc.d fuse remove || true"; \
+-		/usr/sbin/update-rc.d fuse remove || true; \
+-	fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/libfuse-link.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-misc-fuse-Makefile.am.patch?r1=1.4&r2=1.5&f=u