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

bubulle at alioth.debian.org bubulle at alioth.debian.org
Sat Apr 26 10:15:43 UTC 2008


Author: bubulle
Date: 2008-04-26 10:15:43 +0000 (Sat, 26 Apr 2008)
New Revision: 1843

Modified:
   branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch
   branches/samba/experimental/debian/patches/VERSION.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/series
   branches/samba/experimental/debian/patches/smbclient-pager.patch
Log:
Unchanged patches (except line numbering differences)


Modified: branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch
===================================================================
--- branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch	2008-04-26 10:14:41 UTC (rev 1842)
+++ branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch	2008-04-26 10:15:43 UTC (rev 1843)
@@ -6,12 +6,12 @@
 
 Note: 
 
-Index: samba-3.0.28a/examples/LDAP/README
+Index: samba-3.2.0pre3/examples/LDAP/README
 ===================================================================
---- samba-3.0.28a.orig/examples/LDAP/README
-+++ samba-3.0.28a/examples/LDAP/README
-@@ -59,6 +59,9 @@
- The smbldap-tools package can be downloaded individually from 
+--- samba-3.2.0pre3.orig/examples/LDAP/README
++++ samba-3.2.0pre3/examples/LDAP/README
+@@ -69,6 +69,9 @@
+ The smbldap-tools package can be downloaded individually from
  http://samba.idealx.org/dist/
  
 +On Debian systems, the smbldap-tools exists as a separate package

Modified: branches/samba/experimental/debian/patches/VERSION.patch
===================================================================
--- branches/samba/experimental/debian/patches/VERSION.patch	2008-04-26 10:14:41 UTC (rev 1842)
+++ branches/samba/experimental/debian/patches/VERSION.patch	2008-04-26 10:15:43 UTC (rev 1843)
@@ -6,10 +6,10 @@
 
 Note: Should be kept
 
-Index: samba-3.2.0pre2/source/VERSION
+Index: samba-3.2.0pre3/source/VERSION
 ===================================================================
---- samba-3.2.0pre2.orig/source/VERSION
-+++ samba-3.2.0pre2/source/VERSION
+--- samba-3.2.0pre3.orig/source/VERSION
++++ samba-3.2.0pre3/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/fhs-assignpaths.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-assignpaths.patch	2008-04-26 10:14:41 UTC (rev 1842)
+++ branches/samba/experimental/debian/patches/fhs-assignpaths.patch	2008-04-26 10:15:43 UTC (rev 1843)
@@ -7,11 +7,11 @@
 Status wrt upstream: Can remain Debian-specific if upstream doesn't want to
                      change their default behaviour
 
-Index: samba-3.2.0pre2/source/param/loadparm.c
+Index: samba-3.2.0pre3/source/param/loadparm.c
 ===================================================================
---- samba-3.2.0pre2.orig/source/param/loadparm.c
-+++ samba-3.2.0pre2/source/param/loadparm.c
-@@ -114,6 +114,9 @@
+--- samba-3.2.0pre3.orig/source/param/loadparm.c
++++ samba-3.2.0pre3/source/param/loadparm.c
+@@ -121,6 +121,9 @@
  	char *szAddPrinterCommand;
  	char *szDeletePrinterCommand;
  	char *szOs2DriverMap;
@@ -21,24 +21,45 @@
  	char *szLockDir;
  	char *szPidDir;
  	char *szRootdir;
-@@ -1246,8 +1249,13 @@
- 	{"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE}, 
- 	{"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, 
- 	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, 
+@@ -3667,6 +3670,26 @@
+ 		.enum_list	= NULL,
+ 		.flags		= FLAG_ADVANCED,
+ 	},
 +#ifdef FHS_COMPATIBLE
-+	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0}, 
-+	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0},
++	{
++		.label		= "lock directory",
++		.type		= P_STRING,
++		.p_class	= P_GLOBAL,
++		.ptr		= &Globals.szLockDirStub,
++		.special	= NULL,
++		.enum_list	= NULL,
++		.flags		= 0,
++	},
++	{
++		.label		= "lock dir",
++		.type		= P_STRING,
++		.p_class	= P_GLOBAL,
++		.ptr		= &Globals.szLockDirStub,
++		.special	= NULL,
++		.enum_list	= NULL,
++		.flags		= 0,
++	},
 +#else
