[Pkg-sks-commit] r183 - in sks/trunk/sks: . debian debian/patches
chrism at alioth.debian.org
chrism at alioth.debian.org
Thu Jun 19 15:51:55 UTC 2008
Author: chrism
Date: 2008-06-19 15:51:54 +0000 (Thu, 19 Jun 2008)
New Revision: 183
Added:
sks/trunk/sks/debian/README.Debian
sks/trunk/sks/debian/patches/010_tighten_compiler_errors_warnings
sks/trunk/sks/debian/patches/502_makefile_install
sks/trunk/sks/sks-1.1.0.debian.tar.gz
Removed:
sks/trunk/sks/debian/patches/402_separate_keys_with_hr
sks/trunk/sks/debian/patches/509_Slong_Dlong
sks/trunk/sks/sks-1.0.10.debian.tar.gz
Modified:
sks/trunk/sks/debian/changelog
sks/trunk/sks/debian/control
sks/trunk/sks/debian/copyright
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/rules
sks/trunk/sks/debian/sks.dirs
sks/trunk/sks/debian/sks.init
Log:
releasing version 1.1.0-1
Added: sks/trunk/sks/debian/README.Debian
===================================================================
--- sks/trunk/sks/debian/README.Debian (rev 0)
+++ sks/trunk/sks/debian/README.Debian 2008-06-19 15:51:54 UTC (rev 183)
@@ -0,0 +1,38 @@
+Some hints to setup your keyserver:
+
+If you install a new keyserver you might need a fresh keydump to start
+with. You can get one e.g. from nynex.net:
+
+ cd /var/lib/sks/dumps
+ wget -q -r -np -nd -A bz2,SHA256,asc http://nynex.net/keydump/ -e robots=off
+ bunzip2 *bz2
+
+The to build the database from the keydumps call:
+
+ /usr/lib/sks/sks_build.sh
+ chown -R debian-sks:debian-sks /var/lib/sks
+
+To make the server start you have to edit the defaults file:
+
+ vi /etc/default/sks
+
+If you have an old database from a Berkely DB Version (e.g 4.1) prior to the
+current version (at the moment 4.6) you have to do the following in
+/var/lib/sks/DB and /var/lib/sks/PTree:
+
+ db4.1_checkpoint -1
+ db4.1_recover
+ db4.6_recover -e
+ db4.6_checkpoint -1
+ db4.6_archive | xargs --no-run-if-empty rm -f
+
+ chown -R debian-sks:debian-sks /var/lib/sks
+
+Then you can start the database with /etc/init.d/sks start.
+
+-----
+
+Thanks to Peter Palfrader <weasel at debian.org> for building the
+original Debian package.
+
+ -- Christoph Martin <christoph.martin at uni-mainz.de>, Mon, 9 Jun 2008 14:21:34 +0200
Modified: sks/trunk/sks/debian/changelog
===================================================================
--- sks/trunk/sks/debian/changelog 2008-06-19 15:30:09 UTC (rev 182)
+++ sks/trunk/sks/debian/changelog 2008-06-19 15:51:54 UTC (rev 183)
@@ -1,3 +1,15 @@
+sks (1.1.0-1) unstable; urgency=low
+
+ * First official Debian release (closes: #484785)
+ * New upstream release
+ * Update to newest standards version and sid environment
+ * Change to using db4.6
+ * Drop usage of numerix
+ * Include latest upstream patches
+ * Install manpage
+
+ -- Christoph Martin <christoph.martin at uni-mainz.de> Wed, 11 Jun 2008 16:55:15 +0200
+
sks (1.0.10-0.1) UNRELEASED; urgency=low
* New upstream release.
Modified: sks/trunk/sks/debian/control
===================================================================
--- sks/trunk/sks/debian/control 2008-06-19 15:30:09 UTC (rev 182)
+++ sks/trunk/sks/debian/control 2008-06-19 15:51:54 UTC (rev 183)
@@ -1,14 +1,14 @@
Source: sks
Section: net
Priority: optional
-Standards-Version: 3.6.1
+Standards-Version: 3.7.3.0
Maintainer: Peter Palfrader <weasel at debian.org>
-Uploaders: Fabio M. Di Nitto <fabbione at fabbione.net>, Peter Palfrader <weasel at debian.org>
-Build-Depends: ocaml (>= 3.08), dbs, libdb4.1-dev, debhelper (>= 4.0), zlib1g-dev, libcryptokit-ocaml-dev (>= 1.2-4), libnumerix-ocaml-dev (>= 0.19-4), ocaml-nox (>= 1.3-4), perl, perl-doc
+Uploaders: Fabio M. Di Nitto <fabbione at fabbione.net>, Peter Palfrader <weasel at debian.org>, Christoph Martin <christoph.martin at uni-mainz.de>
+Build-Depends: ocaml (>= 3.08), camlp4, dbs, libdb-dev, debhelper (>= 4.0), zlib1g-dev, libcryptokit-ocaml-dev (>= 1.2-4), ocaml-nox (>= 1.3-4), perl, perl-doc
Package: sks
Architecture: any
-Depends: ${shlibs:Depends}, db4.1-util, postfix | mail-transport-agent, procmail, adduser, logrotate
+Depends: ${shlibs:Depends}, db4.6-util, postfix | mail-transport-agent, procmail, adduser, logrotate
Description: Synchronizing OpenPGP Key Server
SKS is an OpenPGP key server that correctly handles all OpenPGP features
defined in RFC2440 and RFC2440bis, including photoID packages and multiple
Modified: sks/trunk/sks/debian/copyright
===================================================================
--- sks/trunk/sks/debian/copyright 2008-06-19 15:30:09 UTC (rev 182)
+++ sks/trunk/sks/debian/copyright 2008-06-19 15:51:54 UTC (rev 183)
@@ -18,8 +18,7 @@
PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place, Suite 330, Boston, MA 02111-1307 USA.
+this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
On Debian systems the complete text of Version 2 of the General
Public License can be found in /usr/share/common-licenses/GPL.
@@ -28,28 +27,6 @@
SKS uses the following additional software:
- numerix:
-
- Copyright (c) 1993-2000 by Florian Klaempfl
-
- Numerix is free software; you can redistribute it and/or modify it under the
- terms of the GNU General Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at your option) any later
- version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- USA.
-
- On Debian systems the complete text of Version 2 of the General
- Public License can be found in /usr/share/common-licenses/GPL.
-
cryptokit:
Copyright 2002 Institut National de Recherche en Informatique et en
Added: sks/trunk/sks/debian/patches/010_tighten_compiler_errors_warnings
===================================================================
--- sks/trunk/sks/debian/patches/010_tighten_compiler_errors_warnings (rev 0)
+++ sks/trunk/sks/debian/patches/010_tighten_compiler_errors_warnings 2008-06-19 15:51:54 UTC (rev 183)
@@ -0,0 +1,293 @@
+diff -ruN sks-1.1.0-old/bitstring.ml sks-1.1.0/bitstring.ml
+--- sks-1.1.0-old/bitstring.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/bitstring.ml 2008-06-04 10:54:08.000000000 +0200
+@@ -158,7 +158,7 @@
+ let str = String.create bytes in
+ String.blit ~src:ba.a ~src_pos:0
+ ~dst:str ~dst_pos:0 ~len:(String.length ba.a);
+- { ba with a = str; bitlength = bitlength }
++ { a = str; bitlength = bitlength }
+
+ (********************************************************************)
+ (*** Shifting *****************************************************)
+diff -ruN sks-1.1.0-old/decode.ml sks-1.1.0/decode.ml
+--- sks-1.1.0-old/decode.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/decode.ml 2008-06-04 10:54:57.000000000 +0200
+@@ -134,9 +134,9 @@
+
+ let rec factor f =
+ let degree = Poly.degree f in
+- if Poly.degree f = 1
++ if degree = 1
+ then ZSet.add (ZZp.neg (Poly.const_coeff f)) ZSet.empty
+- else if Poly.degree f = 0
++ else if degree = 0
+ then ZSet.empty
+ else
+ let (f1,f2) = rand_split f in
+diff -ruN sks-1.1.0-old/index.ml sks-1.1.0/index.ml
+--- sks-1.1.0-old/index.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/index.ml 2008-06-04 10:56:11.000000000 +0200
+@@ -99,8 +99,8 @@
+
+ | 12 -> (* revocation key *)
+ let cin = new Channel.string_in_channel ssp.ssp_body 0 in
+- let revclass = cin#read_int_size 1 in
+- let algid = cin#read_int_size 1 in
++ let _revclass = cin#read_int_size 1 in
++ let _algid = cin#read_int_size 1 in
+ let fingerprint = cin#read_string 20 in
+ siginfo.revocation_key <- Some fingerprint
+
+@@ -170,7 +170,7 @@
+ let selfsigs = List.filter ~f:(fun si -> is_selfsig ~keyid si)
+ siginfo_list in
+ let times = filter_opts
+- (List.map siginfo_list
++ (List.map selfsigs
+ ~f:(function x -> match x.sig_creation_time with
+ None -> None
+ | Some time -> Some (Int64.to_float time)))
+@@ -364,7 +364,6 @@
+
+ | _ -> sprintf "<b>uat</b> [contents omitted]"
+ in
+- let creation_string = datestr_of_int64 in
+ let siginfo_lines =
+ List.concat
+ (List.map ~f:(siginfo_to_lines ~get_uid ~key_creation_time
+diff -ruN sks-1.1.0-old/keydb.ml sks-1.1.0/keydb.ml
+--- sks-1.1.0-old/keydb.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/keydb.ml 2008-06-04 10:56:50.000000000 +0200
+@@ -1261,7 +1261,6 @@
+
+ (** replace [key1] with [key2] in the database *)
+ let swap_keys key1 key2 =
+- let dbs = get_dbs () in
+ let txn = txn_begin () in
+ try
+ delete_key_txn ?txn key1;
+@@ -1281,7 +1280,6 @@
+ (**********************************************************)
+
+ let delete_key ?hash key =
+- let dbs = get_dbs () in
+ let txn = txn_begin () in
+ try
+ delete_key_txn ?txn key;
+diff -ruN sks-1.1.0-old/Makefile sks-1.1.0/Makefile
+--- sks-1.1.0-old/Makefile 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/Makefile 2008-06-04 10:53:16.000000000 +0200
+@@ -47,7 +47,7 @@
+
+ CAMLP4=-pp $(CAMLP4O)
+ CAMLINCLUDE= -I lib -I bdb
+-COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) -ccopt -Lbdb -dtypes -ccopt -pthread
++COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) -ccopt -Lbdb -dtypes -ccopt -pthread -warn-error A
+ OCAMLDEP=ocamldep $(CAMLP4)
+ CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma cryptokit.cma
+ OCAMLFLAGS=$(COMMONCAMLFLAGS) -g $(CAMLLIBS)
+diff -ruN sks-1.1.0-old/parsePGP.ml sks-1.1.0/parsePGP.ml
+--- sks-1.1.0-old/parsePGP.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/parsePGP.ml 2008-06-04 10:57:59.000000000 +0200
+@@ -189,9 +189,9 @@
+ let version = cin#read_byte in
+ if version <> 4 then
+ failwith "Attempt to parse non-v4 signature as v4 signature";
+- let sigtype = cin#read_byte in
+- let key_alg = cin#read_byte in
+- let hash_alg = cin#read_byte in
++ let _sigtype = cin#read_byte in
++ let _key_alg = cin#read_byte in
++ let _hash_alg = cin#read_byte in
+ let hashed_subpacket_count = cin#read_int_size 2 in
+ (* now we can start reading the hashed sub-packets *)
+ cin#read_string hashed_subpacket_count
+@@ -235,7 +235,7 @@
+ | 4 ->
+ let sigtype = cin#read_byte in
+ let pk_alg = cin#read_byte in
+- let hash_alg = cin#read_byte in
++ let _hash_alg = cin#read_byte in
+
+ let hashed_subpacket_bytes = cin#read_int_size 2 in
+ let hashed_subpackets = read_subpackets cin hashed_subpacket_bytes in
+diff -ruN sks-1.1.0-old/pMap.ml sks-1.1.0/pMap.ml
+--- sks-1.1.0-old/pMap.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/pMap.ml 2008-06-04 10:57:31.000000000 +0200
+@@ -92,7 +92,7 @@
+ let rec add ~key:x ~data = function
+ Empty ->
+ Node(Empty, x, data, Empty, 1)
+- | Node(l, v, d, r, h) as t ->
++ | Node(l, v, d, r, h) ->
+ let c = Ord.compare x v in
+ if c = 0 then
+ Node(l, x, data, r, h)
+@@ -126,7 +126,7 @@
+ let rec remove x = function
+ Empty ->
+ Empty
+- | Node(l, v, d, r, h) as t ->
++ | Node(l, v, d, r, h) ->
+ let c = Ord.compare x v in
+ if c = 0 then
+ merge l r
+diff -ruN sks-1.1.0-old/prefixTree.ml sks-1.1.0/prefixTree.ml
+--- sks-1.1.0-old/prefixTree.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/prefixTree.ml 2008-06-04 10:59:53.000000000 +0200
+@@ -321,10 +321,7 @@
+ (** side-effect-free version of load_child *)
+ let load_child_sef t children cindex =
+ match children.(cindex) with
+- | OnDisk key ->
+- let db = op_unwrap t.db in
+- let cnode = load_node t (dbkey_of_key key) in
+- cnode
++ | OnDisk key -> load_node t (dbkey_of_key key)
+ | InMem cnode -> cnode
+
+ (******************************************************************)
+diff -ruN sks-1.1.0-old/reconComm.ml sks-1.1.0/reconComm.ml
+--- sks-1.1.0-old/reconComm.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/reconComm.ml 2008-06-04 11:02:26.000000000 +0200
+@@ -30,7 +30,6 @@
+
+ (** send DbMessages message and wait for response *)
+ let send_dbmsg msg =
+- let ctr = ref 0 in
+ let s = Unix.socket
+ ~domain:Unix.PF_UNIX
+ ~kind:Unix.SOCK_STREAM
+@@ -54,8 +53,7 @@
+ ~protocol:0 in
+ protect ~f:(fun () ->
+ Unix.connect s ~addr:db_command_addr;
+- let cin = Channel.sys_in_from_fd s
+- and cout = Channel.sys_out_from_fd s in
++ let cout = Channel.sys_out_from_fd s in
+ marshal cout msg )
+ ~finally:(fun () -> Unix.close s)
+
+@@ -87,7 +85,7 @@
+ cout#write_string msg;
+ cout#flush;
+ ignore (input_line cin#inchan); (* read "HTTP" line *)
+- let headers = Wserver.parse_headers Map.empty cin#inchan in
++ let _headers = Wserver.parse_headers Map.empty cin#inchan in
+ let keystrings =
+ CMarshal.unmarshal_list ~f:CMarshal.unmarshal_string cin
+ in
+diff -ruN sks-1.1.0-old/rMisc.ml sks-1.1.0/rMisc.ml
+--- sks-1.1.0-old/rMisc.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/rMisc.ml 2008-06-04 11:01:37.000000000 +0200
+@@ -48,7 +48,8 @@
+ if pos < len then
+ let steps =
+ if len - pos > 3 then 3 else len - pos in
+- let bits = rfunc () in
++ (* CR yminsky: I think this has the same bug as the function with the same name in Utils *)
++ let _bits = rfunc () in
+ for i = 0 to steps - 1 do
+ string.[pos + i] <-
+ char_of_int (0xFF land ((rfunc ()) lsr (8 * i)))
+@@ -101,10 +102,12 @@
+ (base_set,diff_set)
+ *)
+
++(*
+ let print_string_set set =
+ let list = Set.elements set in
+ let list= List.sort ~cmp:compare list in
+- List.iter ~f:(fun string -> print_string string; print_newline ())
++ List.iter ~f:(fun string -> print_string string; print_newline ())
++*)
+
+ let add_sarray ~data sarray =
+ Array.fold_right ~f:(fun string set -> Set.add string set)
+diff -ruN sks-1.1.0-old/server.ml sks-1.1.0/server.ml
+--- sks-1.1.0-old/server.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/server.ml 2008-06-04 11:04:26.000000000 +0200
+@@ -45,7 +45,6 @@
+
+ let solve ~remote_size ~local_size ~remote_samples ~local_samples ~points =
+ let values = ZZp.mut_array_div remote_samples local_samples in
+- let len = Array.length values in
+ try
+ let (remote_diff,local_diff) =
+ Decode.reconcile ~values ~points ~d:(remote_size - local_size)
+diff -ruN sks-1.1.0-old/sks_do.ml sks-1.1.0/sks_do.ml
+--- sks-1.1.0-old/sks_do.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/sks_do.ml 2008-06-04 11:04:41.000000000 +0200
+@@ -35,7 +35,6 @@
+ exit (-1)
+
+ let send_dbmsg msg =
+- let ctr = ref 0 in
+ let s = Unix.socket
+ ~domain:Unix.PF_UNIX
+ ~kind:Unix.SOCK_STREAM
+diff -ruN sks-1.1.0-old/stats.ml sks-1.1.0/stats.ml
+--- sks-1.1.0-old/stats.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/stats.ml 2008-06-04 11:04:53.000000000 +0200
+@@ -171,7 +171,6 @@
+ let generate_html_stats_page log size =
+ let log = Array.of_list log in
+ let now = Unix.gettimeofday () in
+- let tm = Unix.localtime now in
+ let num_keys = sprintf "<p>Total number of keys: %d</p>\n" size in
+ let title =
+ sprintf
+diff -ruN sks-1.1.0-old/utils.ml sks-1.1.0/utils.ml
+--- sks-1.1.0-old/utils.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/utils.ml 2008-06-04 11:06:50.000000000 +0200
+@@ -255,12 +255,15 @@
+ if pos < len then
+ let steps =
+ if len - pos > 3 then 3 else len - pos in
+- let bits = rfunc () in
+- for i = 0 to steps - 1 do
+- string.[pos + i] <-
++ (* CR yminsky: this is basically a bug. We double-call rfunc for no reason.
++ I'm worried about changing this because there is probably some assumptions about
++ the random generation being deterministic *)
++ let _bits = rfunc () in
++ for i = 0 to steps - 1 do
++ string.[pos + i] <-
+ char_of_int (0xFF land ((rfunc ()) lsr (8 * i)))
+- done;
+- fill_random_string rfunc string ~pos:(pos + steps) ~len
++ done;
++ fill_random_string rfunc string ~pos:(pos + steps) ~len
+ else
+ ()
+
+diff -ruN sks-1.1.0-old/wserver.ml sks-1.1.0/wserver.ml
+--- sks-1.1.0-old/wserver.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/wserver.ml 2008-06-04 11:07:36.000000000 +0200
+@@ -254,7 +254,7 @@
+ let output = output_chan#contents in
+ send_result cout ~content_type output
+ with
+- | Eventloop.SigAlarm as e ->
++ | Eventloop.SigAlarm ->
+ ignore (Unix.alarm recover_timeout);
+ plerror 2 "request %s timed out" (request_to_string request);
+ let output =
+@@ -301,7 +301,6 @@
+ 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; charset=UTF-8" in
+ let output =
+ (HtmlTemplates.page ~title:"Error handling request"
+ ~body:(sprintf "Error handling request. Exception raised: %s"
+@@ -310,7 +309,7 @@
+ send_result cout ~error_code:500 output
+ with
+ | Sys.Break as e -> raise e
+- | Eventloop.SigAlarm as e ->
++ | Eventloop.SigAlarm ->
+ ignore (Unix.alarm recover_timeout);
+ let output =
+ HtmlTemplates.page ~title:"Timeout"
Deleted: sks/trunk/sks/debian/patches/402_separate_keys_with_hr
===================================================================
--- sks/trunk/sks/debian/patches/402_separate_keys_with_hr 2008-06-19 15:30:09 UTC (rev 182)
+++ sks/trunk/sks/debian/patches/402_separate_keys_with_hr 2008-06-19 15:51:54 UTC (rev 183)
@@ -1,15 +0,0 @@
-diff -Nur sks-1.0.10-old/index.ml sks-1.0.10/index.ml
---- sks-1.0.10-old/index.ml 2005-08-24 17:58:23.000000000 +0200
-+++ sks-1.0.10/index.ml 2005-08-24 18:48:09.872824649 +0200
-@@ -605,7 +605,10 @@
- else
- lines
- in
-- keystr::lines
-+ let lines =
-+ keystr::lines
-+ in
-+ "</pre><hr><pre>"::lines
- with
- | Sys.Break | Eventloop.SigAlarm as e -> raise e
- | e ->
Modified: sks/trunk/sks/debian/patches/500_debian_fhs
===================================================================
--- sks/trunk/sks/debian/patches/500_debian_fhs 2008-06-19 15:30:09 UTC (rev 182)
+++ sks/trunk/sks/debian/patches/500_debian_fhs 2008-06-19 15:51:54 UTC (rev 183)
@@ -1,7 +1,7 @@
-diff -Nur sks-1.0.10-old/common.ml sks-1.0.10/common.ml
---- sks-1.0.10-old/common.ml 2005-08-24 17:58:23.000000000 +0200
-+++ sks-1.0.10/common.ml 2005-08-24 18:48:22.685273598 +0200
-@@ -81,7 +81,7 @@
+diff -ruN sks-1.1.0-old/common.ml sks-1.1.0/common.ml
+--- sks-1.1.0-old/common.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/common.ml 2008-05-30 00:08:38.000000000 +0200
+@@ -82,7 +82,7 @@
let set_logfile extension =
if !Settings.filelog then
@@ -10,7 +10,7 @@
stored_logfile_name := Some fname;
logfile := open_out_gen [ Open_wronly; Open_creat; Open_append; ]
0o600 fname;
-@@ -200,8 +200,8 @@
+@@ -201,8 +201,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 -Nur sks-1.0.10-old/dbserver.ml sks-1.0.10/dbserver.ml
---- sks-1.0.10-old/dbserver.ml 2005-08-24 17:58:23.000000000 +0200
-+++ sks-1.0.10/dbserver.ml 2005-08-24 18:48:22.686273477 +0200
-@@ -382,7 +382,7 @@
+diff -ruN sks-1.1.0-old/dbserver.ml sks-1.1.0/dbserver.ml
+--- sks-1.1.0-old/dbserver.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/dbserver.ml 2008-05-30 00:08:38.000000000 +0200
+@@ -362,7 +362,7 @@
let convert_web_fname fname =
if verify_web_fname fname then
@@ -33,9 +33,9 @@
else raise (Wserver.Misc_error "Malformed requst")
let supported_extensions =
-diff -Nur sks-1.0.10-old/getfileopts.ml sks-1.0.10/getfileopts.ml
---- sks-1.0.10-old/getfileopts.ml 2005-08-24 17:58:23.000000000 +0200
-+++ sks-1.0.10/getfileopts.ml 2005-08-24 18:48:22.686273477 +0200
+diff -ruN sks-1.1.0-old/getfileopts.ml sks-1.1.0/getfileopts.ml
+--- sks-1.1.0-old/getfileopts.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/getfileopts.ml 2008-05-30 00:08:38.000000000 +0200
@@ -106,7 +106,7 @@
(**************************************************************)
(**************************************************************)
@@ -45,11 +45,11 @@
let parse args =
Arg.current := 0;
-diff -Nur sks-1.0.10-old/reconserver.ml sks-1.0.10/reconserver.ml
---- sks-1.0.10-old/reconserver.ml 2005-08-24 17:58:24.000000000 +0200
-+++ sks-1.0.10/reconserver.ml 2005-08-24 18:48:22.687273356 +0200
-@@ -182,7 +182,7 @@
- let elements = Set.elements results in
+diff -ruN sks-1.1.0-old/reconserver.ml sks-1.1.0/reconserver.ml
+--- sks-1.1.0-old/reconserver.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/reconserver.ml 2008-05-30 00:08:38.000000000 +0200
+@@ -183,7 +183,7 @@
+ let elements = ZSet.elements results in
let hashes = hashconvert elements in
print_hashes (sockaddr_to_string http_addr) hashes;
- log_diffs (sprintf "diff-%s.txt" (sockaddr_to_name http_addr)) hashes;
@@ -57,7 +57,7 @@
if List.length elements > 0
then
begin
-@@ -220,7 +220,7 @@
+@@ -221,7 +221,7 @@
plerror 4 "Reconciliation complete";
let hashes = hashconvert results in
print_hashes (sockaddr_to_string http_addr) hashes;
@@ -66,9 +66,9 @@
match results with
[] -> []
| _ ->
-diff -Nur sks-1.0.10-old/settings.ml sks-1.0.10/settings.ml
---- sks-1.0.10-old/settings.ml 2005-08-24 17:58:24.000000000 +0200
-+++ sks-1.0.10/settings.ml 2005-08-24 18:48:22.687273356 +0200
+diff -ruN sks-1.1.0-old/settings.ml sks-1.1.0/settings.ml
+--- sks-1.1.0-old/settings.ml 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/settings.ml 2008-05-30 00:08:38.000000000 +0200
@@ -173,7 +173,7 @@
let command_timeout = ref 60
let set_command_timeout value = command_timeout := value
@@ -110,4 +110,4 @@
+ ("-basedir", Arg.Set_string basedir, " 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 " ^
+ ("-diskptree", Arg.Set disk_ptree,
Modified: sks/trunk/sks/debian/patches/501_makefile_cflags
===================================================================
--- sks/trunk/sks/debian/patches/501_makefile_cflags 2008-06-19 15:30:09 UTC (rev 182)
+++ sks/trunk/sks/debian/patches/501_makefile_cflags 2008-06-19 15:51:54 UTC (rev 183)
@@ -1,6 +1,20 @@
-diff -Nur sks-1.0.10-old/Makefile sks-1.0.10/Makefile
---- sks-1.0.10-old/Makefile 2005-08-24 17:58:23.000000000 +0200
-+++ sks-1.0.10/Makefile 2005-08-24 18:48:40.380131459 +0200
+diff -ruN sks-1.1.0-old/bdb/Makefile sks-1.1.0/bdb/Makefile
+--- sks-1.1.0-old/bdb/Makefile 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/bdb/Makefile 2008-06-04 11:15:31.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
+diff -ruN sks-1.1.0-old/Makefile sks-1.1.0/Makefile
+--- sks-1.1.0-old/Makefile 2008-06-04 11:15:31.000000000 +0200
++++ sks-1.1.0/Makefile 2008-06-04 11:16:08.000000000 +0200
@@ -17,8 +17,8 @@
CINCLUDES=-I`ocamlc -where`
CC=gcc
@@ -12,25 +26,25 @@
ifndef OCAMLC
OCAMLC=ocamlc
-@@ -49,7 +49,7 @@
+@@ -46,7 +46,7 @@
endif
CAMLP4=-pp $(CAMLP4O)
-CAMLINCLUDE= -I lib -I bdb
-+CAMLINCLUDE= -I lib -I bdb -I +numerix -I +cryptokit
- COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) -ccopt -Lbdb -dtypes
++CAMLINCLUDE= -I lib -I bdb -I +cryptokit
+ COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) -ccopt -Lbdb -dtypes -ccopt -pthread -warn-error A
OCAMLDEP=ocamldep $(CAMLP4)
- CAMLLIBS=unix.cma str.cma bdb.cma nums.cma numerix.cma bigarray.cma cryptokit.cma
-@@ -101,7 +101,7 @@
+ CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma cryptokit.cma
+@@ -99,7 +99,7 @@
EXEOBJS.bc=$(RSERVOBJS.bc) build.cmo fastbuild.cmo dbserver.cmo pdiskTest.cmo
--LIBS.bc= lib/cryptokit.cma lib/numerix.cma bdb/bdb.cma
+-LIBS.bc= lib/cryptokit.cma bdb/bdb.cma
+LIBS.bc= bdb/bdb.cma
LIBS=$(LIBS.bc:.cma=.cmxa)
VERSION := $(shell cat VERSION)
-@@ -256,10 +256,10 @@
+@@ -249,10 +249,10 @@
##################################
bdb/bdb.cmxa: bdb/bdb_stubs.c bdb/bdb_stubs.h
@@ -43,7 +57,7 @@
bdbclean:
cd bdb && $(MAKE) clean
-@@ -274,51 +274,6 @@
+@@ -267,29 +267,6 @@
touch prepared
@@ -70,32 +84,10 @@
-
-lib/cryptokit.cmxa: lib/cryptokit.cma
-
--
--################################
--
--NXDIR=numerix-0.19c
--
--$(NXDIR)/READ.ME:
-- tar xvmfz $(NXDIR).tar.gz
--
--$(NXDIR)/config.status: $(NXDIR)/READ.ME
-- cd $(NXDIR) && \
-- ./configure --libdir=`pwd`/../lib \
-- --bindir=`pwd`/../tmp/bin --includedir=`pwd`/../tmp/include
--
--lib/numerix.cma: $(NXDIR)/config.status prepared
-- cd $(NXDIR) && \
-- $(MAKE) lib; \
-- $(MAKE) install
-- touch -c lib/*num*
--
--lib/numerix.cmxa: lib/numerix.cma
--
--
################################
# old stuff
################################
-@@ -414,8 +369,6 @@
+@@ -386,8 +363,6 @@
cleanall: clean bdbclean
rm -f lib/*
@@ -104,17 +96,3 @@
rm -rf
# Dependencies
-diff -Nur sks-1.0.10-old/bdb/Makefile sks-1.0.10/bdb/Makefile
---- sks-1.0.10-old/bdb/Makefile 2005-08-24 17:58:23.000000000 +0200
-+++ sks-1.0.10/bdb/Makefile 2005-08-24 18:48:40.380131459 +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
Added: sks/trunk/sks/debian/patches/502_makefile_install
===================================================================
--- sks/trunk/sks/debian/patches/502_makefile_install (rev 0)
+++ sks/trunk/sks/debian/patches/502_makefile_install 2008-06-19 15:51:54 UTC (rev 183)
@@ -0,0 +1,43 @@
+diff -ruN sks-1.1.0-old/Makefile sks-1.1.0/Makefile
+--- sks-1.1.0-old/Makefile 2008-06-03 17:43:20.000000000 +0200
++++ sks-1.1.0/Makefile 2008-06-04 10:26:03.000000000 +0200
+@@ -54,8 +54,8 @@
+ OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40 $(CAMLLIBS:.cma=.cmxa)
+
+ EXE=sks sks_add_mail
+-ALL=$(EXE)
+-ALL.bc=$(EXE:=.bc)
++ALL=$(EXE) sks.8.gz
++ALL.bc=$(EXE:=.bc) sks.8.gz
+
+ all: $(ALL)
+ all.bc: $(ALL.bc)
+@@ -125,8 +125,9 @@
+ # Special targets
+
+ install:
+- mkdir -p $(PREFIX)/bin
+- install sks_build.sh sks sks_add_mail $(PREFIX)/bin
++ mkdir -p $(PREFIX)/sbin $(PREFIX)/lib/sks
++ install sks $(PREFIX)/sbin
++ install sks_build.sh sks_add_mail $(PREFIX)/lib/sks
+ mkdir -p $(MANDIR)/man8
+ install sks.8.gz $(MANDIR)/man8
+
+@@ -148,7 +149,7 @@
+ # Ordinary targets
+
+ sks.8.gz: sks.8
+- gzip -f sks.8
++ gzip -9 -f sks.8
+
+ sks.8: sks.pod
+ pod2man -c "SKS OpenPGP Key server" --section 8 -r 0.1 -name sks sks.pod sks.8
+@@ -360,6 +361,7 @@
+ clean: mlclean
+ rm -f *.o
+ rm -f prepared
++ rm -f sks.8.gz
+
+ cleanall: clean bdbclean
+ rm -f lib/*
Modified: sks/trunk/sks/debian/patches/508_build_fastbuild
===================================================================
--- sks/trunk/sks/debian/patches/508_build_fastbuild 2008-06-19 15:30:09 UTC (rev 182)
+++ sks/trunk/sks/debian/patches/508_build_fastbuild 2008-06-19 15:51:54 UTC (rev 183)
@@ -1,6 +1,6 @@
-diff -Nur sks-1.0.10-old/sks_build.sh sks-1.0.10/sks_build.sh
---- sks-1.0.10-old/sks_build.sh 2005-08-24 17:58:23.000000000 +0200
-+++ sks-1.0.10/sks_build.sh 2005-08-24 18:49:02.962397592 +0200
+diff -ruN sks-1.1.0-old/sks_build.sh sks-1.1.0/sks_build.sh
+--- sks-1.1.0-old/sks_build.sh 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.0/sks_build.sh 2008-05-30 00:17:07.000000000 +0200
@@ -5,12 +5,44 @@
# You might want to edit this file to reduce or increase memory usage
# depending on your system
Deleted: sks/trunk/sks/debian/patches/509_Slong_Dlong
===================================================================
--- sks/trunk/sks/debian/patches/509_Slong_Dlong 2008-06-19 15:30:09 UTC (rev 182)
+++ sks/trunk/sks/debian/patches/509_Slong_Dlong 2008-06-19 15:51:54 UTC (rev 183)
@@ -1,12 +0,0 @@
-diff -Nur sks-1.0.10-old/number.ml sks-1.0.10/number.ml
---- sks-1.0.10-old/number.ml 2005-08-24 17:58:23.000000000 +0200
-+++ sks-1.0.10/number.ml 2005-08-24 18:49:18.268544555 +0200
-@@ -18,7 +18,7 @@
- (** Basic operations and definitions for multi-precistion integers. *)
-
- (* Change to Dlong for non x86 platforms *)
--module Nx = Numerix.Slong
-+module Nx = Numerix.Dlong
-
- let two = Nx.of_int 2
- let one = Nx.of_int 1
Modified: sks/trunk/sks/debian/rules
===================================================================
--- sks/trunk/sks/debian/rules 2008-06-19 15:30:09 UTC (rev 182)
+++ sks/trunk/sks/debian/rules 2008-06-19 15:51:54 UTC (rev 183)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-TAR_DIR = sks-1.0.10
+TAR_DIR = sks-1.1.0
# the dbs rules
include /usr/share/dbs/dbs-build.mk
@@ -8,6 +8,8 @@
include /usr/share/dbs/dpkg-arch.mk
endif
+TMP =$(CURDIR)/debian/sks
+
DEBCFLAGS = -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
DEBCFLAGS += -O0
@@ -15,13 +17,16 @@
DEBCFLAGS += -O3
endif
+debug:
+ ls -l
+
configure: configure-stamp
configure-stamp: $(patched)
dh_testdir
cd $(BUILD_TREE) && make clean dep
touch configure-stamp
-build: configure-stamp build-stamp
+build: debug configure-stamp build-stamp
build-stamp: $(patched)
dh_testdir
cd $(BUILD_TREE) && $(MAKE) DEBCFLAGS="$(DEBCFLAGS)" all
@@ -36,8 +41,9 @@
dh_installchangelogs
# from upstream
- install -m 755 $(BUILD_TREE)/sks debian/sks/usr/sbin/sks
- install -m 755 $(BUILD_TREE)/sks_add_mail debian/sks/usr/lib/sks/sks_add_mail
+ cd $(BUILD_TREE) && $(MAKE) PREFIX="$(TMP)/usr" MANDIR="$(TMP)/usr/share/man" install
+ #install -m 755 $(BUILD_TREE)/sks debian/sks/usr/sbin/sks
+ #install -m 755 $(BUILD_TREE)/sks_add_mail debian/sks/usr/lib/sks/sks_add_mail
# Debian specific
cp -a debian/debcfg/* debian/sks/etc/sks
Modified: sks/trunk/sks/debian/sks.dirs
===================================================================
--- sks/trunk/sks/debian/sks.dirs 2008-06-19 15:30:09 UTC (rev 182)
+++ sks/trunk/sks/debian/sks.dirs 2008-06-19 15:51:54 UTC (rev 183)
@@ -1,7 +1,6 @@
etc/sks
usr/sbin
usr/lib/sks
-usr/share/sks
var/lib/sks/dump
var/log/sks
var/run/sks
Modified: sks/trunk/sks/debian/sks.init
===================================================================
--- sks/trunk/sks/debian/sks.init 2008-06-19 15:30:09 UTC (rev 182)
+++ sks/trunk/sks/debian/sks.init 2008-06-19 15:51:54 UTC (rev 183)
@@ -1,5 +1,13 @@
#!/bin/sh -e
#
+### BEGIN INIT INFO
+# Provides: sks
+# Required-Start: $remote_fs $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+### END INIT INFO
+#
# Start/stops the sks daemons.
#
#
Deleted: sks/trunk/sks/sks-1.0.10.debian.tar.gz
===================================================================
(Binary files differ)
Added: sks/trunk/sks/sks-1.1.0.debian.tar.gz
===================================================================
(Binary files differ)
Property changes on: sks/trunk/sks/sks-1.1.0.debian.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the Pkg-sks-commit
mailing list