[Pkg-sks-commit] r148 - sks/trunk/sks/debian/patches
chrism at alioth.debian.org
chrism at alioth.debian.org
Thu Jun 19 15:09:39 UTC 2008
Author: chrism
Date: 2008-06-19 15:09:37 +0000 (Thu, 19 Jun 2008)
New Revision: 148
Added:
sks/trunk/sks/debian/patches/211_content_type_utf8
Removed:
sks/trunk/sks/debian/patches/201_speling
sks/trunk/sks/debian/patches/202_correct_x_keyserver
sks/trunk/sks/debian/patches/203_extra_space_in_fpr
sks/trunk/sks/debian/patches/204_relative_links
sks/trunk/sks/debian/patches/205_show_peer_when_config_rejected
sks/trunk/sks/debian/patches/206_also_write_empty_diffs
sks/trunk/sks/debian/patches/207_log_recovered_hashes_source
sks/trunk/sks/debian/patches/508_build_fastbuild
Modified:
sks/trunk/sks/debian/patches/208_show_revoked_in_ms
sks/trunk/sks/debian/patches/209_handle_attribute_uids_in_mr
sks/trunk/sks/debian/patches/210_only_latest_changetime_in_mr
sks/trunk/sks/debian/patches/402_separate_keys_with_hr
sks/trunk/sks/debian/patches/500_debian_fhs
sks/trunk/sks/debian/patches/501_makefile_cflags
sks/trunk/sks/debian/patches/509_Slong_Dlong
sks/trunk/sks/debian/patches/510_sane_logfile_names
Log:
[project @ 150]
New upstream patch incorporates the following patches:
- 201_speling
- 202_correct_x_keyserver
- 203_extra_space_in_fpr
- 204_relative_links
- 205_show_peer_when_config_rejected
- 206_also_write_empty_diffs
- 207_log_recovered_hashes_source
The build script disappeared in the upstream tarball, remove 508_build_fastbuild
Updated with new pathnames/offsets:
- 209_handle_attribute_uids_in_mr
- 210_only_latest_changetime_in_mr
- 402_separate_keys_with_hr
- 500_debian_fhs
- 501_makefile_cflags
- 509_Slong_Dlong
- 510_sane_logfile_names
Use UTF8 as charset in html content-types.
Original author: weasel
Date: 2004-10-18 20:55:59.646344+00:00
Deleted: sks/trunk/sks/debian/patches/201_speling
===================================================================
--- sks/trunk/sks/debian/patches/201_speling 2008-06-19 15:09:25 UTC (rev 147)
+++ sks/trunk/sks/debian/patches/201_speling 2008-06-19 15:09:37 UTC (rev 148)
@@ -1,12 +0,0 @@
-diff -ruN sks-1.0.7-old/stats.ml sks-1.0.7/stats.ml
---- sks-1.0.7-old/stats.ml 2003-12-12 00:42:22.000000000 +0100
-+++ sks-1.0.7/stats.ml 2004-03-14 01:51:47.000000000 +0100
-@@ -207,7 +207,7 @@
- let generate_html_stats_page_nostats () =
- let body = info_tables () ^
- "<br> Database statistics are time-consuming and so are " ^
-- "only calculated one per day"
-+ "only calculated once per day"
- in
- let title = "Stats not calculated yet" in
- HtmlTemplates.page ~title ~body
Deleted: sks/trunk/sks/debian/patches/202_correct_x_keyserver
===================================================================
--- sks/trunk/sks/debian/patches/202_correct_x_keyserver 2008-06-19 15:09:25 UTC (rev 147)
+++ sks/trunk/sks/debian/patches/202_correct_x_keyserver 2008-06-19 15:09:37 UTC (rev 148)
@@ -1,12 +0,0 @@
-diff -ruN sks-1.0.7-old/dbserver.ml sks-1.0.7/dbserver.ml
---- sks-1.0.7-old/dbserver.ml Fri Feb 20 13:21:57 2004
-+++ sks-1.0.7/dbserver.ml Wed Mar 24 07:21:39 2004
-@@ -557,7 +557,7 @@
- "Subject","incremental";
- "Precedence","list";
- "Content-type", "application/pgp-keys";
-- "X-KeyServer-Sent",!Settings.hostname;
-+ "X-KeyServer-Sent", Settings.get_from_addr ();
- ] ;
- Sendmail.body = body;
- }
Deleted: sks/trunk/sks/debian/patches/203_extra_space_in_fpr
===================================================================
--- sks/trunk/sks/debian/patches/203_extra_space_in_fpr 2008-06-19 15:09:25 UTC (rev 147)
+++ sks/trunk/sks/debian/patches/203_extra_space_in_fpr 2008-06-19 15:09:37 UTC (rev 148)
@@ -1,22 +0,0 @@
-diff -ruN sks-1.0.7-old/fingerprint.ml sks-1.0.7/fingerprint.ml
---- sks-1.0.7-old/fingerprint.ml Sun Oct 12 22:20:18 2003
-+++ sks-1.0.7/fingerprint.ml Wed Mar 24 09:18:39 2004
-@@ -102,11 +102,17 @@
- let fp_to_string fp =
- let bs = if (String.length fp) = 20 then 4 else 2 in
- (* standard practice is to bunch long fingerprints by 4 and short ones by 2 *)
-+ let extraspace = if (String.length fp) = 20 then ref 5 else ref 8 in
-+ (* standard practice is to put an extra space just in the middle
-+ That's after 8 blocks for short (MD5) and after 5 for long (SHA1) fingerprints *)
- let hex = Utils.hexstring fp in
- let buf = Buffer.create 0 in
- for i = 0 to String.length hex / bs - 1 do
- Buffer.add_substring buf hex (i * bs) bs;
-- Buffer.add_string buf " "
-+ Buffer.add_string buf " ";
-+ decr extraspace;
-+ if (!extraspace = 0) then
-+ Buffer.add_string buf " "
- done;
- Buffer.contents buf
-
Deleted: sks/trunk/sks/debian/patches/204_relative_links
===================================================================
--- sks/trunk/sks/debian/patches/204_relative_links 2008-06-19 15:09:25 UTC (rev 147)
+++ sks/trunk/sks/debian/patches/204_relative_links 2008-06-19 15:09:37 UTC (rev 148)
@@ -1,58 +0,0 @@
-diff -ruN sks-1.0.7-old/htmlTemplates.ml sks-1.0.7/htmlTemplates.ml
---- sks-1.0.7-old/htmlTemplates.ml Wed Dec 10 03:12:34 2003
-+++ sks-1.0.7/htmlTemplates.ml Wed Apr 21 21:09:39 2004
-@@ -47,13 +47,16 @@
- (Str.global_replace br_regexp " | " title) title body
-
- let link ~hostname ~op ~hash ~fingerprint ~port ~keyid =
-- sprintf "http://%s:%d/pks/lookup?op=%s%s%s&search=0x%s"
-- hostname
-- port
-+ let path = sprintf "/pks/lookup?op=%s%s%s&search=0x%s"
- op
- (if hash then "&hash=on" else "")
- (if fingerprint then "&fingerprint=on" else "")
- keyid
-+ in
-+ if !Settings.links_include_server then
-+ sprintf "http://%s:%d%s" hostname port path
-+ else
-+ path
-
- let keyinfo_header = "Type bits/keyID Date User ID"
-
-@@ -76,8 +79,11 @@
- sprintf "\t Fingerprint=%s" fp
-
- let hash_link ~hostname ~port ~hash =
-- sprintf "http://%s:%d/pks/lookup?op=hget&search=%s"
-- hostname port hash
-+ let path = sprintf "/pks/lookup?op=hget&search=%s" hash in
-+ if !Settings.links_include_server then
-+ sprintf "http://%s:%d%s" hostname port path
-+ else
-+ path
-
- let hash ~hostname ~port ~hash =
- sprintf "\t Hash=<a href=%s>%s</a>"
-diff -ruN sks-1.0.7-old/settings.ml sks-1.0.7/settings.ml
---- sks-1.0.7-old/settings.ml Tue Dec 9 22:33:31 2003
-+++ sks-1.0.7/settings.ml Wed Apr 21 20:50:05 2004
-@@ -133,6 +133,9 @@
- let hostname = ref (Unix.gethostname ())
- let set_hostname value = hostname := value
-
-+let links_include_server = ref false
-+let set_links_include_server value = links_include_server := value
-+
- let filelog = ref true
-
- let transactions = ref true
-@@ -230,6 +233,7 @@
- "in one shot");
- ("-seed", Arg.Int set_seed, "Seed used by RNG");
- ("-hostname", Arg.String set_hostname, "current hostname");
-+ ("-links_include_server", Arg.Set links_include_server, "HTTP links include server and port ");
- ("-d", Arg.Int set_drop, "Number of keys to drop at random " ^
- "when synchronizing");
- ("-n", Arg.Int set_n, "Multiple of 15,000 keys to load at once");
Deleted: sks/trunk/sks/debian/patches/205_show_peer_when_config_rejected
===================================================================
--- sks/trunk/sks/debian/patches/205_show_peer_when_config_rejected 2008-06-19 15:09:25 UTC (rev 147)
+++ sks/trunk/sks/debian/patches/205_show_peer_when_config_rejected 2008-06-19 15:09:37 UTC (rev 148)
@@ -1,51 +0,0 @@
-Binary files sks-1.0.7-old/.reconCS.ml.swp and sks-1.0.7/.reconCS.ml.swp differ
-diff -ruN sks-1.0.7-old/reconCS.ml sks-1.0.7/reconCS.ml
---- sks-1.0.7-old/reconCS.ml Fri Feb 20 00:58:18 2004
-+++ sks-1.0.7/reconCS.ml Sun May 2 15:45:11 2004
-@@ -83,7 +83,7 @@
- @param filters list of strings representing filters that have been applied
- to data.
- *)
--let handle_config cin cout filters =
-+let handle_config cin cout filters peer =
- let configdata = build_configdata filters in
- marshal cout (Config configdata); (* channel is flushed here *)
- let remote_configdata =
-@@ -99,15 +99,15 @@
- marshal_string cout "failed";
- marshal_string cout reason;
- cout#flush;
-- failwith (sprintf "Remote configuration rejected: %s"
-- reason)
-+ failwith (sprintf "Remote (%s) configuration rejected: %s"
-+ (sockaddr_to_string peer) reason)
- );
- (match unmarshal_string cin with
- "passed" -> ()
- | "failed" ->
- let reason = unmarshal_string cin in
-- failwith (sprintf "Local configuration rejected remotely: %s"
-- reason)
-+ failwith (sprintf "Local configuration rejected remotely(%s): %s"
-+ (sockaddr_to_string peer) reason)
- | _ -> failwith "Unexpected configuration confirmation response"
- );
- remote_configdata
-@@ -144,7 +144,7 @@
- let cin = Channel.sys_in_from_fd s
- and cout = Channel.sys_out_from_fd s in
- signore (plerror 4 "Initiating reconciliation");
-- let remote_config = handle_config cin cout filters in
-+ let remote_config = handle_config cin cout filters partner in
- ignore (Unix.alarm !Settings.reconciliation_timeout);
-
- let http_port = config_get_http_port remote_config in
-@@ -160,7 +160,7 @@
- let handle_connection tree ~filters ~partner cin cout =
-
- signore (plerror 4 "Joining reconciliation");
-- let remote_config = handle_config cin cout filters in
-+ let remote_config = handle_config cin cout filters partner in
- ignore (Unix.alarm !Settings.reconciliation_timeout);
-
- let http_port = config_get_http_port remote_config in
Deleted: sks/trunk/sks/debian/patches/206_also_write_empty_diffs
===================================================================
--- sks/trunk/sks/debian/patches/206_also_write_empty_diffs 2008-06-19 15:09:25 UTC (rev 147)
+++ sks/trunk/sks/debian/patches/206_also_write_empty_diffs 2008-06-19 15:09:37 UTC (rev 148)
@@ -1,28 +0,0 @@
-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:58:26 2004
-@@ -179,9 +179,9 @@
- 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 (
-- log_diffs (sprintf "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
-@@ -216,12 +216,10 @@
- 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
- [] -> []
- | _ ->
-- log_diffs (sprintf "diff-%s.txt"
-- (sockaddr_to_name partner))
-- hashes;
- update_recover_list results http_addr;
- [Eventloop.Event (Unix.gettimeofday (),
- Eventloop.make_tc ~cb:get_missing_keys
Deleted: sks/trunk/sks/debian/patches/207_log_recovered_hashes_source
===================================================================
--- sks/trunk/sks/debian/patches/207_log_recovered_hashes_source 2008-06-19 15:09:25 UTC (rev 147)
+++ sks/trunk/sks/debian/patches/207_log_recovered_hashes_source 2008-06-19 15:09:37 UTC (rev 148)
@@ -1,43 +0,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:09:45 2004
-+++ sks-1.0.7/reconserver.ml Sat Jun 19 01:10:09 2004
-@@ -178,7 +178,7 @@
- ignore (plerror 4 "Reconciliation complete");
- 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;
- if List.length elements > 0
- then (
-@@ -215,7 +215,7 @@
- let results = Set.elements results in
- 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;
- match results with
- [] -> []
-diff -ruN sks-1.0.7-old/recoverList.ml sks-1.0.7/recoverList.ml
---- sks-1.0.7-old/recoverList.ml Tue Mar 2 13:52:17 2004
-+++ sks-1.0.7/recoverList.ml Sat Jun 19 01:11:39 2004
-@@ -56,14 +56,14 @@
- in
- loop list []
-
--let print_hashes hashes =
-- if List.length hashes = 0 then signore (plerror 4 "No hashes recovered")
-+let print_hashes source hashes =
-+ if List.length hashes = 0 then signore (plerror 4 "No hashes recovered from %s" source)
- else if List.length hashes <= 10 then (
-- ignore (plerror 3 "Hashes recovered: ");
-+ ignore (plerror 3 "Hashes recovered from %s" source);
- List.iter hashes
- ~f:(fun hash -> ignore (plerror 3 "\t%s" (KeyHash.hexify hash)));
- ) else
-- ignore (plerror 3 "%d hashes recovered" (List.length hashes))
-+ ignore (plerror 3 "%d hashes recovered from %s" (List.length hashes) source)
-
- (** converts a list of elements of ZZp to a sorted list of hashes *)
- let hashconvert elements =
Modified: sks/trunk/sks/debian/patches/208_show_revoked_in_ms
===================================================================
--- sks/trunk/sks/debian/patches/208_show_revoked_in_ms 2008-06-19 15:09:25 UTC (rev 147)
+++ sks/trunk/sks/debian/patches/208_show_revoked_in_ms 2008-06-19 15:09:37 UTC (rev 148)
@@ -1,6 +1,6 @@
diff -ruN sks-1.0.7-old/mRindex.ml sks-1.0.7/mRindex.ml
---- sks-1.0.7-old/mRindex.ml Sun Oct 12 22:20:18 2003
-+++ sks-1.0.7/mRindex.ml Mon Aug 2 10:36:39 2004
+--- sks-1.0.8-old/mRindex.ml Sun Oct 12 22:20:18 2003
++++ sks-1.0.8/mRindex.ml Mon Aug 2 10:36:39 2004
@@ -107,12 +107,13 @@
| Some days -> sprintf "%Ld"
(Int64.add pki.pk_ctime (Int64.mul daysecs (Int64.of_int days)))
Modified: sks/trunk/sks/debian/patches/209_handle_attribute_uids_in_mr
===================================================================
--- sks/trunk/sks/debian/patches/209_handle_attribute_uids_in_mr 2008-06-19 15:09:25 UTC (rev 147)
+++ sks/trunk/sks/debian/patches/209_handle_attribute_uids_in_mr 2008-06-19 15:09:37 UTC (rev 148)
@@ -1,6 +1,6 @@
diff -ruN sks-1.0.7-old/mRindex.ml sks-1.0.7/mRindex.ml
---- sks-1.0.7-old/mRindex.ml Mon Aug 2 10:45:27 2004
-+++ sks-1.0.7/mRindex.ml Mon Aug 2 10:49:51 2004
+--- sks-1.0.8-old/mRindex.ml Mon Aug 2 10:45:27 2004
++++ sks-1.0.8/mRindex.ml Mon Aug 2 10:49:51 2004
@@ -116,7 +116,12 @@
(if (Index.is_revoked key) then "r" else "")
in
Modified: sks/trunk/sks/debian/patches/210_only_latest_changetime_in_mr
===================================================================
--- sks/trunk/sks/debian/patches/210_only_latest_changetime_in_mr 2008-06-19 15:09:25 UTC (rev 147)
+++ sks/trunk/sks/debian/patches/210_only_latest_changetime_in_mr 2008-06-19 15:09:37 UTC (rev 148)
@@ -1,6 +1,6 @@
diff -ruN sks-1.0.7-old/mRindex.ml sks-1.0.7/mRindex.ml
---- sks-1.0.7-old/mRindex.ml Mon Aug 2 10:54:48 2004
-+++ sks-1.0.7/mRindex.ml Mon Aug 2 11:09:16 2004
+--- sks-1.0.8-old/mRindex.ml Mon Aug 2 10:54:48 2004
++++ sks-1.0.8/mRindex.ml Mon Aug 2 11:09:16 2004
@@ -78,18 +78,20 @@
sigs
Added: sks/trunk/sks/debian/patches/211_content_type_utf8
===================================================================
--- sks/trunk/sks/debian/patches/211_content_type_utf8 (rev 0)
+++ sks/trunk/sks/debian/patches/211_content_type_utf8 2008-06-19 15:09:37 UTC (rev 148)
@@ -0,0 +1,87 @@
+diff -ruN sks-1.0.8-old/dbserver.ml sks-1.0.8/dbserver.ml
+--- sks-1.0.8-old/dbserver.ml 2004-10-06 10:40:48.000000000 +0200
++++ sks-1.0.8/dbserver.ml 2004-10-18 22:41:20.000000000 +0200
+@@ -203,7 +203,7 @@
+ match request.kind with
+ | Stats ->
+ plerror 4 "/pks/lookup: DB Stats request";
+- ("text/html", !last_stat_page)
++ ("text/html; charset=UTF-8", !last_stat_page)
+ | Get ->
+ plerror 4 "/pks/lookup: Get request (%s)"
+ (String.concat " " request.search);
+@@ -211,7 +211,7 @@
+ let keys = clean_keys request keys in
+ let keystr = Key.to_string_multiple keys in
+ let aakeys = Armor.encode_pubkey_string keystr in
+- ("text/html",
++ ("text/html; charset=UTF-8",
+ HtmlTemplates.page
+ ~title:(sprintf "Public Key Server -- Get ``%s ''"
+ (String.concat ~sep:" " request.search))
+@@ -235,7 +235,7 @@
+ in
+ let keystr = Key.to_string key in
+ let aakeys = Armor.encode_pubkey_string keystr in
+- ("text/html",
++ ("text/html; charset=UTF-8",
+ HtmlTemplates.page
+ ~title:(sprintf "Public Key Server -- Get ``%s ''" hash_str)
+ ~body:(sprintf "\r\n<pre>\r\n%s\r\n</pre>\r\n" aakeys)
+@@ -267,7 +267,7 @@
+ let pre = HtmlTemplates.preformat_list
+ (Index.keyinfo_header request :: output)
+ in
+- ("text/html",
++ ("text/html; charset=UTF-8",
+ HtmlTemplates.page ~body:pre
+ ~title:(sprintf "Search results for '%s'"
+ (String.concat ~sep:" " request.search))
+@@ -387,7 +387,7 @@
+ let fname = convert_web_fname "index.html" in
+ let text = read_file fname in
+ cout#write_string text;
+- "text/html"
++ "text/html; charset=UTF-8"
+ else
+ (try
+ let extension = get_extension base in
+@@ -450,7 +450,7 @@
+ cout#write_string (sprintf "%d keys added succesfully.<br>" !ctr)
+ );
+ cout#write_string "</html></body>";
+- "text/html"
++ "text/html; charset=UTF-8"
+ | "/pks/hashquery" ->
+ plerror 4 "Handling /pks/hashquery";
+ let sin = new Channel.string_in_channel body 0 in
+@@ -466,7 +466,7 @@
+ cout#write_string (HtmlTemplates.page
+ ~title:"Unexpected POST request"
+ ~body:"");
+- "text/html"
++ "text/html; charset=UTF-8"
+
+
+ (** Prepare handler for use with eventloop by transforming system
+diff -ruN sks-1.0.8-old/wserver.ml sks-1.0.8/wserver.ml
+--- sks-1.0.8-old/wserver.ml 2004-10-04 04:07:50.000000000 +0200
++++ sks-1.0.8/wserver.ml 2004-10-18 22:40:52.000000000 +0200
+@@ -236,7 +236,7 @@
+
+
+
+-let send_result cout ?(error_code = 200) ?(content_type = "text/html") body =
++let send_result cout ?(error_code = 200) ?(content_type = "text/html; charset=UTF-8") body =
+ fprintf cout "HTTP/1.0 %03d OK\r\n" error_code;
+ fprintf cout "Server: sks_www/%s\r\n" version;
+ fprintf cout "Content-type: %s\r\n\r\n" content_type;
+@@ -301,7 +301,7 @@
+ ignore (Unix.alarm recover_timeout);
+ plerror 2 "Error handling request %s: %s"
+ (request_to_string request) (Common.err_to_string e);
+- let content_type = "text/html" in
++ let content_type = "text/html; charset=UTF-8" in
+ let output =
+ (HtmlTemplates.page ~title:"Error handling request"
+ ~body:(sprintf "Error handling request. Exception raised: %s"
Modified: sks/trunk/sks/debian/patches/402_separate_keys_with_hr
===================================================================
--- sks/trunk/sks/debian/patches/402_separate_keys_with_hr 2008-06-19 15:09:25 UTC (rev 147)
+++ sks/trunk/sks/debian/patches/402_separate_keys_with_hr 2008-06-19 15:09:37 UTC (rev 148)
@@ -1,6 +1,7 @@
---- sks-1.0.7/index.ml.orig Sun Dec 7 01:10:27 2003
-+++ sks-1.0.7/index.ml Sun Dec 7 01:09:35 2003
-@@ -557,7 +557,10 @@
+diff -ruN sks-1.0.8-old/index.ml sks-1.0.8/index.ml
+--- sks-1.0.8-old/index.ml 2004-10-04 04:48:46.000000000 +0200
++++ sks-1.0.8/index.ml 2004-10-18 22:42:34.000000000 +0200
+@@ -605,7 +605,10 @@
else
lines
in
Modified: sks/trunk/sks/debian/patches/500_debian_fhs
===================================================================
--- sks/trunk/sks/debian/patches/500_debian_fhs 2008-06-19 15:09:25 UTC (rev 147)
+++ sks/trunk/sks/debian/patches/500_debian_fhs 2008-06-19 15:09:37 UTC (rev 148)
@@ -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:13:23 2004
+diff -ruN sks-1.0.8-old/common.ml sks-1.0.8/common.ml
+--- sks-1.0.8-old/common.ml 2004-10-04 04:50:52.000000000 +0200
++++ sks-1.0.8/common.ml 2004-10-18 22:49:35.000000000 +0200
@@ -81,7 +81,7 @@
let set_logfile extension =
@@ -10,7 +10,7 @@
stored_logfile_name := Some fname;
logfile := open_out_gen [ Open_wronly; Open_creat; Open_append; ]
0o600 fname;
-@@ -202,8 +202,8 @@
+@@ -200,8 +200,8 @@
let recon_address = !Settings.recon_address
let http_port = !Settings.hkp_port
let http_address = !Settings.hkp_address
@@ -21,10 +21,10 @@
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:13:23 2004
-+++ sks-1.0.7/dbserver.ml Sat Jun 19 01:13:23 2004
-@@ -336,7 +336,7 @@
+diff -ruN sks-1.0.8-old/dbserver.ml sks-1.0.8/dbserver.ml
+--- sks-1.0.8-old/dbserver.ml 2004-10-18 22:49:35.000000000 +0200
++++ sks-1.0.8/dbserver.ml 2004-10-18 22:49:35.000000000 +0200
+@@ -357,7 +357,7 @@
let convert_web_fname fname =
if verify_web_fname fname then
@@ -32,10 +32,10 @@
+ Filename.concat !Settings.basedir (Filename.concat "/var/lib/sks/www" fname)
else raise (Wserver.Misc_error "Malformed requst")
- (** 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:13:23 2004
+ let supported_extensions =
+diff -ruN sks-1.0.8-old/getfileopts.ml sks-1.0.8/getfileopts.ml
+--- sks-1.0.8-old/getfileopts.ml 2004-04-25 03:06:34.000000000 +0200
++++ sks-1.0.8/getfileopts.ml 2004-10-18 22:49:35.000000000 +0200
@@ -106,7 +106,7 @@
(**************************************************************)
(**************************************************************)
@@ -45,20 +45,20 @@
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: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 (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
- then (
- update_recover_list elements http_addr;
-@@ -216,7 +216,7 @@
- ignore (plerror 4 "Reconciliation complete");
+diff -ruN sks-1.0.8-old/reconserver.ml sks-1.0.8/reconserver.ml
+--- sks-1.0.8-old/reconserver.ml 2004-10-04 04:28:59.000000000 +0200
++++ sks-1.0.8/reconserver.ml 2004-10-18 22:49:35.000000000 +0200
+@@ -181,7 +181,7 @@
+ let elements = Set.elements results in
+ let hashes = hashconvert elements in
+ 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
+ then
+ begin
+@@ -219,7 +219,7 @@
+ plerror 4 "Reconciliation complete";
let hashes = hashconvert results in
print_hashes (sockaddr_to_name partner) hashes;
- log_diffs (sprintf "diff-%s.txt" (sockaddr_to_name partner)) hashes;
@@ -66,48 +66,10 @@
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:13:23 2004
-+++ sks-1.0.7/settings.ml Sat Jun 19 01:13:23 2004
-@@ -176,7 +176,7 @@
+diff -ruN sks-1.0.8-old/settings.ml sks-1.0.8/settings.ml
+--- sks-1.0.8-old/settings.ml 2004-09-28 13:28:52.000000000 +0200
++++ sks-1.0.8/settings.ml 2004-10-18 22:49:35.000000000 +0200
+@@ -173,7 +173,7 @@
let command_timeout = ref 60
let set_command_timeout value = command_timeout := value
@@ -116,7 +78,7 @@
let set_sendmail_cmd value = sendmail_cmd := value
let membership_reload_time = ref (60. *. 60. *. 6.)
-@@ -194,13 +194,13 @@
+@@ -197,13 +197,13 @@
from_addr := Some addr;
addr
@@ -137,7 +99,7 @@
let update_dir basedir dirref =
dirref := Filename.concat basedir !dirref
-@@ -215,7 +215,7 @@
+@@ -218,7 +218,7 @@
update_dir basedir failed_msgdir;
()
@@ -146,12 +108,12 @@
let set_basedir value =
basedir := value;
prepare_options !basedir
-@@ -258,7 +258,7 @@
- ("-hkp_address",Arg.String set_hkp_address, "Set hkp binding address");
+@@ -260,7 +260,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!!)");
+ " 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 (Take special care if running the Debian package!)");
("-stdoutlog", Arg.Clear filelog,
- "Send log messages to stdout instead of log file");
- ("-diskptree", Arg.Set disk_ptree, "Use a disk-based ptree " ^
+ " Send log messages to stdout instead of log file");
+ ("-diskptree", Arg.Set disk_ptree, " Use a disk-based ptree " ^
Modified: sks/trunk/sks/debian/patches/501_makefile_cflags
===================================================================
--- sks/trunk/sks/debian/patches/501_makefile_cflags 2008-06-19 15:09:25 UTC (rev 147)
+++ sks/trunk/sks/debian/patches/501_makefile_cflags 2008-06-19 15:09:37 UTC (rev 148)
@@ -1,20 +1,6 @@
-diff -ruN sks-1.0.7-old/bdb/Makefile sks-1.0.7/bdb/Makefile
---- sks-1.0.7-old/bdb/Makefile 2003-07-05 17:16:29.000000000 +0200
-+++ sks-1.0.7/bdb/Makefile 2004-02-17 11:35:25.000000000 +0100
-@@ -16,8 +16,8 @@
- CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE)
- CC=gcc
- CXX=g++
--CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I .
--CXXFLAGS=-O3 $(CINCLUDES) $(BDBLIB) -I .
-+CFLAGS=$(DEBCFLAGS) -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I .
-+CXXFLAGS=$(DEBCFLAGS) $(CINCLUDES) $(BDBLIB) -I .
-
- MKLIB=ocamlmklib
- RANLIB=ranlib
-diff -ruN sks-1.0.7-old/Makefile sks-1.0.7/Makefile
---- sks-1.0.7-old/Makefile 2004-02-01 18:51:19.000000000 +0100
-+++ sks-1.0.7/Makefile 2004-02-17 13:01:00.000000000 +0100
+diff -ruN sks-1.0.8-old/Makefile sks-1.0.8/Makefile
+--- sks-1.0.8-old/Makefile 2004-10-13 23:47:44.000000000 +0200
++++ sks-1.0.8/Makefile 2004-10-18 22:50:32.000000000 +0200
@@ -17,8 +17,8 @@
CINCLUDES=-I`ocamlc -where`
CC=gcc
@@ -26,7 +12,7 @@
ifndef OCAMLC
OCAMLC=ocamlc
-@@ -46,7 +46,7 @@
+@@ -49,7 +49,7 @@
endif
CAMLP4=-pp $(CAMLP4O)
@@ -35,7 +21,7 @@
COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) -ccopt -Lbdb -dtypes
OCAMLDEP=ocamldep $(CAMLP4)
CAMLLIBS=unix.cma str.cma bdb.cma nums.cma numerix.cma bigarray.cma cryptokit.cma
-@@ -98,7 +98,7 @@
+@@ -101,7 +101,7 @@
EXEOBJS.bc=$(RSERVOBJS.bc) build.cmo fastbuild.cmo dbserver.cmo pdiskTest.cmo
@@ -44,7 +30,7 @@
LIBS=$(LIBS.bc:.cma=.cmxa)
VERSION := $(shell cat VERSION)
-@@ -235,10 +235,10 @@
+@@ -246,10 +246,10 @@
##################################
bdb/bdb.cmxa: bdb/bdb_stubs.c bdb/bdb_stubs.h
@@ -57,7 +43,7 @@
bdbclean:
cd bdb && $(MAKE) clean
-@@ -253,51 +253,6 @@
+@@ -264,51 +264,6 @@
touch prepared
@@ -109,7 +95,7 @@
################################
# old stuff
################################
-@@ -393,8 +348,6 @@
+@@ -404,8 +359,6 @@
cleanall: clean bdbclean
rm -f lib/*
@@ -118,3 +104,17 @@
rm -rf
# Dependencies
+diff -ruN sks-1.0.8-old/bdb/Makefile sks-1.0.8/bdb/Makefile
+--- sks-1.0.8-old/bdb/Makefile 2004-04-25 03:06:34.000000000 +0200
++++ sks-1.0.8/bdb/Makefile 2004-10-18 22:50:32.000000000 +0200
+@@ -16,8 +16,8 @@
+ CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE)
+ CC=gcc
+ CXX=g++
+-CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I .
+-CXXFLAGS=-O3 $(CINCLUDES) $(BDBLIB) -I .
++CFLAGS=$(DEBCFLAGS) -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I .
++CXXFLAGS=$(DEBCFLAGS) $(CINCLUDES) $(BDBLIB) -I .
+
+ MKLIB=ocamlmklib
+ RANLIB=ranlib
Deleted: sks/trunk/sks/debian/patches/508_build_fastbuild
===================================================================
--- sks/trunk/sks/debian/patches/508_build_fastbuild 2008-06-19 15:09:25 UTC (rev 147)
+++ sks/trunk/sks/debian/patches/508_build_fastbuild 2008-06-19 15:09:37 UTC (rev 148)
@@ -1,52 +0,0 @@
-diff -ruN sks-1.0.7-old/sks_build.sh sks-1.0.7/sks_build.sh
---- sks-1.0.7-old/sks_build.sh 2003-11-29 14:38:18.000000000 +0100
-+++ sks-1.0.7/sks_build.sh 2004-03-27 01:46:47.000000000 +0100
-@@ -5,12 +5,44 @@
- # You might want to edit this file to reduce or increase memory usage
- # depending on your system
-
-+ask_mode() {
-+ echo "Please select the mode in which you want to import the keydump:"
-+ echo ""
-+ echo "1 - fastbuild"
-+ echo " only an index of the keydump is created and the keydump cannot be"
-+ echo " removed."
-+ echo ""
-+ echo "2 - normalbuild"
-+ echo ""
-+ echo " all the keydump will be imported in a new database. It takes longer"
-+ echo " time and more disk space, but the server will run faster (depending"
-+ echo " from the source/age of the keydump)."
-+ echo " The keydump can be removed after the import."
-+ echo ""
-+ echo -n "Enter enter the mode (1/2): "
-+ read
-+ case "$REPLY" in
-+ 1)
-+ mode="fastbuild"
-+ ;;
-+ 2)
-+ mode="build /var/lib/sks/dump/*.pgp"
-+ ;;
-+ *)
-+ echo "Option unknown. bye!"
-+ exit 1
-+ ;;
-+ esac
-+}
-+
- fail() { echo Command failed unexpectedly. Bailing out; exit -1; }
-
--echo === Running fastbuild... ===
--if ! sks fastbuild -n 10 -cache 100; then fail; fi
-+ask_mode
-+
-+echo "=== Running (fast)build... ==="
-+if ! /usr/sbin/sks $mode -n 10 -cache 100; then fail; fi
- echo === Cleaning key database... ===
--if ! sks cleandb; then fail; fi
-+if ! /usr/sbin/sks cleandb; then fail; fi
- echo === Building ptree database... ===
--if ! sks pbuild -cache 20 -ptree_cache 70; then fail; fi
-+if ! /usr/sbin/sks pbuild -cache 20 -ptree_cache 70; then fail; fi
- echo === Done! ===
Modified: sks/trunk/sks/debian/patches/509_Slong_Dlong
===================================================================
--- sks/trunk/sks/debian/patches/509_Slong_Dlong 2008-06-19 15:09:25 UTC (rev 147)
+++ sks/trunk/sks/debian/patches/509_Slong_Dlong 2008-06-19 15:09:37 UTC (rev 148)
@@ -1,6 +1,6 @@
-diff -ruN sks-1.0.7-old/number.ml sks-1.0.7/number.ml
---- sks-1.0.7-old/number.ml 2003-10-12 22:20:19.000000000 +0200
-+++ sks-1.0.7/number.ml 2004-02-25 18:27:08.000000000 +0100
+diff -ruN sks-1.0.8-old/number.ml sks-1.0.8/number.ml
+--- sks-1.0.8-old/number.ml 2004-04-25 03:06:34.000000000 +0200
++++ sks-1.0.8/number.ml 2004-10-18 22:52:31.000000000 +0200
@@ -18,7 +18,7 @@
(** Basic operations and definitions for multi-precistion integers. *)
Modified: sks/trunk/sks/debian/patches/510_sane_logfile_names
===================================================================
--- sks/trunk/sks/debian/patches/510_sane_logfile_names 2008-06-19 15:09:25 UTC (rev 147)
+++ sks/trunk/sks/debian/patches/510_sane_logfile_names 2008-06-19 15:09:37 UTC (rev 148)
@@ -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 Sat Mar 6 22:06:25 2004
-+++ sks-1.0.7/common.ml Sat Mar 6 22:07:23 2004
+diff -ruN sks-1.0.8-old/common.ml sks-1.0.8/common.ml
+--- sks-1.0.8-old/common.ml 2004-10-18 22:52:50.000000000 +0200
++++ sks-1.0.8/common.ml 2004-10-18 22:52:51.000000000 +0200
@@ -81,7 +81,7 @@
let set_logfile extension =
More information about the Pkg-sks-commit
mailing list