[Pkg-sks-commit] r32 - in sks/trunk/sks/debian: . patches

[chrism at alioth.debian.org]

Author: chrism
Date: 2008-06-19 14:37:13 +0000 (Thu, 19 Jun 2008)
New Revision: 32

Modified:
   sks/trunk/sks/debian/TODO
   sks/trunk/sks/debian/dirs
   sks/trunk/sks/debian/patches/500_debian_fhs
Log:
[project @ 33]
more about FHS /var/log/sks and sockets /var/run/sks

Original author: fabbione
Date: 2003-12-02 12:27:30.301417+00:00

Modified: sks/trunk/sks/debian/TODO
===================================================================
--- sks/trunk/sks/debian/TODO	2008-06-19 14:37:07 UTC (rev 31)
+++ sks/trunk/sks/debian/TODO	2008-06-19 14:37:13 UTC (rev 32)
@@ -12,9 +12,11 @@
 	    a libtool <-> ocaml interaction but not everything all the
 	    CFLAGS are the same so we cannot really use a debian standard.
 	- debian fhs needs to be completed
-	  - where are the recon and db sockets?  do they still exist in 1.0.5?
+	  o where are the recon and db sockets?  do they still exist in 1.0.5?
+	    they are in /var/run/sks now.
 	  o why the fuck upstream has to force pwd???.. a fucking "."
 	    go figure...
+	    and we should be carefull to the runtime option -basedir!
 	- completing Build-Depends:
 	- wait for the non-free Nat stuff to get rewritten in ocaml.
 	  Sven says it will be in ocaml 3.08.

Modified: sks/trunk/sks/debian/dirs
===================================================================
--- sks/trunk/sks/debian/dirs	2008-06-19 14:37:07 UTC (rev 31)
+++ sks/trunk/sks/debian/dirs	2008-06-19 14:37:13 UTC (rev 32)
@@ -4,5 +4,6 @@
 usr/share/sks
 var/lib/sks/dump
 var/log/sks
+var/run/sks
 var/spool/sks/messages
 var/spool/sks/failed_messages

Modified: sks/trunk/sks/debian/patches/500_debian_fhs
===================================================================
--- sks/trunk/sks/debian/patches/500_debian_fhs	2008-06-19 14:37:07 UTC (rev 31)
+++ sks/trunk/sks/debian/patches/500_debian_fhs	2008-06-19 14:37:13 UTC (rev 32)
@@ -1,6 +1,43 @@
+diff -ruN sks-1.0.5-old/common.ml sks-1.0.5/common.ml
+--- sks-1.0.5-old/common.ml	2003-11-28 13:48:22.000000000 +0100
++++ sks-1.0.5/common.ml	2003-12-02 12:45:27.000000000 +0100
+@@ -81,7 +81,7 @@
+ 
+ let set_logfile extension = 
+   if !Settings.filelog then
+-    let fname = (Filename.concat !Settings.basedir "log") ^ extension in
++    let fname = (Filename.concat !Settings.basedir "/var/log/sks/log") ^ extension in
+     stored_logfile_name := Some fname;
+     logfile := open_out_gen [ Open_wronly; Open_creat; Open_append; ] 
+       0o600 fname;
+@@ -202,8 +202,8 @@
+ let recon_address = !Settings.recon_address
+ let http_port = !Settings.hkp_port
+ let http_address = !Settings.hkp_address
+-let db_command_name = Filename.concat !Settings.basedir "db_com_sock"
+-let recon_command_name = Filename.concat !Settings.basedir "recon_com_sock"
++let db_command_name = Filename.concat !Settings.basedir "/var/run/sks/db_com_sock"
++let recon_command_name = Filename.concat !Settings.basedir "/var/run/sks/recon_com_sock"
+ 
+ let db_command_addr = Unix.ADDR_UNIX db_command_name
+ let recon_command_addr = Unix.ADDR_UNIX recon_command_name
+diff -ruN sks-1.0.5-old/common.src.ml sks-1.0.5/common.src.ml
+--- sks-1.0.5-old/common.src.ml	2003-10-12 22:20:18.000000000 +0200
++++ sks-1.0.5/common.src.ml	2003-12-02 12:27:38.000000000 +0100
+@@ -204,8 +204,8 @@
+ let recon_address = !Settings.recon_address
+ let http_port = !Settings.hkp_port
+ let http_address = !Settings.hkp_address
+-let db_command_name = Filename.concat !Settings.basedir "db_com_sock"
+-let recon_command_name = Filename.concat !Settings.basedir "recon_com_sock"
++let db_command_name = Filename.concat !Settings.basedir "/var/run/sks/db_com_sock"
++let recon_command_name = Filename.concat !Settings.basedir "/var/run/sks/recon_com_sock"
+ 
+ let db_command_addr = Unix.ADDR_UNIX db_command_name
+ let recon_command_addr = Unix.ADDR_UNIX recon_command_name
 diff -ruN sks-1.0.5-old/getfileopts.ml sks-1.0.5/getfileopts.ml
 --- sks-1.0.5-old/getfileopts.ml	2003-11-04 03:34:43.000000000 +0100
-+++ sks-1.0.5/getfileopts.ml	2003-12-01 21:43:08.000000000 +0100
++++ sks-1.0.5/getfileopts.ml	2003-12-02 12:23:58.000000000 +0100
 @@ -106,7 +106,7 @@
  (**************************************************************)
  (**************************************************************)
@@ -12,7 +49,7 @@
    Arg.current := 0;
 diff -ruN sks-1.0.5-old/settings.ml sks-1.0.5/settings.ml
 --- sks-1.0.5-old/settings.ml	2003-11-29 15:18:31.000000000 +0100
-+++ sks-1.0.5/settings.ml	2003-12-01 21:43:40.000000000 +0100
++++ sks-1.0.5/settings.ml	2003-12-02 12:23:58.000000000 +0100
 @@ -90,7 +90,7 @@
  let max_uid_fetches = ref 1000
  let set_max_uid_fetches value = max_uid_fetches := value