[Pkg-samba-maint] r1907 - branches/samba/experimental/debian/patches

bubulle at alioth.debian.org bubulle at alioth.debian.org
Fri May 30 20:53:17 UTC 2008 

Author: bubulle
Date: 2008-05-30 20:53:17 +0000 (Fri, 30 May 2008)
New Revision: 1907

Modified:
   branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch
   branches/samba/experimental/debian/patches/VERSION.patch
   branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch
   branches/samba/experimental/debian/patches/autoconf.patch
   branches/samba/experimental/debian/patches/documentation.patch
   branches/samba/experimental/debian/patches/fhs-assignpaths.patch
   branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch
   branches/samba/experimental/debian/patches/fhs-filespaths.patch
   branches/samba/experimental/debian/patches/installswat.sh.patch
   branches/samba/experimental/debian/patches/non-linux-ports.patch
   branches/samba/experimental/debian/patches/pam-examples.patch
   branches/samba/experimental/debian/patches/smbclient-pager.patch
   branches/samba/experimental/debian/patches/smbpasswd-syslog.patch
   branches/samba/experimental/debian/patches/undefined-symbols.patch
   branches/samba/experimental/debian/patches/usershare.patch
Log:
Refresh patches for 3.2.0-rc1


Modified: branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch
===================================================================
--- branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch	2008-05-30 20:53:00 UTC (rev 1906)
+++ branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch	2008-05-30 20:53:17 UTC (rev 1907)
@@ -6,10 +6,10 @@
 
 Note: 
 
-Index: samba-3.2.0pre3/examples/LDAP/README
+Index: samba-3.2.0rc1/examples/LDAP/README
 ===================================================================
---- samba-3.2.0pre3.orig/examples/LDAP/README
-+++ samba-3.2.0pre3/examples/LDAP/README
+--- samba-3.2.0rc1.orig/examples/LDAP/README
++++ samba-3.2.0rc1/examples/LDAP/README
 @@ -69,6 +69,9 @@
  The smbldap-tools package can be downloaded individually from
  http://samba.idealx.org/dist/

Modified: branches/samba/experimental/debian/patches/VERSION.patch
===================================================================
--- branches/samba/experimental/debian/patches/VERSION.patch	2008-05-30 20:53:00 UTC (rev 1906)
+++ branches/samba/experimental/debian/patches/VERSION.patch	2008-05-30 20:53:17 UTC (rev 1907)
@@ -6,10 +6,10 @@
 
 Note: Should be kept
 
-Index: samba-3.2.0pre3/source/VERSION
+Index: samba-3.2.0rc1/source/VERSION
 ===================================================================
---- samba-3.2.0pre3.orig/source/VERSION
-+++ samba-3.2.0pre3/source/VERSION
+--- samba-3.2.0rc1.orig/source/VERSION
++++ samba-3.2.0rc1/source/VERSION
 @@ -95,5 +95,5 @@
  # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version()    #
  #  ->  "CVS 3.0.0rc2-VendorVersion"                    #

Modified: branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch
===================================================================
--- branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch	2008-05-30 20:53:00 UTC (rev 1906)
+++ branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch	2008-05-30 20:53:17 UTC (rev 1907)
@@ -6,10 +6,10 @@
 
 Note: 
 
-Index: samba-3.2.0pre3/docs/manpages/smb.conf.5
+Index: samba-3.2.0rc1/docs/manpages/smb.conf.5
 ===================================================================
---- samba-3.2.0pre3.orig/docs/manpages/smb.conf.5
-+++ samba-3.2.0pre3/docs/manpages/smb.conf.5
+--- samba-3.2.0rc1.orig/docs/manpages/smb.conf.5
++++ samba-3.2.0rc1/docs/manpages/smb.conf.5
 @@ -750,8 +750,8 @@
  Default:
  \fI\fIadd machine script\fR\fR\fI = \fR\fI\fR\fI \fR

Modified: branches/samba/experimental/debian/patches/autoconf.patch
===================================================================
--- branches/samba/experimental/debian/patches/autoconf.patch	2008-05-30 20:53:00 UTC (rev 1906)
+++ branches/samba/experimental/debian/patches/autoconf.patch	2008-05-30 20:53:17 UTC (rev 1907)
@@ -25,11 +25,11 @@
  quilt refresh
  find . -name '*.rej' | xargs rm
 
-Index: samba-3.2.0pre3/source/configure
+Index: samba-3.2.0rc1/source/configure
 ===================================================================
---- samba-3.2.0pre3.orig/source/configure
-+++ samba-3.2.0pre3/source/configure
-@@ -2213,7 +2213,7 @@
+--- samba-3.2.0rc1.orig/source/configure
++++ samba-3.2.0rc1/source/configure
+@@ -2225,7 +2225,7 @@
  if test "${with_fhs+set}" = set; then
    withval=$with_fhs;  case "$withval" in
    yes)
