[Pkg-samba-maint] [SCM] Debian packaging for Samba branch, master, updated. debian/2%3.6.15-1-7-g8ada4cb

[Ivo De Decker]

The following commit has been merged in the master branch:
commit 4742f1bc48aec78653088cd99378161ddc403d04
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Wed Jun 19 20:35:20 2013 +0200

    refresh patches for upstream version 3.6.16

diff --git a/debian/patches/autoconf.patch b/debian/patches/autoconf.patch
index 631b330..7ff5e3e 100644
--- a/debian/patches/autoconf.patch
+++ b/debian/patches/autoconf.patch
@@ -25,11 +25,9 @@ Note: This patch will normally have to be updated by hand after every
  quilt refresh
  find . -name '*.rej' | xargs rm
 
-Index: samba/source3/configure
-===================================================================
---- samba.orig/source3/configure
-+++ samba/source3/configure
-@@ -3147,6 +3147,27 @@
+--- a/source3/configure
++++ b/source3/configure
+@@ -3172,6 +3172,27 @@
  
  
  
@@ -57,7 +55,7 @@ Index: samba/source3/configure
  echo "LIBREPLACE_LOCATION_CHECKS: END"
  
  
-@@ -5772,7 +5793,6 @@
+@@ -5797,7 +5818,6 @@
  
  
  
@@ -65,7 +63,7 @@ Index: samba/source3/configure
   cat >>confdefs.h <<\EOF
  #ifndef _XOPEN_SOURCE_EXTENDED
  #define _XOPEN_SOURCE_EXTENDED 1
-@@ -6019,7 +6039,6 @@
+@@ -6044,7 +6064,6 @@
  		# this brings in socklen_t
  
  
@@ -73,7 +71,7 @@ Index: samba/source3/configure
   cat >>confdefs.h <<\EOF
  #ifndef _XOPEN_SOURCE
  #define _XOPEN_SOURCE 600
-@@ -6028,7 +6047,6 @@
+@@ -6053,7 +6072,6 @@
  
  
  
diff --git a/debian/patches/dont-build-VFS-examples.patch b/debian/patches/dont-build-VFS-examples.patch
index beff7db..fb99f66 100644
--- a/debian/patches/dont-build-VFS-examples.patch
+++ b/debian/patches/dont-build-VFS-examples.patch
@@ -2,11 +2,9 @@ Description: Do not build VFS examples
 Author: Christian Perrier <bubulle at debian.org>
 Forwarded: not-needed
 
-Index: samba/source3/Makefile.in
-===================================================================
---- samba.orig/source3/Makefile.in
-+++ samba/source3/Makefile.in
-@@ -1616,8 +1616,7 @@
+--- a/source3/Makefile.in
++++ b/source3/Makefile.in
+@@ -1618,8 +1618,7 @@
  
  
  everything:: all libtalloc libsmbclient libnetapi debug2html smbfilter talloctort replacetort smbconftort modules torture \
@@ -16,7 +14,7 @@ Index: samba/source3/Makefile.in
  
  .SUFFIXES:
  .SUFFIXES: .c .o .lo
-@@ -3552,12 +3551,3 @@
+@@ -3645,12 +3644,3 @@
  bin/ndrdump4: $(BINARY_PREREQS)
  	$(MAKE) -f Makefile-smbtorture4 bin/ndrdump4
  
diff --git a/debian/patches/undefined-symbols.patch b/debian/patches/undefined-symbols.patch
index d1fe70d..9249683 100644
--- a/debian/patches/undefined-symbols.patch
+++ b/debian/patches/undefined-symbols.patch
@@ -9,16 +9,14 @@ Author: Steve Langasek <vorlon at debian.org>
 Bug-Debian: http://bugs.debian.org/281181
 Forwarded: no
 
-Index: samba/source3/Makefile.in
-===================================================================
---- samba.orig/source3/Makefile.in
-+++ samba/source3/Makefile.in
-@@ -2501,7 +2501,7 @@
+--- a/source3/Makefile.in
++++ b/source3/Makefile.in
+@@ -2594,7 +2594,7 @@
  
- $(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_THREAD_OBJ) $(LIBSMBCLIENT_SYMS) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+ $(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_THREAD_OBJ) $(LIBSMBCLIENT_SYMS) $(LIBTALLOC) $(LIBTEVENT) $(LIBTDB) $(LIBWBCLIENT)
  	@echo Linking shared library $@
 -	@$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_THREAD_OBJ) \
 +	@$(SHLD_DSO) -Wl,-z,defs $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_THREAD_OBJ) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBS) \
  		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) $(PTHREAD_LDFLAGS) \
  		@SONAMEFLAG@`basename $@`

-- 
Debian packaging for Samba