[Pkg-sks-commit] r48 - sks/trunk/sks/debian/patches

[chrism at alioth.debian.org]

Author: chrism
Date: 2008-06-19 14:42:28 +0000 (Thu, 19 Jun 2008)
New Revision: 48

Modified:
   sks/trunk/sks/debian/patches/500_debian_fhs
Log:
[project @ 49]
fare warning to not set -basedir with debian binaries

Original author: fabbione
Date: 2003-12-04 14:56:57.675864+00:00

Modified: sks/trunk/sks/debian/patches/500_debian_fhs
===================================================================
--- sks/trunk/sks/debian/patches/500_debian_fhs	2008-06-19 14:42:07 UTC (rev 47)
+++ sks/trunk/sks/debian/patches/500_debian_fhs	2008-06-19 14:42:28 UTC (rev 48)
@@ -1,6 +1,6 @@
 diff -ruN sks-1.0.6-old/common.src.ml sks-1.0.6/common.src.ml
 --- sks-1.0.6-old/common.src.ml	2003-12-02 11:23:52.000000000 +0100
-+++ sks-1.0.6/common.src.ml	2003-12-04 13:29:20.000000000 +0100
++++ sks-1.0.6/common.src.ml	2003-12-04 15:51:45.000000000 +0100
 @@ -81,7 +81,7 @@
  
  let set_logfile extension = 
@@ -23,7 +23,7 @@
  let recon_command_addr = Unix.ADDR_UNIX recon_command_name
 diff -ruN sks-1.0.6-old/dbserver.ml sks-1.0.6/dbserver.ml
 --- sks-1.0.6-old/dbserver.ml	2003-12-02 12:03:33.000000000 +0100
-+++ sks-1.0.6/dbserver.ml	2003-12-04 13:29:20.000000000 +0100
++++ sks-1.0.6/dbserver.ml	2003-12-04 15:51:45.000000000 +0100
 @@ -336,7 +336,7 @@
  
    let convert_web_fname fname =
@@ -35,7 +35,7 @@
    (** Handler for HTTP requests *)
 diff -ruN sks-1.0.6-old/getfileopts.ml sks-1.0.6/getfileopts.ml
 --- sks-1.0.6-old/getfileopts.ml	2003-11-04 04:11:58.000000000 +0100
-+++ sks-1.0.6/getfileopts.ml	2003-12-04 13:29:20.000000000 +0100
++++ sks-1.0.6/getfileopts.ml	2003-12-04 15:51:45.000000000 +0100
 @@ -106,7 +106,7 @@
  (**************************************************************)
  (**************************************************************)
@@ -47,7 +47,7 @@
    Arg.current := 0;
 diff -ruN sks-1.0.6-old/reconserver.ml sks-1.0.6/reconserver.ml
 --- sks-1.0.6-old/reconserver.ml	2003-10-12 22:20:19.000000000 +0200
-+++ sks-1.0.6/reconserver.ml	2003-12-04 13:29:58.000000000 +0100
++++ sks-1.0.6/reconserver.ml	2003-12-04 15:51:45.000000000 +0100
 @@ -181,7 +181,7 @@
        print_hashes hashes;
        if List.length elements > 0 
@@ -68,7 +68,7 @@
  	      update_recover_list results http_addr;
 diff -ruN sks-1.0.6-old/settings.ml sks-1.0.6/settings.ml
 --- sks-1.0.6-old/settings.ml	2003-11-29 15:25:51.000000000 +0100
-+++ sks-1.0.6/settings.ml	2003-12-04 13:29:20.000000000 +0100
++++ sks-1.0.6/settings.ml	2003-12-04 15:53:51.000000000 +0100
 @@ -90,7 +90,7 @@
  let max_uid_fetches = ref 1000
  let set_max_uid_fetches value = max_uid_fetches := value
@@ -108,3 +108,12 @@
  
  let update_dir dirref =
    dirref := Filename.concat !basedir !dirref
+@@ -252,7 +252,7 @@
+     ("-hkp_address",Arg.String set_hkp_address, "Set hkp binding address"); 
+     ("-use_port_80",Arg.Set use_port_80, 
+      "Have the HKP interface listen on port 80, as well as the hkp_port"); 
+-    ("-basedir", Arg.String set_basedir, "Set base directory");
++    ("-basedir", Arg.String set_basedir, "Set base directory (DO NOT SET IT IF YOU ARE RUNNING THE DEBIAN BINARIES!!)");
+     ("-stdoutlog", Arg.Clear filelog, 
+      "Send log messages to stdout instead of log file");
+     ("-diskptree", Arg.Set disk_ptree, "Use a disk-based ptree " ^