diff options
| author | Eloy Paris <peloy@samba.org> | 2003-06-18 15:17:32 +0000 |
|---|---|---|
| committer | Eloy Paris <peloy@samba.org> | 2003-06-18 15:17:32 +0000 |
| commit | e900f4ed106163e836613e83247d750aa6cb32d9 (patch) | |
| tree | e412a84c6836084adfecec1b5932fe9439565997 /packaging/Debian | |
| parent | c3641282120eb73396219c7a316d07a0b2aa25ad (diff) | |
| download | samba-e900f4ed106163e836613e83247d750aa6cb32d9.tar.gz samba-e900f4ed106163e836613e83247d750aa6cb32d9.tar.bz2 samba-e900f4ed106163e836613e83247d750aa6cb32d9.zip | |
Updated Debian patches so they apply cleanly and without warnings at
build time.
(This used to be commit 37acf55b609e90d4ae1a4b6bafb6067487352cee)
Diffstat (limited to 'packaging/Debian')
| -rw-r--r-- | packaging/Debian/debian/patches/fhs.patch | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/packaging/Debian/debian/patches/fhs.patch b/packaging/Debian/debian/patches/fhs.patch index 781f895f1e..fe34d01200 100644 --- a/packaging/Debian/debian/patches/fhs.patch +++ b/packaging/Debian/debian/patches/fhs.patch @@ -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) -@@ -115,7 +123,7 @@ +@@ -114,7 +122,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. -@@ -1146,7 +1154,7 @@ +@@ -1133,7 +1141,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 @@ +@@ -218,7 +218,7 @@ if (tdb && local_pid == sys_getpid()) return True; @@ -310,12 +310,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_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; - wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000, + wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 5000, @@ -335,7 +334,7 @@ diff -uNr samba-3.0alpha23.orig/source/param/loadparm.c samba-3.0alpha23/source/ char *szLockDir; char *szPidDir; char *szRootdir; -@@ -1053,8 +1056,13 @@ +@@ -1054,8 +1057,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 +500,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 { |