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

[chrism at alioth.debian.org]

Author: chrism
Date: 2008-06-19 15:09:00 +0000 (Thu, 19 Jun 2008)
New Revision: 145

Modified:
   sks/trunk/sks/debian/patches/500_debian_fhs
Log:
[project @ 147]
Fix 500_debian_fhs

Original author: weasel
Date: 2004-06-20 11:25:15.343939+00:00

Modified: sks/trunk/sks/debian/patches/500_debian_fhs
===================================================================
--- sks/trunk/sks/debian/patches/500_debian_fhs	2008-06-19 15:08:40 UTC (rev 144)
+++ sks/trunk/sks/debian/patches/500_debian_fhs	2008-06-19 15:09:00 UTC (rev 145)
@@ -1,6 +1,6 @@
 diff -ruN sks-1.0.7-old/common.ml sks-1.0.7/common.ml
 --- sks-1.0.7-old/common.ml	Fri Feb 20 00:58:04 2004
-+++ sks-1.0.7/common.ml	Sat Jun 19 01:01:54 2004
++++ sks-1.0.7/common.ml	Sat Jun 19 01:13:23 2004
 @@ -81,7 +81,7 @@
  
  let set_logfile extension = 
@@ -22,8 +22,8 @@
  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.7-old/dbserver.ml sks-1.0.7/dbserver.ml
---- sks-1.0.7-old/dbserver.ml	Sat Jun 19 01:01:54 2004
-+++ sks-1.0.7/dbserver.ml	Sat Jun 19 01:01:54 2004
+--- sks-1.0.7-old/dbserver.ml	Sat Jun 19 01:13:23 2004
++++ sks-1.0.7/dbserver.ml	Sat Jun 19 01:13:23 2004
 @@ -336,7 +336,7 @@
  
    let convert_web_fname fname =
@@ -35,7 +35,7 @@
    (** Handler for HTTP requests *)
 diff -ruN sks-1.0.7-old/getfileopts.ml sks-1.0.7/getfileopts.ml
 --- sks-1.0.7-old/getfileopts.ml	Tue Dec  9 22:33:49 2003
-+++ sks-1.0.7/getfileopts.ml	Sat Jun 19 01:01:54 2004
++++ sks-1.0.7/getfileopts.ml	Sat Jun 19 01:13:23 2004
 @@ -106,7 +106,7 @@
  (**************************************************************)
  (**************************************************************)
@@ -46,12 +46,12 @@
  let parse args = 
    Arg.current := 0;
 diff -ruN sks-1.0.7-old/reconserver.ml sks-1.0.7/reconserver.ml
---- sks-1.0.7-old/reconserver.ml	Sat Jun 19 01:01:54 2004
-+++ sks-1.0.7/reconserver.ml	Sat Jun 19 00:56:40 2004
+--- sks-1.0.7-old/reconserver.ml	Sat Jun 19 01:13:23 2004
++++ sks-1.0.7/reconserver.ml	Sat Jun 19 01:13:52 2004
 @@ -179,7 +179,7 @@
        let elements = Set.elements results in
        let hashes = hashconvert elements in
-       print_hashes hashes;
+       print_hashes (sockaddr_to_name addr) hashes;
 -      log_diffs (sprintf "diff-%s.txt" (sockaddr_to_name addr)) hashes;
 +      log_diffs (sprintf "/var/spool/sks/diff-%s.txt" (sockaddr_to_name addr)) hashes;
        if List.length elements > 0 
@@ -60,15 +60,53 @@
 @@ -216,7 +216,7 @@
  	ignore (plerror 4 "Reconciliation complete");
  	let hashes = hashconvert results in
- 	print_hashes hashes;
+ 	print_hashes (sockaddr_to_name partner) hashes;
 -	log_diffs (sprintf "diff-%s.txt" (sockaddr_to_name partner)) hashes;
 +	log_diffs (sprintf "/var/spool/sks/diff-%s.txt" (sockaddr_to_name partner)) hashes;
  	match results with
  	    [] -> []
  	  | _ ->
+diff -ruN sks-1.0.7-old/reconserver.ml.rej sks-1.0.7/reconserver.ml.rej
+--- sks-1.0.7-old/reconserver.ml.rej	Thu Jan  1 01:00:00 1970
++++ sks-1.0.7/reconserver.ml.rej	Sat Jun 19 01:13:23 2004
+@@ -0,0 +1,34 @@
++***************
++*** 179,185 ****
++        let elements = Set.elements results in
++        let hashes = hashconvert elements in
++        print_hashes hashes;
++-       log_diffs (sprintf "diff-%s.txt" (sockaddr_to_name addr)) hashes;
++        if List.length elements > 0 
++        then (
++  	update_recover_list elements http_addr;
++--- 179,185 ----
++        let elements = Set.elements results in
++        let hashes = hashconvert elements in
++        print_hashes hashes;
+++       log_diffs (sprintf "/var/spool/sks/diff-%s.txt" (sockaddr_to_name addr)) hashes;
++        if List.length elements > 0 
++        then (
++  	update_recover_list elements http_addr;
++***************
++*** 216,222 ****
++  	ignore (plerror 4 "Reconciliation complete");
++  	let hashes = hashconvert results in
++  	print_hashes hashes;
++- 	log_diffs (sprintf "diff-%s.txt" (sockaddr_to_name partner)) hashes;
++  	match results with
++  	    [] -> []
++  	  | _ ->
++--- 216,222 ----
++  	ignore (plerror 4 "Reconciliation complete");
++  	let hashes = hashconvert results in
++  	print_hashes hashes;
+++ 	log_diffs (sprintf "/var/spool/sks/diff-%s.txt" (sockaddr_to_name partner)) hashes;
++  	match results with
++  	    [] -> []
++  	  | _ ->
 diff -ruN sks-1.0.7-old/settings.ml sks-1.0.7/settings.ml
---- sks-1.0.7-old/settings.ml	Sat Jun 19 01:01:54 2004
-+++ sks-1.0.7/settings.ml	Sat Jun 19 01:01:54 2004
+--- sks-1.0.7-old/settings.ml	Sat Jun 19 01:13:23 2004
++++ sks-1.0.7/settings.ml	Sat Jun 19 01:13:23 2004
 @@ -176,7 +176,7 @@
  let command_timeout = ref 60
  let set_command_timeout value = command_timeout := value