summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEloy Paris <peloy@samba.org>2003-07-03 02:43:49 +0000
committerEloy Paris <peloy@samba.org>2003-07-03 02:43:49 +0000
commit230724d4e3137ffef8136c4cc0b1738833472c22 (patch)
treee1fc38e0b18c6571c4ecf212dc5e37968e0b9985
parent02020093f52517b1cb2049d61d957f7a834d5b89 (diff)
downloadsamba-230724d4e3137ffef8136c4cc0b1738833472c22.tar.gz
samba-230724d4e3137ffef8136c4cc0b1738833472c22.tar.bz2
samba-230724d4e3137ffef8136c4cc0b1738833472c22.zip
Debian updates.
(This used to be commit 617902427688de58b21c176e060b9b678ebfcd10)
-rw-r--r--packaging/Debian/README2
-rw-r--r--packaging/Debian/debian/changelog4
-rw-r--r--packaging/Debian/debian/patches/fhs.patch46
-rw-r--r--packaging/Debian/debian/patches/samba.patch2
4 files changed, 16 insertions, 38 deletions
diff --git a/packaging/Debian/README b/packaging/Debian/README
index 764a042939..c124ef01a5 100644
--- a/packaging/Debian/README
+++ b/packaging/Debian/README
@@ -4,7 +4,7 @@ Building Samba Packages for Debian GNU/Linux
Building Debian packages is not as hard as some people might think. The
following instructions will allow you to build your own Samba Debian
packages. These instructions, and the files in packaging/Debian/, should
-be current as of Samba 3.0beta1, and should allow you to build Debian
+be current as of Samba 3.0beta2, and should allow you to build Debian
packages for Debian unstable.
We try to maintain as much compatibility with previous releases
diff --git a/packaging/Debian/debian/changelog b/packaging/Debian/debian/changelog
index 5eff13e711..8c1d9b594d 100644
--- a/packaging/Debian/debian/changelog
+++ b/packaging/Debian/debian/changelog
@@ -1,8 +1,8 @@
-samba (3.0.0beta1-1.1) unstable; urgency=low
+samba (3.0.0beta2-0.1) unstable; urgency=low
* Local build.
- -- Debian User <someone@somewhere.com> Sun, 8 Jun 2003 15:24:18 -0400
+ -- Debian User <somebody@somewhere.net> Wed, 2 Jul 2003 22:41:33 -0400
samba (3.0.0beta1-1) unstable; urgency=low
diff --git a/packaging/Debian/debian/patches/fhs.patch b/packaging/Debian/debian/patches/fhs.patch
index fa1f464f10..f27c6afb49 100644
--- a/packaging/Debian/debian/patches/fhs.patch
+++ b/packaging/Debian/debian/patches/fhs.patch
@@ -1,7 +1,7 @@
diff -uNr samba-3.0alpha23.orig/source/Makefile.in samba-3.0alpha23/source/Makefile.in
--- samba-3.0alpha23.orig/source/Makefile.in 2003-03-30 20:28:28.000000000 -0600
+++ samba-3.0alpha23/source/Makefile.in 2003-04-04 21:04:05.000000000 -0600
-@@ -67,6 +67,7 @@
+@@ -68,6 +68,7 @@
CONFIGDIR = @configdir@
VARDIR = @localstatedir@
MANDIR = @mandir@
@@ -9,7 +9,7 @@ diff -uNr samba-3.0alpha23.orig/source/Makefile.in samba-3.0alpha23/source/Makef
# The permissions to give the executables
INSTALLPERMS = 0755
-@@ -90,6 +91,13 @@
+@@ -91,6 +92,13 @@
# the directory where lock files go
LOCKDIR = @lockdir@
@@ -23,7 +23,7 @@ diff -uNr samba-3.0alpha23.orig/source/Makefile.in samba-3.0alpha23/source/Makef
# the directory where pid files go
PIDDIR = @piddir@
# man pages language(s)
-@@ -114,7 +122,7 @@
+@@ -115,7 +123,7 @@
PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\"
PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \
-DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\"
@@ -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.
-@@ -1128,7 +1136,7 @@
+@@ -1129,7 +1137,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
-@@ -214,7 +214,7 @@
+@@ -134,7 +134,7 @@
if (tdb && local_pid == sys_getpid())
return True;
@@ -277,27 +277,6 @@ diff -uNr samba-3.0alpha23.orig/source/lib/util_unistr.c samba-3.0alpha23/source
if (valid_file) {
valid_table = valid_file;
mapped_file = 1;
-diff -uNr samba-3.0alpha23.orig/source/libsmb/netlogon_unigrp.c samba-3.0alpha23/source/libsmb/netlogon_unigrp.c
---- samba-3.0alpha23.orig/source/libsmb/netlogon_unigrp.c 2003-01-02 10:22:58.000000000 -0600
-+++ samba-3.0alpha23/source/libsmb/netlogon_unigrp.c 2003-04-04 21:04:06.000000000 -0600
-@@ -41,7 +41,7 @@
- BOOL uni_group_cache_init(void)
- {
- if (!netlogon_unigrp_tdb) {
-- netlogon_unigrp_tdb = tdb_open_log(lock_path("netlogon_unigrp.tdb"), 0,
-+ netlogon_unigrp_tdb = tdb_open_log(state_path("netlogon_unigrp.tdb"), 0,
- TDB_DEFAULT, O_RDWR | O_CREAT, 0644);
- }
-
-@@ -119,7 +119,7 @@
- return NULL;
- }
- if (!netlogon_unigrp_tdb) {
-- netlogon_unigrp_tdb = tdb_open_log(lock_path("netlogon_unigrp.tdb"), 0,
-+ netlogon_unigrp_tdb = tdb_open_log(state_path("netlogon_unigrp.tdb"), 0,
- TDB_DEFAULT, O_RDWR, 0644);
- }
- if (!netlogon_unigrp_tdb) {
diff -uNr samba-3.0alpha23.orig/source/nmbd/nmbd_serverlistdb.c samba-3.0alpha23/source/nmbd/nmbd_serverlistdb.c
--- samba-3.0alpha23.orig/source/nmbd/nmbd_serverlistdb.c 2002-12-12 09:07:32.000000000 -0600
+++ samba-3.0alpha23/source/nmbd/nmbd_serverlistdb.c 2003-04-04 21:04:06.000000000 -0600
@@ -310,12 +289,11 @@ diff -uNr samba-3.0alpha23.orig/source/nmbd/nmbd_serverlistdb.c samba-3.0alpha23
trim_string(fname,NULL,"/");
pstrcat(fname,"/");
pstrcat(fname,SERVER_LIST);
-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;
+--- samba/source/nsswitch/winbindd_cache.c.orig 2003-07-02 22:37:40.000000000 -0400
++++ samba/source/nsswitch/winbindd_cache.c 2003-07-02 22:39:05.000000000 -0400
+@@ -56,7 +56,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,
@@ -335,7 +313,7 @@ diff -uNr samba-3.0alpha23.orig/source/param/loadparm.c samba-3.0alpha23/source/
char *szLockDir;
char *szPidDir;
char *szRootdir;
-@@ -1051,8 +1054,13 @@
+@@ -1055,8 +1058,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},
@@ -501,7 +479,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
-@@ -943,10 +943,7 @@
+@@ -956,10 +956,7 @@
if (location) {
tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location);
} else {
diff --git a/packaging/Debian/debian/patches/samba.patch b/packaging/Debian/debian/patches/samba.patch
index 79a76b8685..8dcfac5e65 100644
--- a/packaging/Debian/debian/patches/samba.patch
+++ b/packaging/Debian/debian/patches/samba.patch
@@ -49,7 +49,7 @@ diff -uNr samba-3.0alpha23.orig/source/script/installbin.sh samba-3.0alpha23/sou
diff -uNr samba-3.0alpha23.orig/source/smbd/service.c samba-3.0alpha23/source/smbd/service.c
--- samba-3.0alpha23.orig/source/smbd/service.c 2003-03-30 20:28:31.000000000 -0600
+++ samba-3.0alpha23/source/smbd/service.c 2003-04-04 21:05:58.000000000 -0600
-@@ -888,6 +888,14 @@
+@@ -890,6 +890,14 @@
change_to_root_user();
}