@@ -38,7 +38,7 @@
      piddir="\${VARDIR}/run"
      mandir="\${prefix}/share/man"
      logfilebase="\${VARDIR}/log/samba"
-@@ -2221,9 +2221,9 @@
+@@ -2233,9 +2233,9 @@
      test "${libdir}" || libdir="\${prefix}/lib/samba"
      configdir="\${sysconfdir}/samba"
      swatdir="\${DATADIR}/samba/swat"
@@ -50,7 +50,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define FHS_COMPATIBLE 1
-@@ -12870,6 +12870,27 @@
+@@ -12885,6 +12885,27 @@
        fi
      ;;
  
@@ -78,7 +78,7 @@
  # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
  #
      *linux*)
-@@ -40409,7 +40430,7 @@
+@@ -40329,7 +40350,7 @@
  #
  #
  case "$host_os" in
@@ -87,7 +87,7 @@
         # glibc <= 2.3.2 has a broken getgrouplist
         if test "$cross_compiling" = yes; then
    { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-@@ -45365,11 +45386,14 @@
+@@ -45351,11 +45372,14 @@
  
    # and these are for particular systems
    case "$host_os" in
@@ -104,7 +104,7 @@
  			BLDSHARED="true"
  			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
  				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -68819,7 +68843,7 @@
+@@ -68611,7 +68635,7 @@
  echo "${ECHO_T}yes" >&6; };
  
  	case "$host_os" in
@@ -113,7 +113,7 @@
  		{ echo "$as_me:$LINENO: checking for linux sendfile64 support" >&5
  echo $ECHO_N "checking for linux sendfile64 support... $ECHO_C" >&6; }
  if test "${samba_cv_HAVE_SENDFILE64+set}" = set; then
-@@ -69900,11 +69924,11 @@
+@@ -69692,11 +69716,11 @@
  WINBIND_NSS_PTHREAD=""
  
  case "$host_os" in
@@ -127,10 +127,10 @@
  		# FreeBSD winbind client is implemented as a wrapper around
  		# the Linux version.
  		NSSSONAMEVERSIONSUFFIX=".1"
-Index: samba-3.2.0pre3/source/include/config.h.in
+Index: samba-3.2.0rc1/source/include/config.h.in
 ===================================================================
---- samba-3.2.0pre3.orig/source/include/config.h.in
-+++ samba-3.2.0pre3/source/include/config.h.in
+--- samba-3.2.0rc1.orig/source/include/config.h.in
++++ samba-3.2.0rc1/source/include/config.h.in
 @@ -66,6 +66,9 @@
  /* Whether to use fully FHS-compatible paths */
  #undef FHS_COMPATIBLE

Modified: branches/samba/experimental/debian/patches/documentation.patch
===================================================================
--- branches/samba/experimental/debian/patches/documentation.patch	2008-05-30 20:53:00 UTC (rev 1906)
+++ branches/samba/experimental/debian/patches/documentation.patch	2008-05-30 20:53:17 UTC (rev 1907)
@@ -6,10 +6,10 @@
 
 Note: Some part should maybe go in the FHS patch
 
-Index: samba-3.2.0pre3/docs/manpages/swat.8
+Index: samba-3.2.0rc1/docs/manpages/swat.8
 ===================================================================
---- samba-3.2.0pre3.orig/docs/manpages/swat.8
-+++ samba-3.2.0pre3/docs/manpages/swat.8
+--- samba-3.2.0rc1.orig/docs/manpages/swat.8
++++ samba-3.2.0rc1/docs/manpages/swat.8
 @@ -103,85 +103,6 @@
  .RS 4
  Print a summary of command line options\.
@@ -113,10 +113,10 @@
  .RE
  .SH "WARNINGS"
  .PP
-Index: samba-3.2.0pre3/docs/manpages/nmbd.8
+Index: samba-3.2.0rc1/docs/manpages/nmbd.8
 ===================================================================
---- samba-3.2.0pre3.orig/docs/manpages/nmbd.8
-+++ samba-3.2.0pre3/docs/manpages/nmbd.8
+--- samba-3.2.0rc1.orig/docs/manpages/nmbd.8
++++ samba-3.2.0rc1/docs/manpages/nmbd.8
 @@ -107,11 +107,9 @@
  to answer any name queries\. Adding a line to this file affects name NetBIOS resolution from this host
  \fIONLY\fR\.
@@ -162,10 +162,10 @@
  nmbd
  to dump out its server database in the
  \fIlog\.nmb\fR
-Index: samba-3.2.0pre3/docs/manpages/smbd.8
+Index: samba-3.2.0rc1/docs/manpages/smbd.8
 ===================================================================
