[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Upload of sks 1.1.1-2 backport?



Hi,

I created a backport of sks 1.1.1-2 to lenny.  Should I upload it to
backports.org?  It's rank 25565 in the popcon vote rankings:

 http://qa.debian.org/popcon.php?package=sks

I've attached the diff against the lenny version and against the
testing version.

-- 
Matt                                            http://ftbfs.org/kraai
diff -Nru sks-1.1.0/debian/changelog sks-1.1.1/debian/changelog
--- sks-1.1.0/debian/changelog	2010-08-22 10:39:25.000000000 -0700
+++ sks-1.1.1/debian/changelog	2010-08-22 12:16:02.000000000 -0700
@@ -1,3 +1,69 @@
+sks (1.1.1-2~bpo50+1) lenny-backports; urgency=low
+
+  * Change libdb4.7-dev and db4.7-util in debian/control to libdb-dev and
+    db4.6-util, respectively.
+  * Remove debian/patches/203_db4.7.
+  * Change 4.6 and 4.7 in debian/README.Debian to 4.1 and 4.6,
+    respectively.
+  * Change 4.7 to 4.6 in debian/sks.cron.daily.
+  * Add self to Uploaders to debian/control.
+
+ -- Matt Kraai <kraai@debian.org>  Sun, 22 Aug 2010 12:16:02 -0700
+
+sks (1.1.1-2) unstable; urgency=low
+
+  * don't chown PIDDIR in postinst, since we do it in init (Closes: #566922)
+
+ -- Christoph Martin <christoph.martin@uni-mainz.de>  Mon, 08 Feb 2010 15:00:34 +0100
+
+sks (1.1.1-1) unstable; urgency=low
+
+  * New upstream
+  * fix watchfile
+  * fix some lintian errors/warnings
+
+ -- Christoph Martin <christoph.martin@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).
+
+ -- Christoph Martin <christoph.martin@uni-mainz.de>  Wed, 04 Nov 2009 21:40:36 +0100
+
+sks (1.1.0-8) unstable; urgency=low
+
+  * Teach dbserver about content-type for .html.
+  * Allow - in filenames for webserver.
+  * closes: #505014
+  * thanks to Peter Palfrader <weasel@debian.org>
+
+ -- Christoph Martin <christoph.martin@uni-mainz.de>  Thu, 16 Jul 2009 23:33:21 +0200
+
+sks (1.1.0-7) unstable; urgency=low
+
+  * fix patch for PIDDIR
+  * link against libdb4.7
+  * really include watch file
+
+ -- Christoph Martin <christoph.martin@uni-mainz.de>  Thu, 16 Jul 2009 00:22:06 +0200
+
+sks (1.1.0-6) unstable; urgency=low
+
+  * remove Peter Palfrader from Maintainer and Uploaders
+  * add watch file
+  * Remove reference to native-arch in old OCaml standard library path
+    (Thanks to Stephane Glondu <steph@glondu.net>) (Closes: #535267)
+
+ -- Christoph Martin <christoph.martin@uni-mainz.de>  Fri, 10 Jul 2009 23:34:36 +0200
+
+sks (1.1.0-5) unstable; urgency=low
+
+  * Check spool directories for existance (Thanks to Filippo Giunchedi
+    <filippo@debian.org>) (Closes: #493335)
+  * make PIDDIR on startup to workaround /var/run on a tempfs
+
+ -- Christoph Martin <christoph.martin@uni-mainz.de>  Thu, 18 Jun 2009 16:39:09 +0200
+
 sks (1.1.0-4) unstable; urgency=low
 
   * fix cron.daily to call correct db*_archive and print unwanted messages
diff -Nru sks-1.1.0/debian/compat sks-1.1.1/debian/compat
--- sks-1.1.0/debian/compat	2010-08-22 10:39:25.000000000 -0700
+++ sks-1.1.1/debian/compat	2010-08-21 09:08:30.000000000 -0700
@@ -1 +1 @@
-4
+5
diff -Nru sks-1.1.0/debian/control sks-1.1.1/debian/control
--- sks-1.1.0/debian/control	2010-08-22 10:39:25.000000000 -0700
+++ sks-1.1.1/debian/control	2010-08-22 12:15:48.000000000 -0700
@@ -1,10 +1,10 @@
 Source: sks
 Section: net
 Priority: optional
-Standards-Version: 3.8.0
-Maintainer: Peter Palfrader <weasel@debian.org>
-Uploaders: Fabio M. Di Nitto <fabbione@fabbione.net>, Peter Palfrader <weasel@debian.org>, Christoph Martin <christoph.martin@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
+Standards-Version: 3.8.3
+Maintainer: Christoph Martin <christoph.martin@uni-mainz.de>
+Uploaders: Fabio M. Di Nitto <fabbione@fabbione.net>, Matt Kraai <kraai@debian.org>
+Build-Depends: ocaml (>= 3.08), camlp4, dbs, libdb-dev, debhelper (>= 5.0), zlib1g-dev, libcryptokit-ocaml-dev (>= 1.2-4), ocaml-nox (>= 1.3-4), perl, perl-doc
 
 Package: sks
 Architecture: any
diff -Nru sks-1.1.0/debian/patches/010_tighten_compiler_errors_warnings sks-1.1.1/debian/patches/010_tighten_compiler_errors_warnings
--- sks-1.1.0/debian/patches/010_tighten_compiler_errors_warnings	2010-08-22 10:39:25.000000000 -0700
+++ sks-1.1.1/debian/patches/010_tighten_compiler_errors_warnings	1969-12-31 16:00:00.000000000 -0800
@@ -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" 
diff -Nru sks-1.1.0/debian/patches/201_makefile_man sks-1.1.1/debian/patches/201_makefile_man
--- sks-1.1.0/debian/patches/201_makefile_man	2010-08-22 10:39:25.000000000 -0700
+++ sks-1.1.1/debian/patches/201_makefile_man	1969-12-31 16:00:00.000000000 -0800
@@ -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/*
diff -Nru sks-1.1.0/debian/patches/202_makefile_bytecode sks-1.1.1/debian/patches/202_makefile_bytecode
--- sks-1.1.0/debian/patches/202_makefile_bytecode	2010-08-22 10:39:25.000000000 -0700
+++ sks-1.1.1/debian/patches/202_makefile_bytecode	2010-08-21 09:08:30.000000000 -0700
@@ -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: 
diff -Nru sks-1.1.0/debian/patches/500_debian_fhs sks-1.1.1/debian/patches/500_debian_fhs
--- sks-1.1.0/debian/patches/500_debian_fhs	2010-08-22 10:39:25.000000000 -0700
+++ sks-1.1.1/debian/patches/500_debian_fhs	2010-08-21 09:08:30.000000000 -0700
@@ -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
diff -Nru sks-1.1.0/debian/patches/501_makefile_cflags sks-1.1.1/debian/patches/501_makefile_cflags
--- sks-1.1.0/debian/patches/501_makefile_cflags	2010-08-22 10:39:25.000000000 -0700
+++ sks-1.1.1/debian/patches/501_makefile_cflags	2010-08-21 09:08:30.000000000 -0700
@@ -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/*
diff -Nru sks-1.1.0/debian/patches/502_makefile_install sks-1.1.1/debian/patches/502_makefile_install
--- sks-1.1.0/debian/patches/502_makefile_install	2010-08-22 10:39:25.000000000 -0700
+++ sks-1.1.1/debian/patches/502_makefile_install	2010-08-21 09:08:30.000000000 -0700
@@ -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 
  
diff -Nru sks-1.1.0/debian/patches/508_build_fastbuild sks-1.1.1/debian/patches/508_build_fastbuild
--- sks-1.1.0/debian/patches/508_build_fastbuild	2010-08-22 10:39:25.000000000 -0700
+++ sks-1.1.1/debian/patches/508_build_fastbuild	2010-08-21 09:08:30.000000000 -0700
@@ -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
diff -Nru sks-1.1.0/debian/patches/509-content-types sks-1.1.1/debian/patches/509-content-types
--- sks-1.1.0/debian/patches/509-content-types	1969-12-31 16:00:00.000000000 -0800
+++ sks-1.1.1/debian/patches/509-content-types	2010-08-21 09:08:30.000000000 -0700
@@ -0,0 +1,11 @@
+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";
+       ".png", "image/png";
++      ".html", "text/html";
+       ".txt", "text/plain"; 
+     ]
+ 
diff -Nru sks-1.1.0/debian/patches/510-allowed-chars sks-1.1.1/debian/patches/510-allowed-chars
--- sks-1.1.0/debian/patches/510-allowed-chars	1969-12-31 16:00:00.000000000 -0800
+++ sks-1.1.1/debian/patches/510-allowed-chars	2010-08-21 09:08:30.000000000 -0700
@@ -0,0 +1,12 @@
+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 = 
+     (char >= 'A' && char <= 'Z') || (char >= 'a' && char <= 'z') || 
+-    (char >= '0' && char <= '9') || (char = '.')
++    (char >= '0' && char <= '9') || (char = '.') || (char = '-')
+     
+ 
+   let verify_web_fname fname = 
diff -Nru sks-1.1.0/debian/README.Debian sks-1.1.1/debian/README.Debian
--- sks-1.1.0/debian/README.Debian	2010-08-22 10:39:25.000000000 -0700
+++ sks-1.1.1/debian/README.Debian	2010-08-22 10:44:37.000000000 -0700
@@ -39,4 +39,4 @@
 Thanks to Peter Palfrader <weasel@debian.org> for building the
 original Debian package.
 
- -- Christoph Martin <Christoph.Martin@Uni-Mainz.DE>, Tue, 22 Jul 2008 17:28:24 +0200
+ -- Matt Kraai <kraai@debian.org>, Sun, 22 Aug 2010 10:44:37 -0700
diff -Nru sks-1.1.0/debian/rules sks-1.1.1/debian/rules
--- sks-1.1.0/debian/rules	2010-08-22 10:39:25.000000000 -0700
+++ sks-1.1.1/debian/rules	2010-08-21 09:08:30.000000000 -0700
@@ -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
 
@@ -35,7 +35,7 @@
 build: debug configure-stamp build-stamp
 build-stamp: $(patched)
 	dh_testdir
-	cat /usr/lib/ocaml/*/native-archs
+	#cat /usr/lib/ocaml/*/native-archs
 	cd $(BUILD_TREE) && $(MAKE) DEBCFLAGS="$(DEBCFLAGS)" $(all)
 	touch build-stamp
 
diff -Nru sks-1.1.0/debian/sks.cron.daily sks-1.1.1/debian/sks.cron.daily
--- sks-1.1.0/debian/sks.cron.daily	2010-08-22 10:39:25.000000000 -0700
+++ sks-1.1.1/debian/sks.cron.daily	2010-08-22 10:47:48.000000000 -0700
@@ -11,8 +11,12 @@
 # eventhing that hasn't been touched in the last 2 weeks
 # is probably old and the result of a host that changed IP.
 
+[ -d /var/spool/sks ] || exit 0
+
 find /var/spool/sks -type f -name 'diff-*.txt' -mtime +14 | xargs --no-run-if-empty rm -f
 
+[ -d /var/spool/sks/failed_messages ] || exit 0
+
 # Also remove failed messages
 find /var/spool/sks/failed_messages -type f -name 'msg-*.ready' -mtime +14 | xargs --no-run-if-empty rm -f
 
diff -Nru sks-1.1.0/debian/sks.dirs sks-1.1.1/debian/sks.dirs
--- sks-1.1.0/debian/sks.dirs	2010-08-22 10:39:25.000000000 -0700
+++ sks-1.1.1/debian/sks.dirs	2010-08-21 09:08:30.000000000 -0700
@@ -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
diff -Nru sks-1.1.0/debian/sks.init sks-1.1.1/debian/sks.init
--- sks-1.1.0/debian/sks.init	2010-08-22 10:39:25.000000000 -0700
+++ sks-1.1.1/debian/sks.init	2010-08-21 09:08:30.000000000 -0700
@@ -68,6 +68,9 @@
 	    exit 0
 	fi
 
+	mkdir -p `dirname "$SKSDBPID"`
+	chown debian-sks `dirname "$SKSDBPID"`
+
 	echo -n " sksdb.."
 
 	start-stop-daemon --start --quiet --oknodo \
diff -Nru sks-1.1.0/debian/sks.postinst sks-1.1.1/debian/sks.postinst
--- sks-1.1.0/debian/sks.postinst	2010-08-22 10:39:25.000000000 -0700
+++ sks-1.1.1/debian/sks.postinst	2010-08-21 09:08:30.000000000 -0700
@@ -43,7 +43,7 @@
     # note that sks creates files/dirs with 600/700
     # permissions as default. so let's stick with it for the
     # installation. We will do nothing across upgrades.
-    for i in lib log run spool; do
+    for i in lib log spool; do
 	chown -R debian-sks:debian-sks /var/$i/sks
 	chmod -R 700 /var/$i/sks
 	find /var/$i/sks -type f -exec chmod 600 '{}' ';'
diff -Nru sks-1.1.0/debian/sks.prerm sks-1.1.1/debian/sks.prerm
--- sks-1.1.0/debian/sks.prerm	2010-08-22 10:39:25.000000000 -0700
+++ sks-1.1.1/debian/sks.prerm	2010-08-21 09:08:30.000000000 -0700
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 #DEBHELPER#
 
diff -Nru sks-1.1.0/debian/watch sks-1.1.1/debian/watch
--- sks-1.1.0/debian/watch	1969-12-31 16:00:00.000000000 -0800
+++ sks-1.1.1/debian/watch	2010-08-21 09:08:30.000000000 -0700
@@ -0,0 +1,3 @@
+version=3
+http://code.google.com/p/sks-keyserver/downloads/list \
+http://sks-keyserver.googlecode.com/files/sks-(\d.*).tgz
Binary files sks-1.1.0/sks-1.1.0.debian.tar.gz and sks-1.1.1/sks-1.1.0.debian.tar.gz differ
Binary files sks-1.1.0/sks-1.1.1.debian.tar.gz and sks-1.1.1/sks-1.1.1.debian.tar.gz differ
diff -Nru sks-1.1.1~/debian/changelog sks-1.1.1/debian/changelog
--- sks-1.1.1~/debian/changelog	2010-08-22 12:12:27.000000000 -0700
+++ sks-1.1.1/debian/changelog	2010-08-22 12:16:02.000000000 -0700
@@ -1,3 +1,15 @@
+sks (1.1.1-2~bpo50+1) lenny-backports; urgency=low
+
+  * Change libdb4.7-dev and db4.7-util in debian/control to libdb-dev and
+    db4.6-util, respectively.
+  * Remove debian/patches/203_db4.7.
+  * Change 4.6 and 4.7 in debian/README.Debian to 4.1 and 4.6,
+    respectively.
+  * Change 4.7 to 4.6 in debian/sks.cron.daily.
+  * Add self to Uploaders to debian/control.
+
+ -- Matt Kraai <kraai@debian.org>  Sun, 22 Aug 2010 12:16:02 -0700
+
 sks (1.1.1-2) unstable; urgency=low
 
   * don't chown PIDDIR in postinst, since we do it in init (Closes: #566922)
diff -Nru sks-1.1.1~/debian/control sks-1.1.1/debian/control
--- sks-1.1.1~/debian/control	2010-08-22 12:12:27.000000000 -0700
+++ sks-1.1.1/debian/control	2010-08-22 12:15:48.000000000 -0700
@@ -3,12 +3,12 @@
 Priority: optional
 Standards-Version: 3.8.3
 Maintainer: Christoph Martin <christoph.martin@uni-mainz.de>
-Uploaders: Fabio M. Di Nitto <fabbione@fabbione.net>
-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
+Uploaders: Fabio M. Di Nitto <fabbione@fabbione.net>, Matt Kraai <kraai@debian.org>
+Build-Depends: ocaml (>= 3.08), camlp4, dbs, libdb-dev, debhelper (>= 5.0), zlib1g-dev, libcryptokit-ocaml-dev (>= 1.2-4), ocaml-nox (>= 1.3-4), perl, perl-doc
 
 Package: sks
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${F:OCamlRun}, db4.7-util, postfix | mail-transport-agent, procmail, adduser, logrotate
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${F:OCamlRun}, 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
diff -Nru sks-1.1.1~/debian/patches/203_db4.7 sks-1.1.1/debian/patches/203_db4.7
--- sks-1.1.1~/debian/patches/203_db4.7	2010-08-22 12:12:27.000000000 -0700
+++ sks-1.1.1/debian/patches/203_db4.7	1969-12-31 16:00:00.000000000 -0800
@@ -1,12 +0,0 @@
-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 
- 
- ifndef LIBDB
--LIBDB=-ldb-4.6
-+LIBDB=-ldb-4.7
- endif
- 
- COBJS = bdb_stubs.o
diff -Nru sks-1.1.1~/debian/README.Debian sks-1.1.1/debian/README.Debian
--- sks-1.1.1~/debian/README.Debian	2010-08-22 12:12:27.000000000 -0700
+++ sks-1.1.1/debian/README.Debian	2010-08-22 10:44:37.000000000 -0700
@@ -16,15 +16,15 @@
 
  vi /etc/default/sks
 
-If you have an old database from a Berkely DB Version (e.g 4.6) prior to the
-current version (at the moment 4.7) you have to do the following in
+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_recover
- db4.7_recover -e
- db4.7_checkpoint -1
- db4.7_archive | xargs --no-run-if-empty rm -f
+ db4.6_archive | xargs --no-run-if-empty rm -f
 
  chown -R debian-sks:debian-sks /var/lib/sks /var/log/sks
 
@@ -39,4 +39,4 @@
 Thanks to Peter Palfrader <weasel@debian.org> for building the
 original Debian package.
 
- -- Christoph Martin <Christoph.Martin@Uni-Mainz.DE>, Tue, 22 Jul 2008 17:28:24 +0200
+ -- Matt Kraai <kraai@debian.org>, Sun, 22 Aug 2010 10:44:37 -0700
diff -Nru sks-1.1.1~/debian/sks.cron.daily sks-1.1.1/debian/sks.cron.daily
--- sks-1.1.1~/debian/sks.cron.daily	2010-08-22 12:12:27.000000000 -0700
+++ sks-1.1.1/debian/sks.cron.daily	2010-08-22 10:47:48.000000000 -0700
@@ -26,7 +26,7 @@
 	dir=$1
 	if [ -d "$dir" ]
 	then
-		db4.7_archive -h $dir -d
+		db4.6_archive -h $dir -d
 	fi
 	return 0
 }

Reply to: