Package: samba
Version: 3.0.21a-1
Severity: normal
Tags: patch
Checked the new Debian version. If one have a look at the build-file
you will see many hunks and fuzzes applying the patches. Please find
attached patch made of completely reworked single patches. Note: The
number of original patches doesn't change. Working on that, I found a
very complicated patch in patch system. So switching to dpatch could
make maintaining the patches more efficient, Isn't it?
Elimar
--
Excellent day for drinking heavily.
Spike the office water cooler;-)
Nur in patches.hunked: README_nosmbldap-tools.patch.
diff -ur patches.hunked/VERSION.patch patches/VERSION.patch
--- patches.hunked/VERSION.patch 2006-01-01 19:33:11.154811000 +0100
+++ patches/VERSION.patch 2006-01-01 19:34:19.792248917 +0100
@@ -1,6 +1,6 @@
--- samba-3.0.0rc2/source/VERSION.orig 2003-09-02 21:56:11.000000000 -0400
+++ samba-3.0.0rc2/source/VERSION 2003-09-02 21:56:30.000000000 -0400
-@@ -78,4 +78,4 @@
+@@ -90,4 +90,4 @@
# e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() #
# -> "CVS 3.0.0rc2-VendorVersion" #
########################################################
diff -ur patches.hunked/cups.patch patches/cups.patch
--- patches.hunked/cups.patch 2006-01-01 19:33:11.158811000 +0100
+++ patches/cups.patch 2006-01-01 19:25:08.564610884 +0100
@@ -1,6 +1,6 @@
--- samba-3.0.10.orig/source/include/includes.h
+++ samba-3.0.10/source/include/includes.h
-@@ -940,10 +940,7 @@
+@@ -1049,10 +1049,7 @@
#endif
#ifndef DEFAULT_PRINTING
diff -ur patches.hunked/documentation.patch patches/documentation.patch
--- patches.hunked/documentation.patch 2006-01-01 19:33:11.158811000 +0100
+++ patches/documentation.patch 2006-01-01 19:25:08.564610884 +0100
@@ -1,6 +1,6 @@
--- samba-3.0.4/docs/manpages/swat.8.orig 2004-05-05 10:22:50.000000000
-0400
+++ samba-3.0.4/docs/manpages/swat.8 2004-05-10 13:25:53.000000000 -0400
-@@ -80,6 +80,13 @@
+@@ -84,6 +84,13 @@
.SH "INSTALLATION"
.PP
@@ -14,7 +14,7 @@
Swat is included as binary package with most distributions\&. The package
manager in this case takes care of the installation and configuration\&. This
section is only for those who have compiled swat from scratch\&.
.PP
-@@ -87,13 +94,13 @@
+@@ -91,13 +98,13 @@
.TP 3
\(bu
@@ -31,7 +31,7 @@
.LP
.SS "Inetd Installation"
-@@ -102,7 +109,7 @@
+@@ -106,7 +113,7 @@
You need to edit your \fI/etc/inetd\&.conf \fR and \fI/etc/services\fR to
enable SWAT to be launched via \fBinetd\fR\&.
.PP
@@ -40,7 +40,7 @@
.PP
\fBswat 901/tcp\fR
-@@ -114,10 +121,10 @@
+@@ -118,10 +125,10 @@
the choice of port number isn't really important except that it should be
less than 1024 and not currently used (using a number above 1024 presents an
obscure security hole depending on the implementation details of
your\fBinetd\fR daemon)\&.
.PP
@@ -53,7 +53,7 @@
.PP
Once you have edited \fI/etc/services\fR and \fI/etc/inetd\&.conf\fR you need
to send a HUP signal to inetd\&. To do this use \fBkill \-1 PID \fR where PID
is the process ID of the inetd daemon\&.
-@@ -141,8 +148,8 @@
+@@ -145,8 +152,8 @@
This file must contain a mapping of service name (e\&.g\&., swat) to service
port (e\&.g\&., 901) and protocol type (e\&.g\&., tcp)\&.
.TP
diff -ur patches.hunked/fhs.patch patches/fhs.patch
--- patches.hunked/fhs.patch 2006-01-01 19:33:11.162811000 +0100
+++ patches/fhs.patch 2006-01-01 19:25:08.568611201 +0100
@@ -1,7 +1,7 @@
-diff -uNr samba-3.0.10.orig/source/Makefile.in samba-3.0.10/source/Makefile.in
---- samba-3.0.10.orig/source/Makefile.in 2004-12-17 03:50:08.000000000
-0800
-+++ samba-3.0.10/source/Makefile.in 2004-12-17 03:55:29.000000000 -0800
-@@ -90,6 +90,13 @@
+diff -Naur samba-3.0.21.orig/source/Makefile.in samba-3.0.21/source/Makefile.in
+--- samba-3.0.21.orig/source/Makefile.in 2005-12-24 14:03:21.777015449
+0100
++++ samba-3.0.21/source/Makefile.in 2005-12-24 14:01:25.935827183 +0100
+@@ -91,6 +91,13 @@
# the directory where lock files go
LOCKDIR = @lockdir@
@@ -14,8 +14,8 @@
+
# the directory where pid files go
PIDDIR = @piddir@
- # man pages language(s)
-@@ -114,7 +121,7 @@
+
+@@ -120,7 +127,7 @@
PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\"
-DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\"
PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \
-DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@[EMAIL PROTECTED]"
@@ -24,7 +24,7 @@
PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS)
# Note that all executable programs now provide for an optional executable
suffix.
-@@ -1319,7 +1326,7 @@
+@@ -1431,7 +1438,7 @@
@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS)
$(DESTDIR)$(BINDIR) $(SCRIPTS)
installdat: installdirs
@@ -33,9 +33,9 @@
installmsg: installdirs
@$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR)$(LIBDIR) $(srcdir)
-diff -uNr samba-3.0.10.orig/source/configure.in
samba-3.0.10/source/configure.in
---- samba-3.0.10.orig/source/configure.in 2004-12-17 03:50:08.000000000
-0800
-+++ samba-3.0.10/source/configure.in 2004-12-17 03:55:29.000000000 -0800
+diff -Naur samba-3.0.21.orig/source/configure.in
samba-3.0.21/source/configure.in
+--- samba-3.0.21.orig/source/configure.in 2005-12-24 14:03:21.785016111
+0100
++++ samba-3.0.21/source/configure.in 2005-12-24 14:01:25.943827816 +0100
@@ -35,7 +35,7 @@
[ --with-fhs Use FHS-compliant paths (default=no)],
[ case "$withval" in
@@ -66,9 +66,9 @@
dnl Unique-to-Samba variables we'll be playing with.
AC_SUBST(SHELL)
-diff -uNr samba-3.0.10.orig/source/dynconfig.c samba-3.0.10/source/dynconfig.c
---- samba-3.0.10.orig/source/dynconfig.c 2004-12-17 03:50:08.000000000
-0800
-+++ samba-3.0.10/source/dynconfig.c 2004-12-17 03:55:29.000000000 -0800
+diff -Naur samba-3.0.21.orig/source/dynconfig.c samba-3.0.21/source/dynconfig.c
+--- samba-3.0.21.orig/source/dynconfig.c 2005-12-24 14:03:21.785016111
+0100
++++ samba-3.0.21/source/dynconfig.c 2005-12-24 14:01:25.947828132 +0100
@@ -53,6 +53,13 @@
pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
@@ -111,10 +111,10 @@
+ return lp_lockdir();
+#endif
+}
-diff -uNr samba-3.0.10.orig/source/groupdb/mapping.c
samba-3.0.10/source/groupdb/mapping.c
---- samba-3.0.10.orig/source/groupdb/mapping.c 2004-12-17 03:50:08.000000000
-0800
-+++ samba-3.0.10/source/groupdb/mapping.c 2004-12-17 03:55:29.000000000
-0800
-@@ -140,7 +140,7 @@
+diff -Naur samba-3.0.21.orig/source/groupdb/mapping.c
samba-3.0.21/source/groupdb/mapping.c
+--- samba-3.0.21.orig/source/groupdb/mapping.c 2005-12-24 14:03:21.793016772
+0100
++++ samba-3.0.21/source/groupdb/mapping.c 2005-12-24 14:01:25.951828448
+0100
+@@ -129,7 +129,7 @@
if (tdb)
return True;
@@ -123,9 +123,9 @@
if (!tdb) {
DEBUG(0,("Failed to open group mapping database\n"));
return False;
-diff -uNr samba-3.0.10.orig/source/include/dynconfig.h
samba-3.0.10/source/include/dynconfig.h
---- samba-3.0.10.orig/source/include/dynconfig.h 2004-12-17
03:50:08.000000000 -0800
-+++ samba-3.0.10/source/include/dynconfig.h 2004-12-17 03:55:29.000000000
-0800
+diff -Naur samba-3.0.21.orig/source/include/dynconfig.h
samba-3.0.21/source/include/dynconfig.h
+--- samba-3.0.21.orig/source/include/dynconfig.h 2005-12-24
14:03:21.797017103 +0100
++++ samba-3.0.21/source/include/dynconfig.h 2005-12-24 14:01:25.955828765
+0100
@@ -31,8 +31,12 @@
extern pstring dyn_CONFIGFILE;
extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -139,9 +139,9 @@
+
+char *dyn_STATEDIR(void);
+char *dyn_CACHEDIR(void);
-diff -uNr samba-3.0.10.orig/source/intl/lang_tdb.c
samba-3.0.10/source/intl/lang_tdb.c
---- samba-3.0.10.orig/source/intl/lang_tdb.c 2004-12-17 03:50:08.000000000
-0800
-+++ samba-3.0.10/source/intl/lang_tdb.c 2004-12-17 03:55:29.000000000
-0800
+diff -Naur samba-3.0.21.orig/source/intl/lang_tdb.c
samba-3.0.21/source/intl/lang_tdb.c
+--- samba-3.0.21.orig/source/intl/lang_tdb.c 2005-12-24 14:03:21.801017434
+0100
++++ samba-3.0.21/source/intl/lang_tdb.c 2005-12-24 14:01:25.959829081
+0100
@@ -128,7 +128,7 @@
if (!lang)
return True;
@@ -151,22 +151,10 @@
if (stat(msg_path, &st) != 0) {
/* the msg file isn't available */
DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path,
-diff -uNr samba-3.0.21a.orig/source/lib/account_pol.c
samba-3.0.21a/source/lib/account_pol.c
---- samba-3.0.21a.orig/source/lib/account_pol.c 2006-01-01 13:45:20.000000000
+0100
-+++ samba-3.0.21a/source/lib/account_pol.c 2006-01-01 13:49:37.000000000
+0100
-@@ -262,7 +262,7 @@
- return True;
- }
-
-- tdb = tdb_open_log(lock_path("account_policy.tdb"), 0, TDB_DEFAULT,
O_RDWR|O_CREAT, 0600);
-+ tdb = tdb_open_log(state_path("account_policy.tdb"), 0, TDB_DEFAULT,
O_RDWR|O_CREAT, 0600);
- if (!tdb) {
- DEBUG(0,("Failed to open account policy database\n"));
- return False;
-diff -uNr samba-3.0.10.orig/source/lib/util.c samba-3.0.10/source/lib/util.c
---- samba-3.0.10.orig/source/lib/util.c 2004-12-17 03:50:08.000000000
-0800
-+++ samba-3.0.10/source/lib/util.c 2004-12-17 03:55:29.000000000 -0800
-@@ -2362,6 +2362,61 @@
+diff -Naur samba-3.0.21.orig/source/lib/util.c samba-3.0.21/source/lib/util.c
+--- samba-3.0.21.orig/source/lib/util.c 2005-12-24 14:03:21.833020080
+0100
++++ samba-3.0.21/source/lib/util.c 2005-12-24 14:01:25.987831296 +0100
+@@ -2410,6 +2410,61 @@
}
/**
@@ -228,11 +216,11 @@
* @brief Returns the platform specific shared library extension.
*
* @retval Pointer to a static #fstring containing the extension.
-diff -uNr samba-3.0.10.orig/source/lib/util_unistr.c
samba-3.0.10/source/lib/util_unistr.c
---- samba-3.0.10.orig/source/lib/util_unistr.c 2004-12-17 03:50:08.000000000
-0800
-+++ samba-3.0.10/source/lib/util_unistr.c 2004-12-17 03:55:29.000000000
-0800
-@@ -54,8 +54,8 @@
- if (initialised) return;
+diff -Naur samba-3.0.21.orig/source/lib/util_unistr.c
samba-3.0.21/source/lib/util_unistr.c
+--- samba-3.0.21.orig/source/lib/util_unistr.c 2005-12-24 14:03:21.841020742
+0100
++++ samba-3.0.21/source/lib/util_unistr.c 2005-12-24 14:01:25.995831929
+0100
+@@ -58,8 +58,8 @@
+ }
initialised = 1;
- upcase_table = map_file(lib_path("upcase.dat"), 0x20000);
@@ -242,7 +230,7 @@
/* we would like Samba to limp along even if these tables are
not available */
-@@ -161,7 +161,7 @@
+@@ -174,7 +174,7 @@
return;
}
@@ -251,9 +239,9 @@
if (valid_file) {
valid_table = valid_file;
mapped_file = 1;
-diff -uNr samba-3.0.10.orig/source/libsmb/samlogon_cache.c
samba-3.0.10/source/libsmb/samlogon_cache.c
---- samba-3.0.10.orig/source/libsmb/samlogon_cache.c 2004-12-17
03:50:08.000000000 -0800
-+++ samba-3.0.10/source/libsmb/samlogon_cache.c 2004-12-17
03:55:29.000000000 -0800
+diff -Naur samba-3.0.21.orig/source/libsmb/samlogon_cache.c
samba-3.0.21/source/libsmb/samlogon_cache.c
+--- samba-3.0.21.orig/source/libsmb/samlogon_cache.c 2005-12-24
14:03:21.845021073 +0100
++++ samba-3.0.21/source/libsmb/samlogon_cache.c 2005-12-24
14:01:25.999832245 +0100
@@ -34,7 +34,7 @@
BOOL netsamlogon_cache_init(void)
{
@@ -272,9 +260,9 @@
TDB_DEFAULT, O_RDWR, 0600);
if (!tdb) {
DEBUG(5, ("netsamlogon_clear_cached_user: failed to
open cache\n"));
-diff -uNr samba-3.0.10.orig/source/nmbd/nmbd_serverlistdb.c
samba-3.0.10/source/nmbd/nmbd_serverlistdb.c
---- samba-3.0.10.orig/source/nmbd/nmbd_serverlistdb.c 2004-12-17
03:50:09.000000000 -0800
-+++ samba-3.0.10/source/nmbd/nmbd_serverlistdb.c 2004-12-17
03:55:29.000000000 -0800
+diff -Naur samba-3.0.21.orig/source/nmbd/nmbd_serverlistdb.c
samba-3.0.21/source/nmbd/nmbd_serverlistdb.c
+--- samba-3.0.21.orig/source/nmbd/nmbd_serverlistdb.c 2005-12-24
14:03:21.849021403 +0100
++++ samba-3.0.21/source/nmbd/nmbd_serverlistdb.c 2005-12-24
14:01:26.003832561 +0100
@@ -327,7 +327,7 @@
updatecount++;
@@ -284,9 +272,9 @@
trim_char(fname,'\0' ,'/');
pstrcat(fname,"/");
pstrcat(fname,SERVER_LIST);
-diff -uNr samba-3.0.10.orig/source/nmbd/nmbd_winsserver.c
samba-3.0.10/source/nmbd/nmbd_winsserver.c
---- samba-3.0.10.orig/source/nmbd/nmbd_winsserver.c 2004-12-17
03:50:09.000000000 -0800
-+++ samba-3.0.10/source/nmbd/nmbd_winsserver.c 2004-12-17 03:55:30.000000000
-0800
+diff -Naur samba-3.0.21.orig/source/nmbd/nmbd_winsserver.c
samba-3.0.21/source/nmbd/nmbd_winsserver.c
+--- samba-3.0.21.orig/source/nmbd/nmbd_winsserver.c 2005-12-24
14:03:21.853021734 +0100
++++ samba-3.0.21/source/nmbd/nmbd_winsserver.c 2005-12-24 14:01:26.007832878
+0100
@@ -234,7 +234,7 @@
add_samba_names_to_subnet(wins_server_subnet);
@@ -305,22 +293,10 @@
all_string_sub(fname,"//", "/", 0);
slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned
int)sys_getpid());
-diff -uNr samba-3.0.20b.orig/source/passdb/login_cache.c
samba-3.0.20b/source/passdb/login_cache.c
---- samba-3.0.20b.orig/source/passdb/login_cache.c
-+++ samba-3.0.20b/source/passdb/login_cache.c
-@@ -36,7 +36,7 @@
- /* skip file open if it's already opened */
- if (cache) return True;
-
-- asprintf(&cache_fname, "%s/%s", lp_lockdir(), LOGIN_CACHE_FILE);
-+ asprintf(&cache_fname, "%s/%s", dyn_CACHEDIR(), LOGIN_CACHE_FILE);
- if (cache_fname)
- DEBUG(5, ("Opening cache file at %s\n", cache_fname));
- else {
-diff -uNr samba-3.0.20b.orig/source/nsswitch/winbindd_cache.c
samba-3.0.20b/source/nsswitch/winbindd_cache.c
---- samba-3.0.20b.orig/source/nsswitch/winbindd_cache.c
-+++ samba-3.0.20b/source/nsswitch/winbindd_cache.c
-@@ -57,7 +57,7 @@
+diff -Naur samba-3.0.21.orig/source/nsswitch/winbindd_cache.c
samba-3.0.21/source/nsswitch/winbindd_cache.c
+--- samba-3.0.21.orig/source/nsswitch/winbindd_cache.c 2005-12-24
14:03:21.865022727 +0100
++++ samba-3.0.21/source/nsswitch/winbindd_cache.c 2005-12-24
14:01:26.039835409 +0100
+@@ -58,7 +58,7 @@
if (opt_nocache)
return;
@@ -329,7 +305,7 @@
TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0600);
if (!wcache->tdb) {
-@@ -1471,7 +1471,7 @@
+@@ -1467,7 +1467,7 @@
if (wcache->tdb != NULL)
return True;
@@ -338,10 +314,10 @@
TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0600);
if (wcache->tdb == NULL) {
-diff -uNr samba-3.0.10.orig/source/nsswitch/winbindd_util.c
samba-3.0.10/source/nsswitch/winbindd_util.c
---- samba-3.0.10.orig/source/nsswitch/winbindd_util.c 2004-12-17
03:50:09.000000000 -0800
-+++ samba-3.0.10/source/nsswitch/winbindd_util.c 2004-12-17
03:55:30.000000000 -0800
-@@ -957,7 +957,7 @@
+diff -Naur samba-3.0.21.orig/source/nsswitch/winbindd_util.c
samba-3.0.21/source/nsswitch/winbindd_util.c
+--- samba-3.0.21.orig/source/nsswitch/winbindd_util.c 2005-12-24
14:03:21.881024050 +0100
++++ samba-3.0.21/source/nsswitch/winbindd_util.c 2005-12-24
14:01:26.047836042 +0100
+@@ -1173,7 +1173,7 @@
SMB_STRUCT_STAT stbuf;
TDB_CONTEXT *idmap_tdb;
@@ -350,10 +326,10 @@
if (!file_exist(idmap_name, &stbuf)) {
/* nothing to convert return */
-diff -uNr samba-3.0.10.orig/source/param/loadparm.c
samba-3.0.10/source/param/loadparm.c
---- samba-3.0.10.orig/source/param/loadparm.c 2004-12-17 03:50:09.000000000
-0800
-+++ samba-3.0.10/source/param/loadparm.c 2004-12-17 03:55:30.000000000
-0800
-@@ -104,6 +104,9 @@
+diff -Naur samba-3.0.21.orig/source/param/loadparm.c
samba-3.0.21/source/param/loadparm.c
+--- samba-3.0.21.orig/source/param/loadparm.c 2005-12-24 14:03:21.893025042
+0100
++++ samba-3.0.21/source/param/loadparm.c 2005-12-24 14:01:26.059836991
+0100
+@@ -105,6 +105,9 @@
char *szAddPrinterCommand;
char *szDeletePrinterCommand;
char *szOs2DriverMap;
@@ -363,7 +339,7 @@
char *szLockDir;
char *szPidDir;
char *szRootdir;
-@@ -1105,8 +1108,13 @@
+@@ -1174,8 +1177,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},
@@ -377,10 +353,22 @@
{"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},
-diff -uNr samba-3.0.10.orig/source/passdb/pdb_tdb.c
samba-3.0.10/source/passdb/pdb_tdb.c
---- samba-3.0.10.orig/source/passdb/pdb_tdb.c 2004-12-17 03:50:09.000000000
-0800
-+++ samba-3.0.10/source/passdb/pdb_tdb.c 2004-12-17 03:55:30.000000000
-0800
-@@ -734,10 +734,7 @@
+diff -Naur samba-3.0.21.orig/source/passdb/login_cache.c
samba-3.0.21/source/passdb/login_cache.c
+--- samba-3.0.21.orig/source/passdb/login_cache.c 2005-12-24
14:03:21.857022065 +0100
++++ samba-3.0.21/source/passdb/login_cache.c 2005-12-24 14:01:26.031834776
+0100
+@@ -36,7 +36,7 @@
+ /* skip file open if it's already opened */
+ if (cache) return True;
+
+- asprintf(&cache_fname, "%s/%s", lp_lockdir(), LOGIN_CACHE_FILE);
++ asprintf(&cache_fname, "%s/%s", dyn_CACHEDIR(), LOGIN_CACHE_FILE);
+ if (cache_fname)
+ DEBUG(5, ("Opening cache file at %s\n", cache_fname));
+ else {
+diff -Naur samba-3.0.21.orig/source/passdb/pdb_tdb.c
samba-3.0.21/source/passdb/pdb_tdb.c
+--- samba-3.0.21.orig/source/passdb/pdb_tdb.c 2005-12-24 14:03:21.901025704
+0100
++++ samba-3.0.21/source/passdb/pdb_tdb.c 2005-12-24 14:01:26.067837623
+0100
+@@ -917,10 +917,7 @@
if (location) {
tdb_state->tdbsam_location =
talloc_strdup(pdb_context->mem_ctx, location);
} else {
@@ -392,10 +380,10 @@
tdb_state->tdbsam_location =
talloc_strdup(pdb_context->mem_ctx, tdbfile);
}
-diff -uNr samba-3.0.10.orig/source/passdb/secrets.c
samba-3.0.10/source/passdb/secrets.c
---- samba-3.0.10.orig/source/passdb/secrets.c 2004-12-17 03:50:09.000000000
-0800
-+++ samba-3.0.10/source/passdb/secrets.c 2004-12-17 03:55:30.000000000
-0800
-@@ -55,8 +55,7 @@
+diff -Naur samba-3.0.21.orig/source/passdb/secrets.c
samba-3.0.21/source/passdb/secrets.c
+--- samba-3.0.21.orig/source/passdb/secrets.c 2005-12-24 14:03:21.905026034
+0100
++++ samba-3.0.21/source/passdb/secrets.c 2005-12-24 14:01:26.075838256
+0100
+@@ -58,8 +58,7 @@
if (tdb)
return True;
@@ -405,10 +393,10 @@
tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-diff -uNr samba-3.0.10.orig/source/printing/nt_printing.c
samba-3.0.10/source/printing/nt_printing.c
---- samba-3.0.10.orig/source/printing/nt_printing.c 2004-12-17
03:50:09.000000000 -0800
-+++ samba-3.0.10/source/printing/nt_printing.c 2004-12-17 03:55:31.000000000
-0800
-@@ -298,28 +298,28 @@
+diff -Naur samba-3.0.21.orig/source/printing/nt_printing.c
samba-3.0.21/source/printing/nt_printing.c
+--- samba-3.0.21.orig/source/printing/nt_printing.c 2005-12-24
14:03:21.985032650 +0100
++++ samba-3.0.21/source/printing/nt_printing.c 2005-12-24 14:01:26.167845533
+0100
+@@ -530,28 +530,28 @@
if (tdb_drivers)
tdb_close(tdb_drivers);
@@ -443,10 +431,19 @@
return False;
}
-diff -uNr samba-3.0.10.orig/source/printing/printing.c
samba-3.0.10/source/printing/printing.c
---- samba-3.0.10.orig/source/printing/printing.c 2004-12-17
03:50:09.000000000 -0800
-+++ samba-3.0.10/source/printing/printing.c 2004-12-17 03:55:31.000000000
-0800
-@@ -177,8 +177,8 @@
+@@ -2325,7 +2325,7 @@
+ close_all_print_db();
+
+ if (geteuid() == 0) {
+- pstrcpy(printdb_path, lock_path("printing/"));
++ pstrcpy(printdb_path, cache_path("printing/"));
+ pstrcat(printdb_path, sharename);
+ pstrcat(printdb_path, ".tdb");
+
+diff -Naur samba-3.0.21.orig/source/printing/printing.c
samba-3.0.21/source/printing/printing.c
+--- samba-3.0.21.orig/source/printing/printing.c 2005-12-24
14:03:21.925027688 +0100
++++ samba-3.0.21/source/printing/printing.c 2005-12-24 14:01:26.091839522
+0100
+@@ -183,8 +183,8 @@
int services = lp_numservices();
int snum;
@@ -457,9 +454,10 @@
mkdir(printing_path,0755);
/* handle a Samba upgrade */
-diff -uNr samba-3.0.10.orig/source/printing/printing_db.c
samba-3.0.10/source/printing/printing_db.c
---- samba-3.0.10.orig/source/printing/printing_db.c 2004-12-17
03:50:09.000000000 -0800
-+++ samba-3.0.10/source/printing/printing_db.c 2004-12-17 03:55:31.000000000
-0800
+ /* handle a Samba upgrade */
+diff -Naur samba-3.0.21.orig/source/printing/printing_db.c
samba-3.0.21/source/printing/printing_db.c
+--- samba-3.0.21.orig/source/printing/printing_db.c 2005-12-24
14:03:21.929028019 +0100
++++ samba-3.0.21/source/printing/printing_db.c 2005-12-24 14:01:26.095839838
+0100
@@ -89,7 +89,7 @@
DLIST_ADD(print_db_head, p);
}
@@ -469,29 +467,10 @@
pstrcat(printdb_path, printername);
pstrcat(printdb_path, ".tdb");
-diff -uNr samba-3.0.21a.orig/source/registry/reg_db.c
samba-3.0.21a/source/registry/reg_db.c
---- samba-3.0.21a.orig/source/registry/reg_db.c 2006-01-01
13:54:28.000000000 +0100
-+++ samba-3.0.21a/source/registry/reg_db.c 2006-01-01 13:58:09.000000000
+0100
-@@ -205,12 +205,12 @@
- if ( tdb_reg )
- return True;
-
-- if ( !(tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0,
TDB_DEFAULT, O_RDWR, 0600)) )
-+ if ( !(tdb_reg = tdb_open_log(state_path("registry.tdb"), 0,
TDB_DEFAULT, O_RDWR, 0600)) )
- {
-- tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0,
TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-+ tdb_reg = tdb_open_log(state_path("registry.tdb"), 0,
TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
- if ( !tdb_reg ) {
- DEBUG(0,("regdb_init: Failed to open registry %s
(%s)\n",
-- lock_path("registry.tdb"), strerror(errno) ));
-+ state_path("registry.tdb"), strerror(errno) ));
- return False;
- }
-
-diff -uNr samba-3.0.10.orig/source/rpc_server/srv_srvsvc_nt.c
samba-3.0.10/source/rpc_server/srv_srvsvc_nt.c
---- samba-3.0.10.orig/source/rpc_server/srv_srvsvc_nt.c 2004-12-17
03:50:09.000000000 -0800
-+++ samba-3.0.10/source/rpc_server/srv_srvsvc_nt.c 2004-12-17
03:55:31.000000000 -0800
-@@ -133,10 +133,10 @@
+diff -Naur samba-3.0.21.orig/source/rpc_server/srv_srvsvc_nt.c
samba-3.0.21/source/rpc_server/srv_srvsvc_nt.c
+--- samba-3.0.21.orig/source/rpc_server/srv_srvsvc_nt.c 2005-12-24
14:03:21.953030004 +0100
++++ samba-3.0.21/source/rpc_server/srv_srvsvc_nt.c 2005-12-24
14:01:26.119841736 +0100
+@@ -156,10 +156,10 @@
if (share_tdb && local_pid == sys_getpid())
return True;
@@ -504,9 +483,9 @@
return False;
}
-diff -uNr samba-3.0.10.orig/source/sam/idmap_tdb.c
samba-3.0.10/source/sam/idmap_tdb.c
---- samba-3.0.10.orig/source/sam/idmap_tdb.c 2004-12-17 03:50:09.000000000
-0800
-+++ samba-3.0.10/source/sam/idmap_tdb.c 2004-12-17 03:55:31.000000000
-0800
+diff -Naur samba-3.0.21.orig/source/sam/idmap_tdb.c
samba-3.0.21/source/sam/idmap_tdb.c
+--- samba-3.0.21.orig/source/sam/idmap_tdb.c 2005-12-24 14:03:21.957030335
+0100
++++ samba-3.0.21/source/sam/idmap_tdb.c 2005-12-24 14:01:26.123842053
+0100
@@ -487,7 +487,7 @@
BOOL tdb_is_new = False;
@@ -516,10 +495,10 @@
if (!tdbfile) {
DEBUG(0, ("idmap_init: out of memory!\n"));
return NT_STATUS_NO_MEMORY;
-diff -uNr samba-3.0.10.orig/source/smbd/lanman.c
samba-3.0.10/source/smbd/lanman.c
---- samba-3.0.10.orig/source/smbd/lanman.c 2004-12-17 03:50:10.000000000
-0800
-+++ samba-3.0.10/source/smbd/lanman.c 2004-12-17 03:55:31.000000000 -0800
-@@ -969,9 +969,9 @@
+diff -Naur samba-3.0.21.orig/source/smbd/lanman.c
samba-3.0.21/source/smbd/lanman.c
+--- samba-3.0.21.orig/source/smbd/lanman.c 2005-12-24 14:03:21.965030996
+0100
++++ samba-3.0.21/source/smbd/lanman.c 2005-12-24 14:01:26.147843951 +0100
+@@ -1040,9 +1040,9 @@
BOOL local_list_only;
int i;
@@ -531,10 +510,10 @@
return(0);
}
-diff -uNr samba-3.0.10.orig/source/utils/net_idmap.c
samba-3.0.10/source/utils/net_idmap.c
---- samba-3.0.10.orig/source/utils/net_idmap.c 2004-12-17 03:50:10.000000000
-0800
-+++ samba-3.0.10/source/utils/net_idmap.c 2004-12-17 03:55:32.000000000
-0800
-@@ -126,7 +126,7 @@
+diff -Naur samba-3.0.21.orig/source/utils/net_idmap.c
samba-3.0.21/source/utils/net_idmap.c
+--- samba-3.0.21.orig/source/utils/net_idmap.c 2005-12-24 14:03:21.969031327
+0100
++++ samba-3.0.21/source/utils/net_idmap.c 2005-12-24 14:01:26.155844584
+0100
+@@ -136,7 +136,7 @@
return NT_STATUS_UNSUCCESSFUL;
}
@@ -543,9 +522,9 @@
if (!tdbfile) {
DEBUG(0, ("idmap_init: out of memory!\n"));
return NT_STATUS_NO_MEMORY;
-diff -uNr samba-3.0.10.orig/source/wrepld/process.c
samba-3.0.10/source/wrepld/process.c
---- samba-3.0.10.orig/source/wrepld/process.c 2004-12-17 03:50:10.000000000
-0800
-+++ samba-3.0.10/source/wrepld/process.c 2004-12-17 03:55:32.000000000
-0800
+diff -Naur samba-3.0.21.orig/source/wrepld/process.c
samba-3.0.21/source/wrepld/process.c
+--- samba-3.0.21.orig/source/wrepld/process.c 2005-12-24 14:03:21.973031658
+0100
++++ samba-3.0.21/source/wrepld/process.c 2005-12-24 14:01:26.159844900
+0100
@@ -197,7 +197,7 @@
{
TDB_CONTEXT *tdb;
@@ -564,15 +543,3 @@
if (!tdb) {
DEBUG(2,("send_entry_request: Can't open wins database file %s.
Error was %s\n", WINS_LIST, strerror(errno) ));
return;
-diff -uNr samba-3.0.11.orig/source/printing/nt_printing.c
samba-3.0.11/source/printing/nt_printing.c
---- samba-3.0.11.orig/source/printing/nt_printing.c 2005-03-23
02:51:08.000000000 -0800
-+++ samba-3.0.11/source/printing/nt_printing.c 2005-03-23 02:54:33.000000000
-0800
-@@ -2065,7 +2065,7 @@
- close_all_print_db();
-
- if (geteuid() == 0) {
-- pstrcpy(printdb_path, lock_path("printing/"));
-+ pstrcpy(printdb_path, cache_path("printing/"));
- pstrcat(printdb_path, sharename);
- pstrcat(printdb_path, ".tdb");
-
diff -ur patches.hunked/make-distclean.patch patches/make-distclean.patch
--- patches.hunked/make-distclean.patch 2006-01-01 19:33:11.150810000 +0100
+++ patches/make-distclean.patch 2006-01-01 19:25:08.564610884 +0100
@@ -1,7 +1,7 @@
diff -uNr samba-3.0.7.orig/source/Makefile.in samba-3.0.7/source/Makefile.in
--- samba-3.0.7.orig/source/Makefile.in 2004-10-25 10:06:08.000000000
-0700
+++ samba-3.0.7/source/Makefile.in 2004-10-25 10:03:31.000000000 -0700
-@@ -1371,6 +1371,7 @@
+@@ -1490,6 +1490,7 @@
python_clean:
@-if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi
@@ -9,7 +9,7 @@
# revert to the previously installed version
revert:
-@@ -1437,6 +1438,7 @@
+@@ -1558,6 +1559,7 @@
@rm -f include/proto.h include/build_env.h include/wrepld_proto.h \
nsswitch/winbindd_proto.h web/swat_proto.h \
client/client_proto.h utils/net_proto.h \
@@ -17,7 +17,7 @@
smbd/build_options.c
MKPROTO_SH = $(srcdir)/script/mkproto.sh
-@@ -1512,6 +1514,7 @@
+@@ -1634,6 +1636,7 @@
distclean: realclean
-rm -f include/stamp-h
diff -ur patches.hunked/nmbd-signalling.patch patches/nmbd-signalling.patch
--- patches.hunked/nmbd-signalling.patch 2006-01-01 19:33:11.158811000
+0100
+++ patches/nmbd-signalling.patch 2006-01-01 19:25:08.564610884 +0100
@@ -1,20 +1,20 @@
-diff -uNr samba-2.999+3.0.alpha21.orig/source/nmbd/nmbd_subnetdb.c
samba-2.999+3.0.alpha21/source/nmbd/nmbd_subnetdb.c
---- samba-2.999+3.0.alpha21.orig/source/nmbd/nmbd_subnetdb.c 2002-11-26
20:54:19.000000000 -0600
-+++ samba-2.999+3.0.alpha21/source/nmbd/nmbd_subnetdb.c 2002-12-16
23:34:13.000000000 -0600
+diff -Naur samba-3.0.21.orig/source/nmbd/nmbd_subnetdb.c
samba-3.0.21/source/nmbd/nmbd_subnetdb.c
+--- samba-3.0.21.orig/source/nmbd/nmbd_subnetdb.c 2005-04-18
18:38:20.000000000 +0200
++++ samba-3.0.21/source/nmbd/nmbd_subnetdb.c 2005-12-24 14:47:29.681084145
+0100
@@ -214,12 +214,16 @@
- extern struct in_addr loopback_ip;
+ struct in_addr unicast_ip, ipzero;
- if(num_interfaces == 0) {
+ if(num_interfaces == 0) {
+ void (*old_handler)(int);
+
- DEBUG(0,("create_subnets: No local interfaces !\n"));
- DEBUG(0,("create_subnets: Waiting for an interface to appear
...\n"));
+ DEBUG(0,("create_subnets: No local interfaces !\n"));
+ DEBUG(0,("create_subnets: Waiting for an interface to appear
...\n"));
+ old_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
- while (iface_count() == 0) {
- sleep(5);
- load_interfaces();
- }
+ while (iface_count() == 0) {
+ sleep(5);
+ load_interfaces();
+ }
+ CatchSignal( SIGTERM, SIGNAL_CAST old_handler );
- }
+ }
- num_interfaces = iface_count();
+ num_interfaces = iface_count();
diff -ur patches.hunked/non-linux-ports.patch patches/non-linux-ports.patch
--- patches.hunked/non-linux-ports.patch 2006-01-01 19:33:11.154811000
+0100
+++ patches/non-linux-ports.patch 2006-01-01 19:25:08.572611517 +0100
@@ -1,7 +1,7 @@
-diff -uNr samba-3.0.11.orig/source/configure.in
samba-3.0.11/source/configure.in
---- samba-3.0.11.orig/source/configure.in 2005-03-23 02:39:11.000000000
-0800
-+++ samba-3.0.11/source/configure.in 2005-03-23 02:43:01.000000000 -0800
-@@ -573,6 +573,15 @@
+diff -Naur samba-3.0.21.orig/source/configure.in
samba-3.0.21/source/configure.in
+--- samba-3.0.21.orig/source/configure.in 2005-12-14 13:45:51.000000000
+0100
++++ samba-3.0.21/source/configure.in 2005-12-24 15:35:47.823755381 +0100
+@@ -638,6 +638,15 @@
fi
;;
@@ -17,7 +17,7 @@
# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater
support.
#
*linux*)
-@@ -1040,7 +1049,7 @@
+@@ -1197,7 +1206,7 @@
#
#
case "$host_os" in
@@ -26,7 +26,7 @@
# glibc <= 2.3.2 has a broken getgrouplist
AC_TRY_RUN([
#include <unistd.h>
-@@ -1172,7 +1181,10 @@
+@@ -1392,7 +1401,10 @@
# and these are for particular systems
case "$host_os" in
@@ -38,7 +38,7 @@
BLDSHARED="true"
if test
"${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
LDSHFLAGS="-shared -Wl,-Bsymbolic
-Wl,--allow-shlib-undefined"
-@@ -4044,7 +4056,7 @@
+@@ -4622,7 +4634,7 @@
AC_MSG_RESULT(yes);
case "$host_os" in
@@ -47,16 +47,3 @@
AC_CACHE_CHECK([for linux sendfile64
support],samba_cv_HAVE_SENDFILE64,[
AC_TRY_LINK([#include <sys/sendfile.h>],
[\
-@@ -4722,10 +4722,10 @@
- WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS
-
- case "$host_os" in
-- *linux*)
-+ linux*-gnu* | gnu* | k*bsd*-gnu)
- WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
- ;;
-- *freebsd[[5-9]]*)
-+ freebsd5*|*freebsd[[6-9]]*)
- # FreeBSD winbind client is implemented as a wrapper around
- # the Linux version.
- WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
diff -ur patches.hunked/nonpic-libsmbclient.patch
patches/nonpic-libsmbclient.patch
--- patches.hunked/nonpic-libsmbclient.patch 2006-01-01 19:33:11.154811000
+0100
+++ patches/nonpic-libsmbclient.patch 2006-01-01 19:25:08.572611517 +0100
@@ -1,6 +1,7 @@
---- samba-3.0.21a.orig/source/Makefile.in 2006-01-01 13:26:14.000000000
+0100
-+++ samba-3.0.21a/source/Makefile.in 2006-01-01 13:27:38.000000000 +0100
-@@ -1057,9 +1057,9 @@
+diff -Naur samba-3.0.21.orig/source/Makefile.in samba-3.0.21/source/Makefile.in
+--- samba-3.0.21.orig/source/Makefile.in 2005-12-14 13:45:49.000000000
+0100
++++ samba-3.0.21/source/Makefile.in 2005-12-24 15:37:12.978618364 +0100
+@@ -1064,9 +1064,9 @@
$(KRB5LIBS) $(LDAP_LIBS) \
@[EMAIL PROTECTED] [EMAIL PROTECTED](LIBSMBCLIENT_MAJOR)
@@ -12,15 +13,3 @@
bin/[EMAIL PROTECTED]@: $(LIBSMBSHAREMODES_PICOBJS)
@echo Linking libsmbsharemodes shared library $@
-@@ -1076,9 +1076,9 @@
- @$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_PICOBJS) $(LDFLAGS) $(LIBS) \
- @[EMAIL PROTECTED] [EMAIL PROTECTED](LIBMSRPC_MAJOR)
-
--bin/libmsrpc.a: $(CAC_PICOBJS)
-+bin/libmsrpc.a: $(CAC_OBJS)
- @echo Linking libmsrpc non-shared library $@
-- @-$(AR) -rc $@ $(CAC_PICOBJS)
-+ @-$(AR) -rc $@ $(CAC_OBJS)
-
- # This is probably wrong for anything other than the GNU linker.
- bin/[EMAIL PROTECTED]@: $(LIBBIGBALLOFMUD_PICOBJS)
diff -ur patches.hunked/samba.patch patches/samba.patch
--- patches.hunked/samba.patch 2006-01-01 19:33:11.154811000 +0100
+++ patches/samba.patch 2006-01-01 19:25:08.568611201 +0100
@@ -1,7 +1,7 @@
-diff -uNr samba-3.0.0beta1.orig/source/client/smbmount.c
samba-3.0.0beta1/source/client/smbmount.c
---- samba-3.0.0beta1.orig/source/client/smbmount.c 2003-06-07
12:57:32.000000000 -0500
-+++ samba-3.0.0beta1/source/client/smbmount.c 2003-06-30 20:12:22.000000000
-0500
-@@ -766,7 +766,7 @@
+diff -Naur samba-3.0.21.orig/source/client/smbmount.c
samba-3.0.21/source/client/smbmount.c
+--- samba-3.0.21.orig/source/client/smbmount.c 2005-07-28 15:19:53.000000000
+0200
++++ samba-3.0.21/source/client/smbmount.c 2005-12-24 14:54:02.324432132
+0100
+@@ -764,7 +764,7 @@
*lp = 0;
pstrcpy(password,lp+1);
got_pass = True;
@@ -10,7 +10,7 @@
}
if ((lp=strchr_m(username,'/'))) {
*lp = 0;
-@@ -776,7 +776,7 @@
+@@ -774,7 +774,7 @@
!strcmp(opts, "password")) {
pstrcpy(password,opteq+1);
got_pass = True;
@@ -19,7 +19,7 @@
} else if(!strcmp(opts, "credentials")) {
pstrcpy(credentials,opteq+1);
} else if(!strcmp(opts, "netbiosname")) {
-@@ -890,7 +902,7 @@
+@@ -888,7 +888,7 @@
*p = 0;
pstrcpy(password,p+1);
got_pass = True;
@@ -28,19 +28,9 @@
}
strupper_m(username);
}
-diff -uNr samba-3.0.0beta1.orig/source/web/diagnose.c
samba-3.0.0beta1/source/web/diagnose.c
---- samba-3.0.0beta1.orig/source/web/diagnose.c 2003-06-07
12:57:41.000000000 -0500
-+++ samba-3.0.0beta1/source/web/diagnose.c 2003-06-30 20:12:22.000000000
-0500
-@@ -66,6 +66,7 @@
- static struct cli_state cli;
- extern struct in_addr loopback_ip;
-
-+ loopback_ip.s_addr = htonl((127 << 24) + 1);
- if (!cli_initialise(&cli))
- return False;
-
---- samba-3.0.1/source/script/installbin.sh.orig 2003-10-10
14:08:36.000000000 -0400
-+++ samba-3.0.1/source/script/installbin.sh 2003-12-17 10:51:45.000000000
-0500
+diff -Naur samba-3.0.21.orig/source/script/installbin.sh
samba-3.0.21/source/script/installbin.sh
+--- samba-3.0.21.orig/source/script/installbin.sh 2005-02-25
18:59:43.000000000 +0100
++++ samba-3.0.21/source/script/installbin.sh 2005-12-24 14:54:02.332432769
+0100
@@ -24,12 +24,14 @@
chmod $INSTALLPERMS $BINDIR/$p2
@@ -62,3 +52,14 @@
done
+diff -Naur samba-3.0.21.orig/source/web/diagnose.c
samba-3.0.21/source/web/diagnose.c
+--- samba-3.0.21.orig/source/web/diagnose.c 2005-12-20 16:28:39.000000000
+0100
++++ samba-3.0.21/source/web/diagnose.c 2005-12-24 14:54:02.328432451 +0100
+@@ -62,6 +62,7 @@
+ {
+ static struct cli_state cli;
+
++ loopback_ip.s_addr = htonl((127 << 24) + 1);
+ if (!cli_initialise(&cli))
+ return False;
+
diff -ur patches.hunked/smbclient-tar.patch.unused
patches/smbclient-tar.patch.unused
--- patches.hunked/smbclient-tar.patch.unused 2006-01-01 19:33:11.154811000
+0100
+++ patches/smbclient-tar.patch.unused 2006-01-01 19:25:08.568611201 +0100
@@ -1,24 +1,7 @@
-diff -uNr samba-3.0.0beta2.orig/source/client/client.c
samba-3.0.0beta2/source/client/client.c
---- samba-3.0.0beta2.orig/source/client/client.c 2003-07-01
22:36:24.000000000 -0500
-+++ samba-3.0.0beta2/source/client/client.c 2003-07-06 15:17:36.000000000
-0500
-@@ -2773,6 +2773,7 @@
- int opt;
- pstring query_host;
- BOOL message = False;
-+ char* tar_args = NULL;
- extern char tar_type;
- pstring term_code;
- static const char *new_name_resolve_order = NULL;
-@@ -2816,7 +2817,7 @@
- max_protocol = interpret_protocol(poptGetOptArg(pc),
max_protocol);
- break;
- case 'T':
-- if (!tar_parseargs(argc, argv, poptGetOptArg(pc),
optind)) {
-+ if (!(tar_args = poptGetOptArg(pc))) {
- poptPrintUsage(pc, stderr, 0);
- exit(1);
- }
-@@ -2917,6 +2917,22 @@
+diff -Naur samba-3.0.21.orig/source/client/client.c
samba-3.0.21/source/client/client.c
+--- samba-3.0.21.orig/source/client/client.c 2005-12-02 20:21:50.000000000
+0100
++++ samba-3.0.21/source/client/client.c 2005-12-24 14:55:19.398569462
+0100
+@@ -3480,6 +3480,22 @@
pstrcpy(cmdline_auth_info.password,poptGetArg(pc));
}
diff -ur patches.hunked/smbmount-mtab-flags.patch
patches/smbmount-mtab-flags.patch
--- patches.hunked/smbmount-mtab-flags.patch 2006-01-01 19:33:11.158811000
+0100
+++ patches/smbmount-mtab-flags.patch 2006-01-01 19:25:08.568611201 +0100
@@ -1,7 +1,7 @@
diff -ur samba-2.2.4.orig/source/client/smbmnt.c
samba-2.2.4/source/client/smbmnt.c
--- samba-2.2.4.orig/source/client/smbmnt.c Sun Apr 8 15:22:51 2001
+++ samba-2.2.4/source/client/smbmnt.c Sun May 5 16:42:29 2002
-@@ -259,7 +259,10 @@
+@@ -276,7 +276,10 @@
ment.mnt_fsname = share_name ? share_name : "none";
ment.mnt_dir = mount_point;
ment.mnt_type = "smbfs";
diff -ur patches.hunked/smbmount-nomtab.patch patches/smbmount-nomtab.patch
--- patches.hunked/smbmount-nomtab.patch 2006-01-01 19:33:11.150810000
+0100
+++ patches/smbmount-nomtab.patch 2006-01-01 19:25:08.568611201 +0100
@@ -1,7 +1,7 @@
-diff -uNr samba-3.0alpha22.orig/source/client/smbmnt.c
samba-3.0alpha22/source/client/smbmnt.c
---- samba-3.0alpha22.orig/source/client/smbmnt.c 2003-03-15
12:11:39.000000000 -0600
-+++ samba-3.0alpha22/source/client/smbmnt.c 2003-03-15 12:11:49.000000000
-0600
-@@ -28,6 +28,7 @@
+diff -Naur samba-3.0.21.orig/source/client/smbmnt.c
samba-3.0.21/source/client/smbmnt.c
+--- samba-3.0.21.orig/source/client/smbmnt.c 2005-07-28 15:19:53.000000000
+0200
++++ samba-3.0.21/source/client/smbmnt.c 2005-12-24 14:24:53.396906439
+0100
+@@ -44,6 +44,7 @@
static uid_t mount_uid;
static gid_t mount_gid;
static int mount_ro;
@@ -9,15 +9,15 @@
static unsigned mount_fmask;
static unsigned mount_dmask;
static int user_mount;
-@@ -40,6 +41,7 @@
+@@ -56,6 +57,7 @@
printf("Usage: smbmnt mount-point [options]\n");
- printf("Version %s\n\n",VERSION);
+ printf("Version %s\n\n",SAMBA_VERSION_STRING);
printf("-s share share name on server\n"
+ "-n don't update /etc/mtab\n"
"-r mount read-only\n"
"-u uid mount as uid\n"
"-g gid mount as gid\n"
-@@ -54,7 +56,7 @@
+@@ -70,7 +72,7 @@
{
int opt;
@@ -26,7 +26,7 @@
{
switch (opt)
{
-@@ -71,6 +73,9 @@
+@@ -87,6 +89,9 @@
mount_gid = strtol(optarg, NULL, 0);
}
break;
@@ -36,7 +36,7 @@
case 'r':
mount_ro = 1;
break;
-@@ -274,36 +279,38 @@
+@@ -291,36 +296,38 @@
return -1;
}
@@ -102,10 +102,10 @@
return 0;
}
-diff -uNr samba-3.0alpha22.orig/source/client/smbmount.c
samba-3.0alpha22/source/client/smbmount.c
---- samba-3.0alpha22.orig/source/client/smbmount.c 2003-03-15
12:04:29.000000000 -0600
-+++ samba-3.0alpha22/source/client/smbmount.c 2003-03-15 12:15:10.000000000
-0600
-@@ -48,6 +48,7 @@
+diff -Naur samba-3.0.21.orig/source/client/smbmount.c
samba-3.0.21/source/client/smbmount.c
+--- samba-3.0.21.orig/source/client/smbmount.c 2005-07-28 15:19:53.000000000
+0200
++++ samba-3.0.21/source/client/smbmount.c 2005-12-24 14:24:53.412907721
+0100
+@@ -46,6 +46,7 @@
static int mount_ro;
static unsigned mount_fmask;
static unsigned mount_dmask;
@@ -113,7 +113,7 @@
static BOOL use_kerberos;
/* TODO: Add code to detect smbfs version in kernel */
static BOOL status32_smbfs = False;
-@@ -273,6 +274,9 @@
+@@ -271,6 +272,9 @@
return;
}
@@ -123,7 +123,7 @@
if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1) {
DEBUG(0,("%d: Can't get "MOUNTED"~ lock file", sys_getpid()));
return;
-@@ -467,6 +471,9 @@
+@@ -465,6 +469,9 @@
args[i++] = "-s";
args[i++] = svc2;
@@ -133,16 +133,16 @@
if (mount_ro) {
args[i++] = "-r";
}
-@@ -662,7 +669,7 @@
+@@ -660,7 +667,7 @@
****************************************************************************/
static void usage(void)
{
- printf("Usage: mount.smbfs service mountpoint [-o options,...]\n");
+ printf("Usage: mount.smbfs service mountpoint [-n] [-o options,...]\n");
- printf("Version %s\n\n",VERSION);
+ printf("Version %s\n\n",SAMBA_VERSION_STRING);
-@@ -740,8 +747,13 @@
+@@ -738,8 +745,13 @@
argc -= 2;
argv += 2;
diff -ur patches.hunked/smbmount-unix-caps.patch
patches/smbmount-unix-caps.patch
--- patches.hunked/smbmount-unix-caps.patch 2006-01-01 19:33:11.158811000
+0100
+++ patches/smbmount-unix-caps.patch 2006-01-01 19:25:08.568611201 +0100
@@ -1,7 +1,7 @@
diff -uNr samba-3.0.14a.orig/source/client/smbmount.c
samba-3.0.14a/source/client/smbmount.c
--- samba-3.0.14a.orig/source/client/smbmount.c 2005-06-02
06:49:31.000000000 -0700
+++ samba-3.0.14a/source/client/smbmount.c 2005-06-02 06:59:41.000000000
-0700
-@@ -213,6 +213,10 @@
+@@ -211,6 +211,10 @@
c->capabilities &= ~CAP_STATUS32;
c->force_dos_errors = True;
}
diff -ur patches.hunked/smbstatus-locking.patch patches/smbstatus-locking.patch
--- patches.hunked/smbstatus-locking.patch 2006-01-01 19:33:11.158811000
+0100
+++ patches/smbstatus-locking.patch 2006-01-01 19:25:08.564610884 +0100
@@ -1,8 +1,8 @@
-diff -uNr samba-2.999+3.0.alpha21.orig/source/utils/status.c
samba-2.999+3.0.alpha21/source/utils/status.c
---- samba-2.999+3.0.alpha21.orig/source/utils/status.c 2002-11-26
20:54:22.000000000 -0600
-+++ samba-2.999+3.0.alpha21/source/utils/status.c 2002-12-16
23:37:14.000000000 -0600
-@@ -686,6 +686,16 @@
- if (!shares_only) {
+diff -Naur samba-3.0.21.orig/source/utils/status.c
samba-3.0.21/source/utils/status.c
+--- samba-3.0.21.orig/source/utils/status.c 2005-11-09 19:29:02.000000000
+0100
++++ samba-3.0.21/source/utils/status.c 2005-12-24 14:26:23.052075098 +0100
+@@ -701,6 +701,16 @@
+ if ( show_locks ) {
int ret;
+ tdb = tdb_open_log(lock_path("locking.tdb"), 0, TDB_DEFAULT,
O_RDONLY, 0);
diff -ur patches.hunked/undefined-symbols.patch patches/undefined-symbols.patch
--- patches.hunked/undefined-symbols.patch 2006-01-01 19:33:11.154811000
+0100
+++ patches/undefined-symbols.patch 2006-01-01 19:25:08.564610884 +0100
@@ -1,8 +1,8 @@
-diff -uNr samba-3.0.11.orig/source/Makefile.in samba-3.0.11/source/Makefile.in
---- samba-3.0.11.orig/source/Makefile.in 2005-03-23 02:40:40.000000000
-0800
-+++ samba-3.0.11/source/Makefile.in 2005-03-23 02:48:59.000000000 -0800
-@@ -631,7 +631,8 @@
- $(RPC_ECHO_OBJ) $(SMBLDAP_OBJ) $(IDMAP_OBJ) libsmb/spnego.o
$(PASSCHANGE_OBJ)
+diff -Naur samba-3.0.21.orig/source/Makefile.in samba-3.0.21/source/Makefile.in
+--- samba-3.0.21.orig/source/Makefile.in 2005-12-14 13:45:49.000000000
+0100
++++ samba-3.0.21/source/Makefile.in 2005-12-24 15:05:00.854020325 +0100
+@@ -673,7 +673,8 @@
+ $(RPC_NTSVCS_OBJ)
WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) \
- $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ)
@@ -11,7 +11,7 @@
WINBIND_WINS_NSS_PICOBJS = $(WINBIND_WINS_NSS_OBJ:[EMAIL PROTECTED]@)
-@@ -997,7 +998,7 @@
+@@ -1060,7 +1061,7 @@
bin/[EMAIL PROTECTED]@: $(LIBSMBCLIENT_PICOBJS)
@echo Linking libsmbclient shared library $@