---- samba-3.2.0pre3.orig/docs/manpages/smbd.8
-+++ samba-3.2.0pre3/docs/manpages/smbd.8
+--- samba-3.2.0rc1.orig/docs/manpages/smbd.8
++++ samba-3.2.0rc1/docs/manpages/smbd.8
 @@ -161,14 +161,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
@@ -183,10 +183,10 @@
  .sp
  This file describes all the services the server is to make available to clients\. See
  \fBsmb.conf\fR(5)
-Index: samba-3.2.0pre3/docs/manpages/lmhosts.5
+Index: samba-3.2.0rc1/docs/manpages/lmhosts.5
 ===================================================================
---- samba-3.2.0pre3.orig/docs/manpages/lmhosts.5
-+++ samba-3.2.0pre3/docs/manpages/lmhosts.5
+--- samba-3.2.0rc1.orig/docs/manpages/lmhosts.5
++++ samba-3.2.0rc1/docs/manpages/lmhosts.5
 @@ -83,10 +83,8 @@
  file\.
  .SH "FILES"
@@ -199,11 +199,11 @@
 +\fI/etc/samba\fR.
  .SH "VERSION"
  .PP
- This man page is correct for version 3\.0 of the Samba suite\.
-Index: samba-3.2.0pre3/docs/manpages/ntlm_auth.1
+ This man page is correct for version 3 of the Samba suite\.
+Index: samba-3.2.0rc1/docs/manpages/ntlm_auth.1
 ===================================================================
---- samba-3.2.0pre3.orig/docs/manpages/ntlm_auth.1
-+++ samba-3.2.0pre3/docs/manpages/ntlm_auth.1
+--- samba-3.2.0rc1.orig/docs/manpages/ntlm_auth.1
++++ samba-3.2.0rc1/docs/manpages/ntlm_auth.1
 @@ -35,7 +35,7 @@
  Some of these commands also require access to the directory
  \fIwinbindd_privileged\fR
@@ -231,10 +231,10 @@
  .RE
  .PP
  gss\-spnego\-client
-Index: samba-3.2.0pre3/docs/manpages/tdbbackup.8
+Index: samba-3.2.0rc1/docs/manpages/tdbbackup.8
 ===================================================================
---- samba-3.2.0pre3.orig/docs/manpages/tdbbackup.8
-+++ samba-3.2.0pre3/docs/manpages/tdbbackup.8
+--- samba-3.2.0rc1.orig/docs/manpages/tdbbackup.8
++++ samba-3.2.0rc1/docs/manpages/tdbbackup.8
 @@ -69,7 +69,7 @@
  .\}
  
@@ -261,11 +261,11 @@
 +located in the /var/lib/samba and /var/run/samba directories.
  .SH "VERSION"
  .PP
- This man page is correct for version 3\.0 of the Samba suite\.
-Index: samba-3.2.0pre3/docs/manpages/winbindd.8
+ This man page is correct for version 3 of the Samba suite\.
+Index: samba-3.2.0rc1/docs/manpages/winbindd.8
 ===================================================================
---- samba-3.2.0pre3.orig/docs/manpages/winbindd.8
-+++ samba-3.2.0pre3/docs/manpages/winbindd.8
+--- samba-3.2.0rc1.orig/docs/manpages/winbindd.8
++++ samba-3.2.0rc1/docs/manpages/winbindd.8
 @@ -518,16 +518,16 @@
  file are owned by root\.
  .RE

Modified: branches/samba/experimental/debian/patches/fhs-assignpaths.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-assignpaths.patch	2008-05-30 20:53:00 UTC (rev 1906)
+++ branches/samba/experimental/debian/patches/fhs-assignpaths.patch	2008-05-30 20:53:17 UTC (rev 1907)
@@ -7,10 +7,10 @@
 Status wrt upstream: Can remain Debian-specific if upstream doesn't want to
                      change their default behaviour
 
-Index: samba-3.2.0pre3/source/param/loadparm.c
+Index: samba-3.2.0rc1/source/param/loadparm.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/param/loadparm.c
-+++ samba-3.2.0pre3/source/param/loadparm.c
+--- samba-3.2.0rc1.orig/source/param/loadparm.c
++++ samba-3.2.0rc1/source/param/loadparm.c
 @@ -121,6 +121,9 @@
  	char *szAddPrinterCommand;
  	char *szDeletePrinterCommand;