- 	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED}, 
- 	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE}, 
+ 	{
+ 		.label		= "lock directory",
+ 		.type		= P_STRING,
+@@ -3685,6 +3708,7 @@
+ 		.enum_list	= NULL,
+ 		.flags		= FLAG_HIDE,
+ 	},
 +#endif
- 	{"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED}, 
- #ifdef WITH_UTMP
- 	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED}, 
-Index: samba-3.2.0pre2/source/m4/check_path.m4
+ 	{
+ 		.label		= "pid directory",
+ 		.type		= P_STRING,
+Index: samba-3.2.0pre3/source/m4/check_path.m4
 ===================================================================
---- samba-3.2.0pre2.orig/source/m4/check_path.m4
-+++ samba-3.2.0pre2/source/m4/check_path.m4
+--- samba-3.2.0pre3.orig/source/m4/check_path.m4
++++ samba-3.2.0pre3/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-04-26 10:14:41 UTC (rev 1842)
+++ branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch	2008-04-26 10:15:43 UTC (rev 1843)
@@ -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.0pre2/source/lib/util.c
+Index: samba-3.2.0pre3/source/lib/util.c
 ===================================================================
---- samba-3.2.0pre2.orig/source/lib/util.c
-+++ samba-3.2.0pre2/source/lib/util.c
-@@ -2543,6 +2543,15 @@
+--- samba-3.2.0pre3.orig/source/lib/util.c
++++ samba-3.2.0pre3/source/lib/util.c
+@@ -2577,6 +2577,15 @@
  	return xx_path(name, get_dyn_STATEDIR());
  }
  
