[Pkg-samba-maint] r1482 - trunk/samba/debian/patches

vorlon at alioth.debian.org vorlon at alioth.debian.org
Fri Jul 27 23:41:43 UTC 2007


Author: vorlon
Date: 2007-07-27 23:41:43 +0000 (Fri, 27 Jul 2007)
New Revision: 1482

Modified:
   trunk/samba/debian/patches/README_nosmbldap-tools.patch
   trunk/samba/debian/patches/VERSION.patch
   trunk/samba/debian/patches/adapt_machine_creation_script.patch
   trunk/samba/debian/patches/autoconf.patch
   trunk/samba/debian/patches/cifs-umount-same-user.patch
   trunk/samba/debian/patches/cifs-umount-trailing-slashes.patch
   trunk/samba/debian/patches/cups.patch
   trunk/samba/debian/patches/documentation.patch
   trunk/samba/debian/patches/fhs.patch
   trunk/samba/debian/patches/installswat.sh.patch
   trunk/samba/debian/patches/linux-cifs-user-perms.patch
   trunk/samba/debian/patches/make-distclean.patch
   trunk/samba/debian/patches/missing_userspace_bugzilla999.patch
   trunk/samba/debian/patches/no_smbmount_symlink.patch
   trunk/samba/debian/patches/non-linux-ports.patch
   trunk/samba/debian/patches/pam-examples.patch
   trunk/samba/debian/patches/python-examples.patch
   trunk/samba/debian/patches/smbclient-pager.patch
   trunk/samba/debian/patches/smbmount-mtab-flags.patch
   trunk/samba/debian/patches/smbmount-nomtab.patch
   trunk/samba/debian/patches/smbstatus-locking.patch
   trunk/samba/debian/patches/undefined-symbols.patch
Log:
quilt refresh with --no-timestamps, so that future refreshes for new upstream
versions don't cause deltas when the code itself hasn't changed; thanks to
Adeodato Sim?\195?\179 for his helpful blog entry



Modified: trunk/samba/debian/patches/README_nosmbldap-tools.patch
===================================================================
--- trunk/samba/debian/patches/README_nosmbldap-tools.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/README_nosmbldap-tools.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -8,8 +8,8 @@
 
 Index: samba-3.0.25b/examples/LDAP/README
 ===================================================================
---- samba-3.0.25b.orig/examples/LDAP/README	2007-06-27 09:25:37.744135712 +0200
-+++ samba-3.0.25b/examples/LDAP/README	2007-06-27 09:28:26.736125563 +0200
+--- samba-3.0.25b.orig/examples/LDAP/README
++++ samba-3.0.25b/examples/LDAP/README
 @@ -59,6 +59,9 @@
  The smbldap-tools package can be downloaded individually from 
  http://samba.idealx.org/dist/

Modified: trunk/samba/debian/patches/VERSION.patch
===================================================================
--- trunk/samba/debian/patches/VERSION.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/VERSION.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -8,8 +8,8 @@
 
 Index: samba-3.0.25b/source/VERSION
 ===================================================================
---- samba-3.0.25b.orig/source/VERSION	2007-06-27 09:25:31.744419574 +0200
-+++ samba-3.0.25b/source/VERSION	2007-06-27 09:28:46.235199543 +0200
+--- samba-3.0.25b.orig/source/VERSION
++++ samba-3.0.25b/source/VERSION
 @@ -95,5 +95,5 @@
  # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version()    #
  #  ->  "CVS 3.0.0rc2-VendorVersion"                    #

Modified: trunk/samba/debian/patches/adapt_machine_creation_script.patch
===================================================================
--- trunk/samba/debian/patches/adapt_machine_creation_script.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/adapt_machine_creation_script.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -8,8 +8,8 @@
 
 Index: samba-3.0.25b/docs/manpages/smb.conf.5
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/smb.conf.5	2007-06-27 09:25:31.244443227 +0200
-+++ samba-3.0.25b/docs/manpages/smb.conf.5	2007-06-27 09:28:53.734843287 +0200
+--- samba-3.0.25b.orig/docs/manpages/smb.conf.5
++++ samba-3.0.25b/docs/manpages/smb.conf.5
 @@ -662,8 +662,8 @@
  Default:
  \fB\fIadd machine script\fR = \fR

Modified: trunk/samba/debian/patches/autoconf.patch
===================================================================
--- trunk/samba/debian/patches/autoconf.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/autoconf.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -27,8 +27,8 @@
 
 Index: samba-3.0.25b/source/configure
 ===================================================================
---- samba-3.0.25b.orig/source/configure	2007-06-27 09:25:30.244490534 +0200
-+++ samba-3.0.25b/source/configure	2007-06-27 09:28:56.734700771 +0200
+--- samba-3.0.25b.orig/source/configure
++++ samba-3.0.25b/source/configure
 @@ -671,6 +671,9 @@
  logfilebase
  privatedir
