Refresh all patches for 3.0.25a (cosmetic refresh)

git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba/debian@1404 fc4039ab-9d04-0410-8cac-899223bdd6b0

20 files changed, 142 insertions, 142 deletions

diff --git a/patches/README_nosmbldap-tools.patch b/patches/README_nosmbldap-tools.patch
index b7ac397228..f2aa97badb 100644
--- a/patches/README_nosmbldap-tools.patch
+++ b/patches/README_nosmbldap-tools.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: 
 
-Index: samba-3.0.25rc2/examples/LDAP/README
+Index: samba-3.0.25a/examples/LDAP/README
 ===================================================================
---- samba-3.0.25rc2.orig/examples/LDAP/README	2007-04-24 11:07:00.794075484 +0200
-+++ samba-3.0.25rc2/examples/LDAP/README	2007-04-24 11:07:50.515917059 +0200
+--- samba-3.0.25a.orig/examples/LDAP/README	2007-05-26 07:45:39.860217151 +0200
++++ samba-3.0.25a/examples/LDAP/README	2007-05-26 07:46:32.312635012 +0200
 @@ -59,6 +59,9 @@
  The smbldap-tools package can be downloaded individually from 
  http://samba.idealx.org/dist/
diff --git a/patches/VERSION.patch b/patches/VERSION.patch
index 16313766d1..6589ff17bf 100644
--- a/patches/VERSION.patch
+++ b/patches/VERSION.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: Should be kept
 
-Index: samba-3.0.25rc2/source/VERSION
+Index: samba-3.0.25a/source/VERSION
 ===================================================================
---- samba-3.0.25rc2.orig/source/VERSION	2007-04-24 11:06:59.962042371 +0200
-+++ samba-3.0.25rc2/source/VERSION	2007-04-24 11:07:56.384117797 +0200
+--- samba-3.0.25a.orig/source/VERSION	2007-05-26 07:45:38.780208554 +0200
++++ samba-3.0.25a/source/VERSION	2007-05-26 07:46:35.332659088 +0200
 @@ -95,5 +95,5 @@
  # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version()    #
  #  ->  "CVS 3.0.0rc2-VendorVersion"                    #
diff --git a/patches/adapt_machine_creation_script.patch b/patches/adapt_machine_creation_script.patch
index 91af36662d..e091a4c837 100644
--- a/patches/adapt_machine_creation_script.patch
+++ b/patches/adapt_machine_creation_script.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: 
 
-Index: samba-3.0.25/docs/manpages/smb.conf.5
+Index: samba-3.0.25a/docs/manpages/smb.conf.5
 ===================================================================
---- samba-3.0.25.orig/docs/manpages/smb.conf.5	2007-05-11 02:01:35.000000000 +0000
-+++ samba-3.0.25/docs/manpages/smb.conf.5	2007-05-14 07:18:25.000000000 +0000
+--- samba-3.0.25a.orig/docs/manpages/smb.conf.5	2007-05-26 07:45:38.688207821 +0200
++++ samba-3.0.25a/docs/manpages/smb.conf.5	2007-05-26 07:46:35.684661895 +0200
 @@ -662,8 +662,8 @@
  Default:
  \fB\fIadd machine script\fR = \fR
diff --git a/patches/autoconf.patch b/patches/autoconf.patch
index 2993178393..495b4aede7 100644
--- a/patches/autoconf.patch
+++ b/patches/autoconf.patch
@@ -27,8 +27,8 @@ Note: This patch will normally have to be updated by hand after every
 
 Index: samba-3.0.25a/source/configure
 ===================================================================
---- samba-3.0.25a.orig/source/configure	2007-05-25 06:11:18.000000000 +0200
-+++ samba-3.0.25a/source/configure	2007-05-26 07:37:15.604186764 +0200
+--- samba-3.0.25a.orig/source/configure	2007-05-26 07:45:38.604207153 +0200
++++ samba-3.0.25a/source/configure	2007-05-26 07:46:36.104665243 +0200
 @@ -671,6 +671,9 @@
  logfilebase
  privatedir
@@ -191,8 +191,8 @@ Index: samba-3.0.25a/source/configure
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 Index: samba-3.0.25a/source/include/config.h.in
 ===================================================================
---- samba-3.0.25a.orig/source/include/config.h.in	2007-05-25 06:11:16.000000000 +0200
-+++ samba-3.0.25a/source/include/config.h.in	2007-05-26 07:36:40.979909622 +0200
+--- samba-3.0.25a.orig/source/include/config.h.in	2007-05-26 07:45:38.616207248 +0200
++++ samba-3.0.25a/source/include/config.h.in	2007-05-26 07:46:36.112665307 +0200
 @@ -57,6 +57,9 @@
  /* Define to turn on dmalloc debugging */
  #undef ENABLE_DMALLOC
diff --git a/patches/cups.patch b/patches/cups.patch
index b9b16243bd..325a3b2748 100644
--- a/patches/cups.patch
+++ b/patches/cups.patch
@@ -7,10 +7,10 @@ Status wrt upstream: Debian specific
 Note: We need to decide whether it's still reasonable to use "printing=bsd"
       as a default. Probably provide a debconf-supported way to upgrade
 
-Index: samba-3.0.25rc2/source/include/includes.h
+Index: samba-3.0.25a/source/include/includes.h
 ===================================================================
---- samba-3.0.25rc2.orig/source/include/includes.h	2007-04-24 11:07:02.626148126 +0200
-+++ samba-3.0.25rc2/source/include/includes.h	2007-04-24 11:07:46.491777495 +0200
+--- samba-3.0.25a.orig/source/include/includes.h	2007-05-26 07:45:42.088234889 +0200
++++ samba-3.0.25a/source/include/includes.h	2007-05-26 07:46:27.748598629 +0200
 @@ -809,10 +809,7 @@
  #endif
  
diff --git a/patches/documentation.patch b/patches/documentation.patch
index 56273a5099..51111769db 100644
--- a/patches/documentation.patch
+++ b/patches/documentation.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: Some part should maybe go in the FHS patch
 
-Index: samba-3.0.25/docs/manpages/swat.8
+Index: samba-3.0.25a/docs/manpages/swat.8
 ===================================================================