@@ -66,10 +66,10 @@
  /**
   * @brief Returns the platform specific shared library extension.
   *
-Index: samba-3.2.0pre2/source/libsmb/samlogon_cache.c
+Index: samba-3.2.0pre3/source/libsmb/samlogon_cache.c
 ===================================================================
---- samba-3.2.0pre2.orig/source/libsmb/samlogon_cache.c
-+++ samba-3.2.0pre2/source/libsmb/samlogon_cache.c
+--- samba-3.2.0pre3.orig/source/libsmb/samlogon_cache.c
++++ samba-3.2.0pre3/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.0pre2/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.2.0pre3/source/nmbd/nmbd_serverlistdb.c
 ===================================================================
---- samba-3.2.0pre2.orig/source/nmbd/nmbd_serverlistdb.c
-+++ samba-3.2.0pre2/source/nmbd/nmbd_serverlistdb.c
+--- samba-3.2.0pre3.orig/source/nmbd/nmbd_serverlistdb.c
++++ samba-3.2.0pre3/source/nmbd/nmbd_serverlistdb.c
 @@ -326,7 +326,7 @@
  
  	updatecount++;
@@ -101,10 +101,10 @@
  	if (!fname) {
  		return;
  	}
-Index: samba-3.2.0pre2/source/passdb/login_cache.c
+Index: samba-3.2.0pre3/source/passdb/login_cache.c
 ===================================================================
---- samba-3.2.0pre2.orig/source/passdb/login_cache.c
-+++ samba-3.2.0pre2/source/passdb/login_cache.c
+--- samba-3.2.0pre3.orig/source/passdb/login_cache.c
++++ samba-3.2.0pre3/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.0pre2/source/printing/printing.c
+Index: samba-3.2.0pre3/source/printing/printing.c
 ===================================================================
---- samba-3.2.0pre2.orig/source/printing/printing.c
-+++ samba-3.2.0pre2/source/printing/printing.c
+--- samba-3.2.0pre3.orig/source/printing/printing.c
++++ samba-3.2.0pre3/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.0pre2/source/printing/printing_db.c
+Index: samba-3.2.0pre3/source/printing/printing_db.c
 ===================================================================
---- samba-3.2.0pre2.orig/source/printing/printing_db.c
-+++ samba-3.2.0pre2/source/printing/printing_db.c
+--- samba-3.2.0pre3.orig/source/printing/printing_db.c
++++ samba-3.2.0pre3/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.0pre2/source/smbd/lanman.c
+Index: samba-3.2.0pre3/source/smbd/lanman.c
 ===================================================================
---- samba-3.2.0pre2.orig/source/smbd/lanman.c
-+++ samba-3.2.0pre2/source/smbd/lanman.c
+--- samba-3.2.0pre3.orig/source/smbd/lanman.c
++++ samba-3.2.0pre3/source/smbd/lanman.c
 @@ -1157,9 +1157,9 @@
  	bool local_list_only;
  	int i;
@@ -158,10 +158,10 @@
  		return 0;
  	}
  
-Index: samba-3.2.0pre2/source/utils/smbcontrol.c
+Index: samba-3.2.0pre3/source/utils/smbcontrol.c
 ===================================================================
---- samba-3.2.0pre2.orig/source/utils/smbcontrol.c
-+++ samba-3.2.0pre2/source/utils/smbcontrol.c
+--- samba-3.2.0pre3.orig/source/utils/smbcontrol.c
++++ samba-3.2.0pre3/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,11 +191,11 @@
  		return False;
  	}
  
-Index: samba-3.2.0pre2/source/libgpo/gpo_fetch.c
+Index: samba-3.2.0pre3/source/libgpo/gpo_fetch.c
 ===================================================================
---- samba-3.2.0pre2.orig/source/libgpo/gpo_fetch.c
-+++ samba-3.2.0pre2/source/libgpo/gpo_fetch.c
-@@ -56,7 +56,7 @@
+--- samba-3.2.0pre3.orig/source/libgpo/gpo_fetch.c
++++ samba-3.2.0pre3/source/libgpo/gpo_fetch.c
+@@ -59,7 +59,7 @@
  
  	if ((path = talloc_asprintf(mem_ctx,
  					"%s/%s",
@@ -204,7 +204,7 @@
  					file_sys_path)) == NULL) {
  		return NT_STATUS_NO_MEMORY;
  	}
-@@ -80,7 +80,7 @@
+@@ -82,7 +82,7 @@
  static NTSTATUS gpo_prepare_local_store(TALLOC_CTX *mem_ctx,
  					const char *unix_path)
  {
@@ -213,10 +213,10 @@
  	char *current_dir;
  	char *tok;
  
-Index: samba-3.2.0pre2/source/winbindd/idmap_cache.c
+Index: samba-3.2.0pre3/source/winbindd/idmap_cache.c
 ===================================================================
---- samba-3.2.0pre2.orig/source/winbindd/idmap_cache.c
-+++ samba-3.2.0pre2/source/winbindd/idmap_cache.c
+--- samba-3.2.0pre3.orig/source/winbindd/idmap_cache.c
++++ samba-3.2.0pre3/source/winbindd/idmap_cache.c
 @@ -54,7 +54,7 @@
  		return NULL;
  	}
@@ -226,11 +226,11 @@
  
  	DEBUG(10, ("Opening cache file at %s\n", cache_fname));
  
-Index: samba-3.2.0pre2/source/winbindd/winbindd_cache.c
+Index: samba-3.2.0pre3/source/winbindd/winbindd_cache.c
 ===================================================================
---- samba-3.2.0pre2.orig/source/winbindd/winbindd_cache.c
-+++ samba-3.2.0pre2/source/winbindd/winbindd_cache.c
-@@ -2297,7 +2297,7 @@
+--- samba-3.2.0pre3.orig/source/winbindd/winbindd_cache.c
++++ samba-3.2.0pre3/source/winbindd/winbindd_cache.c
+@@ -2304,7 +2304,7 @@
  		return true;
  
  	/* when working offline we must not clear the cache on restart */