@@ -191,8 +191,8 @@
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 Index: samba-3.0.25b/source/include/config.h.in
 ===================================================================
---- samba-3.0.25b.orig/source/include/config.h.in	2007-06-27 09:25:30.244490534 +0200
-+++ samba-3.0.25b/source/include/config.h.in	2007-06-27 09:28:56.734700771 +0200
+--- samba-3.0.25b.orig/source/include/config.h.in
++++ samba-3.0.25b/source/include/config.h.in
 @@ -57,6 +57,9 @@
  /* Define to turn on dmalloc debugging */
  #undef ENABLE_DMALLOC

Modified: trunk/samba/debian/patches/cifs-umount-same-user.patch
===================================================================
--- trunk/samba/debian/patches/cifs-umount-same-user.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/cifs-umount-same-user.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -9,8 +9,8 @@
 
 Index: samba-3.0.25b/source/client/umount.cifs.c
 ===================================================================
---- samba-3.0.25b.orig/source/client/umount.cifs.c	2007-07-12 00:30:57.000000000 -0700
-+++ samba-3.0.25b/source/client/umount.cifs.c	2007-07-12 15:44:00.000000000 -0700
+--- samba-3.0.25b.orig/source/client/umount.cifs.c
++++ samba-3.0.25b/source/client/umount.cifs.c
 @@ -131,7 +131,7 @@
  		printf("user unmounting via %s is an optional feature of",thisprogram);
  		printf(" the cifs filesystem driver (cifs.ko)");

Modified: trunk/samba/debian/patches/cifs-umount-trailing-slashes.patch
===================================================================
--- trunk/samba/debian/patches/cifs-umount-trailing-slashes.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/cifs-umount-trailing-slashes.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -6,8 +6,8 @@
 
 Index: samba-3.0.25b/source/client/umount.cifs.c
 ===================================================================
---- samba-3.0.25b.orig/source/client/umount.cifs.c	2007-07-11 20:33:17.000000000 -0700
-+++ samba-3.0.25b/source/client/umount.cifs.c	2007-07-11 20:39:23.000000000 -0700
+--- samba-3.0.25b.orig/source/client/umount.cifs.c
++++ samba-3.0.25b/source/client/umount.cifs.c
 @@ -342,6 +342,10 @@
  
  	/* fixup path if needed */

Modified: trunk/samba/debian/patches/cups.patch
===================================================================
--- trunk/samba/debian/patches/cups.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/cups.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -9,8 +9,8 @@
 
 Index: samba-3.0.25b/source/include/includes.h
 ===================================================================
---- samba-3.0.25b.orig/source/include/includes.h	2007-06-27 09:25:45.243780834 +0200
-+++ samba-3.0.25b/source/include/includes.h	2007-06-27 09:28:00.237383426 +0200
+--- samba-3.0.25b.orig/source/include/includes.h
++++ samba-3.0.25b/source/include/includes.h
 @@ -809,10 +809,7 @@
  #endif
  

Modified: trunk/samba/debian/patches/documentation.patch
===================================================================
--- trunk/samba/debian/patches/documentation.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/documentation.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -8,8 +8,8 @@
 
 Index: samba-3.0.25b/docs/manpages/swat.8
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/swat.8	2007-06-27 09:25:44.243828154 +0200
-+++ samba-3.0.25b/docs/manpages/swat.8	2007-06-27 09:28:03.237241060 +0200
+--- samba-3.0.25b.orig/docs/manpages/swat.8
++++ samba-3.0.25b/docs/manpages/swat.8
 @@ -111,60 +111,6 @@
  .RS 3n
  Print a summary of command line options.
@@ -90,8 +90,8 @@
  .PP
 Index: samba-3.0.25b/docs/manpages/nmbd.8
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/nmbd.8	2007-06-27 09:25:44.243828154 +0200
-+++ samba-3.0.25b/docs/manpages/nmbd.8	2007-06-27 09:28:03.237241060 +0200
+--- samba-3.0.25b.orig/docs/manpages/nmbd.8
++++ samba-3.0.25b/docs/manpages/nmbd.8
 @@ -113,11 +113,9 @@
  to answer any name queries. Adding a line to this file affects name NetBIOS resolution from this host
  \fBONLY\fR.
@@ -139,8 +139,8 @@
  \fIlog.nmb\fR
 Index: samba-3.0.25b/docs/manpages/smbd.8
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/smbd.8	2007-06-27 09:25:44.243828154 +0200
-+++ samba-3.0.25b/docs/manpages/smbd.8	2007-06-27 09:28:03.237241060 +0200
+--- samba-3.0.25b.orig/docs/manpages/smbd.8
++++ samba-3.0.25b/docs/manpages/smbd.8
 @@ -168,14 +168,11 @@
  inetd, this file must contain a mapping of service name (e.g., netbios-ssn) to service port (e.g., 139) and protocol type (e.g., tcp).
  .RE
