[Pkg-sks-commit] r161 - sks/trunk/sks/debian/patches
chrism at alioth.debian.org
chrism at alioth.debian.org
Thu Jun 19 15:14:29 UTC 2008
Author: chrism
Date: 2008-06-19 15:14:28 +0000 (Thu, 19 Jun 2008)
New Revision: 161
Modified:
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/508_build_fastbuild
sks/trunk/sks/debian/patches/509_Slong_Dlong
sks/trunk/sks/debian/patches/510_sane_logfile_names
sks/trunk/sks/debian/patches/511_sys_random
Log:
[project @ 163]
Forward port rest of patches
Original author: weasel
Date: 2004-10-25 23:53:55.030718+00:00
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:14:21 UTC (rev 160)
+++ sks/trunk/sks/debian/patches/402_separate_keys_with_hr 2008-06-19 15:14:28 UTC (rev 161)
@@ -1,6 +1,6 @@
-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
+diff -ruN sks-1.0.9-old/index.ml sks-1.0.9/index.ml
+--- sks-1.0.9-old/index.ml 2004-10-04 04:48:46.000000000 +0200
++++ sks-1.0.9/index.ml 2004-10-18 22:42:34.000000000 +0200
@@ -605,7 +605,10 @@
else
lines
Modified: sks/trunk/sks/debian/patches/500_debian_fhs
===================================================================
--- sks/trunk/sks/debian/patches/500_debian_fhs 2008-06-19 15:14:21 UTC (rev 160)
+++ sks/trunk/sks/debian/patches/500_debian_fhs 2008-06-19 15:14:28 UTC (rev 161)
@@ -1,6 +1,6 @@
-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
+diff -ruN sks-1.0.9-old/common.ml sks-1.0.9/common.ml
+--- sks-1.0.9-old/common.ml 2004-10-21 04:56:03.000000000 +0200
++++ sks-1.0.9/common.ml 2004-10-26 01:49:31.000000000 +0200
@@ -81,7 +81,7 @@
let set_logfile extension =
@@ -21,9 +21,9 @@
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.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
+diff -ruN sks-1.0.9-old/dbserver.ml sks-1.0.9/dbserver.ml
+--- sks-1.0.9-old/dbserver.ml 2004-10-21 04:56:03.000000000 +0200
++++ sks-1.0.9/dbserver.ml 2004-10-26 01:49:31.000000000 +0200
@@ -357,7 +357,7 @@
let convert_web_fname fname =
@@ -33,9 +33,9 @@
else raise (Wserver.Misc_error "Malformed requst")
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
+diff -ruN sks-1.0.9-old/getfileopts.ml sks-1.0.9/getfileopts.ml
+--- sks-1.0.9-old/getfileopts.ml 2004-10-21 04:56:03.000000000 +0200
++++ sks-1.0.9/getfileopts.ml 2004-10-26 01:49:31.000000000 +0200
@@ -106,7 +106,7 @@
(**************************************************************)
(**************************************************************)
@@ -45,30 +45,30 @@
let parse args =
Arg.current := 0;
-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 @@
+diff -ruN sks-1.0.9-old/reconserver.ml sks-1.0.9/reconserver.ml
+--- sks-1.0.9-old/reconserver.ml 2004-10-21 04:56:03.000000000 +0200
++++ sks-1.0.9/reconserver.ml 2004-10-26 01:50:13.000000000 +0200
+@@ -182,7 +182,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;
+ print_hashes (sockaddr_to_string http_addr) hashes;
+- log_diffs (sprintf "diff-%s.txt" (sockaddr_to_name http_addr)) hashes;
++ log_diffs (sprintf "diff-%s.txt" (sockaddr_to_name addr)) hashes;
if List.length elements > 0
then
begin
-@@ -219,7 +219,7 @@
+@@ -220,7 +220,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;
+ print_hashes (sockaddr_to_string http_addr) hashes;
+- log_diffs (sprintf "diff-%s.txt" (sockaddr_to_name http_addr)) hashes;
+ log_diffs (sprintf "/var/spool/sks/diff-%s.txt" (sockaddr_to_name partner)) hashes;
match results with
[] -> []
| _ ->
-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
+diff -ruN sks-1.0.9-old/settings.ml sks-1.0.9/settings.ml
+--- sks-1.0.9-old/settings.ml 2004-10-21 04:56:04.000000000 +0200
++++ sks-1.0.9/settings.ml 2004-10-26 01:49:31.000000000 +0200
@@ -173,7 +173,7 @@
let command_timeout = ref 60
let set_command_timeout value = command_timeout := value
Modified: sks/trunk/sks/debian/patches/501_makefile_cflags
===================================================================
--- sks/trunk/sks/debian/patches/501_makefile_cflags 2008-06-19 15:14:21 UTC (rev 160)
+++ sks/trunk/sks/debian/patches/501_makefile_cflags 2008-06-19 15:14:28 UTC (rev 161)
@@ -1,6 +1,6 @@
-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
+diff -ruN sks-1.0.9-old/Makefile sks-1.0.9/Makefile
+--- sks-1.0.9-old/Makefile 2004-10-13 23:47:44.000000000 +0200
++++ sks-1.0.9/Makefile 2004-10-18 22:50:32.000000000 +0200
@@ -17,8 +17,8 @@
CINCLUDES=-I`ocamlc -where`
CC=gcc
@@ -104,9 +104,9 @@
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
+diff -ruN sks-1.0.9-old/bdb/Makefile sks-1.0.9/bdb/Makefile
+--- sks-1.0.9-old/bdb/Makefile 2004-04-25 03:06:34.000000000 +0200
++++ sks-1.0.9/bdb/Makefile 2004-10-18 22:50:32.000000000 +0200
@@ -16,8 +16,8 @@
CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE)
CC=gcc
Modified: sks/trunk/sks/debian/patches/508_build_fastbuild
===================================================================
--- sks/trunk/sks/debian/patches/508_build_fastbuild 2008-06-19 15:14:21 UTC (rev 160)
+++ sks/trunk/sks/debian/patches/508_build_fastbuild 2008-06-19 15:14:28 UTC (rev 161)
@@ -1,6 +1,6 @@
-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
+diff -ruN sks-1.0.9-old/sks_build.sh sks-1.0.9/sks_build.sh
+--- sks-1.0.9-old/sks_build.sh 2003-11-29 14:38:18.000000000 +0100
++++ sks-1.0.9/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
Modified: sks/trunk/sks/debian/patches/509_Slong_Dlong
===================================================================
--- sks/trunk/sks/debian/patches/509_Slong_Dlong 2008-06-19 15:14:21 UTC (rev 160)
+++ sks/trunk/sks/debian/patches/509_Slong_Dlong 2008-06-19 15:14:28 UTC (rev 161)
@@ -1,6 +1,6 @@
-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
+diff -ruN sks-1.0.9-old/number.ml sks-1.0.9/number.ml
+--- sks-1.0.9-old/number.ml 2004-04-25 03:06:34.000000000 +0200
++++ sks-1.0.9/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:14:21 UTC (rev 160)
+++ sks/trunk/sks/debian/patches/510_sane_logfile_names 2008-06-19 15:14:28 UTC (rev 161)
@@ -1,6 +1,6 @@
-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
+diff -ruN sks-1.0.9-old/common.ml sks-1.0.9/common.ml
+--- sks-1.0.9-old/common.ml 2004-10-18 22:52:50.000000000 +0200
++++ sks-1.0.9/common.ml 2004-10-18 22:52:51.000000000 +0200
@@ -81,7 +81,7 @@
let set_logfile extension =
Modified: sks/trunk/sks/debian/patches/511_sys_random
===================================================================
--- sks/trunk/sks/debian/patches/511_sys_random 2008-06-19 15:14:21 UTC (rev 160)
+++ sks/trunk/sks/debian/patches/511_sys_random 2008-06-19 15:14:28 UTC (rev 161)
@@ -1,6 +1,6 @@
-diff -ruN sks-1.0.8-old/mRandom.ml sks-1.0.8/mRandom.ml
---- sks-1.0.8-old/mRandom.ml 2004-04-25 03:06:34.000000000 +0200
-+++ sks-1.0.8/mRandom.ml 2004-10-18 23:19:06.000000000 +0200
+diff -ruN sks-1.0.9-old/mRandom.ml sks-1.0.9/mRandom.ml
+--- sks-1.0.9-old/mRandom.ml 2004-04-25 03:06:34.000000000 +0200
++++ sks-1.0.9/mRandom.ml 2004-10-18 23:19:06.000000000 +0200
@@ -92,7 +92,7 @@
(* Low-entropy system-dependent initialisation. *)
More information about the Pkg-sks-commit
mailing list