---- samba-3.0.25.orig/docs/manpages/swat.8	2007-05-11 02:02:07.000000000 +0000
-+++ samba-3.0.25/docs/manpages/swat.8	2007-05-14 07:05:47.000000000 +0000
+--- samba-3.0.25a.orig/docs/manpages/swat.8	2007-05-26 07:45:41.924233583 +0200
++++ samba-3.0.25a/docs/manpages/swat.8	2007-05-26 07:46:28.136601722 +0200
 @@ -111,60 +111,6 @@
  .RS 3n
  Print a summary of command line options.
@@ -88,10 +88,10 @@ Index: samba-3.0.25/docs/manpages/swat.8
  .RE
  .SH "WARNINGS"
  .PP
-Index: samba-3.0.25/docs/manpages/nmbd.8
+Index: samba-3.0.25a/docs/manpages/nmbd.8
 ===================================================================
---- samba-3.0.25.orig/docs/manpages/nmbd.8	2007-05-11 02:01:14.000000000 +0000
-+++ samba-3.0.25/docs/manpages/nmbd.8	2007-05-14 07:08:43.000000000 +0000
+--- samba-3.0.25a.orig/docs/manpages/nmbd.8	2007-05-26 07:45:41.932233647 +0200
++++ samba-3.0.25a/docs/manpages/nmbd.8	2007-05-26 07:46:28.136601722 +0200
 @@ -113,11 +113,9 @@
  to answer any name queries. Adding a line to this file affects name NetBIOS resolution from this host
  \fBONLY\fR.
@@ -137,10 +137,10 @@ Index: samba-3.0.25/docs/manpages/nmbd.8
  \fBnmbd\fR
  to dump out its server database in the
  \fIlog.nmb\fR
-Index: samba-3.0.25/docs/manpages/smbd.8
+Index: samba-3.0.25a/docs/manpages/smbd.8
 ===================================================================
---- samba-3.0.25.orig/docs/manpages/smbd.8	2007-05-11 02:01:40.000000000 +0000
-+++ samba-3.0.25/docs/manpages/smbd.8	2007-05-14 07:09:29.000000000 +0000
+--- samba-3.0.25a.orig/docs/manpages/smbd.8	2007-05-26 07:45:41.948233774 +0200
++++ samba-3.0.25a/docs/manpages/smbd.8	2007-05-26 07:46:28.172602009 +0200
 @@ -168,14 +168,11 @@
  \fBinetd\fR, 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
@@ -158,10 +158,10 @@ Index: samba-3.0.25/docs/manpages/smbd.8
  .sp
  This file describes all the services the server is to make available to clients. See
  \fBsmb.conf\fR(5)
-Index: samba-3.0.25/docs/manpages/lmhosts.5
+Index: samba-3.0.25a/docs/manpages/lmhosts.5
 ===================================================================
---- samba-3.0.25.orig/docs/manpages/lmhosts.5	2007-05-11 02:01:06.000000000 +0000
-+++ samba-3.0.25/docs/manpages/lmhosts.5	2007-05-14 07:10:00.000000000 +0000
+--- samba-3.0.25a.orig/docs/manpages/lmhosts.5	2007-05-26 07:45:41.956233838 +0200
++++ samba-3.0.25a/docs/manpages/lmhosts.5	2007-05-26 07:46:28.204602264 +0200
 @@ -77,10 +77,8 @@
  file.
  .SH "FILES"
@@ -175,10 +175,10 @@ Index: samba-3.0.25/docs/manpages/lmhosts.5
  .SH "VERSION"
  .PP
  This man page is correct for version 3.0 of the Samba suite.
-Index: samba-3.0.25/docs/manpages/ntlm_auth.1
+Index: samba-3.0.25a/docs/manpages/ntlm_auth.1
 ===================================================================
---- samba-3.0.25.orig/docs/manpages/ntlm_auth.1	2007-05-11 02:01:18.000000000 +0000
-+++ samba-3.0.25/docs/manpages/ntlm_auth.1	2007-05-14 07:11:15.000000000 +0000
+--- samba-3.0.25a.orig/docs/manpages/ntlm_auth.1	2007-05-26 07:45:41.968233934 +0200
++++ samba-3.0.25a/docs/manpages/ntlm_auth.1	2007-05-26 07:46:28.244602583 +0200
 @@ -43,7 +43,7 @@
  Some of these commands also require access to the directory
  \fIwinbindd_privileged\fR
@@ -206,10 +206,10 @@ Index: samba-3.0.25/docs/manpages/ntlm_auth.1
  .RE
  .PP
  gss-spnego-client
-Index: samba-3.0.25/docs/manpages/tdbbackup.8
+Index: samba-3.0.25a/docs/manpages/tdbbackup.8
 ===================================================================
---- samba-3.0.25.orig/docs/manpages/tdbbackup.8	2007-05-11 02:02:09.000000000 +0000
-+++ samba-3.0.25/docs/manpages/tdbbackup.8	2007-05-14 07:12:18.000000000 +0000
+--- samba-3.0.25a.orig/docs/manpages/tdbbackup.8	2007-05-26 07:45:41.976233997 +0200
++++ samba-3.0.25a/docs/manpages/tdbbackup.8	2007-05-26 07:46:28.276602838 +0200
 @@ -70,17 +70,17 @@
  •
  
@@ -231,10 +231,10 @@ Index: samba-3.0.25/docs/manpages/tdbbackup.8
  .SH "VERSION"
  .PP
  This man page is correct for version 3.0 of the Samba suite.
-Index: samba-3.0.25/docs/manpages/winbindd.8
+Index: samba-3.0.25a/docs/manpages/winbindd.8
 ===================================================================
---- samba-3.0.25.orig/docs/manpages/winbindd.8	2007-05-11 02:02:57.000000000 +0000
-+++ samba-3.0.25/docs/manpages/winbindd.8	2007-05-14 07:14:38.000000000 +0000
+--- samba-3.0.25a.orig/docs/manpages/winbindd.8	2007-05-26 07:45:42.008234252 +0200
++++ samba-3.0.25a/docs/manpages/winbindd.8	2007-05-26 07:46:28.316603157 +0200
 @@ -436,16 +436,16 @@
  file are owned by root.
  .RE
diff --git a/patches/fhs.patch b/patches/fhs.patch
index a5c931ecd5..ea8da0ab58 100644
--- a/patches/fhs.patch
+++ b/patches/fhs.patch
@@ -17,8 +17,8 @@ Note: Use dedicated directories for:
 
 Index: samba-3.0.25a/source/Makefile.in
 ===================================================================