@@ -160,8 +160,8 @@
  \fBsmb.conf\fR(5)
 Index: samba-3.0.25b/docs/manpages/lmhosts.5
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/lmhosts.5	2007-06-27 09:25:44.243828154 +0200
-+++ samba-3.0.25b/docs/manpages/lmhosts.5	2007-06-27 09:28:03.237241060 +0200
+--- samba-3.0.25b.orig/docs/manpages/lmhosts.5
++++ samba-3.0.25b/docs/manpages/lmhosts.5
 @@ -77,10 +77,8 @@
  file.
  .SH "FILES"
@@ -177,8 +177,8 @@
  This man page is correct for version 3.0 of the Samba suite.
 Index: samba-3.0.25b/docs/manpages/ntlm_auth.1
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/ntlm_auth.1	2007-06-27 09:25:44.243828154 +0200
-+++ samba-3.0.25b/docs/manpages/ntlm_auth.1	2007-06-27 09:28:03.237241060 +0200
+--- samba-3.0.25b.orig/docs/manpages/ntlm_auth.1
++++ samba-3.0.25b/docs/manpages/ntlm_auth.1
 @@ -43,7 +43,7 @@
  Some of these commands also require access to the directory
  \fIwinbindd_privileged\fR
@@ -208,8 +208,8 @@
  gss-spnego-client
 Index: samba-3.0.25b/docs/manpages/tdbbackup.8
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/tdbbackup.8	2007-06-27 09:25:44.243828154 +0200
-+++ samba-3.0.25b/docs/manpages/tdbbackup.8	2007-06-27 09:28:03.237241060 +0200
+--- samba-3.0.25b.orig/docs/manpages/tdbbackup.8
++++ samba-3.0.25b/docs/manpages/tdbbackup.8
 @@ -70,17 +70,17 @@
  \(bu
  
@@ -233,8 +233,8 @@
  This man page is correct for version 3.0 of the Samba suite.
 Index: samba-3.0.25b/docs/manpages/winbindd.8
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/winbindd.8	2007-06-27 09:25:44.243828154 +0200
-+++ samba-3.0.25b/docs/manpages/winbindd.8	2007-06-27 09:28:03.237241060 +0200
+--- samba-3.0.25b.orig/docs/manpages/winbindd.8
++++ samba-3.0.25b/docs/manpages/winbindd.8
 @@ -440,16 +440,16 @@
  file are owned by root.
  .RE

Modified: trunk/samba/debian/patches/fhs.patch
===================================================================
--- trunk/samba/debian/patches/fhs.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/fhs.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -44,8 +44,8 @@
 
 Index: samba-3.0.25b/source/Makefile.in
 ===================================================================
---- samba-3.0.25b.orig/source/Makefile.in	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/Makefile.in	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/Makefile.in
++++ samba-3.0.25b/source/Makefile.in
 @@ -106,6 +106,13 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
@@ -84,8 +84,8 @@
  	@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
 Index: samba-3.0.25b/source/configure.in
 ===================================================================
---- samba-3.0.25b.orig/source/configure.in	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/configure.in	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/configure.in
++++ samba-3.0.25b/source/configure.in
 @@ -40,7 +40,7 @@
  [  --with-fhs              Use FHS-compliant paths (default=no)],
  [ case "$withval" in
@@ -118,8 +118,8 @@
  
 Index: samba-3.0.25b/source/dynconfig.c
 ===================================================================
---- samba-3.0.25b.orig/source/dynconfig.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/dynconfig.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/dynconfig.c
++++ samba-3.0.25b/source/dynconfig.c
 @@ -53,6 +53,13 @@
  pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
  
@@ -164,8 +164,8 @@
 +}
 Index: samba-3.0.25b/source/include/dynconfig.h
 ===================================================================
---- samba-3.0.25b.orig/source/include/dynconfig.h	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/include/dynconfig.h	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/include/dynconfig.h
++++ samba-3.0.25b/source/include/dynconfig.h
 @@ -31,8 +31,12 @@
  extern pstring dyn_CONFIGFILE;
  extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -181,8 +181,8 @@
 +char *dyn_CACHEDIR(void);
 Index: samba-3.0.25b/source/intl/lang_tdb.c
 ===================================================================
---- samba-3.0.25b.orig/source/intl/lang_tdb.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/intl/lang_tdb.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/intl/lang_tdb.c
++++ samba-3.0.25b/source/intl/lang_tdb.c
 @@ -131,7 +131,7 @@
  	if (!lang) 
  		return True;
@@ -194,8 +194,8 @@
  		DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path, 
 Index: samba-3.0.25b/source/lib/util.c
 ===================================================================
---- samba-3.0.25b.orig/source/lib/util.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/lib/util.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/lib/util.c
++++ samba-3.0.25b/source/lib/util.c
 @@ -2630,6 +2630,61 @@
  }
  