@@ -239,7 +239,7 @@
  				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
  				lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST), 
  				O_RDWR|O_CREAT, 0600);
-@@ -2340,9 +2340,9 @@
+@@ -2347,9 +2347,9 @@
  		tdb_close(wcache->tdb);
  		wcache->tdb = NULL;
  
@@ -251,7 +251,7 @@
  				strerror(errno) ));
  			return false;
  		}
-@@ -2624,7 +2624,7 @@
+@@ -2631,7 +2631,7 @@
  		return;
  
  	/* when working offline we must not clear the cache on restart */
@@ -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);
-@@ -3380,7 +3380,7 @@
+@@ -3411,7 +3411,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"));
-@@ -3422,7 +3422,7 @@
+@@ -3453,7 +3453,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.0pre2/source/printing/nt_printing.c
+Index: samba-3.2.0pre3/source/printing/nt_printing.c
 ===================================================================
---- samba-3.2.0pre2.orig/source/printing/nt_printing.c
-+++ samba-3.2.0pre2/source/printing/nt_printing.c
-@@ -2541,7 +2541,7 @@
+--- samba-3.2.0pre3.orig/source/printing/nt_printing.c
++++ samba-3.2.0pre3/source/printing/nt_printing.c
+@@ -2543,7 +2543,7 @@
  
  	if (geteuid() == 0) {
  		if (asprintf(&printdb_path, "%s%s.tdb",
@@ -291,10 +291,10 @@
  				sharename) < 0) {
  			return (uint32)-1;
  		}
-Index: samba-3.2.0pre2/source/winbindd/idmap_tdb2.c
+Index: samba-3.2.0pre3/source/winbindd/idmap_tdb2.c
 ===================================================================
---- samba-3.2.0pre2.orig/source/winbindd/idmap_tdb2.c
-+++ samba-3.2.0pre2/source/winbindd/idmap_tdb2.c
+--- samba-3.2.0pre3.orig/source/winbindd/idmap_tdb2.c
++++ samba-3.2.0pre3/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-04-26 10:14:41 UTC (rev 1842)
+++ branches/samba/experimental/debian/patches/fhs-filespaths.patch	2008-04-26 10:15:43 UTC (rev 1843)
@@ -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.0pre2/source/passdb/pdb_tdb.c
+Index: samba-3.2.0pre3/source/passdb/pdb_tdb.c
 ===================================================================
---- samba-3.2.0pre2.orig/source/passdb/pdb_tdb.c
-+++ samba-3.2.0pre2/source/passdb/pdb_tdb.c
+--- samba-3.2.0pre3.orig/source/passdb/pdb_tdb.c
++++ samba-3.2.0pre3/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.0pre2/source/modules/vfs_xattr_tdb.c
+Index: samba-3.2.0pre3/source/modules/vfs_xattr_tdb.c
 ===================================================================
---- samba-3.2.0pre2.orig/source/modules/vfs_xattr_tdb.c
-+++ samba-3.2.0pre2/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
 @@ -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-04-26 10:14:41 UTC (rev 1842)
+++ branches/samba/experimental/debian/patches/installswat.sh.patch	2008-04-26 10:15:43 UTC (rev 1843)
@@ -6,10 +6,10 @@
 
 Note: 
 
-Index: samba-3.0.28a/source/script/installswat.sh
+Index: samba-3.2.0pre3/source/script/installswat.sh
 ===================================================================
---- samba-3.0.28a.orig/source/script/installswat.sh
-+++ samba-3.0.28a/source/script/installswat.sh
+--- samba-3.2.0pre3.orig/source/script/installswat.sh
++++ samba-3.2.0pre3/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-04-26 10:14:41 UTC (rev 1842)
+++ branches/samba/experimental/debian/patches/non-linux-ports.patch	2008-04-26 10:15:43 UTC (rev 1843)
@@ -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.0.28a/source/configure.in
+Index: samba-3.2.0pre3/source/configure.in
 ===================================================================
---- samba-3.0.28a.orig/source/configure.in
-+++ samba-3.0.28a/source/configure.in
-@@ -769,6 +769,15 @@
+--- samba-3.2.0pre3.orig/source/configure.in
++++ samba-3.2.0pre3/source/configure.in
+@@ -557,6 +557,15 @@
        fi
      ;;
  
@@ -27,7 +27,7 @@
  # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
  #
      *linux*)
