[Pkg-samba-maint] [samba] 01/01: debian/patches/bug_221618_precise-64bit-prototype.patch: adjust the LFS handling to work independently of header include order. Closes: #727065.

[Steve Langasek]

This is an automated email from the git hooks/post-receive script.

vorlon pushed a commit to branch master
in repository samba.

commit b6df53758df589060f31e6ceda303cc40dfc82f5
Author: Steve Langasek <vorlon at debian.org>
Date:   Mon Oct 21 20:34:10 2013 -0700

    debian/patches/bug_221618_precise-64bit-prototype.patch: adjust the LFS handling to work independently of header include order.  Closes: #727065.
---
 debian/changelog                                        |    2 ++
 debian/patches/bug_221618_precise-64bit-prototype.patch |   10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 77b02bc..66ec7e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ samba (2:4.0.10+dfsg-3) UNRELEASED; urgency=low
   [ Steve Langasek ]
   * Don't fail on errors from testparm in the samba init script.
     Closes: #726326
+  * debian/patches/bug_221618_precise-64bit-prototype.patch: adjust the LFS
+    handling to work independently of header include order.  Closes: #727065.
 
  -- Ivo De Decker <ivo.dedecker at ugent.be>  Mon, 14 Oct 2013 19:33:04 +0200
 
diff --git a/debian/patches/bug_221618_precise-64bit-prototype.patch b/debian/patches/bug_221618_precise-64bit-prototype.patch
index 31108f2..3f8b302 100644
--- a/debian/patches/bug_221618_precise-64bit-prototype.patch
+++ b/debian/patches/bug_221618_precise-64bit-prototype.patch
@@ -7,12 +7,18 @@ Index: samba/source3/include/libsmbclient.h
 ===================================================================
 --- samba.orig/source3/include/libsmbclient.h
 +++ samba/source3/include/libsmbclient.h
-@@ -79,6 +79,10 @@
+@@ -79,6 +79,16 @@
  #include <fcntl.h>
  #include <utime.h>
  
 +  /* Debian bug #221618 */
-+#define _LARGEFILE64_SOURCE
++#ifdef _LARGEFILE64_SOURCE
++#undef _LARGEFILE64_SOURCE
++#endif
++#define _LARGEFILE64_SOURCE 1
++#ifdef _FILE_OFFSET_BITS
++#undef _FILE_OFFSET_BITS
++#endif
 +#define _FILE_OFFSET_BITS 64
 +
  #define SMBC_BASE_FD        10000 /* smallest file descriptor returned */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git