@@ -260,8 +260,8 @@
   * @retval Pointer to a static #fstring containing the extension.
 Index: samba-3.0.25b/source/lib/util_unistr.c
 ===================================================================
---- samba-3.0.25b.orig/source/lib/util_unistr.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/lib/util_unistr.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/lib/util_unistr.c
++++ samba-3.0.25b/source/lib/util_unistr.c
 @@ -88,11 +88,11 @@
  	}
  	initialised = 1;
@@ -287,8 +287,8 @@
  		mapped_file = 1;
 Index: samba-3.0.25b/source/libsmb/samlogon_cache.c
 ===================================================================
---- samba-3.0.25b.orig/source/libsmb/samlogon_cache.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/libsmb/samlogon_cache.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/libsmb/samlogon_cache.c
++++ samba-3.0.25b/source/libsmb/samlogon_cache.c
 @@ -34,7 +34,7 @@
  BOOL netsamlogon_cache_init(void)
  {
@@ -309,8 +309,8 @@
  		if (!tdb) {
 Index: samba-3.0.25b/source/nmbd/nmbd_serverlistdb.c
 ===================================================================
---- samba-3.0.25b.orig/source/nmbd/nmbd_serverlistdb.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/nmbd/nmbd_serverlistdb.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/nmbd/nmbd_serverlistdb.c
++++ samba-3.0.25b/source/nmbd/nmbd_serverlistdb.c
 @@ -325,7 +325,7 @@
  
  	updatecount++;
@@ -322,8 +322,8 @@
  	pstrcat(fname,SERVER_LIST);
 Index: samba-3.0.25b/source/nmbd/nmbd_winsserver.c
 ===================================================================
---- samba-3.0.25b.orig/source/nmbd/nmbd_winsserver.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/nmbd/nmbd_winsserver.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/nmbd/nmbd_winsserver.c
++++ samba-3.0.25b/source/nmbd/nmbd_winsserver.c
 @@ -585,7 +585,7 @@
  
  	add_samba_names_to_subnet(wins_server_subnet);
@@ -344,8 +344,8 @@
  
 Index: samba-3.0.25b/source/passdb/login_cache.c
 ===================================================================
---- samba-3.0.25b.orig/source/passdb/login_cache.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/passdb/login_cache.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/passdb/login_cache.c
++++ samba-3.0.25b/source/passdb/login_cache.c
 @@ -36,7 +36,7 @@
  	/* skip file open if it's already opened */
  	if (cache) return True;
@@ -357,8 +357,8 @@
  	else {
 Index: samba-3.0.25b/source/nsswitch/winbindd_cache.c
 ===================================================================
---- samba-3.0.25b.orig/source/nsswitch/winbindd_cache.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/nsswitch/winbindd_cache.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/nsswitch/winbindd_cache.c
++++ samba-3.0.25b/source/nsswitch/winbindd_cache.c
 @@ -2180,7 +2180,7 @@
  		return True;
  
@@ -391,8 +391,8 @@
  				O_RDWR|O_CREAT, 0600);
 Index: samba-3.0.25b/source/param/loadparm.c
 ===================================================================
---- samba-3.0.25b.orig/source/param/loadparm.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/param/loadparm.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/param/loadparm.c
++++ samba-3.0.25b/source/param/loadparm.c
 @@ -108,6 +108,9 @@
  	char *szAddPrinterCommand;
  	char *szDeletePrinterCommand;
@@ -419,8 +419,8 @@
  	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED}, 
 Index: samba-3.0.25b/source/passdb/secrets.c
 ===================================================================
---- samba-3.0.25b.orig/source/passdb/secrets.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/passdb/secrets.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/passdb/secrets.c
++++ samba-3.0.25b/source/passdb/secrets.c
 @@ -58,8 +58,7 @@
  	if (tdb)
  		return True;
@@ -433,8 +433,8 @@
  
 Index: samba-3.0.25b/source/printing/nt_printing.c
 ===================================================================
---- samba-3.0.25b.orig/source/printing/nt_printing.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/printing/nt_printing.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/printing/nt_printing.c
++++ samba-3.0.25b/source/printing/nt_printing.c
 @@ -551,28 +551,28 @@
   
  	if (tdb_drivers)
@@ -481,8 +481,8 @@
  
 Index: samba-3.0.25b/source/printing/printing.c
 ===================================================================
---- samba-3.0.25b.orig/source/printing/printing.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/printing/printing.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/printing/printing.c
++++ samba-3.0.25b/source/printing/printing.c
 @@ -185,8 +185,8 @@
  	int services = lp_numservices();
  	int snum;
@@ -496,8 +496,8 @@
  	/* handle a Samba upgrade */
 Index: samba-3.0.25b/source/printing/printing_db.c
 ===================================================================
---- samba-3.0.25b.orig/source/printing/printing_db.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/printing/printing_db.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/printing/printing_db.c
++++ samba-3.0.25b/source/printing/printing_db.c
 @@ -91,7 +91,7 @@
  		DLIST_ADD(print_db_head, p);
  	}