---- samba-3.0.25a.orig/source/Makefile.in	2007-05-23 17:29:19.000000000 +0200
-+++ samba-3.0.25a/source/Makefile.in	2007-05-26 07:24:48.565997630 +0200
+--- samba-3.0.25a.orig/source/Makefile.in	2007-05-26 07:45:41.564230717 +0200
++++ samba-3.0.25a/source/Makefile.in	2007-05-26 07:46:28.752606632 +0200
 @@ -106,6 +106,13 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
@@ -57,8 +57,8 @@ Index: samba-3.0.25a/source/Makefile.in
  	@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
 Index: samba-3.0.25a/source/configure.in
 ===================================================================
---- samba-3.0.25a.orig/source/configure.in	2007-05-23 17:29:20.000000000 +0200
-+++ samba-3.0.25a/source/configure.in	2007-05-26 07:24:48.577997730 +0200
+--- samba-3.0.25a.orig/source/configure.in	2007-05-26 07:45:41.572230781 +0200
++++ samba-3.0.25a/source/configure.in	2007-05-26 07:46:28.764606728 +0200
 @@ -40,7 +40,7 @@
  [  --with-fhs              Use FHS-compliant paths (default=no)],
  [ case "$withval" in
@@ -91,8 +91,8 @@ Index: samba-3.0.25a/source/configure.in
  
 Index: samba-3.0.25a/source/dynconfig.c
 ===================================================================
---- samba-3.0.25a.orig/source/dynconfig.c	2006-06-09 21:30:32.000000000 +0200
-+++ samba-3.0.25a/source/dynconfig.c	2007-05-26 07:24:48.617998063 +0200
+--- samba-3.0.25a.orig/source/dynconfig.c	2007-05-26 07:45:41.580230845 +0200
++++ samba-3.0.25a/source/dynconfig.c	2007-05-26 07:46:28.792606951 +0200
 @@ -53,6 +53,13 @@
  pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
  
@@ -137,8 +137,8 @@ Index: samba-3.0.25a/source/dynconfig.c
 +}
 Index: samba-3.0.25a/source/include/dynconfig.h
 ===================================================================
---- samba-3.0.25a.orig/source/include/dynconfig.h	2006-06-09 21:30:31.000000000 +0200
-+++ samba-3.0.25a/source/include/dynconfig.h	2007-05-26 07:24:48.645998296 +0200
+--- samba-3.0.25a.orig/source/include/dynconfig.h	2007-05-26 07:45:41.588230908 +0200
++++ samba-3.0.25a/source/include/dynconfig.h	2007-05-26 07:46:28.820607175 +0200
 @@ -31,8 +31,12 @@
  extern pstring dyn_CONFIGFILE;
  extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -154,8 +154,8 @@ Index: samba-3.0.25a/source/include/dynconfig.h
 +char *dyn_CACHEDIR(void);
 Index: samba-3.0.25a/source/intl/lang_tdb.c
 ===================================================================
---- samba-3.0.25a.orig/source/intl/lang_tdb.c	2007-03-01 05:54:31.000000000 +0100
-+++ samba-3.0.25a/source/intl/lang_tdb.c	2007-05-26 07:24:48.673998529 +0200
+--- samba-3.0.25a.orig/source/intl/lang_tdb.c	2007-05-26 07:45:41.608231068 +0200
++++ samba-3.0.25a/source/intl/lang_tdb.c	2007-05-26 07:46:28.848607398 +0200
 @@ -131,7 +131,7 @@
  	if (!lang) 
  		return True;
@@ -167,8 +167,8 @@ Index: samba-3.0.25a/source/intl/lang_tdb.c
  		DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path, 
 Index: samba-3.0.25a/source/lib/util.c
 ===================================================================
---- samba-3.0.25a.orig/source/lib/util.c	2007-05-11 00:09:35.000000000 +0200
-+++ samba-3.0.25a/source/lib/util.c	2007-05-26 07:24:48.705998796 +0200
+--- samba-3.0.25a.orig/source/lib/util.c	2007-05-26 07:45:41.616231131 +0200
++++ samba-3.0.25a/source/lib/util.c	2007-05-26 07:46:28.892607749 +0200
 @@ -2630,6 +2630,61 @@
  }
  
@@ -233,8 +233,8 @@ Index: samba-3.0.25a/source/lib/util.c
   * @retval Pointer to a static #fstring containing the extension.
 Index: samba-3.0.25a/source/lib/util_unistr.c
 ===================================================================
---- samba-3.0.25a.orig/source/lib/util_unistr.c	2007-03-01 05:54:30.000000000 +0100
-+++ samba-3.0.25a/source/lib/util_unistr.c	2007-05-26 07:24:48.773999362 +0200
+--- samba-3.0.25a.orig/source/lib/util_unistr.c	2007-05-26 07:45:41.624231195 +0200
++++ samba-3.0.25a/source/lib/util_unistr.c	2007-05-26 07:46:28.932608067 +0200
 @@ -88,11 +88,11 @@
  	}
  	initialised = 1;
@@ -260,8 +260,8 @@ Index: samba-3.0.25a/source/lib/util_unistr.c
  		mapped_file = 1;
 Index: samba-3.0.25a/source/libsmb/samlogon_cache.c
 ===================================================================
