- orphaned, outdated

Changed files:
    captive-no_lufsd.patch -> 1.2
    captive-use_lufis.patch -> 1.3

diff --git a/captive-no_lufsd.patch b/captive-no_lufsd.patch
deleted file mode 100644 (file)
index baa357f..0000000
--- a/captive-no_lufsd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- captive-1.1.5/configure.in.orig    2005-01-08 15:50:21.815164344 +0100
-+++ captive-1.1.5/configure.in 2005-01-08 15:52:20.391138056 +0100
-@@ -329,24 +329,8 @@
-                       AC_MSG_WARN([LUFS client not being compiled as no LUFS include files were found. Install 'lufs-*-*captive*' package.])
-               fi
-       fi
--      AC_CHECK_TYPES([struct lufs_sbattr],,[
--              dnl FIXME: Include 'lufs' version when 'lufs_sbattr' gets integrated:
--              if $have_lufs_includes && test x$enable_lufs = xyes;then
--                      AC_MSG_ERROR([Although LUFS include files were found they are too old. You may also use --enable-lufs=auto.])
--              else
--                      AC_MSG_WARN([Although LUFS include files were found they are too old. df(1) will not show available NTFS disk space.])
--              fi
--              ],[#include <lufs/proto.h>])
--      AC_PATH_PROGS(PATH_LUFSD,lufsd)
--      if test x$PATH_LUFSD = x;then
--              if test x$enable_lufs = xyes;then
--                      AC_MSG_ERROR([LUFS client was requested (--enable-lufs) but no lufsd(1) binary was found. Install 'lufs-*-*captive*' package.])
--              else
--                      AC_MSG_WARN([LUFS client not being compiled as no lufsd(1) binary was found. Install 'lufs-*-*captive*' package.])
--              fi
--      fi
- fi
--AM_CONDITIONAL(ENABLE_LUFS,[ $have_lufs_includes && test x$PATH_LUFSD != x -a x$enable_lufs != no ])
-+AM_CONDITIONAL(ENABLE_LUFS,[ $have_lufs_includes && test x$enable_lufs != no ])
- AC_SUBST(PATH_LUFSD)
- 
- dnl for $(top_srcdir)/src/libcaptive/client/

diff --git a/captive-use_lufis.patch b/captive-use_lufis.patch
deleted file mode 100644 (file)
index 32b41a2..0000000
--- a/captive-use_lufis.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- captive-1.1.5/src/client/lufs/mount.captive.in.orig        2003-12-02 18:23:19.000000000 +0100
-+++ captive-1.1.5/src/client/lufs/mount.captive.in     2005-03-26 23:19:21.163928008 +0100
-@@ -28,8 +28,7 @@
- my $vardir='@localstatedir@/lib/captive';
- $vardir=~s#\$\Q{prefix}\E#'@prefix@';#ge;
- $vardir="/var/lib/captive" if $vardir=~/^@/;
--my $lufsd_bin='@PATH_LUFSD@';
--$lufsd_bin="/usr/bin/lufsd" if $lufsd_bin=~/^@/;
-+my $lufsd_bin="/usr/bin/lufis";
- my $captive_sandbox_server_bin='@sbindir@/captive-sandbox-server';
- $captive_sandbox_server_bin=~s#\$\Q{exec_prefix}\E#'@exec_prefix@';#ge;
- $captive_sandbox_server_bin=~s#\$\Q{prefix}\E#'@prefix@';#ge;
-@@ -128,8 +127,10 @@
- 
- warn "$0: '-n' not supported - ignored" if $nomtab;
- 
-+my $fuseopts="-oallow_other,fsname=$image";
-+
- # Use "'$oo'" to permit another expansion by bash(1) during lufsmnt(8) execution.
--my @argv=($lufsd_bin,"none",$dir,"-o",$oo);
-+my @argv=($lufsd_bin,$oo,$dir,"-s",$fuseopts);
- 
- print STDERR "$0: @argv\n" if $verbose;
- exec $lufsd_bin @argv;