@@ -56,10 +56,10 @@
  	{
  		.label		= "pid directory",
  		.type		= P_STRING,
-Index: samba-3.2.0pre3/source/m4/check_path.m4
+Index: samba-3.2.0rc1/source/m4/check_path.m4
 ===================================================================
---- samba-3.2.0pre3.orig/source/m4/check_path.m4
-+++ samba-3.2.0pre3/source/m4/check_path.m4
+--- samba-3.2.0rc1.orig/source/m4/check_path.m4
++++ samba-3.2.0rc1/source/m4/check_path.m4
 @@ -33,7 +33,7 @@
  [AS_HELP_STRING([--with-fhs],[Use FHS-compliant paths (default=no)])],
  [ case "$withval" in

Modified: branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch	2008-05-30 20:53:00 UTC (rev 1906)
+++ branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch	2008-05-30 20:53:17 UTC (rev 1907)
@@ -46,11 +46,11 @@
       grep -r lp_lockdir source/ | grep -vE \
          '%s/smb_(tmp_)*krb5|source/(lib/util|param/loadparm|dynconfig|utils/testparm)\.c|WINBINDD_PRIV_SOCKET_SUBDIR|(directory_exist|mkdir)\(lp_lockdir\(\),|koplock\.%d|%s/sync\.%d'
 
-Index: samba-3.2.0pre3/source/lib/util.c
+Index: samba-3.2.0rc1/source/lib/util.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/lib/util.c
-+++ samba-3.2.0pre3/source/lib/util.c
-@@ -2577,6 +2577,15 @@
+--- samba-3.2.0rc1.orig/source/lib/util.c
++++ samba-3.2.0rc1/source/lib/util.c
+@@ -2624,6 +2624,15 @@
  	return xx_path(name, get_dyn_STATEDIR());
  }
  
@@ -66,10 +66,10 @@
  /**
   * @brief Returns the platform specific shared library extension.
   *
-Index: samba-3.2.0pre3/source/libsmb/samlogon_cache.c
+Index: samba-3.2.0rc1/source/libsmb/samlogon_cache.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/libsmb/samlogon_cache.c
-+++ samba-3.2.0pre3/source/libsmb/samlogon_cache.c
+--- samba-3.2.0rc1.orig/source/libsmb/samlogon_cache.c
++++ samba-3.2.0rc1/source/libsmb/samlogon_cache.c
 @@ -34,7 +34,7 @@
  bool netsamlogon_cache_init(void)
  {
@@ -88,10 +88,10 @@
  				   WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
  				   TDB_DEFAULT, O_RDWR, 0600);
  		if (!tdb) {
-Index: samba-3.2.0pre3/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.2.0rc1/source/nmbd/nmbd_serverlistdb.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/nmbd/nmbd_serverlistdb.c
-+++ samba-3.2.0pre3/source/nmbd/nmbd_serverlistdb.c
+--- samba-3.2.0rc1.orig/source/nmbd/nmbd_serverlistdb.c
++++ samba-3.2.0rc1/source/nmbd/nmbd_serverlistdb.c
 @@ -326,7 +326,7 @@
  
  	updatecount++;
@@ -101,10 +101,10 @@
  	if (!fname) {
  		return;
  	}
-Index: samba-3.2.0pre3/source/passdb/login_cache.c
+Index: samba-3.2.0rc1/source/passdb/login_cache.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/passdb/login_cache.c
-+++ samba-3.2.0pre3/source/passdb/login_cache.c
+--- samba-3.2.0rc1.orig/source/passdb/login_cache.c
++++ samba-3.2.0rc1/source/passdb/login_cache.c
 @@ -35,7 +35,7 @@
  	/* skip file open if it's already opened */
  	if (cache) return True;
@@ -114,10 +114,10 @@
  	if (cache_fname)
  		DEBUG(5, ("Opening cache file at %s\n", cache_fname));
  	else {
-Index: samba-3.2.0pre3/source/printing/printing.c
+Index: samba-3.2.0rc1/source/printing/printing.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/printing/printing.c
-+++ samba-3.2.0pre3/source/printing/printing.c
+--- samba-3.2.0rc1.orig/source/printing/printing.c
++++ samba-3.2.0rc1/source/printing/printing.c
 @@ -183,8 +183,8 @@
  	int services = lp_numservices();
  	int snum;
@@ -129,10 +129,10 @@
  
  	/* handle a Samba upgrade */
  
-Index: samba-3.2.0pre3/source/printing/printing_db.c
+Index: samba-3.2.0rc1/source/printing/printing_db.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/printing/printing_db.c
-+++ samba-3.2.0pre3/source/printing/printing_db.c
+--- samba-3.2.0rc1.orig/source/printing/printing_db.c
++++ samba-3.2.0rc1/source/printing/printing_db.c
 @@ -91,7 +91,7 @@
  	}
  
@@ -142,10 +142,10 @@
  				printername) < 0) {
  		DLIST_REMOVE(print_db_head, p);
  		SAFE_FREE(p);
-Index: samba-3.2.0pre3/source/smbd/lanman.c
+Index: samba-3.2.0rc1/source/smbd/lanman.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/smbd/lanman.c
-+++ samba-3.2.0pre3/source/smbd/lanman.c
+--- samba-3.2.0rc1.orig/source/smbd/lanman.c
++++ samba-3.2.0rc1/source/smbd/lanman.c
 @@ -1157,9 +1157,9 @@
  	bool local_list_only;
  	int i;
@@ -158,10 +158,10 @@
  		return 0;
  	}
  