---- samba-3.0.25a.orig/source/libsmb/samlogon_cache.c	2007-05-11 00:09:35.000000000 +0200
-+++ samba-3.0.25a/source/libsmb/samlogon_cache.c	2007-05-26 07:24:48.801999595 +0200
+--- samba-3.0.25a.orig/source/libsmb/samlogon_cache.c	2007-05-26 07:45:41.644231354 +0200
++++ samba-3.0.25a/source/libsmb/samlogon_cache.c	2007-05-26 07:46:29.004608641 +0200
 @@ -34,7 +34,7 @@
  BOOL netsamlogon_cache_init(void)
  {
@@ -282,8 +282,8 @@ Index: samba-3.0.25a/source/libsmb/samlogon_cache.c
  		if (!tdb) {
 Index: samba-3.0.25a/source/nmbd/nmbd_serverlistdb.c
 ===================================================================
---- samba-3.0.25a.orig/source/nmbd/nmbd_serverlistdb.c	2006-07-10 18:27:52.000000000 +0200
-+++ samba-3.0.25a/source/nmbd/nmbd_serverlistdb.c	2007-05-26 07:24:48.829999828 +0200
+--- samba-3.0.25a.orig/source/nmbd/nmbd_serverlistdb.c	2007-05-26 07:45:41.652231418 +0200
++++ samba-3.0.25a/source/nmbd/nmbd_serverlistdb.c	2007-05-26 07:46:29.032608865 +0200
 @@ -325,7 +325,7 @@
  
  	updatecount++;
@@ -295,8 +295,8 @@ Index: samba-3.0.25a/source/nmbd/nmbd_serverlistdb.c
  	pstrcat(fname,SERVER_LIST);
 Index: samba-3.0.25a/source/nmbd/nmbd_winsserver.c
 ===================================================================
---- samba-3.0.25a.orig/source/nmbd/nmbd_winsserver.c	2007-03-01 05:54:45.000000000 +0100
-+++ samba-3.0.25a/source/nmbd/nmbd_winsserver.c	2007-05-26 07:24:48.862000095 +0200
+--- samba-3.0.25a.orig/source/nmbd/nmbd_winsserver.c	2007-05-26 07:45:41.672231577 +0200
++++ samba-3.0.25a/source/nmbd/nmbd_winsserver.c	2007-05-26 07:46:29.064609120 +0200
 @@ -585,7 +585,7 @@
  
  	add_samba_names_to_subnet(wins_server_subnet);
@@ -317,8 +317,8 @@ Index: samba-3.0.25a/source/nmbd/nmbd_winsserver.c
  
 Index: samba-3.0.25a/source/passdb/login_cache.c
 ===================================================================
---- samba-3.0.25a.orig/source/passdb/login_cache.c	2007-03-01 05:54:42.000000000 +0100
-+++ samba-3.0.25a/source/passdb/login_cache.c	2007-05-26 07:24:48.890000328 +0200
+--- samba-3.0.25a.orig/source/passdb/login_cache.c	2007-05-26 07:45:41.680231641 +0200
++++ samba-3.0.25a/source/passdb/login_cache.c	2007-05-26 07:46:29.104609438 +0200
 @@ -36,7 +36,7 @@
  	/* skip file open if it's already opened */
  	if (cache) return True;
@@ -330,8 +330,8 @@ Index: samba-3.0.25a/source/passdb/login_cache.c
  	else {
 Index: samba-3.0.25a/source/nsswitch/winbindd_cache.c
 ===================================================================
---- samba-3.0.25a.orig/source/nsswitch/winbindd_cache.c	2007-05-11 00:09:34.000000000 +0200
-+++ samba-3.0.25a/source/nsswitch/winbindd_cache.c	2007-05-26 07:27:24.695298090 +0200
+--- samba-3.0.25a.orig/source/nsswitch/winbindd_cache.c	2007-05-26 07:45:41.708231864 +0200
++++ samba-3.0.25a/source/nsswitch/winbindd_cache.c	2007-05-26 07:46:29.136609694 +0200
 @@ -2180,7 +2180,7 @@
  		return True;
  
@@ -364,8 +364,8 @@ Index: samba-3.0.25a/source/nsswitch/winbindd_cache.c
  				O_RDWR|O_CREAT, 0600);
 Index: samba-3.0.25a/source/param/loadparm.c
 ===================================================================
---- samba-3.0.25a.orig/source/param/loadparm.c	2007-04-21 03:48:07.000000000 +0200
-+++ samba-3.0.25a/source/param/loadparm.c	2007-05-26 07:24:48.982001094 +0200
+--- samba-3.0.25a.orig/source/param/loadparm.c	2007-05-26 07:45:41.736232087 +0200
++++ samba-3.0.25a/source/param/loadparm.c	2007-05-26 07:46:29.184610076 +0200
 @@ -108,6 +108,9 @@
  	char *szAddPrinterCommand;
  	char *szDeletePrinterCommand;
@@ -392,8 +392,8 @@ Index: samba-3.0.25a/source/param/loadparm.c
  	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED}, 
 Index: samba-3.0.25a/source/passdb/secrets.c
 ===================================================================
---- samba-3.0.25a.orig/source/passdb/secrets.c	2007-03-01 05:54:41.000000000 +0100
-+++ samba-3.0.25a/source/passdb/secrets.c	2007-05-26 07:24:49.018001394 +0200
+--- samba-3.0.25a.orig/source/passdb/secrets.c	2007-05-26 07:45:41.688231705 +0200
++++ samba-3.0.25a/source/passdb/secrets.c	2007-05-26 07:46:29.220610363 +0200
 @@ -58,8 +58,7 @@
  	if (tdb)
  		return True;
@@ -406,8 +406,8 @@ Index: samba-3.0.25a/source/passdb/secrets.c
  
 Index: samba-3.0.25a/source/printing/nt_printing.c
 ===================================================================
---- samba-3.0.25a.orig/source/printing/nt_printing.c	2007-05-11 00:09:34.000000000 +0200
-+++ samba-3.0.25a/source/printing/nt_printing.c	2007-05-26 07:24:49.050001660 +0200
+--- samba-3.0.25a.orig/source/printing/nt_printing.c	2007-05-26 07:45:41.744232150 +0200
++++ samba-3.0.25a/source/printing/nt_printing.c	2007-05-26 07:46:29.252610618 +0200
 @@ -551,28 +551,28 @@
   
  	if (tdb_drivers)
@@ -454,8 +454,8 @@ Index: samba-3.0.25a/source/printing/nt_printing.c
  
 Index: samba-3.0.25a/source/printing/printing.c
 ===================================================================
---- samba-3.0.25a.orig/source/printing/printing.c	2007-03-01 05:54:09.000000000 +0100
-+++ samba-3.0.25a/source/printing/printing.c	2007-05-26 07:24:49.090001993 +0200
+--- samba-3.0.25a.orig/source/printing/printing.c	2007-05-26 07:45:41.752232214 +0200
++++ samba-3.0.25a/source/printing/printing.c	2007-05-26 07:46:29.320611160 +0200
 @@ -185,8 +185,8 @@
  	int services = lp_numservices();
  	int snum;
@@ -469,8 +469,8 @@ Index: samba-3.0.25a/source/printing/printing.c
  	/* handle a Samba upgrade */
 Index: samba-3.0.25a/source/printing/printing_db.c
 ===================================================================
---- samba-3.0.25a.orig/source/printing/printing_db.c	2006-06-23 15:16:50.000000000 +0200
-+++ samba-3.0.25a/source/printing/printing_db.c	2007-05-26 07:24:49.118002226 +0200
+--- samba-3.0.25a.orig/source/printing/printing_db.c	2007-05-26 07:45:41.772232373 +0200
++++ samba-3.0.25a/source/printing/printing_db.c	2007-05-26 07:46:29.364611511 +0200
 @@ -91,7 +91,7 @@
  		DLIST_ADD(print_db_head, p);
  	}
