[Pkg-samba-maint] r1401 - trunk/samba/debian/patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Sat May 26 05:31:18 UTC 2007
Author: bubulle
Date: 2007-05-26 05:31:17 +0000 (Sat, 26 May 2007)
New Revision: 1401
Modified:
trunk/samba/debian/patches/fhs.patch
Log:
Adapt to 3.0.25a
Modified: trunk/samba/debian/patches/fhs.patch
===================================================================
--- trunk/samba/debian/patches/fhs.patch 2007-05-23 05:25:47 UTC (rev 1400)
+++ trunk/samba/debian/patches/fhs.patch 2007-05-26 05:31:17 UTC (rev 1401)
@@ -15,10 +15,10 @@
That patch may need some work to check that files still go where they should go
It also needs work to be cleaner wrt people who want to run multiple instances of samba
-Index: samba-3.0.25rc2/source/Makefile.in
+Index: samba-3.0.25a/source/Makefile.in
===================================================================
---- samba-3.0.25rc2.orig/source/Makefile.in 2007-04-24 11:07:02.194131035 +0200
-+++ samba-3.0.25rc2/source/Makefile.in 2007-04-24 11:07:47.427810099 +0200
+--- samba-3.0.25a.orig/source/Makefile.in 2007-05-23 17:29:19.000000000 +0200
++++ samba-3.0.25a/source/Makefile.in 2007-05-26 07:24:48.565997630 +0200
@@ -106,6 +106,13 @@
# the directory where lock files go
LOCKDIR = @lockdir@
@@ -42,7 +42,7 @@
PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS)
# Note that all executable programs now provide for an optional executable suffix.
-@@ -1608,10 +1615,10 @@
+@@ -1613,10 +1620,10 @@
@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
installdat: installdirs
@@ -55,10 +55,10 @@
installswat: installdirs installmsg
@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
-Index: samba-3.0.25rc2/source/configure.in
+Index: samba-3.0.25a/source/configure.in
===================================================================
---- samba-3.0.25rc2.orig/source/configure.in 2007-04-24 11:07:02.202131352 +0200
-+++ samba-3.0.25rc2/source/configure.in 2007-04-24 11:07:47.435810377 +0200
+--- samba-3.0.25a.orig/source/configure.in 2007-05-23 17:29:20.000000000 +0200
++++ samba-3.0.25a/source/configure.in 2007-05-26 07:24:48.577997730 +0200
@@ -40,7 +40,7 @@
[ --with-fhs Use FHS-compliant paths (default=no)],
[ case "$withval" in
@@ -89,10 +89,10 @@
AC_SUBST(rootsbindir)
AC_SUBST(pammodulesdir)
-Index: samba-3.0.25rc2/source/dynconfig.c
+Index: samba-3.0.25a/source/dynconfig.c
===================================================================
---- samba-3.0.25rc2.orig/source/dynconfig.c 2007-04-24 11:07:02.210131668 +0200
-+++ samba-3.0.25rc2/source/dynconfig.c 2007-04-24 11:07:47.487812186 +0200
+--- samba-3.0.25a.orig/source/dynconfig.c 2006-06-09 21:30:32.000000000 +0200
++++ samba-3.0.25a/source/dynconfig.c 2007-05-26 07:24:48.617998063 +0200
@@ -53,6 +53,13 @@
pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
@@ -135,10 +135,10 @@
+ return lp_lockdir();
+#endif
+}
-Index: samba-3.0.25rc2/source/include/dynconfig.h
+Index: samba-3.0.25a/source/include/dynconfig.h
===================================================================
---- samba-3.0.25rc2.orig/source/include/dynconfig.h 2007-04-24 11:07:02.222132143 +0200
-+++ samba-3.0.25rc2/source/include/dynconfig.h 2007-04-24 11:07:47.515813159 +0200
+--- samba-3.0.25a.orig/source/include/dynconfig.h 2006-06-09 21:30:31.000000000 +0200
++++ samba-3.0.25a/source/include/dynconfig.h 2007-05-26 07:24:48.645998296 +0200
@@ -31,8 +31,12 @@
extern pstring dyn_CONFIGFILE;
extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -152,10 +152,10 @@
+
+char *dyn_STATEDIR(void);
+char *dyn_CACHEDIR(void);
-Index: samba-3.0.25rc2/source/intl/lang_tdb.c
+Index: samba-3.0.25a/source/intl/lang_tdb.c
===================================================================
---- samba-3.0.25rc2.orig/source/intl/lang_tdb.c 2007-04-24 11:07:02.238132776 +0200
-+++ samba-3.0.25rc2/source/intl/lang_tdb.c 2007-04-24 11:07:47.539813994 +0200
+--- samba-3.0.25a.orig/source/intl/lang_tdb.c 2007-03-01 05:54:31.000000000 +0100
++++ samba-3.0.25a/source/intl/lang_tdb.c 2007-05-26 07:24:48.673998529 +0200
@@ -131,7 +131,7 @@
if (!lang)
return True;
@@ -165,11 +165,11 @@
if (stat(msg_path, &st) != 0) {
/* the msg file isn't available */
DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path,
-Index: samba-3.0.25rc2/source/lib/util.c
+Index: samba-3.0.25a/source/lib/util.c
===================================================================
---- samba-3.0.25rc2.orig/source/lib/util.c 2007-04-24 11:07:02.246133092 +0200
-+++ samba-3.0.25rc2/source/lib/util.c 2007-04-24 11:07:47.571815107 +0200
-@@ -2618,6 +2618,61 @@
+--- samba-3.0.25a.orig/source/lib/util.c 2007-05-11 00:09:35.000000000 +0200
++++ samba-3.0.25a/source/lib/util.c 2007-05-26 07:24:48.705998796 +0200
+@@ -2630,6 +2630,61 @@
}
/**
@@ -231,10 +231,10 @@
* @brief Returns the platform specific shared library extension.
*
* @retval Pointer to a static #fstring containing the extension.
-Index: samba-3.0.25rc2/source/lib/util_unistr.c
+Index: samba-3.0.25a/source/lib/util_unistr.c
===================================================================
---- samba-3.0.25rc2.orig/source/lib/util_unistr.c 2007-04-24 11:07:02.254133409 +0200
-+++ samba-3.0.25rc2/source/lib/util_unistr.c 2007-04-24 11:07:47.611816498 +0200
+--- samba-3.0.25a.orig/source/lib/util_unistr.c 2007-03-01 05:54:30.000000000 +0100
++++ samba-3.0.25a/source/lib/util_unistr.c 2007-05-26 07:24:48.773999362 +0200
@@ -88,11 +88,11 @@
}
initialised = 1;
@@ -258,10 +258,10 @@
if (valid_file) {
valid_table = valid_file;
mapped_file = 1;
-Index: samba-3.0.25rc2/source/libsmb/samlogon_cache.c
+Index: samba-3.0.25a/source/libsmb/samlogon_cache.c
===================================================================
---- samba-3.0.25rc2.orig/source/libsmb/samlogon_cache.c 2007-04-24 11:07:02.270134042 +0200
-+++ samba-3.0.25rc2/source/libsmb/samlogon_cache.c 2007-04-24 11:07:47.639817472 +0200
+--- samba-3.0.25a.orig/source/libsmb/samlogon_cache.c 2007-05-11 00:09:35.000000000 +0200
++++ samba-3.0.25a/source/libsmb/samlogon_cache.c 2007-05-26 07:24:48.801999595 +0200
@@ -34,7 +34,7 @@
BOOL netsamlogon_cache_init(void)
{
@@ -280,10 +280,10 @@
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
TDB_DEFAULT, O_RDWR, 0600);
if (!tdb) {
-Index: samba-3.0.25rc2/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.0.25a/source/nmbd/nmbd_serverlistdb.c
===================================================================
---- samba-3.0.25rc2.orig/source/nmbd/nmbd_serverlistdb.c 2007-04-24 11:07:02.278134358 +0200
-+++ samba-3.0.25rc2/source/nmbd/nmbd_serverlistdb.c 2007-04-24 11:07:47.699819559 +0200
+--- samba-3.0.25a.orig/source/nmbd/nmbd_serverlistdb.c 2006-07-10 18:27:52.000000000 +0200
++++ samba-3.0.25a/source/nmbd/nmbd_serverlistdb.c 2007-05-26 07:24:48.829999828 +0200
@@ -325,7 +325,7 @@
updatecount++;
@@ -293,10 +293,10 @@
trim_char(fname,'\0' ,'/');
pstrcat(fname,"/");
pstrcat(fname,SERVER_LIST);
-Index: samba-3.0.25rc2/source/nmbd/nmbd_winsserver.c
+Index: samba-3.0.25a/source/nmbd/nmbd_winsserver.c
===================================================================
---- samba-3.0.25rc2.orig/source/nmbd/nmbd_winsserver.c 2007-04-24 11:07:02.294134991 +0200
-+++ samba-3.0.25rc2/source/nmbd/nmbd_winsserver.c 2007-04-24 11:07:47.727820533 +0200
+--- samba-3.0.25a.orig/source/nmbd/nmbd_winsserver.c 2007-03-01 05:54:45.000000000 +0100
++++ samba-3.0.25a/source/nmbd/nmbd_winsserver.c 2007-05-26 07:24:48.862000095 +0200
@@ -585,7 +585,7 @@
add_samba_names_to_subnet(wins_server_subnet);
@@ -315,10 +315,10 @@
all_string_sub(fname,"//", "/", 0);
slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
-Index: samba-3.0.25rc2/source/passdb/login_cache.c
+Index: samba-3.0.25a/source/passdb/login_cache.c
===================================================================
---- samba-3.0.25rc2.orig/source/passdb/login_cache.c 2007-04-24 11:07:02.306135466 +0200
-+++ samba-3.0.25rc2/source/passdb/login_cache.c 2007-04-24 11:07:47.771822063 +0200
+--- samba-3.0.25a.orig/source/passdb/login_cache.c 2007-03-01 05:54:42.000000000 +0100
++++ samba-3.0.25a/source/passdb/login_cache.c 2007-05-26 07:24:48.890000328 +0200
@@ -36,7 +36,7 @@
/* skip file open if it's already opened */
if (cache) return True;
@@ -328,11 +328,11 @@
if (cache_fname)
DEBUG(5, ("Opening cache file at %s\n", cache_fname));
else {
-Index: samba-3.0.25rc2/source/nsswitch/winbindd_cache.c
+Index: samba-3.0.25a/source/nsswitch/winbindd_cache.c
===================================================================
---- samba-3.0.25rc2.orig/source/nsswitch/winbindd_cache.c 2007-04-24 11:07:02.330136415 +0200
-+++ samba-3.0.25rc2/source/nsswitch/winbindd_cache.c 2007-04-24 11:07:47.799823037 +0200
-@@ -2163,7 +2163,7 @@
+--- samba-3.0.25a.orig/source/nsswitch/winbindd_cache.c 2007-05-11 00:09:34.000000000 +0200
++++ samba-3.0.25a/source/nsswitch/winbindd_cache.c 2007-05-26 07:27:24.695298090 +0200
+@@ -2180,7 +2180,7 @@
return True;
/* when working offline we must not clear the cache on restart */
@@ -341,7 +341,19 @@
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST),
O_RDWR|O_CREAT, 0600);
-@@ -2470,7 +2470,7 @@
+@@ -2223,9 +2223,9 @@
+ tdb_close(wcache->tdb);
+ wcache->tdb = NULL;
+
+- 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;
/* when working offline we must not clear the cache on restart */
@@ -350,22 +362,10 @@
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST),
O_RDWR|O_CREAT, 0600);
-@@ -2223,9 +2223,9 @@
- tdb_close(wcache->tdb);
- wcache->tdb = NULL;
-
-- 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;
- }
-Index: samba-3.0.25rc2/source/param/loadparm.c
+Index: samba-3.0.25a/source/param/loadparm.c
===================================================================
---- samba-3.0.25rc2.orig/source/param/loadparm.c 2007-04-24 11:07:02.358137523 +0200
-+++ samba-3.0.25rc2/source/param/loadparm.c 2007-04-24 11:07:47.831824150 +0200
+--- samba-3.0.25a.orig/source/param/loadparm.c 2007-04-21 03:48:07.000000000 +0200
++++ samba-3.0.25a/source/param/loadparm.c 2007-05-26 07:24:48.982001094 +0200
@@ -108,6 +108,9 @@
char *szAddPrinterCommand;
char *szDeletePrinterCommand;
@@ -390,10 +390,10 @@
{"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},
-Index: samba-3.0.25rc2/source/passdb/secrets.c
+Index: samba-3.0.25a/source/passdb/secrets.c
===================================================================
---- samba-3.0.25rc2.orig/source/passdb/secrets.c 2007-04-24 11:07:02.310135624 +0200
-+++ samba-3.0.25rc2/source/passdb/secrets.c 2007-04-24 11:07:47.871825541 +0200
+--- samba-3.0.25a.orig/source/passdb/secrets.c 2007-03-01 05:54:41.000000000 +0100
++++ samba-3.0.25a/source/passdb/secrets.c 2007-05-26 07:24:49.018001394 +0200
@@ -58,8 +58,7 @@
if (tdb)
return True;
@@ -404,10 +404,10 @@
tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-Index: samba-3.0.25rc2/source/printing/nt_printing.c
+Index: samba-3.0.25a/source/printing/nt_printing.c
===================================================================
---- samba-3.0.25rc2.orig/source/printing/nt_printing.c 2007-04-24 11:07:02.366137840 +0200
-+++ samba-3.0.25rc2/source/printing/nt_printing.c 2007-04-24 11:07:47.903826654 +0200
+--- samba-3.0.25a.orig/source/printing/nt_printing.c 2007-05-11 00:09:34.000000000 +0200
++++ samba-3.0.25a/source/printing/nt_printing.c 2007-05-26 07:24:49.050001660 +0200
@@ -551,28 +551,28 @@
if (tdb_drivers)
@@ -452,10 +452,10 @@
pstrcat(printdb_path, sharename);
pstrcat(printdb_path, ".tdb");
-Index: samba-3.0.25rc2/source/printing/printing.c
+Index: samba-3.0.25a/source/printing/printing.c
===================================================================
---- samba-3.0.25rc2.orig/source/printing/printing.c 2007-04-24 11:07:02.374138156 +0200
-+++ samba-3.0.25rc2/source/printing/printing.c 2007-04-24 11:07:47.971829019 +0200
+--- samba-3.0.25a.orig/source/printing/printing.c 2007-03-01 05:54:09.000000000 +0100
++++ samba-3.0.25a/source/printing/printing.c 2007-05-26 07:24:49.090001993 +0200
@@ -185,8 +185,8 @@
int services = lp_numservices();
int snum;
@@ -467,10 +467,10 @@
mkdir(printing_path,0755);
/* handle a Samba upgrade */
-Index: samba-3.0.25rc2/source/printing/printing_db.c
+Index: samba-3.0.25a/source/printing/printing_db.c
===================================================================
---- samba-3.0.25rc2.orig/source/printing/printing_db.c 2007-04-24 11:07:02.382138473 +0200
-+++ samba-3.0.25rc2/source/printing/printing_db.c 2007-04-24 11:07:47.999829993 +0200
+--- samba-3.0.25a.orig/source/printing/printing_db.c 2006-06-23 15:16:50.000000000 +0200
++++ samba-3.0.25a/source/printing/printing_db.c 2007-05-26 07:24:49.118002226 +0200
@@ -91,7 +91,7 @@
DLIST_ADD(print_db_head, p);
}
@@ -480,10 +480,10 @@
pstrcat(printdb_path, printername);
pstrcat(printdb_path, ".tdb");
-Index: samba-3.0.25rc2/source/smbd/lanman.c
+Index: samba-3.0.25a/source/smbd/lanman.c
===================================================================
---- samba-3.0.25rc2.orig/source/smbd/lanman.c 2007-04-24 11:07:02.390138789 +0200
-+++ samba-3.0.25rc2/source/smbd/lanman.c 2007-04-24 11:07:48.031831103 +0200
+--- samba-3.0.25a.orig/source/smbd/lanman.c 2007-05-11 00:09:34.000000000 +0200
++++ samba-3.0.25a/source/smbd/lanman.c 2007-05-26 07:24:49.150002493 +0200
@@ -1088,9 +1088,9 @@
BOOL local_list_only;
int i;
@@ -496,10 +496,10 @@
return 0;
}
-Index: samba-3.0.25rc2/source/registry/reg_db.c
+Index: samba-3.0.25a/source/registry/reg_db.c
===================================================================
---- samba-3.0.25rc2.orig/source/registry/reg_db.c 2007-04-24 11:07:02.406139422 +0200
-+++ samba-3.0.25rc2/source/registry/reg_db.c 2007-04-24 11:07:48.055831935 +0200
+--- samba-3.0.25a.orig/source/registry/reg_db.c 2007-03-01 05:55:05.000000000 +0100
++++ samba-3.0.25a/source/registry/reg_db.c 2007-05-26 07:24:49.174002692 +0200
@@ -234,12 +234,12 @@
if ( tdb_reg )
return True;
@@ -530,10 +530,10 @@
}
unbecome_root();
-Index: samba-3.0.25rc2/source/lib/account_pol.c
+Index: samba-3.0.25a/source/lib/account_pol.c
===================================================================
---- samba-3.0.25rc2.orig/source/lib/account_pol.c 2007-04-24 11:07:02.262133725 +0200
-+++ samba-3.0.25rc2/source/lib/account_pol.c 2007-04-24 11:07:48.087833045 +0200
+--- samba-3.0.25a.orig/source/lib/account_pol.c 2007-03-01 05:54:30.000000000 +0100
++++ samba-3.0.25a/source/lib/account_pol.c 2007-05-26 07:24:49.234003192 +0200
@@ -213,9 +213,9 @@
return True;
}
@@ -546,10 +546,10 @@
if (!tdb) {
DEBUG(0,("Failed to open account policy database\n"));
return False;
-Index: samba-3.0.25rc2/source/registry/reg_perfcount.c
+Index: samba-3.0.25a/source/registry/reg_perfcount.c
===================================================================
---- samba-3.0.25rc2.orig/source/registry/reg_perfcount.c 2007-04-24 11:07:02.418139897 +0200
-+++ samba-3.0.25rc2/source/registry/reg_perfcount.c 2007-04-24 11:07:48.115834016 +0200
+--- samba-3.0.25a.orig/source/registry/reg_perfcount.c 2007-03-01 05:55:05.000000000 +0100
++++ samba-3.0.25a/source/registry/reg_perfcount.c 2007-05-26 07:24:49.262003425 +0200
@@ -46,7 +46,7 @@
fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
@@ -568,10 +568,10 @@
/* no registry keys; just create the perfmon directory */
-Index: samba-3.0.25rc2/source/rpc_server/srv_eventlog_lib.c
+Index: samba-3.0.25a/source/rpc_server/srv_eventlog_lib.c
===================================================================
---- samba-3.0.25rc2.orig/source/rpc_server/srv_eventlog_lib.c 2007-04-24 11:07:02.426140213 +0200
-+++ samba-3.0.25rc2/source/rpc_server/srv_eventlog_lib.c 2007-04-24 11:07:48.143834987 +0200
+--- samba-3.0.25a.orig/source/rpc_server/srv_eventlog_lib.c 2007-03-01 05:54:40.000000000 +0100
++++ samba-3.0.25a/source/rpc_server/srv_eventlog_lib.c 2007-05-26 07:24:49.290003658 +0200
@@ -67,7 +67,7 @@
{
fstring path;
@@ -590,10 +590,10 @@
if ( !directory_exist( eventlogdir, NULL ) )
mkdir( eventlogdir, 0755 );
-Index: samba-3.0.25rc2/source/passdb/pdb_tdb.c
+Index: samba-3.0.25a/source/passdb/pdb_tdb.c
===================================================================
---- samba-3.0.25rc2.orig/source/passdb/pdb_tdb.c 2007-04-24 11:07:02.322136099 +0200
-+++ samba-3.0.25rc2/source/passdb/pdb_tdb.c 2007-04-24 11:07:48.187836513 +0200
+--- samba-3.0.25a.orig/source/passdb/pdb_tdb.c 2007-03-01 05:54:41.000000000 +0100
++++ samba-3.0.25a/source/passdb/pdb_tdb.c 2007-05-26 07:24:49.318003891 +0200
@@ -1623,7 +1623,7 @@
/* save the path for later */
@@ -603,10 +603,10 @@
pfile = tdbfile;
}
pstrcpy( tdbsam_filename, pfile );
-Index: samba-3.0.25rc2/source/groupdb/mapping_tdb.c
+Index: samba-3.0.25a/source/groupdb/mapping_tdb.c
===================================================================
---- samba-3.0.25rc2.orig/source/groupdb/mapping_tdb.c 2007-04-24 11:07:02.438140688 +0200
-+++ samba-3.0.25rc2/source/groupdb/mapping_tdb.c 2007-04-24 11:07:48.215837485 +0200
+--- samba-3.0.25a.orig/source/groupdb/mapping_tdb.c 2007-04-25 11:38:59.000000000 +0200
++++ samba-3.0.25a/source/groupdb/mapping_tdb.c 2007-05-26 07:24:49.346004125 +0200
@@ -39,7 +39,7 @@
if (tdb)
return True;
@@ -616,10 +616,10 @@
if (!tdb) {
DEBUG(0,("Failed to open group mapping database\n"));
return False;
-Index: samba-3.0.25rc2/source/nsswitch/idmap_tdb.c
+Index: samba-3.0.25a/source/nsswitch/idmap_tdb.c
===================================================================
---- samba-3.0.25rc2.orig/source/nsswitch/idmap_tdb.c 2007-04-24 11:07:02.338136732 +0200
-+++ samba-3.0.25rc2/source/nsswitch/idmap_tdb.c 2007-04-24 11:07:48.247838594 +0200
+--- samba-3.0.25a.orig/source/nsswitch/idmap_tdb.c 2007-05-11 00:09:34.000000000 +0200
++++ samba-3.0.25a/source/nsswitch/idmap_tdb.c 2007-05-26 07:24:49.378004391 +0200
@@ -247,7 +247,7 @@
}
More information about the Pkg-samba-maint
mailing list