@@ -509,8 +509,8 @@
  
 Index: samba-3.0.25b/source/smbd/lanman.c
 ===================================================================
---- samba-3.0.25b.orig/source/smbd/lanman.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/smbd/lanman.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/smbd/lanman.c
++++ samba-3.0.25b/source/smbd/lanman.c
 @@ -1088,9 +1088,9 @@
  	BOOL local_list_only;
  	int i;
@@ -525,8 +525,8 @@
  
 Index: samba-3.0.25b/source/registry/reg_db.c
 ===================================================================
---- samba-3.0.25b.orig/source/registry/reg_db.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/registry/reg_db.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/registry/reg_db.c
++++ samba-3.0.25b/source/registry/reg_db.c
 @@ -234,12 +234,12 @@
  	if ( tdb_reg )
  		return True;
@@ -559,8 +559,8 @@
  	unbecome_root();
 Index: samba-3.0.25b/source/lib/account_pol.c
 ===================================================================
---- samba-3.0.25b.orig/source/lib/account_pol.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/lib/account_pol.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/lib/account_pol.c
++++ samba-3.0.25b/source/lib/account_pol.c
 @@ -213,9 +213,9 @@
  		return True;
  	}
@@ -575,8 +575,8 @@
  			return False;
 Index: samba-3.0.25b/source/registry/reg_perfcount.c
 ===================================================================
---- samba-3.0.25b.orig/source/registry/reg_perfcount.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/registry/reg_perfcount.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/registry/reg_perfcount.c
++++ samba-3.0.25b/source/registry/reg_perfcount.c
 @@ -46,7 +46,7 @@
  	
  	fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
@@ -597,8 +597,8 @@
  	
 Index: samba-3.0.25b/source/rpc_server/srv_eventlog_lib.c
 ===================================================================
---- samba-3.0.25b.orig/source/rpc_server/srv_eventlog_lib.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/rpc_server/srv_eventlog_lib.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/rpc_server/srv_eventlog_lib.c
++++ samba-3.0.25b/source/rpc_server/srv_eventlog_lib.c
 @@ -67,7 +67,7 @@
  {
  	fstring path;
@@ -619,8 +619,8 @@
  	
 Index: samba-3.0.25b/source/passdb/pdb_tdb.c
 ===================================================================
---- samba-3.0.25b.orig/source/passdb/pdb_tdb.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/passdb/pdb_tdb.c	2007-07-09 20:48:31.000000000 -0700
+--- samba-3.0.25b.orig/source/passdb/pdb_tdb.c
++++ samba-3.0.25b/source/passdb/pdb_tdb.c
 @@ -1559,7 +1559,7 @@
  	uint32 rid;
  	BOOL ret = False;
@@ -641,8 +641,8 @@
  	pstrcpy( tdbsam_filename, pfile );
 Index: samba-3.0.25b/source/groupdb/mapping_tdb.c
 ===================================================================
---- samba-3.0.25b.orig/source/groupdb/mapping_tdb.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/groupdb/mapping_tdb.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/groupdb/mapping_tdb.c
++++ samba-3.0.25b/source/groupdb/mapping_tdb.c
 @@ -39,7 +39,7 @@
  	if (tdb)
  		return True;
@@ -654,8 +654,8 @@
  		return False;
 Index: samba-3.0.25b/source/nsswitch/idmap_tdb.c
 ===================================================================
---- samba-3.0.25b.orig/source/nsswitch/idmap_tdb.c	2007-07-09 20:44:46.000000000 -0700
-+++ samba-3.0.25b/source/nsswitch/idmap_tdb.c	2007-07-09 20:44:48.000000000 -0700
+--- samba-3.0.25b.orig/source/nsswitch/idmap_tdb.c
++++ samba-3.0.25b/source/nsswitch/idmap_tdb.c
 @@ -247,7 +247,7 @@
  	}
  
@@ -667,8 +667,8 @@
  		ret = NT_STATUS_NO_MEMORY;
 Index: samba-3.0.25b/source/utils/smbcontrol.c
 ===================================================================
