[Pkg-samba-maint] r1090 - in trunk: . patches

[Christian Perrier]

Author: bubulle
Date: 2006-07-01 12:12:38 +0000 (Sat, 01 Jul 2006)
New Revision: 1090

Removed:
   trunk/patches/mount-cifs-include.patch
Modified:
   trunk/changelog
   trunk/patches/series
   trunk/rules
Log:
Compile with --with-cisfmount which solves upstream bug #3779


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2006-06-24 11:46:37 UTC (rev 1089)
+++ trunk/changelog	2006-07-01 12:12:38 UTC (rev 1090)
@@ -36,6 +36,8 @@
   * Add support for /etc/default/winbind. Closes: #262313, #374411
     Thanks to Guido Guenther for the old patch and to Jérôme Warnier
     for reminding us about it.
+  * Compile with --with-cifsmount which is now needed to properly compile
+    mount.cifs and umount.cifs. See samba bug #3799
 
   [ Peter Eisentraut ]
   * Use debian/compat instead of DH_COMPAT

Deleted: trunk/patches/mount-cifs-include.patch
===================================================================
--- trunk/patches/mount-cifs-include.patch	2006-06-24 11:46:37 UTC (rev 1089)
+++ trunk/patches/mount-cifs-include.patch	2006-07-01 12:12:38 UTC (rev 1090)
@@ -1,13 +0,0 @@
-Index: samba-3.0.23rc3/source/client/mount.cifs.c
-===================================================================
---- samba-3.0.23rc3.orig/source/client/mount.cifs.c	2006-06-24 13:46:18.068894750 +0200
-+++ samba-3.0.23rc3/source/client/mount.cifs.c	2006-06-24 13:46:49.010828500 +0200
-@@ -44,7 +44,7 @@
- 
- #ifndef MOUNT_CIFS_VENDOR_SUFFIX
-  #ifdef _SAMBA_BUILD_
--  #include "include/version.h"
-+  #include "version.h"
-   #ifdef SAMBA_VERSION_VENDOR_SUFFIX
-    #define MOUNT_CIFS_VENDOR_SUFFIX "-"SAMBA_VERSION_OFFICIAL_STRING"-"SAMBA_VERSION_VENDOR_SUFFIX
-   #else

Modified: trunk/patches/series
===================================================================
--- trunk/patches/series	2006-06-24 11:46:37 UTC (rev 1089)
+++ trunk/patches/series	2006-07-01 12:12:38 UTC (rev 1090)
@@ -3,7 +3,6 @@
 fhs.patch
 installswat.sh.patch
 make-distclean.patch
-mount-cifs-include.patch
 nmbd-signalling.patch
 non-linux-ports.patch
 nonpic-libsmbclient.patch

Modified: trunk/rules
===================================================================
--- trunk/rules	2006-06-24 11:46:37 UTC (rev 1089)
+++ trunk/rules	2006-07-01 12:12:38 UTC (rev 1090)
@@ -52,6 +52,7 @@
 		--with-automount \
 		--with-tdbsam \
 		--with-ldap \
+		--with-cifsmount \
 		--with-python=python2.3
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)