[Pkg-sks-commit] r143 - sks/trunk/sks/debian/patches
chrism at alioth.debian.org
chrism at alioth.debian.org
Thu Jun 19 15:08:12 UTC 2008
Author: chrism
Date: 2008-06-19 15:08:11 +0000 (Thu, 19 Jun 2008)
New Revision: 143
Modified:
sks/trunk/sks/debian/patches/206_also_write_empty_diffs
sks/trunk/sks/debian/patches/500_debian_fhs
Log:
[project @ 145]
Fix clash with 500_debian_fhs
Original author: weasel
Date: 2004-06-18 23:03:00.823232+00:00
Modified: sks/trunk/sks/debian/patches/206_also_write_empty_diffs
===================================================================
--- sks/trunk/sks/debian/patches/206_also_write_empty_diffs 2008-06-19 15:07:39 UTC (rev 142)
+++ sks/trunk/sks/debian/patches/206_also_write_empty_diffs 2008-06-19 15:08:11 UTC (rev 143)
@@ -1,11 +1,11 @@
diff -ruN sks-1.0.7-old/reconserver.ml sks-1.0.7/reconserver.ml
--- sks-1.0.7-old/reconserver.ml Fri Feb 20 00:57:32 2004
-+++ sks-1.0.7/reconserver.ml Sat Jun 19 00:51:14 2004
++++ sks-1.0.7/reconserver.ml Sat Jun 19 00:58:26 2004
@@ -179,9 +179,9 @@
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;
++ log_diffs (sprintf "diff-%s.txt" (sockaddr_to_name addr)) hashes;
if List.length elements > 0
then (
- log_diffs (sprintf "diff-%s.txt" (sockaddr_to_name addr)) hashes;
@@ -16,7 +16,7 @@
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;
++ log_diffs (sprintf "diff-%s.txt" (sockaddr_to_name partner)) hashes;
match results with
[] -> []
| _ ->
Modified: sks/trunk/sks/debian/patches/500_debian_fhs
===================================================================
--- sks/trunk/sks/debian/patches/500_debian_fhs 2008-06-19 15:07:39 UTC (rev 142)
+++ sks/trunk/sks/debian/patches/500_debian_fhs 2008-06-19 15:08:11 UTC (rev 143)
@@ -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 2003-12-02 11:23:11.000000000 +0100
-+++ sks-1.0.7/common.ml 2003-12-09 23:13:50.000000000 +0100
+--- 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
@@ -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 2003-12-05 03:34:13.000000000 +0100
-+++ sks-1.0.7/dbserver.ml 2003-12-09 23:13:50.000000000 +0100
+--- 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
@@ -336,7 +336,7 @@
let convert_web_fname fname =
@@ -34,8 +34,8 @@
(** 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 2003-12-09 22:33:49.000000000 +0100
-+++ sks-1.0.7/getfileopts.ml 2003-12-09 23:13:50.000000000 +0100
+--- 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
@@ -106,7 +106,7 @@
(**************************************************************)
(**************************************************************)
@@ -46,30 +46,30 @@
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 2003-10-12 22:20:19.000000000 +0200
-+++ sks-1.0.7/reconserver.ml 2003-12-09 23:13:50.000000000 +0100
-@@ -181,7 +181,7 @@
+--- 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
+@@ -179,7 +179,7 @@
+ 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;
++ log_diffs (sprintf "/var/spool/sks/diff-%s.txt" (sockaddr_to_name addr)) hashes;
if List.length elements > 0
then (
-- 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;
update_recover_list elements http_addr;
- [Eventloop.Event (Unix.gettimeofday () +. 10.0,
- Eventloop.make_tc ~cb:get_missing_keys
-@@ -219,7 +219,7 @@
+@@ -216,7 +216,7 @@
+ ignore (plerror 4 "Reconciliation complete");
+ let hashes = hashconvert results in
+ print_hashes 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
[] -> []
| _ ->
-- log_diffs (sprintf "diff-%s.txt"
-+ log_diffs (sprintf "/var/spool/sks/diff-%s.txt"
- (sockaddr_to_name partner))
- hashes;
- update_recover_list results http_addr;
diff -ruN sks-1.0.7-old/settings.ml sks-1.0.7/settings.ml
---- sks-1.0.7-old/settings.ml 2003-12-09 22:33:31.000000000 +0100
-+++ sks-1.0.7/settings.ml 2003-12-09 23:14:11.000000000 +0100
-@@ -173,7 +173,7 @@
+--- 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
+@@ -176,7 +176,7 @@
let command_timeout = ref 60
let set_command_timeout value = command_timeout := value
@@ -78,7 +78,7 @@
let set_sendmail_cmd value = sendmail_cmd := value
let membership_reload_time = ref (60. *. 60. *. 6.)
-@@ -191,13 +191,13 @@
+@@ -194,13 +194,13 @@
from_addr := Some addr;
addr
@@ -99,7 +99,7 @@
let update_dir basedir dirref =
dirref := Filename.concat basedir !dirref
-@@ -212,7 +212,7 @@
+@@ -215,7 +215,7 @@
update_dir basedir failed_msgdir;
()
@@ -108,7 +108,7 @@
let set_basedir value =
basedir := value;
prepare_options !basedir
-@@ -254,7 +254,7 @@
+@@ -258,7 +258,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");
More information about the Pkg-sks-commit
mailing list