diff options
Diffstat (limited to 'packaging/Debian/debian-unstable/patches')
13 files changed, 364 insertions, 185 deletions
diff --git a/packaging/Debian/debian-unstable/patches/VERSION.patch b/packaging/Debian/debian-unstable/patches/VERSION.patch index 0f5c129c56..efa7d85d4d 100644 --- a/packaging/Debian/debian-unstable/patches/VERSION.patch +++ b/packaging/Debian/debian-unstable/patches/VERSION.patch @@ -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 -@@ -120,4 +120,4 @@ +@@ -78,4 +78,4 @@ # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() # # -> "CVS 3.0.0rc2-VendorVersion" # ######################################################## diff --git a/packaging/Debian/debian-unstable/patches/cups.patch b/packaging/Debian/debian-unstable/patches/cups.patch new file mode 100644 index 0000000000..8b1b8653d9 --- /dev/null +++ b/packaging/Debian/debian-unstable/patches/cups.patch @@ -0,0 +1,14 @@ +--- samba-3.0.10.orig/source/include/includes.h ++++ samba-3.0.10/source/include/includes.h +@@ -940,10 +940,7 @@ + #endif + + #ifndef DEFAULT_PRINTING +-#ifdef HAVE_CUPS +-#define DEFAULT_PRINTING PRINT_CUPS +-#define PRINTCAP_NAME "cups" +-#elif defined(SYSV) ++#if defined(SYSV) + #define DEFAULT_PRINTING PRINT_SYSV + #define PRINTCAP_NAME "lpstat" + #else diff --git a/packaging/Debian/debian-unstable/patches/documentation.patch b/packaging/Debian/debian-unstable/patches/documentation.patch index 922b93f990..505a53c51b 100644 --- a/packaging/Debian/debian-unstable/patches/documentation.patch +++ b/packaging/Debian/debian-unstable/patches/documentation.patch @@ -1,6 +1,6 @@ ---- samba_3_0/docs/manpages/swat.8.orig 2003-06-06 16:16:24.000000000 -0400 -+++ samba_3_0/docs/manpages/swat.8 2003-06-06 16:25:13.000000000 -0400 -@@ -91,6 +91,13 @@ +--- 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 @@ .SH "INSTALLATION" .PP @@ -14,26 +14,24 @@ 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 -@@ -98,15 +105,15 @@ +@@ -87,13 +94,13 @@ .TP 3 \(bu --/usr/local/samba/bin/swat +-/usr/local/samba/sbin/swat +/usr/sbin/swat - .TP \(bu -/usr/local/samba/swat/images/* +/usr/share/samba/swat/images/* - .TP \(bu -/usr/local/samba/swat/help/* +/usr/share/samba/swat/help/* - .LP -@@ -116,7 +123,7 @@ + .SS "Inetd Installation" +@@ -102,7 +109,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 @@ -42,27 +40,27 @@ .PP \fBswat 901/tcp\fR -@@ -128,10 +135,10 @@ +@@ -114,10 +121,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 -In \fI/etc/inetd\&.conf\fR you should add a line like this: -+In \fI/etc/inetd\&.conf\fR you should add a line like this (not needed for Debian since the maintainer scripts do it. You need to uncomment the line, though, because it is added commented out for security reasons): ++In \fI/etc/inetd\&.conf\fR you should add a line like this (not needed for Debian since the maintainer scripts do it automatically. You need to uncomment the line, though, because it is added commented out for security reasons): .PP --\fBswat stream tcp nowait\&.400 root /usr/local/samba/bin/swat swat\fR -+\fBswat stream tcp nowait.400 root /usr/sbin/swat swat\fR +-\fBswat stream tcp nowait\&.400 root /usr/local/samba/sbin/swat swat\fR ++\fBswat stream tcp nowait\&.400 root /usr/sbin/swat swat\fR .PP - One 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\&. -@@ -157,8 +164,8 @@ - + 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 @@ + 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 -\fI/usr/local/samba/lib/smb\&.conf\fR -This is the default location of the \fBsmb\&.conf\fR(5) server configuration file that swat edits\&. Other common places that systems install this file are \fI /usr/samba/lib/smb\&.conf\fR and \fI/etc/smb\&.conf \fR\&. This file describes all the services the server is to make available to clients\&. +\fI/etc/samba/smb\&.conf\fR -+This is the default location of the \fBsmb.conf\fR(5) server configuration file that swat edits\&. This file describes all the services the server is to make available to clients\&. - ++This is the default location of the \fBsmb\&.conf\fR(5) server configuration file that swat edits\&. This file describes all the services the server is to make available to clients\&. .SH "WARNINGS" + diff --git a/packaging/Debian/debian-unstable/patches/fhs.patch b/packaging/Debian/debian-unstable/patches/fhs.patch index 2ea7d96103..a3cc7f3826 100644 --- a/packaging/Debian/debian-unstable/patches/fhs.patch +++ b/packaging/Debian/debian-unstable/patches/fhs.patch @@ -1,7 +1,7 @@ -diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makefile.in ---- samba-3.0.0beta2.orig/source/Makefile.in 2003-07-02 23:26:46.000000000 -0500 -+++ samba-3.0.0beta2/source/Makefile.in 2003-07-02 23:19:46.000000000 -0500 -@@ -92,6 +93,13 @@ +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 @@ # the directory where lock files go LOCKDIR = @lockdir@ @@ -15,7 +15,7 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makef # the directory where pid files go PIDDIR = @piddir@ # man pages language(s) -@@ -116,7 +124,7 @@ +@@ -114,7 +121,7 @@ PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \ -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\" @@ -24,48 +24,39 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makef PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS) # Note that all executable programs now provide for an optional executable suffix. -@@ -1234,7 +1242,7 @@ +@@ -1319,7 +1326,7 @@ @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS) installdat: installdirs - @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(LIBDIR) $(srcdir) + @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(CODEPAGEDIR) $(srcdir) - installswat: installdirs - @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir) ---- samba-3.0.1/source/configure.in.orig 2003-12-17 11:05:40.000000000 -0500 -+++ samba-3.0.1/source/configure.in 2003-12-17 11:05:42.000000000 -0500 -@@ -17,19 +17,26 @@ - AC_ARG_WITH(fhs, + 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 +@@ -35,7 +35,7 @@ [ --with-fhs Use FHS-compliant paths (default=no)], - configdir="${sysconfdir}/samba" + [ case "$withval" in + yes) - lockdir="\${VARDIR}/lib/samba" + lockdir="\${VARDIR}/run/samba" piddir="\${VARDIR}/run" mandir="\${prefix}/share/man" logfilebase="\${VARDIR}/log/samba" - privatedir="\${CONFIGDIR}/private" +@@ -43,6 +43,10 @@ libdir="\${prefix}/lib/samba" -- swatdir="\${DATADIR}/samba/swat", -+ swatdir="\${DATADIR}/samba/swat" + configdir="${sysconfdir}/samba" + swatdir="\${DATADIR}/samba/swat" + codepagedir="\${DATADIR}/samba" + statedir="\${VARDIR}/lib/samba" + cachedir="\${VARDIR}/cache/samba" -+ AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths]), - configdir="\${LIBDIR}" - logfilebase="\${VARDIR}" - lockdir="\${VARDIR}/locks" - piddir="\${VARDIR}/locks" - privatedir="\${prefix}/private" -- swatdir="\${prefix}/swat") -+ codepagedir="\${LIBDIR}" -+ swatdir="\${prefix}/swat" -+ statedir="\${LOCKDIR}" -+ cachedir="\${LOCKDIR}") - - ################################################# - # set private directory location -@@ -154,6 +161,9 @@ ++ AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths]) + ;; + esac]) + +@@ -201,6 +205,9 @@ AC_SUBST(swatdir) AC_SUBST(bindir) AC_SUBST(sbindir) @@ -75,9 +66,9 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makef dnl Unique-to-Samba variables we'll be playing with. AC_SUBST(SHELL) -diff -uNr samba-3.0.0beta2.orig/source/dynconfig.c samba-3.0.0beta2/source/dynconfig.c ---- samba-3.0.0beta2.orig/source/dynconfig.c 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/dynconfig.c 2003-07-02 23:19:02.000000000 -0500 +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 @@ -53,6 +53,13 @@ pstring dyn_LMHOSTSFILE = LMHOSTSFILE; @@ -120,21 +111,21 @@ diff -uNr samba-3.0.0beta2.orig/source/dynconfig.c samba-3.0.0beta2/source/dynco + return lp_lockdir(); +#endif +} -diff -uNr samba-3.0.0beta2.orig/source/groupdb/mapping.c samba-3.0.0beta2/source/groupdb/mapping.c ---- samba-3.0.0beta2.orig/source/groupdb/mapping.c 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/groupdb/mapping.c 2003-07-02 23:19:02.000000000 -0500 -@@ -134,7 +134,7 @@ +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 @@ - if (tdb && local_pid == sys_getpid()) + if (tdb) return True; - tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + tdb = tdb_open_log(state_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); if (!tdb) { DEBUG(0,("Failed to open group mapping database\n")); return False; -diff -uNr samba-3.0.0beta2.orig/source/include/dynconfig.h samba-3.0.0beta2/source/include/dynconfig.h ---- samba-3.0.0beta2.orig/source/include/dynconfig.h 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/include/dynconfig.h 2003-07-02 23:19:02.000000000 -0500 +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 @@ -31,8 +31,12 @@ extern pstring dyn_CONFIGFILE; extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE; @@ -148,43 +139,34 @@ diff -uNr samba-3.0.0beta2.orig/source/include/dynconfig.h samba-3.0.0beta2/sour + +char *dyn_STATEDIR(void); +char *dyn_CACHEDIR(void); -diff -uNr samba-3.0.0beta2.orig/source/intl/lang_tdb.c samba-3.0.0beta2/source/intl/lang_tdb.c ---- samba-3.0.0beta2.orig/source/intl/lang_tdb.c 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/intl/lang_tdb.c 2003-07-02 23:19:02.000000000 -0500 +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 @@ -128,7 +128,7 @@ - /* if no lang then we don't translate */ - if (!lang) return True; + if (!lang) + return True; - asprintf(&msg_path, "%s.msg", lib_path((const char *)lang)); + asprintf(&msg_path, "%s.msg", data_path((const char *)lang)); if (stat(msg_path, &st) != 0) { /* the msg file isn't available */ - free(msg_path); -@@ -136,7 +136,7 @@ - } - - -- asprintf(&path, "%s%s.tdb", lock_path("lang_"), lang); -+ asprintf(&path, "%s%s.tdb", state_path("lang_"), lang); + DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path, +diff -uNr samba-3.0.10.orig/source/lib/account_pol.c samba-3.0.10/source/lib/account_pol.c +--- samba-3.0.10.orig/source/lib/account_pol.c 2004-12-17 03:50:08.000000000 -0800 ++++ samba-3.0.10/source/lib/account_pol.c 2004-12-17 03:55:29.000000000 -0800 +@@ -35,7 +35,7 @@ - tdb = tdb_open_log(path, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0644); - if (!tdb) { -diff -uNr samba-3.0.0beta2.orig/source/lib/account_pol.c samba-3.0.0beta2/source/lib/account_pol.c ---- samba-3.0.0beta2.orig/source/lib/account_pol.c 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/lib/account_pol.c 2003-07-02 23:19:02.000000000 -0500 -@@ -36,7 +36,7 @@ - - if (tdb && local_pid == sys_getpid()) + if (tdb) 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.0beta2.orig/source/lib/util.c samba-3.0.0beta2/source/lib/util.c ---- samba-3.0.0beta2.orig/source/lib/util.c 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/lib/util.c 2003-07-02 23:19:02.000000000 -0500 -@@ -2195,6 +2195,61 @@ +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 @@ } /** @@ -246,9 +228,9 @@ diff -uNr samba-3.0.0beta2.orig/source/lib/util.c samba-3.0.0beta2/source/lib/ut * @brief Returns the platform specific shared library extension. * * @retval Pointer to a static #fstring containing the extension. -diff -uNr samba-3.0.0beta2.orig/source/lib/util_unistr.c samba-3.0.0beta2/source/lib/util_unistr.c ---- samba-3.0.0beta2.orig/source/lib/util_unistr.c 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/lib/util_unistr.c 2003-07-02 23:19:02.000000000 -0500 +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; initialised = 1; @@ -269,9 +251,9 @@ diff -uNr samba-3.0.0beta2.orig/source/lib/util_unistr.c samba-3.0.0beta2/source if (valid_file) { valid_table = valid_file; mapped_file = 1; -diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/source/libsmb/samlogon_cache.c ---- samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c 2003-07-01 09:40:37.000000000 -0500 -+++ samba-3.0.0beta2/source/libsmb/samlogon_cache.c 2003-07-02 23:19:02.000000000 -0500 +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 @@ -34,7 +34,7 @@ BOOL netsamlogon_cache_init(void) { @@ -290,8 +272,9 @@ diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/ TDB_DEFAULT, O_RDWR, 0600); if (!tdb) { DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n")); ---- samba_3_0/source/nmbd/nmbd_serverlistdb.c.orig 2003-09-08 10:53:13.000000000 -0400 -+++ samba_3_0/source/nmbd/nmbd_serverlistdb.c 2003-09-08 11:22:03.000000000 -0400 +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 @@ -327,7 +327,7 @@ updatecount++; @@ -301,8 +284,9 @@ diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/ trim_char(fname,'\0' ,'/'); pstrcat(fname,"/"); pstrcat(fname,SERVER_LIST); ---- samba-3.0.0rc2/source/nmbd/nmbd_winsserver.c.orig 2003-08-28 17:42:44.000000000 -0400 -+++ samba-3.0.0rc2/source/nmbd/nmbd_winsserver.c 2003-08-31 08:09:11.000000000 -0400 +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 @@ -234,7 +234,7 @@ add_samba_names_to_subnet(wins_server_subnet); @@ -312,7 +296,7 @@ diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/ DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) )); return True; -@@ -1765,7 +1765,7 @@ +@@ -1810,7 +1810,7 @@ } } @@ -321,9 +305,21 @@ diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/ all_string_sub(fname,"//", "/", 0); slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid()); -diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c samba-3.0.0beta2/source/nsswitch/winbindd_cache.c ---- samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/nsswitch/winbindd_cache.c 2003-07-02 23:19:02.000000000 -0500 +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 @@ if (opt_nocache) return; @@ -333,10 +329,19 @@ diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c samba-3.0.0beta TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0600); if (!wcache->tdb) { -diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_util.c samba-3.0.0beta2/source/nsswitch/winbindd_util.c ---- samba-3.0.0beta2.orig/source/nsswitch/winbindd_util.c 2003-07-01 15:44:25.000000000 -0500 -+++ samba-3.0.0beta2/source/nsswitch/winbindd_util.c 2003-07-02 23:19:02.000000000 -0500 -@@ -874,7 +874,7 @@ +@@ -1471,7 +1471,7 @@ + if (wcache->tdb != NULL) + return True; + +- wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000, ++ wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 5000, + 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 @@ SMB_STRUCT_STAT stbuf; TDB_CONTEXT *idmap_tdb; @@ -345,9 +350,9 @@ diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_util.c samba-3.0.0beta2 if (!file_exist(idmap_name, &stbuf)) { /* nothing to convert return */ -diff -uNr samba-3.0.0beta2.orig/source/param/loadparm.c samba-3.0.0beta2/source/param/loadparm.c ---- samba-3.0.0beta2.orig/source/param/loadparm.c 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/param/loadparm.c 2003-07-02 23:19:02.000000000 -0500 +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 @@ char *szAddPrinterCommand; char *szDeletePrinterCommand; @@ -358,7 +363,7 @@ diff -uNr samba-3.0.0beta2.orig/source/param/loadparm.c samba-3.0.0beta2/source/ char *szLockDir; char *szPidDir; char *szRootdir; -@@ -1083,8 +1083,13 @@ +@@ -1105,8 +1108,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}, @@ -372,10 +377,10 @@ diff -uNr samba-3.0.0beta2.orig/source/param/loadparm.c samba-3.0.0beta2/source/ {"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.0beta2.orig/source/passdb/pdb_tdb.c samba-3.0.0beta2/source/passdb/pdb_tdb.c ---- samba-3.0.0beta2.orig/source/passdb/pdb_tdb.c 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/passdb/pdb_tdb.c 2003-07-02 23:19:02.000000000 -0500 -@@ -501,10 +501,7 @@ +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 @@ if (location) { tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location); } else { @@ -387,22 +392,10 @@ diff -uNr samba-3.0.0beta2.orig/source/passdb/pdb_tdb.c samba-3.0.0beta2/source/ tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, tdbfile); } -diff -uNr samba-3.0.0beta2.orig/source/passdb/privileges.c samba-3.0.0beta2/source/passdb/privileges.c ---- samba-3.0.0beta2.orig/source/passdb/privileges.c 2003-06-07 12:57:35.000000000 -0500 -+++ samba-3.0.0beta2/source/passdb/privileges.c 2003-07-02 23:19:02.000000000 -0500 -@@ -62,7 +62,7 @@ - /* initialise the privilege database */ - BOOL privilege_init(void) - { -- tdb = tdb_open_log(lock_path("privilege.tdb"), 0, TDB_DEFAULT, -+ tdb = tdb_open_log(state_path("privilege.tdb"), 0, TDB_DEFAULT, - O_RDWR|O_CREAT, 0600); - if (!tdb) { - DEBUG(0,("Failed to open privilege database\n")); -diff -uNr samba-3.0.0beta2.orig/source/passdb/secrets.c samba-3.0.0beta2/source/passdb/secrets.c ---- samba-3.0.0beta2.orig/source/passdb/secrets.c 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/passdb/secrets.c 2003-07-02 23:19:02.000000000 -0500 -@@ -38,8 +38,7 @@ +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 @@ if (tdb) return True; @@ -412,10 +405,10 @@ diff -uNr samba-3.0.0beta2.orig/source/passdb/secrets.c samba-3.0.0beta2/source/ tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); -diff -uNr samba-3.0.0beta2.orig/source/printing/nt_printing.c samba-3.0.0beta2/source/printing/nt_printing.c ---- samba-3.0.0beta2.orig/source/printing/nt_printing.c 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/printing/nt_printing.c 2003-07-02 23:19:02.000000000 -0500 -@@ -293,28 +293,28 @@ +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 @@ if (tdb_drivers) tdb_close(tdb_drivers); @@ -450,12 +443,12 @@ diff -uNr samba-3.0.0beta2.orig/source/printing/nt_printing.c samba-3.0.0beta2/s return False; } -diff -uNr samba-3.0.0beta2.orig/source/printing/printing.c samba-3.0.0beta2/source/printing/printing.c ---- samba-3.0.0beta2.orig/source/printing/printing.c 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/printing/printing.c 2003-07-02 23:19:02.000000000 -0500 -@@ -175,8 +175,8 @@ - if (local_pid == sys_getpid()) - return True; +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 @@ + int services = lp_numservices(); + int snum; - unlink(lock_path("printing.tdb")); - pstrcpy(printing_path,lock_path("printing")); @@ -463,11 +456,11 @@ diff -uNr samba-3.0.0beta2.orig/source/printing/printing.c samba-3.0.0beta2/sour + pstrcpy(printing_path,cache_path("printing")); mkdir(printing_path,0755); - local_pid = sys_getpid(); -diff -uNr samba-3.0.0beta2.orig/source/printing/printing_db.c samba-3.0.0beta2/source/printing/printing_db.c ---- samba-3.0.0beta2.orig/source/printing/printing_db.c 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/printing/printing_db.c 2003-07-02 23:19:02.000000000 -0500 -@@ -87,7 +87,7 @@ + /* 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 +@@ -89,7 +89,7 @@ DLIST_ADD(print_db_head, p); } @@ -476,29 +469,28 @@ diff -uNr samba-3.0.0beta2.orig/source/printing/printing_db.c samba-3.0.0beta2/s pstrcat(printdb_path, printername); pstrcat(printdb_path, ".tdb"); -diff -uNr samba-3.0.0beta2.orig/source/registry/reg_db.c samba-3.0.0beta2/source/registry/reg_db.c ---- samba-3.0.0beta2.orig/source/registry/reg_db.c 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/registry/reg_db.c 2003-07-02 23:19:02.000000000 -0500 -@@ -131,13 +131,13 @@ - * if we need to init the data in the registry - */ - -- tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600); -+ tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600); - if ( !tdb_reg ) - { -- 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,("init_registry: 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.0beta2.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0.0beta2/source/rpc_server/srv_srvsvc_nt.c ---- samba-3.0.0beta2.orig/source/rpc_server/srv_srvsvc_nt.c 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/rpc_server/srv_srvsvc_nt.c 2003-07-02 23:19:02.000000000 -0500 +diff -uNr samba-3.0.10.orig/source/registry/reg_db.c samba-3.0.10/source/registry/reg_db.c +--- samba-3.0.10.orig/source/registry/reg_db.c 2004-12-17 03:50:09.000000000 -0800 ++++ samba-3.0.10/source/registry/reg_db.c 2004-12-17 03:55:31.000000000 -0800 +@@ -198,12 +198,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,("init_registry: 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 @@ if (share_tdb && local_pid == sys_getpid()) @@ -512,22 +504,22 @@ diff -uNr samba-3.0.0beta2.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0.0bet return False; } -diff -uNr samba-3.0.0beta2.orig/source/sam/idmap_tdb.c samba-3.0.0beta2/source/sam/idmap_tdb.c ---- samba-3.0.0beta2.orig/source/sam/idmap_tdb.c 2003-07-01 15:44:26.000000000 -0500 -+++ samba-3.0.0beta2/source/sam/idmap_tdb.c 2003-07-02 23:19:02.000000000 -0500 +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 @@ -487,7 +487,7 @@ BOOL tdb_is_new = False; /* use the old database if present */ -- tdbfile = strdup(lock_path("winbindd_idmap.tdb")); -+ tdbfile = strdup(state_path("winbindd_idmap.tdb")); +- tdbfile = SMB_STRDUP(lock_path("winbindd_idmap.tdb")); ++ tdbfile = SMB_STRDUP(state_path("winbindd_idmap.tdb")); if (!tdbfile) { DEBUG(0, ("idmap_init: out of memory!\n")); return NT_STATUS_NO_MEMORY; -diff -uNr samba-3.0.0beta2.orig/source/smbd/lanman.c samba-3.0.0beta2/source/smbd/lanman.c ---- samba-3.0.0beta2.orig/source/smbd/lanman.c 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/smbd/lanman.c 2003-07-02 23:19:02.000000000 -0500 -@@ -970,9 +970,9 @@ +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 @@ BOOL local_list_only; int i; @@ -539,9 +531,21 @@ diff -uNr samba-3.0.0beta2.orig/source/smbd/lanman.c samba-3.0.0beta2/source/smb return(0); } -diff -uNr samba-3.0.0beta2.orig/source/wrepld/process.c samba-3.0.0beta2/source/wrepld/process.c ---- samba-3.0.0beta2.orig/source/wrepld/process.c 2003-07-02 23:26:47.000000000 -0500 -+++ samba-3.0.0beta2/source/wrepld/process.c 2003-07-02 23:19:02.000000000 -0500 +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 @@ + return NT_STATUS_UNSUCCESSFUL; + } + +- tdbfile = SMB_STRDUP(lock_path("winbindd_idmap.tdb")); ++ tdbfile = SMB_STRDUP(state_path("winbindd_idmap.tdb")); + 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 @@ -197,7 +197,7 @@ { TDB_CONTEXT *tdb; @@ -560,3 +564,15 @@ diff -uNr samba-3.0.0beta2.orig/source/wrepld/process.c samba-3.0.0beta2/source/ 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 --git a/packaging/Debian/debian-unstable/patches/installswat.sh.patch b/packaging/Debian/debian-unstable/patches/installswat.sh.patch index a2b1cf8f43..81e3dcd444 100644 --- a/packaging/Debian/debian-unstable/patches/installswat.sh.patch +++ b/packaging/Debian/debian-unstable/patches/installswat.sh.patch @@ -1,6 +1,6 @@ --- 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 -@@ -85,7 +85,11 @@ +@@ -114,7 +114,11 @@ # Install Using Samba book (but only if it is there) diff --git a/packaging/Debian/debian-unstable/patches/make-distclean.patch b/packaging/Debian/debian-unstable/patches/make-distclean.patch new file mode 100644 index 0000000000..e859575290 --- /dev/null +++ b/packaging/Debian/debian-unstable/patches/make-distclean.patch @@ -0,0 +1,27 @@ +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 @@ + + python_clean: + @-if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi ++ @-rm -rf build/ + + # revert to the previously installed version + revert: +@@ -1437,6 +1438,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 \ ++ utils/ntlm_auth_proto.h \ + smbd/build_options.c + + MKPROTO_SH = $(srcdir)/script/mkproto.sh +@@ -1512,6 +1514,7 @@ + + distclean: realclean + -rm -f include/stamp-h ++ -rm -f script/gen-8bit-gap.sh smbadduser + -rm -f include/config.h Makefile + -rm -f config.status config.cache so_locations + -rm -rf .deps TAGS diff --git a/packaging/Debian/debian-unstable/patches/non-linux-ports.patch b/packaging/Debian/debian-unstable/patches/non-linux-ports.patch new file mode 100644 index 0000000000..bd523d6ba3 --- /dev/null +++ b/packaging/Debian/debian-unstable/patches/non-linux-ports.patch @@ -0,0 +1,62 @@ +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 @@ + fi + ;; + ++# Systems with LFS support. ++# ++ gnu* | k*bsd*-gnu) ++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS" ++ AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support]) ++ AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset bits]) ++ AC_DEFINE(_GNU_SOURCE, 1, [Whether to use GNU libc extensions]) ++ ;; ++ + # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support. + # + *linux*) +@@ -1040,7 +1049,7 @@ + # + # + case "$host_os" in +- *linux*) ++ linux*-gnu* | gnu* | k*bsd*-gnu) + # glibc <= 2.3.2 has a broken getgrouplist + AC_TRY_RUN([ + #include <unistd.h> +@@ -1172,7 +1181,10 @@ + + # and these are for particular systems + case "$host_os" in +- *linux*) AC_DEFINE(LINUX,1,[Whether the host os is linux]) ++ linux*-gnu* | gnu* | k*bsd*-gnu) ++ case "$host_os" in linux*) ++ AC_DEFINE(LINUX,1,[Whether the host os is linux]) ;; ++ esac + 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 @@ + AC_MSG_RESULT(yes); + + case "$host_os" in +- *linux*) ++ linux*-gnu* | gnu* | k*bsd*-gnu) + 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 --git a/packaging/Debian/debian-unstable/patches/nonpic-libsmbclient.patch b/packaging/Debian/debian-unstable/patches/nonpic-libsmbclient.patch new file mode 100644 index 0000000000..55e8be0d15 --- /dev/null +++ b/packaging/Debian/debian-unstable/patches/nonpic-libsmbclient.patch @@ -0,0 +1,26 @@ +diff -uNr samba-3.0.14a.orig/source/Makefile.in samba-3.0.14a/source/Makefile.in +--- samba-3.0.14a.orig/source/Makefile.in 2005-06-08 05:53:54.000000000 -0700 ++++ samba-3.0.14a/source/Makefile.in 2005-06-08 05:55:21.000000000 -0700 +@@ -1000,9 +1000,9 @@ + $(KRB5LIBS) $(LDAP_LIBS) \ + @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR) + +-bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS) ++bin/libsmbclient.a: $(LIBSMBCLIENT_OBJS) + @echo Linking libsmbclient non-shared library $@ +- @-$(AR) -rc $@ $(LIBSMBCLIENT_PICOBJS) ++ @-$(AR) -rc $@ $(LIBSMBCLIENT_OBJS) + + # This is probably wrong for anything other than the GNU linker. + bin/libbigballofmud.@SHLIBEXT@: $(LIBBIGBALLOFMUD_PICOBJS) +@@ -1251,8 +1251,8 @@ + @echo "Linking shared library $@" + @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LIBS) -lc $(LDAP_LIBS) $(KRB5LIBS) + +-bin/libmsrpc.a: $(LIBMSRPC_PICOBJ) +- @-$(AR) -rc $@ $(LIBMSRPC_PICOBJ) ++bin/libmsrpc.a: $(LIBMSRPC_OBJ) ++ @-$(AR) -rc $@ $(LIBMSRPC_OBJ) + + bin/tdbbackup@EXEEXT@: $(TDBBACKUP_OBJ) bin/.dummy + @echo Linking $@ diff --git a/packaging/Debian/debian-unstable/patches/samba.patch b/packaging/Debian/debian-unstable/patches/samba.patch index 06d436408f..f4c8ca8742 100644 --- a/packaging/Debian/debian-unstable/patches/samba.patch +++ b/packaging/Debian/debian-unstable/patches/samba.patch @@ -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 -@@ -765,7 +765,7 @@ +@@ -766,7 +766,7 @@ *lp = 0; pstrcpy(password,lp+1); got_pass = True; @@ -10,7 +10,7 @@ diff -uNr samba-3.0.0beta1.orig/source/client/smbmount.c samba-3.0.0beta1/source } if ((lp=strchr_m(username,'/'))) { *lp = 0; -@@ -775,7 +775,7 @@ +@@ -776,7 +776,7 @@ !strcmp(opts, "password")) { pstrcpy(password,opteq+1); got_pass = True; @@ -19,7 +19,7 @@ diff -uNr samba-3.0.0beta1.orig/source/client/smbmount.c samba-3.0.0beta1/source } else if(!strcmp(opts, "credentials")) { pstrcpy(credentials,opteq+1); } else if(!strcmp(opts, "netbiosname")) { -@@ -889,7 +901,7 @@ +@@ -890,7 +902,7 @@ *p = 0; pstrcpy(password,p+1); got_pass = True; diff --git a/packaging/Debian/debian-unstable/patches/smbmount-nomtab.patch b/packaging/Debian/debian-unstable/patches/smbmount-nomtab.patch index 8807148170..f7e9ce4f69 100644 --- a/packaging/Debian/debian-unstable/patches/smbmount-nomtab.patch +++ b/packaging/Debian/debian-unstable/patches/smbmount-nomtab.patch @@ -123,7 +123,7 @@ diff -uNr samba-3.0alpha22.orig/source/client/smbmount.c samba-3.0alpha22/source if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1) { DEBUG(0,("%d: Can't get "MOUNTED"~ lock file", sys_getpid())); return; -@@ -466,6 +470,9 @@ +@@ -467,6 +471,9 @@ args[i++] = "-s"; args[i++] = svc2; @@ -133,7 +133,7 @@ diff -uNr samba-3.0alpha22.orig/source/client/smbmount.c samba-3.0alpha22/source if (mount_ro) { args[i++] = "-r"; } -@@ -661,7 +668,7 @@ +@@ -662,7 +669,7 @@ ****************************************************************************/ static void usage(void) { @@ -142,7 +142,7 @@ diff -uNr samba-3.0alpha22.orig/source/client/smbmount.c samba-3.0alpha22/source printf("Version %s\n\n",VERSION); -@@ -739,8 +746,13 @@ +@@ -740,8 +747,13 @@ argc -= 2; argv += 2; diff --git a/packaging/Debian/debian-unstable/patches/smbmount-unix-caps.patch b/packaging/Debian/debian-unstable/patches/smbmount-unix-caps.patch new file mode 100644 index 0000000000..0c81327987 --- /dev/null +++ b/packaging/Debian/debian-unstable/patches/smbmount-unix-caps.patch @@ -0,0 +1,14 @@ +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 @@ + c->capabilities &= ~CAP_STATUS32; + c->force_dos_errors = True; + } ++ /* For now, respect requests for uid-flattening mount options ++ by disabling Unix permissions handling in the kernel driver */ ++ if (mount_uid || mount_gid || mount_fmask || mount_dmask) ++ c->capabilities &= ~CAP_UNIX; + + if (!cli_session_setup(c, username, + password, strlen(password), diff --git a/packaging/Debian/debian-unstable/patches/smbstatus-locking.patch b/packaging/Debian/debian-unstable/patches/smbstatus-locking.patch index 50072c5c26..db7fccc68b 100644 --- a/packaging/Debian/debian-unstable/patches/smbstatus-locking.patch +++ b/packaging/Debian/debian-unstable/patches/smbstatus-locking.patch @@ -1,7 +1,7 @@ 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 -@@ -667,6 +667,16 @@ +@@ -686,6 +686,16 @@ if (!shares_only) { int ret; diff --git a/packaging/Debian/debian-unstable/patches/undefined-symbols.patch b/packaging/Debian/debian-unstable/patches/undefined-symbols.patch new file mode 100644 index 0000000000..e9a376ea9b --- /dev/null +++ b/packaging/Debian/debian-unstable/patches/undefined-symbols.patch @@ -0,0 +1,22 @@ +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) + + WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) \ +- $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) ++ $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) \ ++ $(SECRETS_OBJ) + + WINBIND_WINS_NSS_PICOBJS = $(WINBIND_WINS_NSS_OBJ:.o=.@PICSUFFIX@) + +@@ -997,7 +998,7 @@ + + bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS) + @echo Linking libsmbclient shared library $@ +- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \ ++ @$(SHLD) $(LDSHFLAGS) -Wl,-z,defs -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \ + $(KRB5LIBS) $(LDAP_LIBS) \ + @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR) + |