@@ -482,8 +482,8 @@ Index: samba-3.0.25a/source/printing/printing_db.c
  
 Index: samba-3.0.25a/source/smbd/lanman.c
 ===================================================================
---- samba-3.0.25a.orig/source/smbd/lanman.c	2007-05-11 00:09:34.000000000 +0200
-+++ samba-3.0.25a/source/smbd/lanman.c	2007-05-26 07:24:49.150002493 +0200
+--- samba-3.0.25a.orig/source/smbd/lanman.c	2007-05-26 07:45:41.784232469 +0200
++++ samba-3.0.25a/source/smbd/lanman.c	2007-05-26 07:46:29.396611766 +0200
 @@ -1088,9 +1088,9 @@
  	BOOL local_list_only;
  	int i;
@@ -498,8 +498,8 @@ Index: samba-3.0.25a/source/smbd/lanman.c
  
 Index: samba-3.0.25a/source/registry/reg_db.c
 ===================================================================
---- samba-3.0.25a.orig/source/registry/reg_db.c	2007-03-01 05:55:05.000000000 +0100
-+++ samba-3.0.25a/source/registry/reg_db.c	2007-05-26 07:24:49.174002692 +0200
+--- samba-3.0.25a.orig/source/registry/reg_db.c	2007-05-26 07:45:41.792232532 +0200
++++ samba-3.0.25a/source/registry/reg_db.c	2007-05-26 07:46:29.436612085 +0200
 @@ -234,12 +234,12 @@
  	if ( tdb_reg )
  		return True;
@@ -532,8 +532,8 @@ Index: samba-3.0.25a/source/registry/reg_db.c
  	unbecome_root();
 Index: samba-3.0.25a/source/lib/account_pol.c
 ===================================================================
---- samba-3.0.25a.orig/source/lib/account_pol.c	2007-03-01 05:54:30.000000000 +0100
-+++ samba-3.0.25a/source/lib/account_pol.c	2007-05-26 07:24:49.234003192 +0200
+--- samba-3.0.25a.orig/source/lib/account_pol.c	2007-05-26 07:45:41.636231291 +0200
++++ samba-3.0.25a/source/lib/account_pol.c	2007-05-26 07:46:29.464612308 +0200
 @@ -213,9 +213,9 @@
  		return True;
  	}
@@ -548,8 +548,8 @@ Index: samba-3.0.25a/source/lib/account_pol.c
  			return False;
 Index: samba-3.0.25a/source/registry/reg_perfcount.c
 ===================================================================
---- samba-3.0.25a.orig/source/registry/reg_perfcount.c	2007-03-01 05:55:05.000000000 +0100
-+++ samba-3.0.25a/source/registry/reg_perfcount.c	2007-05-26 07:24:49.262003425 +0200
+--- samba-3.0.25a.orig/source/registry/reg_perfcount.c	2007-05-26 07:45:41.800232596 +0200
++++ samba-3.0.25a/source/registry/reg_perfcount.c	2007-05-26 07:46:29.492612531 +0200
 @@ -46,7 +46,7 @@
  	
  	fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
@@ -570,8 +570,8 @@ Index: samba-3.0.25a/source/registry/reg_perfcount.c
  	
 Index: samba-3.0.25a/source/rpc_server/srv_eventlog_lib.c
 ===================================================================
---- samba-3.0.25a.orig/source/rpc_server/srv_eventlog_lib.c	2007-03-01 05:54:40.000000000 +0100
-+++ samba-3.0.25a/source/rpc_server/srv_eventlog_lib.c	2007-05-26 07:24:49.290003658 +0200
+--- samba-3.0.25a.orig/source/rpc_server/srv_eventlog_lib.c	2007-05-26 07:45:41.808232660 +0200
++++ samba-3.0.25a/source/rpc_server/srv_eventlog_lib.c	2007-05-26 07:46:29.520612755 +0200
 @@ -67,7 +67,7 @@
  {
  	fstring path;
@@ -592,8 +592,8 @@ Index: samba-3.0.25a/source/rpc_server/srv_eventlog_lib.c
  	
 Index: samba-3.0.25a/source/passdb/pdb_tdb.c
 ===================================================================
---- samba-3.0.25a.orig/source/passdb/pdb_tdb.c	2007-03-01 05:54:41.000000000 +0100
-+++ samba-3.0.25a/source/passdb/pdb_tdb.c	2007-05-26 07:24:49.318003891 +0200
+--- samba-3.0.25a.orig/source/passdb/pdb_tdb.c	2007-05-26 07:45:41.700231800 +0200
++++ samba-3.0.25a/source/passdb/pdb_tdb.c	2007-05-26 07:46:29.580613233 +0200
 @@ -1623,7 +1623,7 @@
  	/* save the path for later */
  			   
@@ -605,8 +605,8 @@ Index: samba-3.0.25a/source/passdb/pdb_tdb.c
  	pstrcpy( tdbsam_filename, pfile );
 Index: samba-3.0.25a/source/groupdb/mapping_tdb.c
 ===================================================================
---- samba-3.0.25a.orig/source/groupdb/mapping_tdb.c	2007-04-25 11:38:59.000000000 +0200
-+++ samba-3.0.25a/source/groupdb/mapping_tdb.c	2007-05-26 07:24:49.346004125 +0200
+--- samba-3.0.25a.orig/source/groupdb/mapping_tdb.c	2007-05-26 07:45:41.832232851 +0200
++++ samba-3.0.25a/source/groupdb/mapping_tdb.c	2007-05-26 07:46:29.608613456 +0200
 @@ -39,7 +39,7 @@
  	if (tdb)
  		return True;
@@ -618,8 +618,8 @@ Index: samba-3.0.25a/source/groupdb/mapping_tdb.c
  		return False;
 Index: samba-3.0.25a/source/nsswitch/idmap_tdb.c
 ===================================================================
---- samba-3.0.25a.orig/source/nsswitch/idmap_tdb.c	2007-05-11 00:09:34.000000000 +0200
-+++ samba-3.0.25a/source/nsswitch/idmap_tdb.c	2007-05-26 07:24:49.378004391 +0200
+--- samba-3.0.25a.orig/source/nsswitch/idmap_tdb.c	2007-05-26 07:45:41.728232023 +0200
++++ samba-3.0.25a/source/nsswitch/idmap_tdb.c	2007-05-26 07:46:29.636613679 +0200
 @@ -247,7 +247,7 @@
  	}
  
