[Pkg-samba-maint] r888 - in trunk: . patches
Christian Perrier
bubulle at costa.debian.org
Thu Jan 5 18:11:22 UTC 2006
Author: bubulle
Date: 2006-01-05 18:11:20 +0000 (Thu, 05 Jan 2006)
New Revision: 888
Modified:
trunk/changelog
trunk/patches/README_nosmbldap-tools.patch
trunk/patches/VERSION.patch
trunk/patches/cups.patch
trunk/patches/documentation.patch
trunk/patches/fhs.patch
trunk/patches/installswat.sh.patch
trunk/patches/make-distclean.patch
trunk/patches/nmbd-signalling.patch
trunk/patches/non-linux-ports.patch
trunk/patches/nonpic-libsmbclient.patch
trunk/patches/pam-examples.patch
trunk/patches/samba.patch
trunk/patches/smbclient-pager.patch
trunk/patches/smbmount-mtab-flags.patch
trunk/patches/smbmount-nomtab.patch
trunk/patches/smbmount-unix-caps.patch
trunk/patches/smbstatus-locking.patch
trunk/patches/undefined-symbols.patch
trunk/rules
Log:
Switch to quilt for patches management. Refresh all patches
Modified: trunk/changelog
===================================================================
--- trunk/changelog 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/changelog 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,8 +1,10 @@
samba (3.0.21a-2) UNRELEASED; urgency=low
- *
+ [ Christian Perrier ]
+ * Switch to quilt for patches management. Refresh all patches so
+ that they apply cleanly. Closes: #345557
- -- Noèl Köthe <noel at debian.org> Sun, 01 Jan 2006 16:45:33 +0100
+ -- Christian Perrier <bubulle at debian.org> Thu, 5 Jan 2006 19:10:38 +0100
samba (3.0.21a-1) unstable; urgency=low
Modified: trunk/patches/README_nosmbldap-tools.patch
===================================================================
--- trunk/patches/README_nosmbldap-tools.patch 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/patches/README_nosmbldap-tools.patch 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,7 +1,7 @@
-Index: samba-3.0.20b/examples/LDAP/README
+Index: samba-3.0.21a.new/examples/LDAP/README
===================================================================
---- samba-3.0.20b.orig/examples/LDAP/README 2005-10-12 19:03:50.000000000 +0200
-+++ samba-3.0.20b/examples/LDAP/README 2005-12-04 19:08:38.169258513 +0100
+--- samba-3.0.21a.new.orig/examples/LDAP/README 2005-02-25 18:59:51.000000000 +0100
++++ samba-3.0.21a.new/examples/LDAP/README 2006-01-02 09:53:32.809543869 +0100
@@ -59,6 +59,9 @@
The smbldap-tools package can be downloaded individually from
http://samba.idealx.org/dist/
Modified: trunk/patches/VERSION.patch
===================================================================
--- trunk/patches/VERSION.patch 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/patches/VERSION.patch 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,6 +1,8 @@
---- 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 @@
+Index: samba-3.0.21a.new/source/VERSION
+===================================================================
+--- samba-3.0.21a.new.orig/source/VERSION 2005-12-29 21:48:50.000000000 +0100
++++ samba-3.0.21a.new/source/VERSION 2006-01-02 09:57:54.054746861 +0100
+@@ -90,4 +90,4 @@
# e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() #
# -> "CVS 3.0.0rc2-VendorVersion" #
########################################################
Modified: trunk/patches/cups.patch
===================================================================
--- trunk/patches/cups.patch 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/patches/cups.patch 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,6 +1,8 @@
---- samba-3.0.10.orig/source/include/includes.h
-+++ samba-3.0.10/source/include/includes.h
-@@ -940,10 +940,7 @@
+Index: samba-3.0.21a.new/source/include/includes.h
+===================================================================
+--- samba-3.0.21a.new.orig/source/include/includes.h 2006-01-02 09:35:13.800068024 +0100
++++ samba-3.0.21a.new/source/include/includes.h 2006-01-02 09:35:22.030398495 +0100
+@@ -1049,10 +1049,7 @@
#endif
#ifndef DEFAULT_PRINTING
Modified: trunk/patches/documentation.patch
===================================================================
--- trunk/patches/documentation.patch 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/patches/documentation.patch 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,6 +1,8 @@
---- 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 @@
+Index: samba-3.0.21a.new/docs/manpages/swat.8
+===================================================================
+--- samba-3.0.21a.new.orig/docs/manpages/swat.8 2006-01-02 09:35:12.832264343 +0100
++++ samba-3.0.21a.new/docs/manpages/swat.8 2006-01-02 09:35:26.040585018 +0100
+@@ -84,6 +84,13 @@
.SH "INSTALLATION"
.PP
@@ -14,7 +16,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 +33,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 +42,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 +55,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
Modified: trunk/patches/fhs.patch
===================================================================
--- trunk/patches/fhs.patch 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/patches/fhs.patch 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,7 +1,8 @@
-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 @@
+Index: samba-3.0.21a.new/source/Makefile.in
+===================================================================
+--- samba-3.0.21a.new.orig/source/Makefile.in 2005-12-14 13:45:49.000000000 +0100
++++ samba-3.0.21a.new/source/Makefile.in 2006-01-02 09:58:55.739279718 +0100
+@@ -91,6 +91,13 @@
# the directory where lock files go
LOCKDIR = @lockdir@
@@ -14,8 +15,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=\"@SHLIBEXT@\"
@@ -24,7 +25,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 +34,10 @@
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
+Index: samba-3.0.21a.new/source/configure.in
+===================================================================
+--- samba-3.0.21a.new.orig/source/configure.in 2005-12-14 13:45:51.000000000 +0100
++++ samba-3.0.21a.new/source/configure.in 2006-01-02 09:58:49.949449984 +0100
@@ -35,7 +35,7 @@
[ --with-fhs Use FHS-compliant paths (default=no)],
[ case "$withval" in
@@ -66,9 +68,10 @@
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
+Index: samba-3.0.21a.new/source/dynconfig.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/dynconfig.c 2005-02-25 18:59:43.000000000 +0100
++++ samba-3.0.21a.new/source/dynconfig.c 2006-01-02 09:43:36.356337494 +0100
@@ -53,6 +53,13 @@
pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
@@ -111,10 +114,11 @@
+ 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 @@
+Index: samba-3.0.21a.new/source/groupdb/mapping.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/groupdb/mapping.c 2005-11-09 19:28:57.000000000 +0100
++++ samba-3.0.21a.new/source/groupdb/mapping.c 2006-01-02 09:43:36.357337292 +0100
+@@ -129,7 +129,7 @@
if (tdb)
return True;
@@ -123,9 +127,10 @@
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
+Index: samba-3.0.21a.new/source/include/dynconfig.h
+===================================================================
+--- samba-3.0.21a.new.orig/source/include/dynconfig.h 2005-02-25 18:59:39.000000000 +0100
++++ samba-3.0.21a.new/source/include/dynconfig.h 2006-01-02 09:43:36.358337089 +0100
@@ -31,8 +31,12 @@
extern pstring dyn_CONFIGFILE;
extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -139,9 +144,10 @@
+
+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
+Index: samba-3.0.21a.new/source/intl/lang_tdb.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/intl/lang_tdb.c 2005-07-28 15:19:45.000000000 +0200
++++ samba-3.0.21a.new/source/intl/lang_tdb.c 2006-01-02 09:43:36.358337089 +0100
@@ -128,7 +128,7 @@
if (!lang)
return True;
@@ -151,22 +157,11 @@
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 @@
+Index: samba-3.0.21a.new/source/lib/util.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/lib/util.c 2005-12-20 16:28:38.000000000 +0100
++++ samba-3.0.21a.new/source/lib/util.c 2006-01-02 09:43:36.369334863 +0100
+@@ -2410,6 +2410,61 @@
}
/**
@@ -228,11 +223,12 @@
* @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;
+Index: samba-3.0.21a.new/source/lib/util_unistr.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/lib/util_unistr.c 2005-12-02 20:21:45.000000000 +0100
++++ samba-3.0.21a.new/source/lib/util_unistr.c 2006-01-02 09:43:36.370334661 +0100
+@@ -58,8 +58,8 @@
+ }
initialised = 1;
- upcase_table = map_file(lib_path("upcase.dat"), 0x20000);
@@ -242,7 +238,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 +247,10 @@
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
+Index: samba-3.0.21a.new/source/libsmb/samlogon_cache.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/libsmb/samlogon_cache.c 2005-11-11 23:10:32.000000000 +0100
++++ samba-3.0.21a.new/source/libsmb/samlogon_cache.c 2006-01-02 09:43:36.371334459 +0100
@@ -34,7 +34,7 @@
BOOL netsamlogon_cache_init(void)
{
@@ -272,9 +269,10 @@
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
+Index: samba-3.0.21a.new/source/nmbd/nmbd_serverlistdb.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/nmbd/nmbd_serverlistdb.c 2005-02-25 18:59:37.000000000 +0100
++++ samba-3.0.21a.new/source/nmbd/nmbd_serverlistdb.c 2006-01-02 09:43:36.372334256 +0100
@@ -327,7 +327,7 @@
updatecount++;
@@ -284,9 +282,10 @@
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
+Index: samba-3.0.21a.new/source/nmbd/nmbd_winsserver.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/nmbd/nmbd_winsserver.c 2005-11-09 19:29:00.000000000 +0100
++++ samba-3.0.21a.new/source/nmbd/nmbd_winsserver.c 2006-01-02 09:43:36.374333852 +0100
@@ -234,7 +234,7 @@
add_samba_names_to_subnet(wins_server_subnet);
@@ -305,9 +304,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
+Index: samba-3.0.21a.new/source/passdb/login_cache.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/passdb/login_cache.c 2005-02-25 18:59:36.000000000 +0100
++++ samba-3.0.21a.new/source/passdb/login_cache.c 2006-01-02 09:43:36.380332637 +0100
@@ -36,7 +36,7 @@
/* skip file open if it's already opened */
if (cache) return True;
@@ -317,10 +317,11 @@
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 @@
+Index: samba-3.0.21a.new/source/nsswitch/winbindd_cache.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/nsswitch/winbindd_cache.c 2005-12-14 13:45:50.000000000 +0100
++++ samba-3.0.21a.new/source/nsswitch/winbindd_cache.c 2006-01-02 09:43:36.381332435 +0100
+@@ -58,7 +58,7 @@
if (opt_nocache)
return;
@@ -329,7 +330,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 +339,11 @@
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 @@
+Index: samba-3.0.21a.new/source/nsswitch/winbindd_util.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/nsswitch/winbindd_util.c 2005-12-14 13:45:50.000000000 +0100
++++ samba-3.0.21a.new/source/nsswitch/winbindd_util.c 2006-01-02 09:43:36.383332030 +0100
+@@ -1173,7 +1173,7 @@
SMB_STRUCT_STAT stbuf;
TDB_CONTEXT *idmap_tdb;
@@ -350,10 +352,11 @@
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 @@
+Index: samba-3.0.21a.new/source/param/loadparm.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/param/loadparm.c 2005-12-02 20:21:45.000000000 +0100
++++ samba-3.0.21a.new/source/param/loadparm.c 2006-01-02 09:43:36.388331018 +0100
+@@ -105,6 +105,9 @@
char *szAddPrinterCommand;
char *szDeletePrinterCommand;
char *szOs2DriverMap;
@@ -363,7 +366,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 +380,11 @@
{"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 @@
+Index: samba-3.0.21a.new/source/passdb/pdb_tdb.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/passdb/pdb_tdb.c 2005-11-09 19:28:59.000000000 +0100
++++ samba-3.0.21a.new/source/passdb/pdb_tdb.c 2006-01-02 09:43:36.389330816 +0100
+@@ -917,10 +917,7 @@
if (location) {
tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location);
} else {
@@ -392,10 +396,11 @@
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 @@
+Index: samba-3.0.21a.new/source/passdb/secrets.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/passdb/secrets.c 2005-10-18 04:45:02.000000000 +0200
++++ samba-3.0.21a.new/source/passdb/secrets.c 2006-01-02 09:43:36.391330411 +0100
+@@ -58,8 +58,7 @@
if (tdb)
return True;
@@ -405,10 +410,11 @@
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 @@
+Index: samba-3.0.21a.new/source/printing/nt_printing.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/printing/nt_printing.c 2005-11-09 19:28:56.000000000 +0100
++++ samba-3.0.21a.new/source/printing/nt_printing.c 2006-01-02 09:43:36.416325352 +0100
+@@ -530,28 +530,28 @@
if (tdb_drivers)
tdb_close(tdb_drivers);
@@ -443,10 +449,20 @@
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");
+
+Index: samba-3.0.21a.new/source/printing/printing.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/printing/printing.c 2005-10-18 04:44:57.000000000 +0200
++++ samba-3.0.21a.new/source/printing/printing.c 2006-01-02 09:43:36.400328590 +0100
+@@ -183,8 +183,8 @@
int services = lp_numservices();
int snum;
@@ -457,9 +473,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
+Index: samba-3.0.21a.new/source/printing/printing_db.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/printing/printing_db.c 2005-10-18 04:44:57.000000000 +0200
++++ samba-3.0.21a.new/source/printing/printing_db.c 2006-01-02 09:43:36.400328590 +0100
@@ -89,7 +89,7 @@
DLIST_ADD(print_db_head, p);
}
@@ -469,29 +486,11 @@
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 @@
+Index: samba-3.0.21a.new/source/rpc_server/srv_srvsvc_nt.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/rpc_server/srv_srvsvc_nt.c 2005-12-14 13:45:50.000000000 +0100
++++ samba-3.0.21a.new/source/rpc_server/srv_srvsvc_nt.c 2006-01-02 09:43:36.404327781 +0100
+@@ -156,10 +156,10 @@
if (share_tdb && local_pid == sys_getpid())
return True;
@@ -504,9 +503,10 @@
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
+Index: samba-3.0.21a.new/source/sam/idmap_tdb.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/sam/idmap_tdb.c 2005-02-25 18:59:38.000000000 +0100
++++ samba-3.0.21a.new/source/sam/idmap_tdb.c 2006-01-02 09:43:36.405327578 +0100
@@ -487,7 +487,7 @@
BOOL tdb_is_new = False;
@@ -516,10 +516,11 @@
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 @@
+Index: samba-3.0.21a.new/source/smbd/lanman.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/smbd/lanman.c 2005-11-09 19:28:55.000000000 +0100
++++ samba-3.0.21a.new/source/smbd/lanman.c 2006-01-02 09:43:36.409326769 +0100
+@@ -1040,9 +1040,9 @@
BOOL local_list_only;
int i;
@@ -531,10 +532,11 @@
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 @@
+Index: samba-3.0.21a.new/source/utils/net_idmap.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/utils/net_idmap.c 2005-11-09 19:29:02.000000000 +0100
++++ samba-3.0.21a.new/source/utils/net_idmap.c 2006-01-02 09:43:36.410326566 +0100
+@@ -136,7 +136,7 @@
return NT_STATUS_UNSUCCESSFUL;
}
@@ -543,9 +545,10 @@
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
+Index: samba-3.0.21a.new/source/wrepld/process.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/wrepld/process.c 2005-07-28 15:19:43.000000000 +0200
++++ samba-3.0.21a.new/source/wrepld/process.c 2006-01-02 09:43:36.411326364 +0100
@@ -197,7 +197,7 @@
{
TDB_CONTEXT *tdb;
@@ -564,15 +567,23 @@
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();
+Index: samba-3.0.21a.new/source/registry/reg_db.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/registry/reg_db.c 2005-10-18 04:45:06.000000000 +0200
++++ samba-3.0.21a.new/source/registry/reg_db.c 2006-01-02 09:45:35.192281636 +0100
+@@ -205,12 +205,12 @@
+ if ( tdb_reg )
+ return True;
- if (geteuid() == 0) {
-- pstrcpy(printdb_path, lock_path("printing/"));
-+ pstrcpy(printdb_path, cache_path("printing/"));
- pstrcat(printdb_path, sharename);
- pstrcat(printdb_path, ".tdb");
-
+- 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;
+ }
+
Modified: trunk/patches/installswat.sh.patch
===================================================================
--- trunk/patches/installswat.sh.patch 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/patches/installswat.sh.patch 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,5 +1,7 @@
---- samba-3.0.1/source/script/installswat.sh.orig 2004-01-13 13:43:42.000000000 -0500
-+++ samba-3.0.1/source/script/installswat.sh 2004-01-13 12:56:49.000000000 -0500
+Index: samba-3.0.21a.new/source/script/installswat.sh
+===================================================================
+--- samba-3.0.21a.new.orig/source/script/installswat.sh 2005-12-20 16:28:39.000000000 +0100
++++ samba-3.0.21a.new/source/script/installswat.sh 2006-01-02 09:45:50.547172952 +0100
@@ -114,7 +114,11 @@
# Install Using Samba book (but only if it is there)
Modified: trunk/patches/make-distclean.patch
===================================================================
--- trunk/patches/make-distclean.patch 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/patches/make-distclean.patch 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,7 +1,8 @@
-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 @@
+Index: samba-3.0.21a.new/source/Makefile.in
+===================================================================
+--- samba-3.0.21a.new.orig/source/Makefile.in 2006-01-02 09:43:36.349338911 +0100
++++ samba-3.0.21a.new/source/Makefile.in 2006-01-02 09:58:46.622122510 +0100
+@@ -1490,6 +1490,7 @@
python_clean:
@-if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi
@@ -9,7 +10,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 +18,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
Modified: trunk/patches/nmbd-signalling.patch
===================================================================
--- trunk/patches/nmbd-signalling.patch 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/patches/nmbd-signalling.patch 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,20 +1,21 @@
-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
+Index: samba-3.0.21a.new/source/nmbd/nmbd_subnetdb.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/nmbd/nmbd_subnetdb.c 2005-04-18 18:38:20.000000000 +0200
++++ samba-3.0.21a.new/source/nmbd/nmbd_subnetdb.c 2006-01-02 09:45:53.644545861 +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();
Modified: trunk/patches/non-linux-ports.patch
===================================================================
--- trunk/patches/non-linux-ports.patch 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/patches/non-linux-ports.patch 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,7 +1,8 @@
-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 @@
+Index: samba-3.0.21a.new/source/configure.in
+===================================================================
+--- samba-3.0.21a.new.orig/source/configure.in 2006-01-02 09:43:36.355337696 +0100
++++ samba-3.0.21a.new/source/configure.in 2006-01-02 09:53:12.969563953 +0100
+@@ -638,6 +638,15 @@
fi
;;
@@ -17,7 +18,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 +27,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 +39,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 +48,16 @@
AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
AC_TRY_LINK([#include <sys/sendfile.h>],
[\
-@@ -4722,10 +4722,10 @@
+@@ -4885,10 +4897,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 \
+- *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 \
Modified: trunk/patches/nonpic-libsmbclient.patch
===================================================================
--- trunk/patches/nonpic-libsmbclient.patch 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/patches/nonpic-libsmbclient.patch 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,6 +1,8 @@
---- 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 @@
+Index: samba-3.0.21a.new/source/Makefile.in
+===================================================================
+--- samba-3.0.21a.new.orig/source/Makefile.in 2006-01-02 09:45:52.416794431 +0100
++++ samba-3.0.21a.new/source/Makefile.in 2006-01-02 09:58:11.514218283 +0100
+@@ -1064,9 +1064,9 @@
$(KRB5LIBS) $(LDAP_LIBS) \
@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
@@ -12,7 +14,7 @@
bin/libsmbsharemodes. at SHLIBEXT@: $(LIBSMBSHAREMODES_PICOBJS)
@echo Linking libsmbsharemodes shared library $@
-@@ -1076,9 +1076,9 @@
+@@ -1083,9 +1083,9 @@
@$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_PICOBJS) $(LDFLAGS) $(LIBS) \
@SONAMEFLAG@`basename $@`.$(LIBMSRPC_MAJOR)
Modified: trunk/patches/pam-examples.patch
===================================================================
--- trunk/patches/pam-examples.patch 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/patches/pam-examples.patch 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,6 +1,7 @@
-diff -uNr ../samba-3.0.20b/source/pam_smbpass/README samba-3.0.20b/source/pam_smbpass/README
---- ../samba-3.0.20b/source/pam_smbpass/README 2005-10-12 19:03:29.000000000 +0200
-+++ samba-3.0.20b/source/pam_smbpass/README 2005-10-25 20:56:03.000000000 +0200
+Index: samba-3.0.21a.new/source/pam_smbpass/README
+===================================================================
+--- samba-3.0.21a.new.orig/source/pam_smbpass/README 2005-02-25 18:59:30.000000000 +0100
++++ samba-3.0.21a.new/source/pam_smbpass/README 2006-01-02 09:53:31.455818173 +0100
@@ -37,7 +37,7 @@
smbconf=<file> - specify an alternate path to the smb.conf
file.
Modified: trunk/patches/samba.patch
===================================================================
--- trunk/patches/samba.patch 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/patches/samba.patch 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,7 +1,8 @@
-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 @@
+Index: samba-3.0.21a.new/source/client/smbmount.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/client/smbmount.c 2005-07-28 15:19:53.000000000 +0200
++++ samba-3.0.21a.new/source/client/smbmount.c 2006-01-02 09:58:20.141474654 +0100
+@@ -764,7 +764,7 @@
*lp = 0;
pstrcpy(password,lp+1);
got_pass = True;
@@ -10,7 +11,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 +20,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 +29,22 @@
}
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 @@
+Index: samba-3.0.21a.new/source/web/diagnose.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/web/diagnose.c 2005-12-20 16:28:39.000000000 +0100
++++ samba-3.0.21a.new/source/web/diagnose.c 2006-01-02 09:53:33.820339053 +0100
+@@ -62,6 +62,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
+Index: samba-3.0.21a.new/source/script/installbin.sh
+===================================================================
+--- samba-3.0.21a.new.orig/source/script/installbin.sh 2005-02-25 18:59:43.000000000 +0100
++++ samba-3.0.21a.new/source/script/installbin.sh 2006-01-02 09:53:33.820339053 +0100
@@ -24,12 +24,14 @@
chmod $INSTALLPERMS $BINDIR/$p2
Modified: trunk/patches/smbclient-pager.patch
===================================================================
--- trunk/patches/smbclient-pager.patch 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/patches/smbclient-pager.patch 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,6 +1,7 @@
-diff -uNr samba-2.999+3.0cvs20020906.orig/source/include/local.h samba-2.999+3.0cvs20020906/source/include/local.h
---- samba-2.999+3.0cvs20020906.orig/source/include/local.h 2002-09-04 14:13:06.000000000 -0500
-+++ samba-2.999+3.0cvs20020906/source/include/local.h 2002-09-08 14:19:24.000000000 -0500
+Index: samba-3.0.21a.new/source/include/local.h
+===================================================================
+--- samba-3.0.21a.new.orig/source/include/local.h 2005-11-09 19:29:00.000000000 +0100
++++ samba-3.0.21a.new/source/include/local.h 2006-01-02 09:53:35.411016735 +0100
@@ -109,7 +109,7 @@
/* the default pager to use for the client "more" command. Users can
override this with the PAGER environment variable */
Modified: trunk/patches/smbmount-mtab-flags.patch
===================================================================
--- trunk/patches/smbmount-mtab-flags.patch 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/patches/smbmount-mtab-flags.patch 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,7 +1,8 @@
-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 @@
+Index: samba-3.0.21a.new/source/client/smbmnt.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/client/smbmnt.c 2005-07-28 15:19:53.000000000 +0200
++++ samba-3.0.21a.new/source/client/smbmnt.c 2006-01-02 09:58:20.140474856 +0100
+@@ -276,7 +276,10 @@
ment.mnt_fsname = share_name ? share_name : "none";
ment.mnt_dir = mount_point;
ment.mnt_type = "smbfs";
Modified: trunk/patches/smbmount-nomtab.patch
===================================================================
--- trunk/patches/smbmount-nomtab.patch 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/patches/smbmount-nomtab.patch 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,7 +1,8 @@
-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 @@
+Index: samba-3.0.21a.new/source/client/smbmnt.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/client/smbmnt.c 2006-01-02 09:57:47.068158819 +0100
++++ samba-3.0.21a.new/source/client/smbmnt.c 2006-01-02 09:57:48.390891503 +0100
+@@ -44,6 +44,7 @@
static uid_t mount_uid;
static gid_t mount_gid;
static int mount_ro;
@@ -9,15 +10,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 +27,7 @@
{
switch (opt)
{
-@@ -71,6 +73,9 @@
+@@ -87,6 +89,9 @@
mount_gid = strtol(optarg, NULL, 0);
}
break;
@@ -36,7 +37,7 @@
case 'r':
mount_ro = 1;
break;
-@@ -274,36 +279,38 @@
+@@ -291,36 +296,38 @@
return -1;
}
@@ -102,10 +103,11 @@
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 @@
+Index: samba-3.0.21a.new/source/client/smbmount.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/client/smbmount.c 2006-01-02 09:53:33.819339256 +0100
++++ samba-3.0.21a.new/source/client/smbmount.c 2006-01-02 09:58:17.214066308 +0100
+@@ -46,6 +46,7 @@
static int mount_ro;
static unsigned mount_fmask;
static unsigned mount_dmask;
@@ -113,7 +115,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 +125,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 +135,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;
Modified: trunk/patches/smbmount-unix-caps.patch
===================================================================
--- trunk/patches/smbmount-unix-caps.patch 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/patches/smbmount-unix-caps.patch 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,7 +1,8 @@
-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 @@
+Index: samba-3.0.21a.new/source/client/smbmount.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/client/smbmount.c 2006-01-02 09:57:48.391891301 +0100
++++ samba-3.0.21a.new/source/client/smbmount.c 2006-01-02 09:57:49.591648836 +0100
+@@ -211,6 +211,10 @@
c->capabilities &= ~CAP_STATUS32;
c->force_dos_errors = True;
}
Modified: trunk/patches/smbstatus-locking.patch
===================================================================
--- trunk/patches/smbstatus-locking.patch 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/patches/smbstatus-locking.patch 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,8 +1,9 @@
-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) {
+Index: samba-3.0.21a.new/source/utils/status.c
+===================================================================
+--- samba-3.0.21a.new.orig/source/utils/status.c 2005-11-09 19:29:02.000000000 +0100
++++ samba-3.0.21a.new/source/utils/status.c 2006-01-02 09:57:51.427277864 +0100
+@@ -701,6 +701,16 @@
+ if ( show_locks ) {
int ret;
+ tdb = tdb_open_log(lock_path("locking.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
Modified: trunk/patches/undefined-symbols.patch
===================================================================
--- trunk/patches/undefined-symbols.patch 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/patches/undefined-symbols.patch 2006-01-05 18:11:20 UTC (rev 888)
@@ -1,8 +1,9 @@
-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)
+Index: samba-3.0.21a.new/source/Makefile.in
+===================================================================
+--- samba-3.0.21a.new.orig/source/Makefile.in 2006-01-02 09:53:29.905132385 +0100
++++ samba-3.0.21a.new/source/Makefile.in 2006-01-02 09:57:52.987962455 +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 +12,7 @@
WINBIND_WINS_NSS_PICOBJS = $(WINBIND_WINS_NSS_OBJ:.o=. at PICSUFFIX@)
-@@ -997,7 +998,7 @@
+@@ -1060,7 +1061,7 @@
bin/libsmbclient. at SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
@echo Linking libsmbclient shared library $@
Modified: trunk/rules
===================================================================
--- trunk/rules 2006-01-05 17:14:28 UTC (rev 887)
+++ trunk/rules 2006-01-05 18:11:20 UTC (rev 888)
@@ -39,6 +39,7 @@
INSTALL += -s
endif
+include /usr/share/quilt/quilt.make
DESTDIR=`pwd`/debian/tmp
@@ -86,18 +87,7 @@
conf_args += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
endif
-patch: patch-stamp
-patch-stamp:
- dh_testdir
- if [ ! -f patch-stamp ]; then /bin/sh debian/scripts/patch-source; fi
- touch patch-stamp
-
-unpatch:
- dh_testdir
- if [ -f patch-stamp ]; then /bin/sh debian/scripts/unpatch-source; fi
- rm -f patch-stamp
-
-configure: patch-stamp configure-stamp
+configure: patch configure-stamp
configure-stamp:
dh_testdir
@@ -121,7 +111,9 @@
touch build-stamp
-clean: unpatch
+clean: clean-patched unpatch
+
+clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -345,4 +337,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
More information about the Pkg-samba-maint
mailing list