Bundle "captive-fusermount" of FUSE "fusermoun.c" for: --enable-standalone

diff --git a/autogen.pl b/autogen.pl
index 7b7c1de..0a06f7c 100755 (executable)
--- a/autogen.pl
+++ b/autogen.pl
@@ -51,6 +51,7 @@ AutoGen->run(
                                ./src/client/lufs/mount.captive
                                ./src/client/fuse/mount.captive
                                ./src/client/fuse/captive
+                               ./src/client/fuse/captive-fusermount
                                ./src/client/sandbox-server/captive-sandbox-server
                                ./src/client/gnomevfs/captive.conf
                                ./src/install/fstab/captive-install-fstab

diff --git a/captive.spec.in b/captive.spec.in
index b163f72..55f5641 100644 (file)
--- a/captive.spec.in
+++ b/captive.spec.in
@@ -204,7 +204,7 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 /usr/sbin/groupadd -r captive 2>/dev/null || \
    /usr/sbin/groupadd captive 2>/dev/null || \
-        true
+   true
 /usr/sbin/useradd -r -c "Captive Sandbox" -s /sbin/nologin -g captive -d %{_var}/lib/@PACKAGE@ captive 2>/dev/null || \
    /usr/sbin/useradd -c "Captive Sandbox" -s /sbin/nologin -g captive -d %{_var}/lib/@PACKAGE@ captive 2>/dev/null || \
    true
@@ -212,6 +212,11 @@ rm -rf $RPM_BUILD_ROOT
 %if ! %{static}
 %post fuse
 %endif
+%if %{static}
+/usr/sbin/groupadd -r fuse 2>/dev/null || \
+   /usr/sbin/groupadd fuse 2>/dev/null || \
+   true
+%endif
 /usr/lib/lsb/install_initd @PACKAGE@ 2>/dev/null || \
                /sbin/chkconfig --add @PACKAGE@
 touch %{_var}/lock/subsys/@PACKAGE@
@@ -268,6 +273,9 @@ rm -rf %{_var}/lib/@PACKAGE@/tmp/*
 /sbin/mount.@PACKAGE@
 /sbin/mount.@PACKAGE@-*
 %attr(644,root,root) %{_mandir}/man?/mount.@PACKAGE@.*
+%if %{static}
+%{_libexecdir}/@PACKAGE@-fusermount
+%endif
 
 %if ! %{static}
 %files install

diff --git a/configure.ac b/configure.ac
index e189390..69df721 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -452,6 +452,7 @@ AC_SUBST(GNOME_VFS_READ_ENTIRE_FILE_O)
 if test x$enable_standalone = xyes;then
        AC_DEFINE(ENABLE_STANDALONE,,[Provide initialization for static-build])
 fi
+AM_CONDITIONAL(ENABLE_STANDALONE,[test x$enable_standalone = xyes])
 
 fontsdir=
 if test x$enable_standalone_fonts != xno;then

diff --git a/src/client/fuse/Makefile.am b/src/client/fuse/Makefile.am
index d551212..9d673c3 100644 (file)
--- a/src/client/fuse/Makefile.am
+++ b/src/client/fuse/Makefile.am
@@ -86,6 +86,12 @@ install-exec-hook:
                        $(LN_S) mount.captive $(DESTDIR)$(enable_sbin_mountdir)/mount.captive-$$fs; \
                fi; \
                done
+       if test `id -u` -eq 0 -a -z "$(DESTDIR)";then \
+               if grep -q '^fuse:' /etc/group;then true;else \
+                       echo "ERROR: Add 'fuse' to your '/etc/group'; see groupadd(8)"; \
+                       exit 1; \
+               fi; \
+       fi
 
 else
 install-exec-hook:
@@ -117,3 +123,15 @@ CLEANFILES+=captive
 captive: captive.init
        $(LN_S) $< $@
 
+captive_fusermount_SOURCES= \
+               fusermount.c
+captive_fusermount_CFLAGS=
+captive_fusermount_LDADD =$(captive_library)
+libexec_PROGRAMS=$(libexec_PROGRAMS_cond)
+libexecPROGRAMS_INSTALL=${INSTALL} -o root -g fuse -m 4754
+
+if ENABLE_FUSE
+if ENABLE_STANDALONE
+libexec_PROGRAMS_cond=captive-fusermount
+endif
+endif