diff --git a/patches/installswat.sh.patch b/patches/installswat.sh.patch
index f3b8cfd872..d4ed621f1a 100644
--- a/patches/installswat.sh.patch
+++ b/patches/installswat.sh.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: 
 
-Index: samba-3.0.25rc2/source/script/installswat.sh
+Index: samba-3.0.25a/source/script/installswat.sh
 ===================================================================
---- samba-3.0.25rc2.orig/source/script/installswat.sh	2007-04-24 11:07:01.214092173 +0200
-+++ samba-3.0.25rc2/source/script/installswat.sh	2007-04-24 11:07:48.931862317 +0200
+--- samba-3.0.25a.orig/source/script/installswat.sh	2007-05-26 07:45:40.380221291 +0200
++++ samba-3.0.25a/source/script/installswat.sh	2007-05-26 07:46:30.380619610 +0200
 @@ -198,7 +198,11 @@
  
  # Install/ remove Using Samba book (but only if it is there)
diff --git a/patches/make-distclean.patch b/patches/make-distclean.patch
index 55daff0c65..8e9a87a924 100644
--- a/patches/make-distclean.patch
+++ b/patches/make-distclean.patch
@@ -6,11 +6,11 @@ Status wrt upstream: Forwarded upstream, will be in 3.0.26
 
 Note: 
 
-Index: samba-3.0.25rc2/source/Makefile.in
+Index: samba-3.0.25a/source/Makefile.in
 ===================================================================
---- samba-3.0.25rc2.orig/source/Makefile.in	2007-04-24 11:07:47.427810099 +0200
-+++ samba-3.0.25rc2/source/Makefile.in	2007-04-24 11:07:49.231872700 +0200
-@@ -1683,6 +1683,7 @@
+--- samba-3.0.25a.orig/source/Makefile.in	2007-05-26 07:46:28.752606632 +0200
++++ samba-3.0.25a/source/Makefile.in	2007-05-26 07:46:30.732622416 +0200
+@@ -1688,6 +1688,7 @@
  
  python_clean:
  	@-if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi
@@ -18,7 +18,7 @@ Index: samba-3.0.25rc2/source/Makefile.in
  
  # revert to the previously installed version
  revert:
-@@ -1871,6 +1872,7 @@
+@@ -1876,6 +1877,7 @@
  
  distclean: realclean
  	-rm -f include/stamp-h
diff --git a/patches/nmbd-signalling.patch b/patches/nmbd-signalling.patch
index 61217b25f8..a39cde86f8 100644
--- a/patches/nmbd-signalling.patch
+++ b/patches/nmbd-signalling.patch
@@ -6,10 +6,10 @@ Status wrt upstream: No apparent reason for not being forwarded upstream
 
 Note: 
 
-Index: samba-3.0.25rc2/source/nmbd/nmbd_subnetdb.c
+Index: samba-3.0.25a/source/nmbd/nmbd_subnetdb.c
 ===================================================================
---- samba-3.0.25rc2.orig/source/nmbd/nmbd_subnetdb.c	2007-04-24 11:07:01.050085666 +0200
-+++ samba-3.0.25rc2/source/nmbd/nmbd_subnetdb.c	2007-04-24 11:07:49.543883491 +0200
+--- samba-3.0.25a.orig/source/nmbd/nmbd_subnetdb.c	2007-05-26 07:45:40.136219349 +0200
++++ samba-3.0.25a/source/nmbd/nmbd_subnetdb.c	2007-05-26 07:46:31.104625382 +0200
 @@ -185,12 +185,16 @@
  	struct in_addr unicast_ip, ipzero;
  
diff --git a/patches/non-linux-ports.patch b/patches/non-linux-ports.patch
index f60ffc3a9d..3569ee82b3 100644
--- a/patches/non-linux-ports.patch
+++ b/patches/non-linux-ports.patch
@@ -7,10 +7,10 @@ Status wrt upstream: Forwarded, will be in 3.0.26
 Note: Upstream would probably welcome patches allowing to build on new architectures. 
       As this patch is the most often broken by new upstream releases, everybody would benefit from it.
 
-Index: samba-3.0.25rc2/source/configure.in
+Index: samba-3.0.25a/source/configure.in
 ===================================================================
---- samba-3.0.25rc2.orig/source/configure.in	2007-04-24 11:07:47.435810377 +0200
-+++ samba-3.0.25rc2/source/configure.in	2007-04-24 11:07:49.843893867 +0200
+--- samba-3.0.25a.orig/source/configure.in	2007-05-26 07:46:28.764606728 +0200
++++ samba-3.0.25a/source/configure.in	2007-05-26 07:46:31.568629081 +0200
 @@ -758,6 +758,15 @@
        fi
      ;;
@@ -48,7 +48,7 @@ Index: samba-3.0.25rc2/source/configure.in
  			BLDSHARED="true"
  			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
  				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -5398,7 +5410,7 @@
+@@ -5409,7 +5421,7 @@
  	AC_MSG_RESULT(yes);
  
  	case "$host_os" in