---- samba-3.0.25b.orig/source/utils/smbcontrol.c	2007-07-09 20:45:00.000000000 -0700
-+++ samba-3.0.25b/source/utils/smbcontrol.c	2007-07-09 20:46:55.000000000 -0700
+--- samba-3.0.25b.orig/source/utils/smbcontrol.c
++++ samba-3.0.25b/source/utils/smbcontrol.c
 @@ -832,10 +832,10 @@
  	/* Remove the entry in the winbindd_cache tdb to tell a later
  	   starting winbindd that we're online. */
@@ -700,8 +700,8 @@
  
 Index: samba-3.0.25b/source/lib/sharesec.c
 ===================================================================
---- samba-3.0.25b.orig/source/lib/sharesec.c	2007-07-09 21:07:17.000000000 -0700
-+++ samba-3.0.25b/source/lib/sharesec.c	2007-07-09 21:07:30.000000000 -0700
+--- samba-3.0.25b.orig/source/lib/sharesec.c
++++ samba-3.0.25b/source/lib/sharesec.c
 @@ -47,10 +47,10 @@
  		return True;
  	}
@@ -717,8 +717,8 @@
   
 Index: samba-3.0.25b/source/libgpo/gpo_fetch.c
 ===================================================================
---- samba-3.0.25b.orig/source/libgpo/gpo_fetch.c	2007-07-09 21:36:33.000000000 -0700
-+++ samba-3.0.25b/source/libgpo/gpo_fetch.c	2007-07-09 21:36:50.000000000 -0700
+--- samba-3.0.25b.orig/source/libgpo/gpo_fetch.c
++++ samba-3.0.25b/source/libgpo/gpo_fetch.c
 @@ -60,7 +60,7 @@
  		return NT_STATUS_NO_MEMORY;
  	}
@@ -739,8 +739,8 @@
  
 Index: samba-3.0.25b/source/nsswitch/idmap_cache.c
 ===================================================================
---- samba-3.0.25b.orig/source/nsswitch/idmap_cache.c	2007-07-09 22:16:23.000000000 -0700
-+++ samba-3.0.25b/source/nsswitch/idmap_cache.c	2007-07-09 22:16:35.000000000 -0700
+--- samba-3.0.25b.orig/source/nsswitch/idmap_cache.c
++++ samba-3.0.25b/source/nsswitch/idmap_cache.c
 @@ -55,7 +55,7 @@
  		return NULL;
  	}

Modified: trunk/samba/debian/patches/installswat.sh.patch
===================================================================
--- trunk/samba/debian/patches/installswat.sh.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/installswat.sh.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -8,8 +8,8 @@
 
 Index: samba-3.0.25b/source/script/installswat.sh
 ===================================================================
---- samba-3.0.25b.orig/source/script/installswat.sh	2007-06-27 09:25:40.743993768 +0200
-+++ samba-3.0.25b/source/script/installswat.sh	2007-06-27 09:28:13.736742711 +0200
+--- samba-3.0.25b.orig/source/script/installswat.sh
++++ samba-3.0.25b/source/script/installswat.sh
 @@ -198,7 +198,11 @@
  
  # Install/ remove Using Samba book (but only if it is there)

Modified: trunk/samba/debian/patches/linux-cifs-user-perms.patch
===================================================================
--- trunk/samba/debian/patches/linux-cifs-user-perms.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/linux-cifs-user-perms.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -5,8 +5,8 @@
 
 Index: samba-3.0.25b/source/client/mount.cifs.c
 ===================================================================
---- samba-3.0.25b.orig/source/client/mount.cifs.c	2007-07-11 19:54:30.000000000 -0700
-+++ samba-3.0.25b/source/client/mount.cifs.c	2007-07-11 20:17:40.000000000 -0700
+--- samba-3.0.25b.orig/source/client/mount.cifs.c
++++ samba-3.0.25b/source/client/mount.cifs.c
 @@ -321,6 +321,8 @@
  	int out_len = 0;
  	int word_len;

Modified: trunk/samba/debian/patches/make-distclean.patch
===================================================================
--- trunk/samba/debian/patches/make-distclean.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/make-distclean.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -8,8 +8,8 @@
 
 Index: samba-3.0.25b/source/Makefile.in
 ===================================================================
---- samba-3.0.25b.orig/source/Makefile.in	2007-06-27 09:28:06.237098685 +0200
-+++ samba-3.0.25b/source/Makefile.in	2007-06-27 09:28:16.236624041 +0200
+--- samba-3.0.25b.orig/source/Makefile.in
++++ samba-3.0.25b/source/Makefile.in
 @@ -1688,6 +1688,7 @@
  
  python_clean:

Modified: trunk/samba/debian/patches/missing_userspace_bugzilla999.patch
===================================================================
--- trunk/samba/debian/patches/missing_userspace_bugzilla999.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/missing_userspace_bugzilla999.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -12,8 +12,8 @@
 
 Index: samba-3.0.25b/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.25b.orig/source/client/smbmnt.c	2007-07-08 17:50:36.000000000 -0700
