[Pkg-samba-maint] r1539 - branches/samba/experimental/debian/patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2007-10-21 07:20:12 +0000 (Sun, 21 Oct 2007)
New Revision: 1539

Modified:
   branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch
   branches/samba/experimental/debian/patches/fhs-filespaths.patch
   branches/samba/experimental/debian/patches/fhs-newpaths.patch
Log:
Adapt comments to the current situation wrt upstream discussion


Modified: branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch	2007-10-21 07:15:04 UTC (rev 1538)
+++ branches/samba/experimental/debian/patches/fhs-filespaths-debatable.patch	2007-10-21 07:20:12 UTC (rev 1539)
@@ -1,51 +1,27 @@
 Goal: Prepare the sources to better respect FHS
       New configurable paths are introduced in fhs-newpaths.patch
       This patch associates files with the new paths
-      This part is debated with upstream
+      This part is debated with upstream but contains the move to
+      "cache" path which seems to be the most difficult chunk for
+      upstream to adopt
 
 Fixes: #49011
 
-Status wrt upstream: Mean to be forwarded upstream (a good rationale 
-                     about FHS is probably recommended)
+Status wrt upstream: Fowarded and dscussed
 
 Note: Use dedicated directories for:
       - discardable cache data (/var/cache/samba): 
           browse.dat, printers.tbd, <printer>.tdb
-      - non discardable state data:
-          all TDB files that may need to be backed up
-      - shared data (/usr/share/samba):
-          codepage stuff
 
       This patch needs work to be cleaner wrt people who want to run
       multiple instances of samba
 
       The patch *must* be reviewed after every new upstream release.
       FAILURE TO DO SO MAY RESULT IN DATA LOSS FOR OUR USERS!
+      
+      See comment in fhs-filespaths.patch
 
-      export QUILT_PATCHES=debian/patches
-      quilt push fhs.patch
-      grep -r lock_path source/ | grep -vE \
-         '"((brlock|connections|gencache|locking|messages|notify|sessionid|unexpected|wins)\.tdb|namelist.debug|lang_)|char \*lock_path|WINBINDD_PRIV_SOCKET_SUBDIR'
 
-      - This will get you the list of any new, unexpected references to
-        lock_path.  The files mentioned above are the known good uses of
-        lock_path; everything else needs to be investigated.
-      - If the file name occurs elsewhere in the fhs.patch, update the
-        patch to fix these new references to the same place (either
-        cache_path or state_path)
-      - If the file is a tdb file, and the code that opens it uses
-        TDB_CLEAR_IF_FIRST, lock_path is correct; just update the query
-        above with the new filename, no other changes are needed.
-      - Otherwise, if this is the first use of the file, you must
-        determine where the file belongs -- i.e., whether it's
-        persistent data, a cache, or runtime-only data.  Consult
-        upstream if necessary.
-      - Repeat these steps for lp_lockdir(), which is less common but
-        still used in the code.
-
-      grep -r lp_lockdir source/ | grep -vE \
-         '%s/smb_(tmp_)*krb5|source/(lib/util|param/loadparm|dynconfig|utils/testparm)\.c|WINBINDD_PRIV_SOCKET_SUBDIR|(directory_exist|mkdir)\(lp_lockdir\(\),|koplock\.%d|%s/sync\.%d'
-
 Index: samba-3.2.0pre1/source/lib/util.c
 ===================================================================
 --- samba-3.2.0pre1.orig/source/lib/util.c

Modified: branches/samba/experimental/debian/patches/fhs-filespaths.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-filespaths.patch	2007-10-21 07:15:04 UTC (rev 1538)
+++ branches/samba/experimental/debian/patches/fhs-filespaths.patch	2007-10-21 07:20:12 UTC (rev 1539)
@@ -5,12 +5,9 @@
 
 Fixes: #49011
 
-Status wrt upstream: Mean to be forwarded upstream (a good rationale 
-                     about FHS is probably recommended)
+Status wrt upstream: Forwarded. Under discussion. Could be adopted.
 
 Note: Use dedicated directories for:
-      - discardable cache data (/var/cache/samba): 
-          browse.dat, printers.tbd, <printer>.tdb
       - non discardable state data:
           all TDB files that may need to be backed up
       - shared data (/usr/share/samba):
@@ -32,7 +29,8 @@
         lock_path; everything else needs to be investigated.
       - If the file name occurs elsewhere in the fhs.patch, update the
         patch to fix these new references to the same place (either
-        cache_path or state_path)
+        cache_path or state_path. If cache_path, the change belongs
+        to fhs-filespaths-debatable)
       - If the file is a tdb file, and the code that opens it uses
         TDB_CLEAR_IF_FIRST, lock_path is correct; just update the query
         above with the new filename, no other changes are needed.

Modified: branches/samba/experimental/debian/patches/fhs-newpaths.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-newpaths.patch	2007-10-21 07:15:04 UTC (rev 1538)
+++ branches/samba/experimental/debian/patches/fhs-newpaths.patch	2007-10-21 07:20:12 UTC (rev 1539)
@@ -4,8 +4,7 @@
 
 Fixes: #49011
 
-Status wrt upstream: Mean to be forwarded upstream (a good rationale 
-                     about FHS is probably recommended)
+Status wrt upstream: Forwarded. Under discussion
 
 Note: See fhs-filespaths for rationale about the meaning of the new
       path variables