summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-07-01 18:09:29 +0000
committerGerald Carter <jerry@samba.org>2003-07-01 18:09:29 +0000
commit8cf2ab577f78f5cafcc7ceb6efef3871b0bd07af (patch)
tree4569c2f4abdc93fb47486db295a243f6d8297e5c
parent34f7dddab0620dbeec71c69aec20e62e0aa28a94 (diff)
downloadsamba-8cf2ab577f78f5cafcc7ceb6efef3871b0bd07af.tar.gz
samba-8cf2ab577f78f5cafcc7ceb6efef3871b0bd07af.tar.bz2
samba-8cf2ab577f78f5cafcc7ceb6efef3871b0bd07af.zip
syncing newer files to SAMBA_3_0
(This used to be commit 1bd76a320e92b4c9d5de6ffceaf5f6ebac1ad459)
-rw-r--r--packaging/Debian/debian/changelog23
-rw-r--r--packaging/Debian/debian/patches/fhs.patch19
2 files changed, 13 insertions, 29 deletions
diff --git a/packaging/Debian/debian/changelog b/packaging/Debian/debian/changelog
index 48dfa47f08..5eff13e711 100644
--- a/packaging/Debian/debian/changelog
+++ b/packaging/Debian/debian/changelog
@@ -1,33 +1,16 @@
-samba (3.0.0beta2-1) unstable; urgency=low
+samba (3.0.0beta1-1.1) unstable; urgency=low
* Local build.
- -- Eloy A. Paris <peloy@debian.org> Thu, 19 Jun 2003 13:17:39 -0400
-
-samba (3.0.0beta1-2) unstable; urgency=low
-
- * Update build-deps to libacl1-dev (>= 2.2.11-1), libacl1 (>= 2.2.11-1)
- to make sure we get the right shlib dependencies (closes: #193149).
- * Update the dhcp config hooks so they're suitable for sourcing (i.e.,
- don't call "exit"). (closes: #196477)
-
- -- Steve Langasek <vorlon@debian.org> Thu, 12 Jun 2003 15:02:00 -0500
+ -- Debian User <someone@somewhere.com> Sun, 8 Jun 2003 15:24:18 -0400
samba (3.0.0beta1-1) unstable; urgency=low
* New upstream version.
- - fix for empty browselist bug (closes: #194553)
- - fix for tab completion segfault in smbclient (closes: #194776)
- - Samba now works as a domain member again without segfaulting
- (closes: #194134, #194394, #194775)
- - WinXP machines can join a Samba-controlled domain again
- (closes: #195362)
* Build-depend on python-dev >= 2.2 instead of on just python-dev
(without version).
- * Added Vorlon'n patch to source/lib/time.c to fix #194075.
- (closes: #194075)
- -- Eloy A. Paris <peloy@debian.org> Sun, 8 Jun 2003 22:26:43 -0400
+ -- Eloy A. Paris <peloy@debian.org> Sun, 8 Jun 2003 14:35:25 -0400
samba (2.999+3.0.alpha24-3) unstable; urgency=low
diff --git a/packaging/Debian/debian/patches/fhs.patch b/packaging/Debian/debian/patches/fhs.patch
index c19c42006f..fa1f464f10 100644
--- a/packaging/Debian/debian/patches/fhs.patch
+++ b/packaging/Debian/debian/patches/fhs.patch
@@ -32,7 +32,7 @@ diff -uNr samba-3.0alpha23.orig/source/Makefile.in samba-3.0alpha23/source/Makef
PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS)
# Note that all executable programs now provide for an optional executable suffix.
-@@ -1133,7 +1141,7 @@
+@@ -1128,7 +1136,7 @@
@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
installdat: installdirs
@@ -131,7 +131,7 @@ diff -uNr samba-3.0alpha23.orig/source/dynconfig.c samba-3.0alpha23/source/dynco
diff -uNr samba-3.0alpha23.orig/source/groupdb/mapping.c samba-3.0alpha23/source/groupdb/mapping.c
--- samba-3.0alpha23.orig/source/groupdb/mapping.c 2003-03-30 20:28:28.000000000 -0600
+++ samba-3.0alpha23/source/groupdb/mapping.c 2003-04-04 21:04:05.000000000 -0600
-@@ -134,7 +134,7 @@
+@@ -214,7 +214,7 @@
if (tdb && local_pid == sys_getpid())
return True;
@@ -310,11 +310,12 @@ diff -uNr samba-3.0alpha23.orig/source/nmbd/nmbd_serverlistdb.c samba-3.0alpha23
trim_string(fname,NULL,"/");
pstrcat(fname,"/");
pstrcat(fname,SERVER_LIST);
---- samba_3_0/source/nsswitch/winbindd_cache.c.orig 2003-06-18 11:08:35.000000000 -0400
-+++ samba_3_0/source/nsswitch/winbindd_cache.c 2003-06-18 11:10:04.000000000 -0400
-@@ -54,7 +54,7 @@
- if (opt_nocache)
- return;
+diff -uNr samba-3.0alpha23.orig/source/nsswitch/winbindd_cache.c samba-3.0alpha23/source/nsswitch/winbindd_cache.c
+--- samba-3.0alpha23.orig/source/nsswitch/winbindd_cache.c 2002-10-16 12:52:31.000000000 -0500
++++ samba-3.0alpha23/source/nsswitch/winbindd_cache.c 2003-04-04 21:04:06.000000000 -0600
+@@ -53,7 +53,7 @@
+ }
+ if (opt_nocache) return;
- wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000,
+ wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 5000,
@@ -334,7 +335,7 @@ diff -uNr samba-3.0alpha23.orig/source/param/loadparm.c samba-3.0alpha23/source/
char *szLockDir;
char *szPidDir;
char *szRootdir;
-@@ -1054,8 +1057,13 @@
+@@ -1051,8 +1054,13 @@
{"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE},
{"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
@@ -500,7 +501,7 @@ diff -uNr samba-3.0alpha23.orig/source/wrepld/process.c samba-3.0alpha23/source/
diff -uNr samba-3.0alpha23.orig/source/passdb/pdb_tdb.c samba-3.0alpha23/source/passdb/pdb_tdb.c
--- samba-3.0alpha23.orig/source/passdb/pdb_tdb.c 2003-03-30 20:28:29.000000000 -0600
+++ samba-3.0alpha23/source/passdb/pdb_tdb.c 2003-04-30 13:51:43.000000000 -0500
-@@ -956,10 +956,7 @@
+@@ -943,10 +943,7 @@
if (location) {
tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location);
} else {