From 5c831ee5ecea9e0f01758e16ab2ee194462b7bbc Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Fri, 4 Jun 2010 16:30:20 +0200 Subject: [PATCH] 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. --- debian/changelog | 6 ++++-- debian/patches/00list | 1 + debian/patches/ne_lfs.dpatch | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100755 debian/patches/ne_lfs.dpatch diff --git a/debian/changelog b/debian/changelog index e40b868..4e32d99 100644 --- 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 Fri, 04 Jun 2010 14:09:17 +0200 + -- Sebastian Harl 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 dfbe427..f7fed7d 100644 --- 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 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 +## +## 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; + } -- 2.30.2