Hello,
Here is interdiff between 0.9.7-8.1 and 0.9.7-8.2.
Best regards, Adam.
diff -u lufs-0.9.7/debian/changelog lufs-0.9.7/debian/changelog
--- lufs-0.9.7/debian/changelog
+++ lufs-0.9.7/debian/changelog
@@ -1,3 +1,16 @@
+lufs (0.9.7-8.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Merge patch to fix kernel BUG at fs/inode.c:252 crash (Closes: #347933).
+ * Merge patch to fix build against kernel 2.6.18 (Closes: #388386).
+ * Merge patch to fix build against kernels 2.6.19+ (Closes: #416061).
+ * Use dh_installmodules (Closes: #381770).
+ * kdist_clean should not fail if already cleaned (Closes: #341828).
+ * Configure with --with-ssh and patch configure.in to always build ssh
+ backend.
+
+ -- Adam Cécile (Le_Vert) <[EMAIL PROTECTED]> Wed, 20 Feb 2008 09:14:41 +0100
+
lufs (0.9.7-8.1) unstable; urgency=high
* debian/control: Update automake build dependency to
reverted:
--- lufs-0.9.7/debian/lufs-module-_KVERS_.postinst.modules.in
+++ lufs-0.9.7.orig/debian/lufs-module-_KVERS_.postinst.modules.in
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "`uname -r`" = _KVERS_ ] ; then
- depmod -a &
-fi
-
-#DEBHELPER#
diff -u lufs-0.9.7/debian/patches/00list lufs-0.9.7/debian/patches/00list
--- lufs-0.9.7/debian/patches/00list
+++ lufs-0.9.7/debian/patches/00list
@@ -5,0 +6,4 @@
+06_kernel_BUG_at_fs_inode.c
+07_linux2.6.18
+08_linux2.6.19
+09_always_enable_sshfs_backend
diff -u lufs-0.9.7/debian/rules lufs-0.9.7/debian/rules
--- lufs-0.9.7/debian/rules
+++ lufs-0.9.7/debian/rules
@@ -46,7 +46,7 @@
#endif
# Add here commands to configure the package.
./bootstrap
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-kernel-support=no
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-kernel-support=no --with-ssh=/usr/bin/ssh
perl -pe 's/^CFLAGS.=/$$& -fPIC /' -i filesystems/gnetfs/Makefile
touch config-stamp
@@ -162,7 +162,7 @@
kdist_clean:
dh_clean
- find -name '*.o' | xargs rm -f
+ find -name '*.o' -exec rm -f '{}' ';'
kdist_config: prep-deb-files
@@ -176,6 +176,7 @@
dh_installdocs
dh_installmodules
dh_installchangelogs
+ dh_installmodules
dh_link
dh_strip
dh_compress
only in patch2:
unchanged:
--- lufs-0.9.7.orig/debian/patches/06_kernel_BUG_at_fs_inode.c.dpatch
+++ lufs-0.9.7/debian/patches/06_kernel_BUG_at_fs_inode.c.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_kernel_BUG_at_fs_inode.c.dpatch
+## by Ludovic Drolez <[EMAIL PROTECTED]>
+##
+## DP: Fix kernel BUG at fs/inode.c:252 by replacing lufs delete inode
+## DP: function by the generic kernel one.
+## DP: See Debian bug #347933.
+
[EMAIL PROTECTED]@
+
+diff -u lufs-0.9.7/kernel/Linux/2.6/inode.c lufs-0.9.7/kernel/Linux/2.6/inode.c.new
+--- lufs-0.9.7/kernel/Linux/2.6/inode.c 2003-03-08 22:45:30.000000000 +0100
++++ lufs-0.9.7/kernel/Linux/2.6/inode.c.new 2008-02-20 09:06:58.246898888 +0100
+@@ -56,8 +56,10 @@
+ static int lu_statfs(struct super_block*, struct statfs*);
+
+ static struct super_operations lu_sops = {
+- .drop_inode = generic_delete_inode,
+- .delete_inode = lu_delete_inode,
++/* .drop_inode = generic_delete_inode, */
++/* .delete_inode = lu_delete_inode, */
++ .drop_inode = generic_drop_inode,
++ .delete_inode = generic_delete_inode,
+ .put_super = lu_put_super,
+ .statfs = lu_statfs,
+ };
only in patch2:
unchanged:
--- lufs-0.9.7.orig/debian/patches/09_always_enable_sshfs_backend.dpatch
+++ lufs-0.9.7/debian/patches/09_always_enable_sshfs_backend.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09_always_enable_sshfs_backend.dpatch
+## by Adam Cécile (Le_Vert) <[EMAIL PROTECTED]>
+##
+## DP: Always build sshfs backend if built with --with-ssh=
+
[EMAIL PROTECTED]@
+
+diff -u lufs-0.9.7/configure.in.orig lufs-0.9.7/configure.in
+--- lufs-0.9.7/configure.in.orig 2003-10-29 23:40:28.000000000 +0100
++++ lufs-0.9.7/configure.in 2008-02-26 16:05:31.844258328 +0100
+@@ -150,7 +150,7 @@
+ [ --with-ssh=PATH specify the path to the ssh executable],
+ [SSHPROG=$withval],
+ [SSHPROG=`which ssh 2>/dev/null`])
+-if test ! -x "$SSHPROG"
++if false
+ then
+ AC_MSG_RESULT([not found (sshfs support disabled)])
+ else
only in patch2:
unchanged:
--- lufs-0.9.7.orig/debian/patches/07_linux2.6.18.dpatch
+++ lufs-0.9.7/debian/patches/07_linux2.6.18.dpatch
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_linux2.6.18.dpatch
+## by "C.Y.M" <[EMAIL PROTECTED]>
+##
+## DP: Fix build against 2.6.18 kernels.
+## See: Debian bug #388386.
+
[EMAIL PROTECTED]@
+
+--- lufs/kernel/Linux/2.6/inode.c 2006-10-05 04:10:30.000000000 -0700
++++ lufs.new/kernel/Linux/2.6/inode.c 2006-10-05 04:07:27.000000000 -0700
+@@ -53,7 +53,7 @@
+
+ static void lu_delete_inode(struct inode*);
+ static void lu_put_super(struct super_block*);
+-static int lu_statfs(struct super_block*, struct statfs*);
++static int lu_statfs(struct dentry*, struct statfs*);
+
+ static struct super_operations lu_sops = {
+ .drop_inode = generic_drop_inode,
+@@ -383,7 +383,7 @@
+ return res;
+ }
+
+-static int lu_statfs(struct super_block *sb, struct statfs *attr)
++static int lu_statfs(struct dentry * dentry, struct statfs *attr)
+ {
+ TRACE("in\n");
+
+@@ -510,9 +510,9 @@
+ return -EINVAL;
+ }
+
+-static struct super_block *lu_get_sb(struct file_system_type *fs_type, int flags, char *dev_name, void *data)
++static int lu_get_sb(struct file_system_type *fs_type, int flags, char *dev_name, void *data, struct vfsmount *mnt)
+ {
+- return get_sb_nodev(fs_type, flags, data, lu_fill_super);
++ return get_sb_nodev(fs_type, flags, data, lu_fill_super, mnt);
+ }
+
+ static struct file_system_type lu_fs_type = {
only in patch2:
unchanged:
--- lufs-0.9.7.orig/debian/patches/08_linux2.6.19.dpatch
+++ lufs-0.9.7/debian/patches/08_linux2.6.19.dpatch
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_linux2.6.19.dpatch
+## by "C.Y.M" <[EMAIL PROTECTED]>
+##
+## DP: Fix build against 2.6.19+ kernels.
+## See: Debian bug #416061.
+
[EMAIL PROTECTED]@
+
+--- lufs/kernel/Linux/2.6/inode.c.orig 2007-03-24 07:15:06.000000000 -0700
++++ lufs/kernel/Linux/2.6/inode.c 2007-03-24 07:15:30.000000000 -0700
+@@ -178,7 +178,6 @@
+ inode->i_ctime.tv_sec = fattr->f_ctime;
+ inode->i_mtime.tv_sec = fattr->f_mtime;
+ inode->i_atime.tv_sec = fattr->f_atime;
+- inode->i_blksize = fattr->f_blksize;
+ inode->i_blocks = fattr->f_blocks;
+ inode->i_size = fattr->f_size;
+
+--- lufs/kernel/Linux/2.6/file.c.orig 2007-03-24 07:15:13.000000000 -0700
++++ lufs/kernel/Linux/2.6/file.c 2007-03-24 07:16:56.000000000 -0700
+@@ -254,7 +254,7 @@
+ TRACE("in\n");
+
+ if(!(res = lu_revalidate_inode(dentry)))
+- res = generic_file_read(filp, buf, count, ppos);
++ res = do_sync_read(filp, buf, count, ppos);
+
+ TRACE("out\n");
+
+@@ -284,7 +284,7 @@
+ TRACE("in\n");
+
+ if(!(res = lu_revalidate_inode(dentry)) && (count > 0))
+- res = generic_file_write(filp, buf, count, ppos);
++ res = do_sync_write(filp, buf, count, ppos);
+
+ TRACE("out\n");
+