-+++ samba-3.0.25b/source/client/smbmnt.c	2007-07-08 17:56:51.000000000 -0700
+--- samba-3.0.25b.orig/source/client/smbmnt.c
++++ samba-3.0.25b/source/client/smbmnt.c
 @@ -49,6 +49,10 @@
  static unsigned mount_dmask;
  static int user_mount;
@@ -83,8 +83,8 @@
          if (geteuid() != 0) {
 Index: samba-3.0.25b/source/client/smbmount.c
 ===================================================================
---- samba-3.0.25b.orig/source/client/smbmount.c	2007-07-08 17:50:36.000000000 -0700
-+++ samba-3.0.25b/source/client/smbmount.c	2007-07-08 17:50:36.000000000 -0700
+--- samba-3.0.25b.orig/source/client/smbmount.c
++++ samba-3.0.25b/source/client/smbmount.c
 @@ -43,6 +43,10 @@
  static int smb_port = 0;
  static BOOL got_user;

Modified: trunk/samba/debian/patches/no_smbmount_symlink.patch
===================================================================
--- trunk/samba/debian/patches/no_smbmount_symlink.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/no_smbmount_symlink.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -8,8 +8,8 @@
 
 Index: samba-3.0.25b/source/script/installbin.sh.in
 ===================================================================
---- samba-3.0.25b.orig/source/script/installbin.sh.in	2007-06-27 09:25:37.244159369 +0200
-+++ samba-3.0.25b/source/script/installbin.sh.in	2007-06-27 09:28:30.235959381 +0200
+--- samba-3.0.25b.orig/source/script/installbin.sh.in
++++ samba-3.0.25b/source/script/installbin.sh.in
 @@ -21,13 +21,15 @@
   chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
  

Modified: trunk/samba/debian/patches/non-linux-ports.patch
===================================================================
--- trunk/samba/debian/patches/non-linux-ports.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/non-linux-ports.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -9,8 +9,8 @@
 
 Index: samba-3.0.25b/source/configure.in
 ===================================================================
---- samba-3.0.25b.orig/source/configure.in	2007-06-27 09:28:06.237098685 +0200
-+++ samba-3.0.25b/source/configure.in	2007-06-27 09:28:20.736410420 +0200
+--- samba-3.0.25b.orig/source/configure.in
++++ samba-3.0.25b/source/configure.in
 @@ -758,6 +758,15 @@
        fi
      ;;

Modified: trunk/samba/debian/patches/pam-examples.patch
===================================================================
--- trunk/samba/debian/patches/pam-examples.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/pam-examples.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -8,8 +8,8 @@
 
 Index: samba-3.0.25b/source/pam_smbpass/README
 ===================================================================
---- samba-3.0.25b.orig/source/pam_smbpass/README	2007-06-27 09:25:38.244112055 +0200
-+++ samba-3.0.25b/source/pam_smbpass/README	2007-06-27 09:28:23.736267996 +0200
+--- samba-3.0.25b.orig/source/pam_smbpass/README
++++ samba-3.0.25b/source/pam_smbpass/README
 @@ -37,7 +37,7 @@
  	smbconf=<file>	-	specify an alternate path to the smb.conf
  				file.

Modified: trunk/samba/debian/patches/python-examples.patch
===================================================================
--- trunk/samba/debian/patches/python-examples.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/python-examples.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -8,8 +8,8 @@
 
 Index: samba-3.0.25b/source/python/examples/tdbpack/tdbtimetrial.py
 ===================================================================
---- samba-3.0.25b.orig/source/python/examples/tdbpack/tdbtimetrial.py	2007-06-27 09:25:29.744514186 +0200
-+++ samba-3.0.25b/source/python/examples/tdbpack/tdbtimetrial.py	2007-06-27 09:29:00.234534490 +0200
+--- samba-3.0.25b.orig/source/python/examples/tdbpack/tdbtimetrial.py
++++ samba-3.0.25b/source/python/examples/tdbpack/tdbtimetrial.py
 @@ -1,4 +1,4 @@
 -#! /usr/bin/python2.2
 +#! /usr/bin/python
@@ -18,8 +18,8 @@
      # import tdbutil
 Index: samba-3.0.25b/source/python/examples/tdbpack/test_tdbpack.py
 ===================================================================
---- samba-3.0.25b.orig/source/python/examples/tdbpack/test_tdbpack.py	2007-06-27 09:25:29.744514186 +0200
-+++ samba-3.0.25b/source/python/examples/tdbpack/test_tdbpack.py	2007-06-27 09:29:00.234534490 +0200
+--- samba-3.0.25b.orig/source/python/examples/tdbpack/test_tdbpack.py
++++ samba-3.0.25b/source/python/examples/tdbpack/test_tdbpack.py
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python2.2
 +#! /usr/bin/env python

Modified: trunk/samba/debian/patches/smbclient-pager.patch
===================================================================
--- trunk/samba/debian/patches/smbclient-pager.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/smbclient-pager.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -10,8 +10,8 @@
 
 Index: samba-3.0.25b/source/include/local.h
 ===================================================================
---- samba-3.0.25b.orig/source/include/local.h	2007-06-27 09:25:36.244206681 +0200
-+++ samba-3.0.25b/source/include/local.h	2007-06-27 09:28:33.235816930 +0200
+--- samba-3.0.25b.orig/source/include/local.h
++++ samba-3.0.25b/source/include/local.h
 @@ -109,7 +109,7 @@
  /* the default pager to use for the client "more" command. Users can
     override this with the PAGER environment variable */

Modified: trunk/samba/debian/patches/smbmount-mtab-flags.patch
===================================================================
--- trunk/samba/debian/patches/smbmount-mtab-flags.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/smbmount-mtab-flags.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -10,8 +10,8 @@
 
 Index: samba-3.0.25b/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.25b.orig/source/client/smbmnt.c	2007-06-27 09:25:35.744230337 +0200
-+++ samba-3.0.25b/source/client/smbmnt.c	2007-06-27 09:28:35.235721957 +0200
+--- samba-3.0.25b.orig/source/client/smbmnt.c
++++ samba-3.0.25b/source/client/smbmnt.c
 @@ -276,7 +276,10 @@
          ment.mnt_fsname = share_name ? share_name : "none";
          ment.mnt_dir = mount_point;

Modified: trunk/samba/debian/patches/smbmount-nomtab.patch
===================================================================
--- trunk/samba/debian/patches/smbmount-nomtab.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/smbmount-nomtab.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -10,8 +10,8 @@
 
 Index: samba-3.0.25b/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.25b.orig/source/client/smbmnt.c	2007-06-27 09:28:35.235721957 +0200
-+++ samba-3.0.25b/source/client/smbmnt.c	2007-06-27 09:28:37.735603237 +0200
+--- samba-3.0.25b.orig/source/client/smbmnt.c
++++ samba-3.0.25b/source/client/smbmnt.c
 @@ -44,6 +44,7 @@
  static uid_t mount_uid;
  static gid_t mount_gid;
@@ -115,8 +115,8 @@
  }	
 Index: samba-3.0.25b/source/client/smbmount.c
 ===================================================================