-@@ -1391,7 +1400,7 @@
+@@ -1231,7 +1240,7 @@
  #
  #
  case "$host_os" in
@@ -36,7 +36,7 @@
         # glibc <= 2.3.2 has a broken getgrouplist
         AC_TRY_RUN([
  #include <unistd.h>
-@@ -1700,7 +1709,10 @@
+@@ -1545,7 +1554,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"
-@@ -5467,7 +5479,7 @@
+@@ -5352,7 +5364,7 @@
  	AC_MSG_RESULT(yes);
  
  	case "$host_os" in
@@ -57,8 +57,8 @@
  		AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
  		AC_TRY_LINK([#include <sys/sendfile.h>],
  [\
-@@ -5772,11 +5784,11 @@
- SMB_KRB5_LOCATOR="bin/smb_krb5_locator.$SHLIBEXT"
+@@ -5658,11 +5670,11 @@
+ WINBIND_NSS_PTHREAD=""
  
  case "$host_os" in
 -	*linux*)

Modified: branches/samba/experimental/debian/patches/pam-examples.patch
===================================================================
--- branches/samba/experimental/debian/patches/pam-examples.patch	2008-04-26 10:14:41 UTC (rev 1842)
+++ branches/samba/experimental/debian/patches/pam-examples.patch	2008-04-26 10:15:43 UTC (rev 1843)
@@ -6,10 +6,10 @@
 
 Note: 
 
-Index: samba-3.0.28a/source/pam_smbpass/README
+Index: samba-3.2.0pre3/source/pam_smbpass/README
 ===================================================================
---- samba-3.0.28a.orig/source/pam_smbpass/README
-+++ samba-3.0.28a/source/pam_smbpass/README
+--- samba-3.2.0pre3.orig/source/pam_smbpass/README
++++ samba-3.2.0pre3/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/series
===================================================================
--- branches/samba/experimental/debian/patches/series	2008-04-26 10:14:41 UTC (rev 1842)
+++ branches/samba/experimental/debian/patches/series	2008-04-26 10:15:43 UTC (rev 1843)
@@ -1,4 +1,3 @@
-fix-manpage-htmlchars.patch
 documentation.patch
 fhs-filespaths.patch
 fhs-filespaths-debatable.patch

Modified: branches/samba/experimental/debian/patches/smbclient-pager.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbclient-pager.patch	2008-04-26 10:14:41 UTC (rev 1842)
+++ branches/samba/experimental/debian/patches/smbclient-pager.patch	2008-04-26 10:15:43 UTC (rev 1843)
@@ -8,10 +8,10 @@
 
 Note: 
 
-Index: samba-3.0.28a/source/include/local.h
+Index: samba-3.2.0pre3/source/include/local.h
 ===================================================================
---- samba-3.0.28a.orig/source/include/local.h
-+++ samba-3.0.28a/source/include/local.h
+--- samba-3.2.0pre3.orig/source/include/local.h
++++ samba-3.2.0pre3/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 */




More information about the Pkg-samba-maint mailing list