-Index: samba-3.2.0pre3/source/utils/smbcontrol.c
+Index: samba-3.2.0rc1/source/utils/smbcontrol.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/utils/smbcontrol.c
-+++ samba-3.2.0pre3/source/utils/smbcontrol.c
+--- samba-3.2.0rc1.orig/source/utils/smbcontrol.c
++++ samba-3.2.0rc1/source/utils/smbcontrol.c
 @@ -875,10 +875,10 @@
  	/* Remove the entry in the winbindd_cache tdb to tell a later
  	   starting winbindd that we're online. */
@@ -191,10 +191,10 @@
  		return False;
  	}
  
-Index: samba-3.2.0pre3/source/libgpo/gpo_fetch.c
+Index: samba-3.2.0rc1/source/libgpo/gpo_fetch.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/libgpo/gpo_fetch.c
-+++ samba-3.2.0pre3/source/libgpo/gpo_fetch.c
+--- samba-3.2.0rc1.orig/source/libgpo/gpo_fetch.c
++++ samba-3.2.0rc1/source/libgpo/gpo_fetch.c
 @@ -59,7 +59,7 @@
  
  	if ((path = talloc_asprintf(mem_ctx,
@@ -213,10 +213,10 @@
  	char *current_dir;
  	char *tok;
  
-Index: samba-3.2.0pre3/source/winbindd/idmap_cache.c
+Index: samba-3.2.0rc1/source/winbindd/idmap_cache.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/winbindd/idmap_cache.c
-+++ samba-3.2.0pre3/source/winbindd/idmap_cache.c
+--- samba-3.2.0rc1.orig/source/winbindd/idmap_cache.c
++++ samba-3.2.0rc1/source/winbindd/idmap_cache.c
 @@ -54,7 +54,7 @@
  		return NULL;
  	}
@@ -226,10 +226,10 @@
  
  	DEBUG(10, ("Opening cache file at %s\n", cache_fname));
  
-Index: samba-3.2.0pre3/source/winbindd/winbindd_cache.c
+Index: samba-3.2.0rc1/source/winbindd/winbindd_cache.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/winbindd/winbindd_cache.c
-+++ samba-3.2.0pre3/source/winbindd/winbindd_cache.c
+--- samba-3.2.0rc1.orig/source/winbindd/winbindd_cache.c
++++ samba-3.2.0rc1/source/winbindd/winbindd_cache.c
 @@ -2304,7 +2304,7 @@
  		return true;
  
@@ -260,7 +260,7 @@
  				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
  				lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST), 
  				O_RDWR|O_CREAT, 0600);
-@@ -3411,7 +3411,7 @@
+@@ -3416,7 +3416,7 @@
  int winbindd_validate_cache(void)
  {
  	int ret = -1;
@@ -269,7 +269,7 @@
  	TDB_CONTEXT *tdb = NULL;
  
  	DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
-@@ -3453,7 +3453,7 @@
+@@ -3458,7 +3458,7 @@
  int winbindd_validate_cache_nobackup(void)
  {
  	int ret = -1;
@@ -278,11 +278,11 @@
  
  	DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
  	smb_panic_fn = validate_panic;
-Index: samba-3.2.0pre3/source/printing/nt_printing.c
+Index: samba-3.2.0rc1/source/printing/nt_printing.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/printing/nt_printing.c
-+++ samba-3.2.0pre3/source/printing/nt_printing.c
-@@ -2543,7 +2543,7 @@
+--- samba-3.2.0rc1.orig/source/printing/nt_printing.c
++++ samba-3.2.0rc1/source/printing/nt_printing.c
+@@ -2552,7 +2552,7 @@
  
  	if (geteuid() == 0) {
  		if (asprintf(&printdb_path, "%s%s.tdb",
@@ -291,10 +291,10 @@
  				sharename) < 0) {
  			return (uint32)-1;
  		}
-Index: samba-3.2.0pre3/source/winbindd/idmap_tdb2.c
+Index: samba-3.2.0rc1/source/winbindd/idmap_tdb2.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/winbindd/idmap_tdb2.c
-+++ samba-3.2.0pre3/source/winbindd/idmap_tdb2.c
+--- samba-3.2.0rc1.orig/source/winbindd/idmap_tdb2.c
++++ samba-3.2.0rc1/source/winbindd/idmap_tdb2.c
 @@ -68,7 +68,7 @@
  		return NT_STATUS_OK;
  	}

Modified: branches/samba/experimental/debian/patches/fhs-filespaths.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-filespaths.patch	2008-05-30 20:53:00 UTC (rev 1906)
+++ branches/samba/experimental/debian/patches/fhs-filespaths.patch	2008-05-30 20:53:17 UTC (rev 1907)
@@ -50,10 +50,10 @@
       grep -r lp_lockdir source/ | grep -vE \
          '%s/smb_(tmp_)*krb5|source/(lib/util|param/loadparm|dynconfig|utils/testparm|smbd/oplock_irix)\.c|WINBINDD_PRIV_SOCKET_SUBDIR|(directory_exist|mkdir)\(lp_lockdir\(\),|koplock\.%d|%s/sync\.%d'
 
-Index: samba-3.2.0pre3/source/passdb/pdb_tdb.c
+Index: samba-3.2.0rc1/source/passdb/pdb_tdb.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/passdb/pdb_tdb.c
-+++ samba-3.2.0pre3/source/passdb/pdb_tdb.c
+--- samba-3.2.0rc1.orig/source/passdb/pdb_tdb.c
++++ samba-3.2.0rc1/source/passdb/pdb_tdb.c
 @@ -1612,7 +1612,7 @@
  	/* save the path for later */
  
@@ -63,10 +63,10 @@
  			     PASSDB_FILE_NAME) < 0) {
  			return NT_STATUS_NO_MEMORY;
  		}
