git.samba.org / garming / samba-autobuild / .git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
syncing packaging files from 3.0
[garming/samba-autobuild/.git] / packaging / Debian / debian / patches / fhs.patch
diff --git a/packaging/Debian/debian/patches/fhs.patch b/packaging/Debian/debian/patches/fhs.patch
index b5c7c6c676896dba651ec637267248e9cc75d933..1c90499a83539e0627204926b269cf15cdabcb3e 100644 (file)
--- a/packaging/Debian/debian/patches/fhs.patch
+++ b/packaging/Debian/debian/patches/fhs.patch
@@ -1,7 +1,7 @@
 diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makefile.in
 --- samba-3.0.0beta2.orig/source/Makefile.in   2003-07-02 23:26:46.000000000 -0500
 +++ samba-3.0.0beta2/source/Makefile.in        2003-07-02 23:19:46.000000000 -0500
-@@ -68,6 +68,7 @@
+@@ -67,6 +67,7 @@
  CONFIGDIR = @configdir@
  VARDIR = @localstatedir@
  MANDIR = @mandir@
@@ -9,7 +9,7 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makef
  
  # The permissions to give the executables
  INSTALLPERMS = 0755
-@@ -91,6 +92,13 @@
+@@ -90,6 +91,13 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
  
@@ -23,7 +23,7 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/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.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makef
  PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS)
  
  # Note that all executable programs now provide for an optional executable suffix.
-@@ -1123,7 +1131,7 @@
+@@ -1203,7 +1211,7 @@
        @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
  
  installdat: installdirs
@@ -192,7 +192,7 @@ diff -uNr samba-3.0.0beta2.orig/source/lib/account_pol.c samba-3.0.0beta2/source
 diff -uNr samba-3.0.0beta2.orig/source/lib/util.c samba-3.0.0beta2/source/lib/util.c
 --- samba-3.0.0beta2.orig/source/lib/util.c    2003-07-02 23:26:47.000000000 -0500
 +++ samba-3.0.0beta2/source/lib/util.c 2003-07-02 23:19:02.000000000 -0500