---- samba-3.0.25b.orig/source/client/smbmount.c	2007-06-27 09:25:34.744277648 +0200
-+++ samba-3.0.25b/source/client/smbmount.c	2007-06-27 09:28:37.735603237 +0200
+--- samba-3.0.25b.orig/source/client/smbmount.c
++++ samba-3.0.25b/source/client/smbmount.c
 @@ -48,6 +48,7 @@
  static int mount_ro;
  static unsigned mount_fmask;

Modified: trunk/samba/debian/patches/smbstatus-locking.patch
===================================================================
--- trunk/samba/debian/patches/smbstatus-locking.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/smbstatus-locking.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -8,8 +8,8 @@
 
 Index: samba-3.0.25b/source/utils/status.c
 ===================================================================
---- samba-3.0.25b.orig/source/utils/status.c	2007-06-27 09:25:33.244348612 +0200
-+++ samba-3.0.25b/source/utils/status.c	2007-06-27 09:28:41.235437018 +0200
+--- samba-3.0.25b.orig/source/utils/status.c
++++ samba-3.0.25b/source/utils/status.c
 @@ -367,6 +367,16 @@
  	if ( show_locks ) {
  		int ret;

Modified: trunk/samba/debian/patches/undefined-symbols.patch
===================================================================
--- trunk/samba/debian/patches/undefined-symbols.patch	2007-07-27 23:31:13 UTC (rev 1481)
+++ trunk/samba/debian/patches/undefined-symbols.patch	2007-07-27 23:41:43 UTC (rev 1482)
@@ -11,8 +11,8 @@
 
 Index: samba-3.0.25b/source/Makefile.in
 ===================================================================
---- samba-3.0.25b.orig/source/Makefile.in	2007-06-27 09:28:16.236624041 +0200
-+++ samba-3.0.25b/source/Makefile.in	2007-06-27 09:28:43.235342031 +0200
+--- samba-3.0.25b.orig/source/Makefile.in
++++ samba-3.0.25b/source/Makefile.in
 @@ -1161,7 +1161,7 @@
  
  bin/libsmbclient. at SHLIBEXT@: proto_exists $(LIBSMBCLIENT_OBJ)




More information about the Pkg-samba-maint mailing list