diff options
Diffstat (limited to 'packaging/Debian')
| -rw-r--r-- | packaging/Debian/README | 3 | ||||
| -rw-r--r-- | packaging/Debian/debian-sarge/changelog | 49 | ||||
| -rw-r--r-- | packaging/Debian/debian-sarge/patches/documentation.patch | 74 | ||||
| -rw-r--r-- | packaging/Debian/debian-sarge/patches/fhs.patch | 202 | ||||
| -rw-r--r-- | packaging/Debian/debian-sarge/patches/nmbd-signalling.patch.unused (renamed from packaging/Debian/debian-sarge/patches/nmbd-signalling.patch) | 0 | ||||
| -rw-r--r-- | packaging/Debian/debian-sarge/patches/non-linux-ports.patch | 4 | ||||
| -rw-r--r-- | packaging/Debian/debian-sarge/patches/samba.patch | 6 | ||||
| -rw-r--r-- | packaging/Debian/debian-sarge/patches/undefined-symbols.patch | 22 |
8 files changed, 203 insertions, 157 deletions
diff --git a/packaging/Debian/README b/packaging/Debian/README index 8efe8164c8d..9c7a1d921fa 100644 --- a/packaging/Debian/README +++ b/packaging/Debian/README @@ -1,3 +1,6 @@ +NOTE: the debian-unstable and debian-woody are not updated anymore, +they are left only as a reference for now. --SSS + Building Samba Packages for Debian GNU/Linux -------------------------------------------- diff --git a/packaging/Debian/debian-sarge/changelog b/packaging/Debian/debian-sarge/changelog index bd66900a7f2..65a25106903 100644 --- a/packaging/Debian/debian-sarge/changelog +++ b/packaging/Debian/debian-sarge/changelog @@ -1,3 +1,52 @@ +samba (3.0.25c-1) stable; urgency=low + + * samba 3.0.25c bugfix release + + -- Simo Sorce <idra@samba.org> Mon, 3 Sep 2007 11:18:30 -0400 + +samba (3.0.25b-1) stable; urgency=low + + * samba 3.0.25b bugfix release + + -- Simo Sorce <idra@samba.org> Mon, 2 Jul 2007 12:16:30 -0400 + +samba (3.0.25a-2) stable; urgency=low + + * Fix bug in fhs.patch + + -- Simo Sorce <idra@samba.org> Wed, 6 Jun 2007 11:33:30 -0400 + +samba (3.0.25a-1) stable; urgency=high + + * samba 3.0.25a Stabilizing release + * Includes Security fixes release with 3.0.24a and 3.0.25 + + -- Simo Sorce <idra@samba.org> Mon, 28 May 2007 20:45:30 -0400 + +samba (3.0.24-1) stable; urgency=high + + * samba 3.0.24 Security Release + + -- Simo Sorce <idra@samba.org> Mon, 19 Feb 2007 15:53:30 -0500 + +samba (3.0.23d-1) stable; urgency=low + + * samba 3.0.23d Samba Team Release + + -- Simo Sorce <idra@samba.org> Fri, 17 Nov 2006 15:39:30 -0500 + +samba (3.0.23c-1) stable; urgency=low + + * samba 3.0.23c Samba Team Release + + -- Simo Sorce <idra@samba.org> Fri, 8 Sep 2006 14:12:30 -0400 + +samba (3.0.23a-1) stable; urgency=low + + * samba 3.0.23a Samba Team Release + + -- Simo Sorce <idra@samba.org> Tue, 1 Aug 2006 22:01:30 -0400 + samba (3.0.23-1) stable; urgency=low * samba 3.0.23 Samba Team Release diff --git a/packaging/Debian/debian-sarge/patches/documentation.patch b/packaging/Debian/debian-sarge/patches/documentation.patch index 505a53c51b6..65fd1722b49 100644 --- a/packaging/Debian/debian-sarge/patches/documentation.patch +++ b/packaging/Debian/debian-sarge/patches/documentation.patch @@ -1,66 +1,66 @@ --- 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 @@ +@@ -80,4 +80,10 @@ .SH "INSTALLATION" - .PP +\fBDebian-specific Note\fR: all these steps have already been done for +you. However, by default, swat is not enabled. This has been done for +security reasons. To enable swat you need to edit /etc/inetd.conf, +uncomment the swat entry (usually at the end of the file), and then +restart inetd. -+ +.PP 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 @@ - - .TP 3 +@@ -87,12 +94,12 @@ + .TP 3n \(bu -/usr/local/samba/sbin/swat +/usr/sbin/swat - .TP + .TP 3n \(bu -/usr/local/samba/swat/images/* +/usr/share/samba/swat/images/* - .TP + .TP 3n \(bu -/usr/local/samba/swat/help/* +/usr/share/samba/swat/help/* - .LP - .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 --In \fI/etc/services\fR you need to add a line like this: -+In \fI/etc/services\fR you need to add a line like this (not needed for Debian): - + You need to edit your +@@ -125,7 +131,7 @@ + .PP + In + \fI/etc/services\fR +-you need to add a line like this: ++you need to add a line like this (not needed for Debian): .PP \fBswat 901/tcp\fR -@@ -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 automatically. You need to uncomment the line, though, because it is added commented out for security reasons): - +@@ -140,9 +146,9 @@ + .PP + In + \fI/etc/inetd.conf\fR +-you should add a line like this: ++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/sbin/swat swat\fR -+\fBswat stream tcp nowait\&.400 root /usr/sbin/swat swat\fR - +-swat stream tcp nowait.400 root /usr/local/samba/sbin/swat swat ++swat stream tcp nowait.400 root /usr/sbin/swat swat .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 @@ - 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\&. - + Once you have edited + \fI/etc/services\fR +@@ -166,13 +172,13 @@ + .RE + .PP +-\fI/usr/local/samba/lib/smb.conf\fR ++\fI/etc/samba/smb.conf\fR + .RS 3n + 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 file describes all the services the server is to make available to clients. + .RE .SH "WARNINGS" - + .PP diff --git a/packaging/Debian/debian-sarge/patches/fhs.patch b/packaging/Debian/debian-sarge/patches/fhs.patch index e152ec873e9..5ab5053bed9 100644 --- a/packaging/Debian/debian-sarge/patches/fhs.patch +++ b/packaging/Debian/debian-sarge/patches/fhs.patch @@ -111,19 +111,6 @@ diff -uNr samba-3.0.10.orig/source/dynconfig.c samba-3.0.10/source/dynconfig.c + 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,8 +140,8 @@ - - 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.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 @@ -152,18 +139,6 @@ diff -uNr samba-3.0.10.orig/source/intl/lang_tdb.c samba-3.0.10/source/intl/lang 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.21.orig/source/lib/account_pol.c samba-3.0.21/source/lib/account_pol.c ---- samba-3.0.21.orig/source/lib/account_pol.c 2005-12-20 15:28:38.000000000 +0000 -+++ samba-3.0.21/source/lib/account_pol.c 2005-12-23 11:41:08.000000000 +0000 -@@ -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 @@ -229,32 +204,6 @@ diff -uNr samba-3.0.10.orig/source/lib/util.c samba-3.0.10/source/lib/util.c * @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,11 +54,11 @@ - } - initialised = 1; - -- upcase_table = map_file(lib_path("upcase.dat"), 0x20000); -+ upcase_table = map_file(data_path("upcase.dat"), 0x20000); - upcase_table_use_unmap = ( upcase_table != NULL ); - -- lowcase_table = map_file(lib_path("lowcase.dat"), 0x20000); -+ lowcase_table = map_file(data_path("lowcase.dat"), 0x20000); - lowcase_table_use_unmap = ( lowcase_table != NULL ); - - #ifdef HAVE_SETLOCALE - /* Get the name of the current locale. */ -@@ -161,7 +161,7 @@ - return; - } - -- valid_file = map_file(lib_path("valid.dat"), 0x10000); -+ valid_file = map_file(data_path("valid.dat"), 0x10000); - 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 @@ -267,15 +216,6 @@ diff -uNr samba-3.0.10.orig/source/libsmb/samlogon_cache.c samba-3.0.10/source/l TDB_DEFAULT, O_RDWR | O_CREAT, 0600); } -@@ -67,7 +67,7 @@ - winbindd_cache.tdb open. Open the tdb if a NULL is passed. */ - - if (!tdb) { -- tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000, -+ tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 5000, - 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 @@ -321,18 +261,27 @@ diff -uNr samba-3.0.23.orig/source/nsswitch/winbindd_cache.c samba-3.0.23/source WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, TDB_DEFAULT /*TDB_CLEAR_IF_FIRST*/, O_RDWR|O_CREAT, 0600); -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; +@@ -2223,9 +2223,9 @@ + tdb_close(wcache->tdb); + wcache->tdb = NULL; -- pstrcpy(idmap_name, lock_path("winbindd_idmap.tdb")); -+ pstrcpy(idmap_name, state_path("winbindd_idmap.tdb")); +- if (unlink(lock_path("winbindd_cache.tdb")) == -1) { ++ if (unlink(cache_path("winbindd_cache.tdb")) == -1) { + DEBUG(0,("initialize_winbindd_cache: unlink %s failed %s ", +- lock_path("winbindd_cache.tdb"), ++ cache_path("winbindd_cache.tdb"), + strerror(errno) )); + return False; + } +@@ -2487,7 +2487,7 @@ + return; - if (!file_exist(idmap_name, &stbuf)) { - /* nothing to convert return */ + /* when working offline we must not clear the cache on restart */ +- wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), ++ wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), + WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, + lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST), + O_RDWR|O_CREAT, 0600); 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 @@ -498,18 +447,6 @@ diff -uNr samba-3.0.23.orig/source/lib/sharesec.c samba-3.0.23/source/lib/shares 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 -@@ -487,7 +487,7 @@ - BOOL tdb_is_new = False; - - /* use the old database if present */ -- 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.23.orig/source/smbd/lanman.c samba-3.0.23/source/smbd/lanman.c --- samba-3.0.23.orig/source/smbd/lanman.c 2006-07-15 09:50:10.000000000 -0400 +++ samba-3.0.23/source/smbd/lanman.c 2006-07-15 09:55:31.000000000 -0400 @@ -525,18 +462,6 @@ diff -uNr samba-3.0.23.orig/source/smbd/lanman.c samba-3.0.23/source/smbd/lanman 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 @@ - 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.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 @@ -549,3 +474,92 @@ diff -uNr samba-3.0.11.orig/source/printing/nt_printing.c samba-3.0.11/source/pr pstrcat(printdb_path, sharename); pstrcat(printdb_path, ".tdb"); +diff -uPr samba-3.0.25a.orig/source/groupdb/mapping_tdb.c samba-3.0.25a/source/groupdb/mapping_tdb.c +--- samba-3.0.25a.orig/source/groupdb/mapping_tdb.c 2007-04-25 09:38:59.000000000 +0000 ++++ samba-3.0.25a/source/groupdb/mapping_tdb.c 2007-05-29 00:28:42.000000000 +0000 +@@ -39,7 +39,7 @@ + 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 -uPr samba-3.0.25a.orig/source/lib/account_pol.c samba-3.0.25a/source/lib/account_pol.c +--- samba-3.0.25a.orig/source/lib/account_pol.c 2007-03-01 04:54:30.000000000 +0000 ++++ samba-3.0.25a/source/lib/account_pol.c 2007-05-29 00:21:35.000000000 +0000 +@@ -213,9 +213,9 @@ + return True; + } + +- tdb = tdb_open_log(lock_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600); ++ tdb = tdb_open_log(state_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600); + if (!tdb) { /* the account policies files does not exist or open failed, try to create a new one */ +- 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 -uPr samba-3.0.25a.orig/source/lib/util_unistr.c samba-3.0.25a/source/lib/util_unistr.c +--- samba-3.0.25a.orig/source/lib/util_unistr.c 2007-03-01 04:54:30.000000000 +0000 ++++ samba-3.0.25a/source/lib/util_unistr.c 2007-05-29 00:24:07.000000000 +0000 +@@ -88,11 +88,11 @@ + } + initialised = 1; + +- upcase_table = (smb_ucs2_t *)map_file(lib_path("upcase.dat"), ++ upcase_table = (smb_ucs2_t *)map_file(data_path("upcase.dat"), + 0x20000); + upcase_table_use_unmap = ( upcase_table != NULL ); + +- lowcase_table = (smb_ucs2_t *)map_file(lib_path("lowcase.dat"), ++ lowcase_table = (smb_ucs2_t *)map_file(data_path("lowcase.dat"), + 0x20000); + lowcase_table_use_unmap = ( lowcase_table != NULL ); + +@@ -230,7 +230,7 @@ + return; + } + +- valid_file = (uint8 *)map_file(lib_path("valid.dat"), 0x10000); ++ valid_file = (uint8 *)map_file(data_path("valid.dat"), 0x10000); + if (valid_file) { + valid_table = valid_file; + mapped_file = 1; +diff -uPr samba-3.0.25a.orig/source/libsmb/samlogon_cache.c samba-3.0.25a/source/libsmb/samlogon_cache.c +--- samba-3.0.25a.orig/source/libsmb/samlogon_cache.c 2007-05-10 22:09:35.000000000 +0000 ++++ samba-3.0.25a/source/libsmb/samlogon_cache.c 2007-05-29 00:38:41.000000000 +0000 +@@ -67,7 +67,7 @@ + winbindd_cache.tdb open. Open the tdb if a NULL is passed. */ + + if (!tdb) { +- tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), ++ tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), + WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, + TDB_DEFAULT, O_RDWR, 0600); + if (!tdb) { +diff -uPr samba-3.0.25a.orig/source/nsswitch/idmap_tdb.c samba-3.0.25a/source/nsswitch/idmap_tdb.c +--- samba-3.0.25a.orig/source/nsswitch/idmap_tdb.c 2007-05-10 22:09:34.000000000 +0000 ++++ samba-3.0.25a/source/nsswitch/idmap_tdb.c 2007-05-29 00:27:55.000000000 +0000 +@@ -247,7 +247,7 @@ + } + + /* use the old database if present */ +- tdbfile = talloc_strdup(ctx, lock_path("winbindd_idmap.tdb")); ++ tdbfile = talloc_strdup(ctx, state_path("winbindd_idmap.tdb")); + if (!tdbfile) { + DEBUG(0, ("Out of memory!\n")); + ret = NT_STATUS_NO_MEMORY; +diff -uPr samba-3.0.25a.orig/source/passdb/pdb_tdb.c samba-3.0.25a/source/passdb/pdb_tdb.c +--- samba-3.0.25a.orig/source/passdb/pdb_tdb.c 2007-03-01 04:54:41.000000000 +0000 ++++ samba-3.0.25a/source/passdb/pdb_tdb.c 2007-05-29 00:38:41.000000000 +0000 +@@ -1559,7 +1559,7 @@ + uint32 rid; + BOOL ret = False; + +- tdb = tdb_open_log(lock_path("winbindd_idmap.tdb"), 0, ++ tdb = tdb_open_log(state_path("winbindd_idmap.tdb"), 0, + TDB_DEFAULT, O_RDWR | O_CREAT, 0644); + + if (tdb == NULL) { diff --git a/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch b/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch.unused index ca04cce3bfa..ca04cce3bfa 100644 --- a/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch +++ b/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch.unused diff --git a/packaging/Debian/debian-sarge/patches/non-linux-ports.patch b/packaging/Debian/debian-sarge/patches/non-linux-ports.patch index ac2ee1dcf54..2a3f55ed4d4 100644 --- a/packaging/Debian/debian-sarge/patches/non-linux-ports.patch +++ b/packaging/Debian/debian-sarge/patches/non-linux-ports.patch @@ -47,16 +47,18 @@ diff -uNr samba-3.0.11.orig/source/configure.in samba-3.0.11/source/configure.in AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[ AC_TRY_LINK([#include <sys/sendfile.h>], [\ -@@ -4307,10 +4319,10 @@ +@@ -4307,12 +4319,12 @@ WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS case "$host_os" in - *linux*) + linux*-gnu* | gnu* | k*bsd*-gnu) + NSSSONAMEVERSIONSUFFIX=".2" 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. + NSSSONAMEVERSIONSUFFIX=".1" WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \ diff --git a/packaging/Debian/debian-sarge/patches/samba.patch b/packaging/Debian/debian-sarge/patches/samba.patch index 8e77cfb86e5..d1d443af26f 100644 --- a/packaging/Debian/debian-sarge/patches/samba.patch +++ b/packaging/Debian/debian-sarge/patches/samba.patch @@ -32,11 +32,11 @@ diff -uNr samba-3.0.0beta1.orig/source/web/diagnose.c samba-3.0.0beta1/source/we --- 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; + { + struct cli_state *cli; + loopback_ip.s_addr = htonl((127 << 24) + 1); - if (!cli_initialise(&cli)) + if ((cli = cli_initialise()) == NULL) return False; --- samba-3.0.23/source/script/installbin.sh.in.orig 2006-07-15 09:08:36.000000000 -0400 diff --git a/packaging/Debian/debian-sarge/patches/undefined-symbols.patch b/packaging/Debian/debian-sarge/patches/undefined-symbols.patch deleted file mode 100644 index e9a376ea9b8..00000000000 --- a/packaging/Debian/debian-sarge/patches/undefined-symbols.patch +++ /dev/null @@ -1,22 +0,0 @@ -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) - |