-@@ -2252,6 +2252,61 @@
+@@ -2190,6 +2190,61 @@
  }
  
  /**
@@ -298,38 +298,36 @@ diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/
                                   TDB_DEFAULT, O_RDWR, 0600);
                if (!tdb) {
                        DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
-diff -uNr samba-3.0.0beta2.orig/source/nmbd/nmbd_serverlistdb.c samba-3.0.0beta2/source/nmbd/nmbd_serverlistdb.c
---- samba-3.0.0beta2.orig/source/nmbd/nmbd_serverlistdb.c      2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/nmbd/nmbd_serverlistdb.c   2003-07-02 23:19:02.000000000 -0500
-@@ -343,7 +343,7 @@
+--- samba_3_0/source/nmbd/nmbd_serverlistdb.c.orig     2003-09-08 10:53:13.000000000 -0400
++++ samba_3_0/source/nmbd/nmbd_serverlistdb.c  2003-09-08 11:22:03.000000000 -0400
+@@ -327,7 +327,7 @@
  
-   updatecount++;
+       updatecount++;
      
--  pstrcpy(fname,lp_lockdir());
-+  pstrcpy(fname,dyn_CACHEDIR());
-   trim_string(fname,NULL,"/");
-   pstrcat(fname,"/");
-   pstrcat(fname,SERVER_LIST);
-diff -uNr samba-3.0.0beta2.orig/source/nmbd/nmbd_winsserver.c samba-3.0.0beta2/source/nmbd/nmbd_winsserver.c
---- samba-3.0.0beta2.orig/source/nmbd/nmbd_winsserver.c        2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/nmbd/nmbd_winsserver.c     2003-07-02 23:19:02.000000000 -0500
-@@ -230,7 +230,7 @@
- 
-   add_samba_names_to_subnet(wins_server_subnet);
- 
--  if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL)
-+  if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL)
-   {
-     DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
-            WINS_LIST, strerror(errno) ));
-@@ -1836,7 +1836,7 @@
-         }
-   }
+-      pstrcpy(fname,lp_lockdir());
++      pstrcpy(fname,dyn_CACHEDIR());
+       trim_char(fname,'\0' ,'/');
+       pstrcat(fname,"/");
+       pstrcat(fname,SERVER_LIST);
+--- samba-3.0.0rc2/source/nmbd/nmbd_winsserver.c.orig  2003-08-28 17:42:44.000000000 -0400
++++ samba-3.0.0rc2/source/nmbd/nmbd_winsserver.c       2003-08-31 08:09:11.000000000 -0400
+@@ -228,7 +228,7 @@
+ 
+       add_samba_names_to_subnet(wins_server_subnet);
+ 
+-      if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL) {
++      if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL) {
+               DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
+                       WINS_LIST, strerror(errno) ));
+               return True;
+@@ -1759,7 +1759,7 @@
+               }
+       }
  
--  slprintf(fname,sizeof(fname)-1,"%s/%s", lp_lockdir(), WINS_LIST);
-+  slprintf(fname,sizeof(fname)-1,"%s/%s", dyn_STATEDIR(), WINS_LIST);
-   all_string_sub(fname,"//", "/", 0);
-   slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
+-      slprintf(fname,sizeof(fname)-1,"%s/%s", lp_lockdir(), WINS_LIST);
++      slprintf(fname,sizeof(fname)-1,"%s/%s", dyn_STATEDIR(), WINS_LIST);
+       all_string_sub(fname,"//", "/", 0);
+       slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
  
 diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c samba-3.0.0beta2/source/nsswitch/winbindd_cache.c
 --- samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c     2003-07-02 23:26:47.000000000 -0500
@@ -346,7 +344,7 @@ diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c samba-3.0.0beta
 diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_util.c samba-3.0.0beta2/source/nsswitch/winbindd_util.c
 --- samba-3.0.0beta2.orig/source/nsswitch/winbindd_util.c      2003-07-01 15:44:25.000000000 -0500
 +++ samba-3.0.0beta2/source/nsswitch/winbindd_util.c   2003-07-02 23:19:02.000000000 -0500
-@@ -747,7 +747,7 @@
+@@ -813,7 +813,7 @@
        SMB_STRUCT_STAT stbuf;
        TDB_CONTEXT *idmap_tdb;
  
@@ -368,24 +366,24 @@ diff -uNr samba-3.0.0beta2.orig/source/param/loadparm.c samba-3.0.0beta2/source/
        char *szLockDir;
        char *szPidDir;
        char *szRootdir;
-@@ -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},
+@@ -1082,8 +1082,13 @@
+       {"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE}, 
+       {"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, 
+       {"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, 
 +#ifdef FHS_COMPATIBLE
++      {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0}, 
 +      {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0},
-+      {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0},
 +#else
+       {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED}, 
        {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE}, 
-       {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 +#endif
-       {"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, 
+       {"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 | FLAG_DEVELOPER},
+       {"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED}, 
 diff -uNr samba-3.0.0beta2.orig/source/passdb/pdb_tdb.c samba-3.0.0beta2/source/passdb/pdb_tdb.c
 --- samba-3.0.0beta2.orig/source/passdb/pdb_tdb.c      2003-07-02 23:26:47.000000000 -0500
 +++ samba-3.0.0beta2/source/passdb/pdb_tdb.c   2003-07-02 23:19:02.000000000 -0500
-@@ -526,10 +526,7 @@
+@@ -501,10 +501,7 @@
        if (location) {
                tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location);
        } else {
@@ -425,7 +423,7 @@ diff -uNr samba-3.0.0beta2.orig/source/passdb/secrets.c samba-3.0.0beta2/source/
 diff -uNr samba-3.0.0beta2.orig/source/printing/nt_printing.c samba-3.0.0beta2/source/printing/nt_printing.c
 --- samba-3.0.0beta2.orig/source/printing/nt_printing.c        2003-07-02 23:26:47.000000000 -0500
 +++ samba-3.0.0beta2/source/printing/nt_printing.c     2003-07-02 23:19:02.000000000 -0500
-@@ -287,28 +287,28 @@
+@@ -293,28 +293,28 @@
   
        if (tdb_drivers)
                tdb_close(tdb_drivers);
@@ -525,7 +523,7 @@ diff -uNr samba-3.0.0beta2.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0.0bet
 diff -uNr samba-3.0.0beta2.orig/source/sam/idmap_tdb.c samba-3.0.0beta2/source/sam/idmap_tdb.c
 --- samba-3.0.0beta2.orig/source/sam/idmap_tdb.c       2003-07-01 15:44:26.000000000 -0500
 +++ samba-3.0.0beta2/source/sam/idmap_tdb.c    2003-07-02 23:19:02.000000000 -0500
-@@ -495,7 +495,7 @@
+@@ -487,7 +487,7 @@
        BOOL tdb_is_new = False;
  
        /* use the old database if present */
@@ -570,14 +568,3 @@ diff -uNr samba-3.0.0beta2.orig/source/wrepld/process.c samba-3.0.0beta2/source/
        if (!tdb) {
                DEBUG(2,("send_entry_request: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) ));
                return;
---- samba_3_0/source/nsswitch/winbindd_acct.c.orig     2003-07-15 13:03:59.000000000 -0400
-+++ samba_3_0/source/nsswitch/winbindd_acct.c  2003-07-15 13:04:42.000000000 -0400
-@@ -73,7 +73,7 @@
-               
-       /* Nope.  Try to open it */
- 
--      if (!(account_tdb = tdb_open_log(lock_path("winbindd_idmap.tdb"), 0, 
-+      if (!(account_tdb = tdb_open_log(state_path("winbindd_idmap.tdb"), 0, 
-               TDB_DEFAULT, O_RDWR | O_CREAT, 0600))) 
-       {
-               /* last chance -- maybe idmap has already opened it */
Unnamed repository; edit this file 'description' to name the repository.