[Pkg-sks-commit] r205 - in sks/trunk/sks: . debian debian/patches
Christoph Martin
chrism at alioth.debian.org
Mon Feb 8 13:45:29 UTC 2010
Author: chrism
Date: 2010-02-08 13:45:28 +0000 (Mon, 08 Feb 2010)
New Revision: 205
Added:
sks/trunk/sks/sks-1.1.1.debian.tar.gz
Removed:
sks/trunk/sks/debian/patches/010_tighten_compiler_errors_warnings
sks/trunk/sks/debian/patches/201_makefile_man
sks/trunk/sks/sks-1.1.0.debian.tar.gz
Modified:
sks/trunk/sks/debian/changelog
sks/trunk/sks/debian/compat
sks/trunk/sks/debian/control
sks/trunk/sks/debian/patches/202_makefile_bytecode
sks/trunk/sks/debian/patches/203_db4.7
sks/trunk/sks/debian/patches/500_debian_fhs
sks/trunk/sks/debian/patches/501_makefile_cflags
sks/trunk/sks/debian/patches/502_makefile_install
sks/trunk/sks/debian/patches/508_build_fastbuild
sks/trunk/sks/debian/patches/509-content-types
sks/trunk/sks/debian/patches/510-allowed-chars
sks/trunk/sks/debian/rules
sks/trunk/sks/debian/sks.dirs
sks/trunk/sks/debian/sks.prerm
sks/trunk/sks/debian/watch
Log:
* New upstream
* fix watchfile
* fix some lintian errors/warnings
Modified: sks/trunk/sks/debian/changelog
===================================================================
--- sks/trunk/sks/debian/changelog 2009-11-04 20:40:59 UTC (rev 204)
+++ sks/trunk/sks/debian/changelog 2010-02-08 13:45:28 UTC (rev 205)
@@ -1,3 +1,11 @@
+sks (1.1.1-1) unstable; urgency=low
+
+ * New upstream
+ * fix watchfile
+ * fix some lintian errors/warnings
+
+ -- Christoph Martin <christoph.martin at uni-mainz.de> Sat, 28 Nov 2009 15:38:39 +0100
+
sks (1.1.0-9) unstable; urgency=low
* Explicitly require libdb4.7, 4.8 is not supported (Closes: #549798).
Modified: sks/trunk/sks/debian/compat
===================================================================
--- sks/trunk/sks/debian/compat 2009-11-04 20:40:59 UTC (rev 204)
+++ sks/trunk/sks/debian/compat 2010-02-08 13:45:28 UTC (rev 205)
@@ -1 +1 @@
-4
+5
Modified: sks/trunk/sks/debian/control
===================================================================
--- sks/trunk/sks/debian/control 2009-11-04 20:40:59 UTC (rev 204)
+++ sks/trunk/sks/debian/control 2010-02-08 13:45:28 UTC (rev 205)
@@ -1,10 +1,10 @@
Source: sks
Section: net
Priority: optional
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
Maintainer: Christoph Martin <christoph.martin at uni-mainz.de>
Uploaders: Fabio M. Di Nitto <fabbione at fabbione.net>
-Build-Depends: ocaml (>= 3.08), camlp4, dbs, libdb4.7-dev, debhelper (>= 4.0), zlib1g-dev, libcryptokit-ocaml-dev (>= 1.2-4), ocaml-nox (>= 1.3-4), perl, perl-doc
+Build-Depends: ocaml (>= 3.08), camlp4, dbs, libdb4.7-dev, debhelper (>= 5.0), zlib1g-dev, libcryptokit-ocaml-dev (>= 1.2-4), ocaml-nox (>= 1.3-4), perl, perl-doc
Package: sks
Architecture: any
Deleted: sks/trunk/sks/debian/patches/010_tighten_compiler_errors_warnings
===================================================================
--- sks/trunk/sks/debian/patches/010_tighten_compiler_errors_warnings 2009-11-04 20:40:59 UTC (rev 204)
+++ sks/trunk/sks/debian/patches/010_tighten_compiler_errors_warnings 2010-02-08 13:45:28 UTC (rev 205)
@@ -1,293 +0,0 @@
-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/201_makefile_man
===================================================================
--- sks/trunk/sks/debian/patches/201_makefile_man 2009-11-04 20:40:59 UTC (rev 204)
+++ sks/trunk/sks/debian/patches/201_makefile_man 2010-02-08 13:45:28 UTC (rev 205)
@@ -1,22 +0,0 @@
-diff -ruN sks-1.1.0-old/Makefile sks-1.1.0/Makefile
---- sks-1.1.0-old/Makefile 2008-06-24 16:56:07.000000000 +0200
-+++ sks-1.1.0/Makefile 2008-06-24 16:57: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)
-@@ -383,6 +383,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/202_makefile_bytecode
===================================================================
--- sks/trunk/sks/debian/patches/202_makefile_bytecode 2009-11-04 20:40:59 UTC (rev 204)
+++ sks/trunk/sks/debian/patches/202_makefile_bytecode 2010-02-08 13:45:28 UTC (rev 205)
@@ -1,6 +1,6 @@
-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-24 16:59:21.000000000 +0200
+diff -ruN sks-1.1.1-old/bdb/Makefile sks-1.1.1/bdb/Makefile
+--- sks-1.1.1-old/bdb/Makefile 2009-03-26 02:18:03.000000000 +0100
++++ sks-1.1.1/bdb/Makefile 2009-11-28 14:42:03.000000000 +0100
@@ -35,7 +35,7 @@
COBJS = bdb_stubs.o
@@ -10,9 +10,9 @@
libbdb.a: $(COBJS)
$(MKLIB) -custom -o bdb $(COBJS)
-diff -ruN sks-1.1.0-old/Makefile sks-1.1.0/Makefile
---- sks-1.1.0-old/Makefile 2008-06-24 16:57:40.000000000 +0200
-+++ sks-1.1.0/Makefile 2008-06-24 16:57:40.000000000 +0200
+diff -ruN sks-1.1.1-old/Makefile sks-1.1.1/Makefile
+--- sks-1.1.1-old/Makefile 2009-08-13 03:51:24.000000000 +0200
++++ sks-1.1.1/Makefile 2009-11-28 14:42:23.000000000 +0100
@@ -132,7 +132,7 @@
install.bc:
Modified: sks/trunk/sks/debian/patches/203_db4.7
===================================================================
--- sks/trunk/sks/debian/patches/203_db4.7 2009-11-04 20:40:59 UTC (rev 204)
+++ sks/trunk/sks/debian/patches/203_db4.7 2010-02-08 13:45:28 UTC (rev 205)
@@ -1,6 +1,6 @@
-diff -ruN sks-1.1.0-old/bdb/Makefile sks-1.1.0/bdb/Makefile
---- sks-1.1.0-old/bdb/Makefile 2009-07-15 23:41:52.889448000 +0200
-+++ sks-1.1.0/bdb/Makefile 2009-07-15 23:43:04.008447926 +0200
+diff -ruN sks-1.1.1-old/bdb/Makefile sks-1.1.1/bdb/Makefile
+--- sks-1.1.1-old/bdb/Makefile 2009-11-28 14:42:58.000000000 +0100
++++ sks-1.1.1/bdb/Makefile 2009-11-28 14:43:33.000000000 +0100
@@ -29,7 +29,7 @@
OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40
Modified: sks/trunk/sks/debian/patches/500_debian_fhs
===================================================================
--- sks/trunk/sks/debian/patches/500_debian_fhs 2009-11-04 20:40:59 UTC (rev 204)
+++ sks/trunk/sks/debian/patches/500_debian_fhs 2010-02-08 13:45:28 UTC (rev 205)
@@ -1,6 +1,6 @@
-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
+diff -ruN sks-1.1.1-old/common.ml sks-1.1.1/common.ml
+--- sks-1.1.1-old/common.ml 2009-03-26 03:14:44.000000000 +0100
++++ sks-1.1.1/common.ml 2009-11-28 14:45:50.000000000 +0100
@@ -82,7 +82,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;
-@@ -201,8 +201,8 @@
+@@ -208,8 +208,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.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 @@
+diff -ruN sks-1.1.1-old/dbserver.ml sks-1.1.1/dbserver.ml
+--- sks-1.1.1-old/dbserver.ml 2009-03-26 03:14:44.000000000 +0100
++++ sks-1.1.1/dbserver.ml 2009-11-28 14:46:27.000000000 +0100
+@@ -364,7 +364,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 -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
+diff -ruN sks-1.1.1-old/getfileopts.ml sks-1.1.1/getfileopts.ml
+--- sks-1.1.1-old/getfileopts.ml 2009-03-26 02:18:03.000000000 +0100
++++ sks-1.1.1/getfileopts.ml 2009-11-28 14:46:45.000000000 +0100
@@ -106,7 +106,7 @@
(**************************************************************)
(**************************************************************)
@@ -45,10 +45,10 @@
let parse args =
Arg.current := 0;
-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 @@
+diff -ruN sks-1.1.1-old/reconserver.ml sks-1.1.1/reconserver.ml
+--- sks-1.1.1-old/reconserver.ml 2009-03-29 00:35:36.000000000 +0100
++++ sks-1.1.1/reconserver.ml 2009-11-28 14:47:56.000000000 +0100
+@@ -188,7 +188,7 @@
let elements = ZSet.elements results in
let hashes = hashconvert elements in
print_hashes (sockaddr_to_string http_addr) hashes;
@@ -57,7 +57,7 @@
if List.length elements > 0
then
begin
-@@ -221,7 +221,7 @@
+@@ -225,7 +225,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 -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
+diff -ruN sks-1.1.1-old/settings.ml sks-1.1.1/settings.ml
+--- sks-1.1.1-old/settings.ml 2009-03-26 03:14:44.000000000 +0100
++++ sks-1.1.1/settings.ml 2009-11-28 14:49:39.000000000 +0100
@@ -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 2009-11-04 20:40:59 UTC (rev 204)
+++ sks/trunk/sks/debian/patches/501_makefile_cflags 2010-02-08 13:45:28 UTC (rev 205)
@@ -1,6 +1,6 @@
-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
+diff -ruN sks-1.1.1-old/bdb/Makefile sks-1.1.1/bdb/Makefile
+--- sks-1.1.1-old/bdb/Makefile 2009-11-28 14:50:28.000000000 +0100
++++ sks-1.1.1/bdb/Makefile 2009-11-28 14:51:32.000000000 +0100
@@ -16,8 +16,8 @@
CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE)
CC=gcc
@@ -12,9 +12,9 @@
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
+diff -ruN sks-1.1.1-old/Makefile sks-1.1.1/Makefile
+--- sks-1.1.1-old/Makefile 2009-11-28 14:50:28.000000000 +0100
++++ sks-1.1.1/Makefile 2009-11-28 14:53:57.000000000 +0100
@@ -17,8 +17,8 @@
CINCLUDES=-I`ocamlc -where`
CC=gcc
@@ -44,7 +44,7 @@
LIBS=$(LIBS.bc:.cma=.cmxa)
VERSION := $(shell cat VERSION)
-@@ -249,10 +249,10 @@
+@@ -255,10 +255,10 @@
##################################
bdb/bdb.cmxa: bdb/bdb_stubs.c bdb/bdb_stubs.h
@@ -57,7 +57,7 @@
bdbclean:
cd bdb && $(MAKE) clean
-@@ -267,29 +267,6 @@
+@@ -273,29 +273,6 @@
touch prepared
@@ -87,7 +87,7 @@
################################
# old stuff
################################
-@@ -386,8 +363,6 @@
+@@ -393,8 +370,6 @@
cleanall: clean bdbclean
rm -f lib/*
Modified: sks/trunk/sks/debian/patches/502_makefile_install
===================================================================
--- sks/trunk/sks/debian/patches/502_makefile_install 2009-11-04 20:40:59 UTC (rev 204)
+++ sks/trunk/sks/debian/patches/502_makefile_install 2010-02-08 13:45:28 UTC (rev 205)
@@ -1,6 +1,6 @@
-diff -ruN sks-1.1.0-old/Makefile sks-1.1.0/Makefile
---- sks-1.1.0-old/Makefile 2008-06-24 17:00:11.000000000 +0200
-+++ sks-1.1.0/Makefile 2008-06-24 17:04:05.000000000 +0200
+diff -ruN sks-1.1.1-old/Makefile sks-1.1.1/Makefile
+--- sks-1.1.1-old/Makefile 2009-11-28 14:54:46.000000000 +0100
++++ sks-1.1.1/Makefile 2009-11-28 14:56:11.000000000 +0100
@@ -125,14 +125,17 @@
# Special targets
Modified: sks/trunk/sks/debian/patches/508_build_fastbuild
===================================================================
--- sks/trunk/sks/debian/patches/508_build_fastbuild 2009-11-04 20:40:59 UTC (rev 204)
+++ sks/trunk/sks/debian/patches/508_build_fastbuild 2010-02-08 13:45:28 UTC (rev 205)
@@ -1,6 +1,6 @@
-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
+diff -ruN sks-1.1.1-old/sks_build.sh sks-1.1.1/sks_build.sh
+--- sks-1.1.1-old/sks_build.sh 2008-05-29 23:44:00.000000000 +0200
++++ sks-1.1.1/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
Modified: sks/trunk/sks/debian/patches/509-content-types
===================================================================
--- sks/trunk/sks/debian/patches/509-content-types 2009-11-04 20:40:59 UTC (rev 204)
+++ sks/trunk/sks/debian/patches/509-content-types 2010-02-08 13:45:28 UTC (rev 205)
@@ -1,6 +1,6 @@
-diff -ruN sks-1.1.0-old/dbserver.ml sks-1.1.0/dbserver.ml
---- sks-1.1.0-old/dbserver.ml 2008-11-08 15:58:54.803687000 +0000
-+++ sks-1.1.0/dbserver.ml 2008-11-08 15:59:37.333809983 +0000
+diff -ruN sks-1.1.1-old/dbserver.ml sks-1.1.1/dbserver.ml
+--- sks-1.1.1-old/dbserver.ml 2008-11-08 15:58:54.803687000 +0000
++++ sks-1.1.1/dbserver.ml 2008-11-08 15:59:37.333809983 +0000
@@ -370,6 +370,7 @@
".gif", "image/gif";
".ico", "image/x-icon";
Modified: sks/trunk/sks/debian/patches/510-allowed-chars
===================================================================
--- sks/trunk/sks/debian/patches/510-allowed-chars 2009-11-04 20:40:59 UTC (rev 204)
+++ sks/trunk/sks/debian/patches/510-allowed-chars 2010-02-08 13:45:28 UTC (rev 205)
@@ -1,6 +1,6 @@
-diff -ruN sks-1.1.0-old/dbserver.ml sks-1.1.0/dbserver.ml
---- sks-1.1.0-old/dbserver.ml 2008-11-08 16:12:22.376045000 +0000
-+++ sks-1.1.0/dbserver.ml 2008-11-08 16:12:59.014429214 +0000
+diff -ruN sks-1.1.1-old/dbserver.ml sks-1.1.1/dbserver.ml
+--- sks-1.1.1-old/dbserver.ml 2008-11-08 16:12:22.376045000 +0000
++++ sks-1.1.1/dbserver.ml 2008-11-08 16:12:59.014429214 +0000
@@ -348,7 +348,7 @@
let is_safe char =
Modified: sks/trunk/sks/debian/rules
===================================================================
--- sks/trunk/sks/debian/rules 2009-11-04 20:40:59 UTC (rev 204)
+++ sks/trunk/sks/debian/rules 2010-02-08 13:45:28 UTC (rev 205)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-TAR_DIR = sks-1.1.0
+TAR_DIR = sks-1.1.1
# the dbs rules
include /usr/share/dbs/dbs-build.mk
Modified: sks/trunk/sks/debian/sks.dirs
===================================================================
--- sks/trunk/sks/debian/sks.dirs 2009-11-04 20:40:59 UTC (rev 204)
+++ sks/trunk/sks/debian/sks.dirs 2010-02-08 13:45:28 UTC (rev 205)
@@ -3,6 +3,5 @@
usr/lib/sks
var/lib/sks/dump
var/log/sks
-var/run/sks
var/spool/sks/messages
var/spool/sks/failed_messages
Modified: sks/trunk/sks/debian/sks.prerm
===================================================================
--- sks/trunk/sks/debian/sks.prerm 2009-11-04 20:40:59 UTC (rev 204)
+++ sks/trunk/sks/debian/sks.prerm 2010-02-08 13:45:28 UTC (rev 205)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
#DEBHELPER#
Modified: sks/trunk/sks/debian/watch
===================================================================
--- sks/trunk/sks/debian/watch 2009-11-04 20:40:59 UTC (rev 204)
+++ sks/trunk/sks/debian/watch 2010-02-08 13:45:28 UTC (rev 205)
@@ -1,2 +1,3 @@
version=3
-http://minskyprimus.net/sks/releases/sks-(\d.*)\.tgz
+http://code.google.com/p/sks-keyserver/downloads/list \
+http://sks-keyserver.googlecode.com/files/sks-(\d.*).tgz
Deleted: sks/trunk/sks/sks-1.1.0.debian.tar.gz
===================================================================
(Binary files differ)
Added: sks/trunk/sks/sks-1.1.1.debian.tar.gz
===================================================================
(Binary files differ)
Property changes on: sks/trunk/sks/sks-1.1.1.debian.tar.gz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
More information about the Pkg-sks-commit
mailing list