patches: Re-introduced a simplified version of ne_lfs.

Check for NE_FEATURE_LFS only if ne_off_t is not large enough for LFS; any
other checks/defines are no longer required for neon27.

diff --git a/debian/changelog b/debian/changelog
index e40b8689306384befecae792f816a2ae61e599dc..4e32d996dc53664ee282da5fbc2239758d4db534 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,11 +10,13 @@ fusedav (0.2-3) unstable; urgency=low
   * debian/patches:
     - Added bts532763-neon27, adding support for neon27; thanks to Andreas
       Metzler for reporting this (Closes: #532763).
-    - Removed ne_lfs -- no longer needed when using neon27.
+    - Simplified ne_lfs -- check for NE_FEATURE_LFS only if ne_off_t is not
+      large enough for LFS; any other checks/defines are no longer required
+      for neon27.
   * debian/README.source:
     - Added generic instructions for dpatch.
 
- -- Sebastian Harl <tokkee@debian.org>  Fri, 04 Jun 2010 14:09:17 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Fri, 04 Jun 2010 16:28:53 +0200
 
 fusedav (0.2-2) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index dfbe4272e1ed2e695ac75814dc046f46ddc9c672..f7fed7df91ab51599709295d00aab6be49a60967 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,3 @@
+ne_lfs.dpatch
 bts532763-neon27.dpatch
 

diff --git a/debian/patches/ne_lfs.dpatch b/debian/patches/ne_lfs.dpatch
new file mode 100755 (executable)
index 0000000..842249d
--- /dev/null
+++ b/debian/patches/ne_lfs.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ne_lfs.dpatch by Sebastian Harl <tokkee@debian.org>
+##
+## DP: Check for NE_FEATURE_LFS only if ne_off_t is not large enough for LFS.
+
+@DPATCH@
+
+diff a/src/fusedav.c b/src/fusedav.c
+--- a/src/fusedav.c
++++ b/src/fusedav.c
+@@ -1387,7 +1387,7 @@ int main(int argc, char *argv[]) {
+ 
+     if (!ne_has_support(NE_FEATURE_SSL) ||
+         !ne_has_support(NE_FEATURE_TS_SSL) ||
+-        !ne_has_support(NE_FEATURE_LFS)) {
++        !((sizeof(ne_off_t) >= 8) || ne_has_support(NE_FEATURE_LFS))) {
+         fprintf(stderr, "fusedav requires libneon built with SSL, SSL thread safety and LFS enabled.\n");
+         goto finish;
+     }