@@ -57,7 +57,7 @@ Index: samba-3.0.25rc2/source/configure.in
  		AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
  		AC_TRY_LINK([#include <sys/sendfile.h>],
  [\
-@@ -5703,11 +5715,11 @@
+@@ -5714,11 +5726,11 @@
  SMB_KRB5_LOCATOR="bin/smb_krb5_locator.$SHLIBEXT"
  
  case "$host_os" in
diff --git a/patches/pam-examples.patch b/patches/pam-examples.patch
index dfee9486e5..35dc25a1c7 100644
--- a/patches/pam-examples.patch
+++ b/patches/pam-examples.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: 
 
-Index: samba-3.0.25rc2/source/pam_smbpass/README
+Index: samba-3.0.25a/source/pam_smbpass/README
 ===================================================================
---- samba-3.0.25rc2.orig/source/pam_smbpass/README	2007-04-24 11:07:00.878078827 +0200
-+++ samba-3.0.25rc2/source/pam_smbpass/README	2007-04-24 11:07:50.199906160 +0200
+--- samba-3.0.25a.orig/source/pam_smbpass/README	2007-05-26 07:45:39.944217820 +0200
++++ samba-3.0.25a/source/pam_smbpass/README	2007-05-26 07:46:31.936632014 +0200
 @@ -37,7 +37,7 @@
  	smbconf=<file>	-	specify an alternate path to the smb.conf
  				file.
diff --git a/patches/python-examples.patch b/patches/python-examples.patch
index a6a026c3fa..2eea10774f 100644
--- a/patches/python-examples.patch
+++ b/patches/python-examples.patch
@@ -6,20 +6,20 @@ Status wrt upstream: Forwarded upstream, will be in 3.0.26
 
 Note: Probably other vendors would benefit from examples not hardcoding the Python version
 
-Index: samba-3.0.25rc1/source/python/examples/tdbpack/tdbtimetrial.py
+Index: samba-3.0.25a/source/python/examples/tdbpack/tdbtimetrial.py
 ===================================================================
---- samba-3.0.25rc1.orig/source/python/examples/tdbpack/tdbtimetrial.py	2007-04-10 10:00:40.790383582 +0200
-+++ samba-3.0.25rc1/source/python/examples/tdbpack/tdbtimetrial.py	2007-04-10 10:01:46.426925654 +0200
+--- samba-3.0.25a.orig/source/python/examples/tdbpack/tdbtimetrial.py	2005-02-25 18:59:24.000000000 +0100
++++ samba-3.0.25a/source/python/examples/tdbpack/tdbtimetrial.py	2007-05-26 07:46:36.652669613 +0200
 @@ -1,4 +1,4 @@
 -#! /usr/bin/python2.2
 +#! /usr/bin/python
  
  def run_trial():
      # import tdbutil
-Index: samba-3.0.25rc1/source/python/examples/tdbpack/test_tdbpack.py
+Index: samba-3.0.25a/source/python/examples/tdbpack/test_tdbpack.py
 ===================================================================
---- samba-3.0.25rc1.orig/source/python/examples/tdbpack/test_tdbpack.py	2007-04-10 10:00:40.806383714 +0200
-+++ samba-3.0.25rc1/source/python/examples/tdbpack/test_tdbpack.py	2007-04-10 10:01:46.462925951 +0200
+--- samba-3.0.25a.orig/source/python/examples/tdbpack/test_tdbpack.py	2005-02-25 18:59:24.000000000 +0100
++++ samba-3.0.25a/source/python/examples/tdbpack/test_tdbpack.py	2007-05-26 07:46:36.652669613 +0200
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python2.2
 +#! /usr/bin/env python
diff --git a/patches/samba.patch b/patches/samba.patch
index bfa5e9a0e7..40fbc8b93e 100644
--- a/patches/samba.patch
+++ b/patches/samba.patch
@@ -9,10 +9,10 @@ Status wrt upstream: Chunk 3 is Debian specific. Not sure for chunks 1 and 2
 
 Note: 
 
-Index: samba-3.0.25rc2/source/client/smbmount.c
+Index: samba-3.0.25a/source/client/smbmount.c
 ===================================================================
---- samba-3.0.25rc2.orig/source/client/smbmount.c	2007-04-24 11:07:00.702071823 +0200
-+++ samba-3.0.25rc2/source/client/smbmount.c	2007-04-24 11:07:51.451949299 +0200
+--- samba-3.0.25a.orig/source/client/smbmount.c	2007-05-26 07:45:39.744216228 +0200
++++ samba-3.0.25a/source/client/smbmount.c	2007-05-26 07:46:32.692638041 +0200
 @@ -768,7 +768,7 @@
  					*lp = 0;
  					pstrcpy(password,lp+1);
@@ -40,10 +40,10 @@ Index: samba-3.0.25rc2/source/client/smbmount.c
  		}
  		strupper_m(username);
  	}
-Index: samba-3.0.25rc2/source/web/diagnose.c
+Index: samba-3.0.25a/source/web/diagnose.c
 ===================================================================
---- samba-3.0.25rc2.orig/source/web/diagnose.c	2007-04-24 11:07:00.722072619 +0200
-+++ samba-3.0.25rc2/source/web/diagnose.c	2007-04-24 11:07:51.455949436 +0200
+--- samba-3.0.25a.orig/source/web/diagnose.c	2007-05-26 07:45:39.752216292 +0200
++++ samba-3.0.25a/source/web/diagnose.c	2007-05-26 07:46:32.696638073 +0200
 @@ -62,6 +62,7 @@
  {
  	struct cli_state *cli;
@@ -52,10 +52,10 @@ Index: samba-3.0.25rc2/source/web/diagnose.c
  	if ((cli = cli_initialise()) == NULL)
  		return False;
  
-Index: samba-3.0.25rc2/source/script/installbin.sh.in
+Index: samba-3.0.25a/source/script/installbin.sh.in
 ===================================================================
---- samba-3.0.25rc2.orig/source/script/installbin.sh.in	2007-04-24 11:07:00.734073097 +0200
-+++ samba-3.0.25rc2/source/script/installbin.sh.in	2007-04-24 11:07:51.523951775 +0200
+--- samba-3.0.25a.orig/source/script/installbin.sh.in	2007-05-26 07:45:39.764216387 +0200
++++ samba-3.0.25a/source/script/installbin.sh.in	2007-05-26 07:46:32.740638424 +0200
 @@ -21,13 +21,15 @@
   chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
  
diff --git a/patches/smbclient-pager.patch b/patches/smbclient-pager.patch
index a89abd2f14..9c1de57f57 100644
--- a/patches/smbclient-pager.patch
+++ b/patches/smbclient-pager.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: 
 
-Index: samba-3.0.25rc2/source/include/local.h
+Index: samba-3.0.25a/source/include/local.h
 ===================================================================
---- samba-3.0.25rc2.orig/source/include/local.h	2007-04-24 11:07:00.526064819 +0200
-+++ samba-3.0.25rc2/source/include/local.h	2007-04-24 11:07:51.847962919 +0200
+--- samba-3.0.25a.orig/source/include/local.h	2007-05-26 07:45:39.520214445 +0200
++++ samba-3.0.25a/source/include/local.h	2007-05-26 07:46:33.132641549 +0200
 @@ -109,7 +109,7 @@
  /* the default pager to use for the client "more" command. Users can
     override this with the PAGER environment variable */
diff --git a/patches/smbmount-mtab-flags.patch b/patches/smbmount-mtab-flags.patch
index 5cac43e8e4..49ae62dd59 100644
--- a/patches/smbmount-mtab-flags.patch
+++ b/patches/smbmount-mtab-flags.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Should be forwarded if pertinent
 
 Note: 
 
-Index: samba-3.0.25rc2/source/client/smbmnt.c
+Index: samba-3.0.25a/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.25rc2.orig/source/client/smbmnt.c	2007-04-24 11:07:00.470062591 +0200
-+++ samba-3.0.25rc2/source/client/smbmnt.c	2007-04-24 11:07:52.143973086 +0200
+--- samba-3.0.25a.orig/source/client/smbmnt.c	2007-05-26 07:45:39.408213553 +0200
++++ samba-3.0.25a/source/client/smbmnt.c	2007-05-26 07:46:33.492644419 +0200
 @@ -276,7 +276,10 @@
          ment.mnt_fsname = share_name ? share_name : "none";
          ment.mnt_dir = mount_point;
diff --git a/patches/smbmount-nomtab.patch b/patches/smbmount-nomtab.patch
index 961a85eadc..d16ba49aea 100644
--- a/patches/smbmount-nomtab.patch
+++ b/patches/smbmount-nomtab.patch
@@ -7,10 +7,10 @@ Status wrt upstream: Should be forwarded
 Note: Part of no-longer maintained smbfs stuff?
       The manpages are not modified
 
-Index: samba-3.0.25rc2/source/client/smbmnt.c
+Index: samba-3.0.25a/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.25rc2.orig/source/client/smbmnt.c	2007-04-24 11:07:52.143973086 +0200
-+++ samba-3.0.25rc2/source/client/smbmnt.c	2007-04-24 11:07:53.912033639 +0200
+--- samba-3.0.25a.orig/source/client/smbmnt.c	2007-05-26 07:46:33.492644419 +0200
++++ samba-3.0.25a/source/client/smbmnt.c	2007-05-26 07:46:33.848647257 +0200
 @@ -44,6 +44,7 @@
  static uid_t mount_uid;
  static gid_t mount_gid;
@@ -112,10 +112,10 @@ Index: samba-3.0.25rc2/source/client/smbmnt.c
  
  	return 0;
  }	
-Index: samba-3.0.25rc2/source/client/smbmount.c
+Index: samba-3.0.25a/source/client/smbmount.c
 ===================================================================
---- samba-3.0.25rc2.orig/source/client/smbmount.c	2007-04-24 11:07:51.451949299 +0200
-+++ samba-3.0.25rc2/source/client/smbmount.c	2007-04-24 11:07:54.208043743 +0200
+--- samba-3.0.25a.orig/source/client/smbmount.c	2007-05-26 07:46:32.692638041 +0200
++++ samba-3.0.25a/source/client/smbmount.c	2007-05-26 07:46:33.884647544 +0200
 @@ -48,6 +48,7 @@
  static int mount_ro;
  static unsigned mount_fmask;
diff --git a/patches/smbmount-unix-caps.patch b/patches/smbmount-unix-caps.patch
index b2d7099763..7b75895b5c 100644
--- a/patches/smbmount-unix-caps.patch
+++ b/patches/smbmount-unix-caps.patch
@@ -6,10 +6,10 @@ Status wrt upstream: If pertinent, should probably be forwarded
 
 Note: Part of no-longer maintained smbfs stuff?
 
-Index: samba-3.0.25rc2/source/client/smbmount.c
+Index: samba-3.0.25a/source/client/smbmount.c
 ===================================================================
---- samba-3.0.25rc2.orig/source/client/smbmount.c	2007-04-24 11:07:54.208043743 +0200
-+++ samba-3.0.25rc2/source/client/smbmount.c	2007-04-24 11:07:54.772062980 +0200
+--- samba-3.0.25a.orig/source/client/smbmount.c	2007-05-26 07:46:33.884647544 +0200
++++ samba-3.0.25a/source/client/smbmount.c	2007-05-26 07:46:34.272650637 +0200
 @@ -213,6 +213,10 @@
    		c->capabilities &= ~CAP_STATUS32;
  		c->force_dos_errors = True;
diff --git a/patches/smbstatus-locking.patch b/patches/smbstatus-locking.patch
index 7f199046f0..9747c72029 100644
--- a/patches/smbstatus-locking.patch
+++ b/patches/smbstatus-locking.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Should maybe be forwarded
 
 Note: 
 
-Index: samba-3.0.25rc2/source/utils/status.c
+Index: samba-3.0.25a/source/utils/status.c
 ===================================================================
---- samba-3.0.25rc2.orig/source/utils/status.c	2007-04-24 11:07:00.162050334 +0200
-+++ samba-3.0.25rc2/source/utils/status.c	2007-04-24 11:07:55.332082050 +0200
+--- samba-3.0.25a.orig/source/utils/status.c	2007-05-26 07:45:38.952209923 +0200
++++ samba-3.0.25a/source/utils/status.c	2007-05-26 07:46:34.640653571 +0200
 @@ -367,6 +367,16 @@
  	if ( show_locks ) {
  		int ret;
diff --git a/patches/undefined-symbols.patch b/patches/undefined-symbols.patch
index 18304241bd..785d7b27d6 100644
--- a/patches/undefined-symbols.patch
+++ b/patches/undefined-symbols.patch
@@ -9,10 +9,10 @@ for it.
 
 Note: 
 
-Index: samba-3.0.25rc3/source/Makefile.in
+Index: samba-3.0.25a/source/Makefile.in
 ===================================================================
---- samba-3.0.25rc3.orig/source/Makefile.in	2007-05-06 13:59:03.000000000 -0700
-+++ samba-3.0.25rc3/source/Makefile.in	2007-05-06 14:01:03.000000000 -0700
+--- samba-3.0.25a.orig/source/Makefile.in	2007-05-26 07:46:30.732622416 +0200
++++ samba-3.0.25a/source/Makefile.in	2007-05-26 07:46:34.984656314 +0200
 @@ -1161,7 +1161,7 @@
  
  bin/libsmbclient.@SHLIBEXT@: proto_exists $(LIBSMBCLIENT_OBJ)