-Index: samba-3.2.0pre3/source/modules/vfs_xattr_tdb.c
+Index: samba-3.2.0rc1/source/modules/vfs_xattr_tdb.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/modules/vfs_xattr_tdb.c
-+++ samba-3.2.0pre3/source/modules/vfs_xattr_tdb.c
+--- samba-3.2.0rc1.orig/source/modules/vfs_xattr_tdb.c
++++ samba-3.2.0rc1/source/modules/vfs_xattr_tdb.c
 @@ -576,7 +576,7 @@
  	const char *dbname;
  

Modified: branches/samba/experimental/debian/patches/installswat.sh.patch
===================================================================
--- branches/samba/experimental/debian/patches/installswat.sh.patch	2008-05-30 20:53:00 UTC (rev 1906)
+++ branches/samba/experimental/debian/patches/installswat.sh.patch	2008-05-30 20:53:17 UTC (rev 1907)
@@ -6,10 +6,10 @@
 
 Note: 
 
-Index: samba-3.2.0pre3/source/script/installswat.sh
+Index: samba-3.2.0rc1/source/script/installswat.sh
 ===================================================================
---- samba-3.2.0pre3.orig/source/script/installswat.sh
-+++ samba-3.2.0pre3/source/script/installswat.sh
+--- samba-3.2.0rc1.orig/source/script/installswat.sh
++++ samba-3.2.0rc1/source/script/installswat.sh
 @@ -198,7 +198,11 @@
  
  # Install/ remove Using Samba book (but only if it is there)

Modified: branches/samba/experimental/debian/patches/non-linux-ports.patch
===================================================================
--- branches/samba/experimental/debian/patches/non-linux-ports.patch	2008-05-30 20:53:00 UTC (rev 1906)
+++ branches/samba/experimental/debian/patches/non-linux-ports.patch	2008-05-30 20:53:17 UTC (rev 1907)
@@ -7,11 +7,11 @@
 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.2.0pre3/source/configure.in
+Index: samba-3.2.0rc1/source/configure.in
 ===================================================================
---- samba-3.2.0pre3.orig/source/configure.in
-+++ samba-3.2.0pre3/source/configure.in
-@@ -557,6 +557,15 @@
+--- samba-3.2.0rc1.orig/source/configure.in
++++ samba-3.2.0rc1/source/configure.in
+@@ -560,6 +560,15 @@
        fi
      ;;
  
@@ -27,7 +27,7 @@
  # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
  #
      *linux*)
-@@ -1231,7 +1240,7 @@
+@@ -1182,7 +1191,7 @@
  #
  #
  case "$host_os" in
@@ -36,7 +36,7 @@
         # glibc <= 2.3.2 has a broken getgrouplist
         AC_TRY_RUN([
  #include <unistd.h>
-@@ -1545,7 +1554,10 @@
+@@ -1543,7 +1552,10 @@
  
    # and these are for particular systems
    case "$host_os" in
@@ -48,7 +48,7 @@
  			BLDSHARED="true"
  			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
  				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -5352,7 +5364,7 @@
+@@ -5307,7 +5319,7 @@
  	AC_MSG_RESULT(yes);
  
  	case "$host_os" in
@@ -57,7 +57,7 @@
  		AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
  		AC_TRY_LINK([#include <sys/sendfile.h>],
  [\
-@@ -5658,11 +5670,11 @@
+@@ -5613,11 +5625,11 @@
  WINBIND_NSS_PTHREAD=""
  
  case "$host_os" in

Modified: branches/samba/experimental/debian/patches/pam-examples.patch
===================================================================
--- branches/samba/experimental/debian/patches/pam-examples.patch	2008-05-30 20:53:00 UTC (rev 1906)
+++ branches/samba/experimental/debian/patches/pam-examples.patch	2008-05-30 20:53:17 UTC (rev 1907)
@@ -6,10 +6,10 @@
 
 Note: 
 
-Index: samba-3.2.0pre3/source/pam_smbpass/README
+Index: samba-3.2.0rc1/source/pam_smbpass/README
 ===================================================================
---- samba-3.2.0pre3.orig/source/pam_smbpass/README
-+++ samba-3.2.0pre3/source/pam_smbpass/README
+--- samba-3.2.0rc1.orig/source/pam_smbpass/README
++++ samba-3.2.0rc1/source/pam_smbpass/README
 @@ -37,7 +37,7 @@
  	smbconf=<file>	-	specify an alternate path to the smb.conf
  				file.

Modified: branches/samba/experimental/debian/patches/smbclient-pager.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbclient-pager.patch	2008-05-30 20:53:00 UTC (rev 1906)
+++ branches/samba/experimental/debian/patches/smbclient-pager.patch	2008-05-30 20:53:17 UTC (rev 1907)
@@ -8,10 +8,10 @@
 
 Note: 
 
-Index: samba-3.2.0pre3/source/include/local.h
+Index: samba-3.2.0rc1/source/include/local.h
 ===================================================================
---- samba-3.2.0pre3.orig/source/include/local.h
-+++ samba-3.2.0pre3/source/include/local.h
+--- samba-3.2.0rc1.orig/source/include/local.h
++++ samba-3.2.0rc1/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: branches/samba/experimental/debian/patches/smbpasswd-syslog.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbpasswd-syslog.patch	2008-05-30 20:53:00 UTC (rev 1906)
+++ branches/samba/experimental/debian/patches/smbpasswd-syslog.patch	2008-05-30 20:53:17 UTC (rev 1907)
@@ -4,10 +4,10 @@
 
 Upstream status: submitted as bugzilla bug #4831
 
-Index: samba-3.2.0pre3/source/pam_smbpass/support.c
+Index: samba-3.2.0rc1/source/pam_smbpass/support.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/pam_smbpass/support.c
-+++ samba-3.2.0pre3/source/pam_smbpass/support.c
+--- samba-3.2.0rc1.orig/source/pam_smbpass/support.c
++++ samba-3.2.0rc1/source/pam_smbpass/support.c
 @@ -14,6 +14,7 @@
   * this program; if not, see <http://www.gnu.org/licenses/>.
   */
@@ -283,10 +283,10 @@
  	}
  	make_remark( pamh, ctrl, PAM_ERROR_MSG, pass_new == NULL ?
  				"No password supplied" : "Password unchanged" );
-Index: samba-3.2.0pre3/source/pam_smbpass/pam_smb_auth.c
+Index: samba-3.2.0rc1/source/pam_smbpass/pam_smb_auth.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/pam_smbpass/pam_smb_auth.c
-+++ samba-3.2.0pre3/source/pam_smbpass/pam_smb_auth.c
+--- samba-3.2.0rc1.orig/source/pam_smbpass/pam_smb_auth.c
++++ samba-3.2.0rc1/source/pam_smbpass/pam_smb_auth.c
 @@ -81,10 +81,9 @@
  
  	/* Samba initialization. */
@@ -361,10 +361,10 @@
  			, "pam_get_item returned error to pam_sm_authenticate" );
  		return PAM_AUTHTOK_RECOVER_ERR;
  	} else if (pass == NULL) {
-Index: samba-3.2.0pre3/source/pam_smbpass/pam_smb_acct.c
+Index: samba-3.2.0rc1/source/pam_smbpass/pam_smb_acct.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/pam_smbpass/pam_smb_acct.c
-+++ samba-3.2.0pre3/source/pam_smbpass/pam_smb_acct.c
+--- samba-3.2.0rc1.orig/source/pam_smbpass/pam_smb_acct.c
++++ samba-3.2.0rc1/source/pam_smbpass/pam_smb_acct.c
 @@ -58,26 +58,25 @@
  
  	/* Samba initialization. */
@@ -425,10 +425,10 @@
  		}
  		make_remark( pamh, ctrl, PAM_ERROR_MSG
  			, "Your account has been disabled; "
-Index: samba-3.2.0pre3/source/pam_smbpass/pam_smb_passwd.c
+Index: samba-3.2.0rc1/source/pam_smbpass/pam_smb_passwd.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/pam_smbpass/pam_smb_passwd.c
-+++ samba-3.2.0pre3/source/pam_smbpass/pam_smb_passwd.c
+--- samba-3.2.0rc1.orig/source/pam_smbpass/pam_smb_passwd.c
++++ samba-3.2.0rc1/source/pam_smbpass/pam_smb_passwd.c
 @@ -106,10 +106,9 @@
  
      /* Samba initialization. */
@@ -565,10 +565,10 @@
          retval = PAM_ABORT;
  
      }
-Index: samba-3.2.0pre3/source/pam_smbpass/support.h
+Index: samba-3.2.0rc1/source/pam_smbpass/support.h
 ===================================================================
---- samba-3.2.0pre3.orig/source/pam_smbpass/support.h
-+++ samba-3.2.0pre3/source/pam_smbpass/support.h
+--- samba-3.2.0rc1.orig/source/pam_smbpass/support.h
++++ samba-3.2.0rc1/source/pam_smbpass/support.h
 @@ -1,8 +1,8 @@
  /* syslogging function for errors and other information */
 -extern void _log_err(int, const char *, ...);

Modified: branches/samba/experimental/debian/patches/undefined-symbols.patch
===================================================================
--- branches/samba/experimental/debian/patches/undefined-symbols.patch	2008-05-30 20:53:00 UTC (rev 1906)
+++ branches/samba/experimental/debian/patches/undefined-symbols.patch	2008-05-30 20:53:17 UTC (rev 1907)
@@ -9,11 +9,11 @@
 
 Note: 
 
-Index: samba-3.2.0pre3/source/Makefile.in
+Index: samba-3.2.0rc1/source/Makefile.in
 ===================================================================
---- samba-3.2.0pre3.orig/source/Makefile.in
-+++ samba-3.2.0pre3/source/Makefile.in
-@@ -1623,7 +1623,7 @@
+--- samba-3.2.0rc1.orig/source/Makefile.in
++++ samba-3.2.0rc1/source/Makefile.in
+@@ -1653,7 +1653,7 @@
  
  bin/libsmbclient. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
  	@echo Linking shared library $@

Modified: branches/samba/experimental/debian/patches/usershare.patch
===================================================================
--- branches/samba/experimental/debian/patches/usershare.patch	2008-05-30 20:53:00 UTC (rev 1906)
+++ branches/samba/experimental/debian/patches/usershare.patch	2008-05-30 20:53:17 UTC (rev 1907)
@@ -8,10 +8,10 @@
 
 Status wrt upstream: Debian-specific
 
-Index: samba-3.2.0pre3/docs/manpages/smb.conf.5
+Index: samba-3.2.0rc1/docs/manpages/smb.conf.5
 ===================================================================
---- samba-3.2.0pre3.orig/docs/manpages/smb.conf.5
-+++ samba-3.2.0pre3/docs/manpages/smb.conf.5
+--- samba-3.2.0rc1.orig/docs/manpages/smb.conf.5
++++ samba-3.2.0rc1/docs/manpages/smb.conf.5
 @@ -269,7 +269,7 @@
  .PP
  usershare path
@@ -54,7 +54,7 @@
  .PP
  net usershare add sharename path [comment] [acl] [guest_ok=[y|n]]
  .RS 4
-@@ -8723,25 +8699,25 @@
+@@ -8737,25 +8713,25 @@
  usershare path (G)
  .PP
  .RS 4
@@ -86,10 +86,10 @@
  .RE
  
  usershare prefix allow list (G)
-Index: samba-3.2.0pre3/docs/manpages/net.8
+Index: samba-3.2.0rc1/docs/manpages/net.8
 ===================================================================
---- samba-3.2.0pre3.orig/docs/manpages/net.8
-+++ samba-3.2.0pre3/docs/manpages/net.8
+--- samba-3.2.0rc1.orig/docs/manpages/net.8
++++ samba-3.2.0rc1/docs/manpages/net.8
 @@ -660,9 +660,9 @@
  Store a secret for the specified domain, used primarily for domains that use idmap_ldap as a backend\. In this case the secret is used as the password for the user DN used to bind to the ldap server\.
  .SS "USERSHARE"
@@ -102,10 +102,10 @@
  .PP
  The usershare commands are:
  .IP "" 4
-Index: samba-3.2.0pre3/source/param/loadparm.c
+Index: samba-3.2.0rc1/source/param/loadparm.c
 ===================================================================
---- samba-3.2.0pre3.orig/source/param/loadparm.c
-+++ samba-3.2.0pre3/source/param/loadparm.c
+--- samba-3.2.0rc1.orig/source/param/loadparm.c
++++ samba-3.2.0rc1/source/param/loadparm.c
 @@ -4868,7 +4868,7 @@
  	string_set(&Globals.szUsersharePath, s);
  	SAFE_FREE(s);

More information about the Pkg-samba-maint mailing list