[Pkg-sks-commit] r157 - in sks/trunk/sks: . debian debian/patches
chrism at alioth.debian.org
chrism at alioth.debian.org
Thu Jun 19 15:13:58 UTC 2008
Author: chrism
Date: 2008-06-19 15:13:56 +0000 (Thu, 19 Jun 2008)
New Revision: 157
Added:
sks/trunk/sks/sks-1.0.9.debian.tar.gz
Removed:
sks/trunk/sks/debian/patches/208_show_revoked_in_ms
sks/trunk/sks/debian/patches/209_handle_attribute_uids_in_mr
sks/trunk/sks/debian/patches/210_only_latest_changetime_in_mr
sks/trunk/sks/debian/patches/211_content_type_utf8
sks/trunk/sks/sks-1.0.8-fixed.debian.tgz
Modified:
sks/trunk/sks/debian/changelog
sks/trunk/sks/debian/rules
Log:
[project @ 159]
New upstream release
Original author: weasel
Date: 2004-10-25 23:35:01.827955+00:00
Modified: sks/trunk/sks/debian/changelog
===================================================================
--- sks/trunk/sks/debian/changelog 2008-06-19 15:13:48 UTC (rev 156)
+++ sks/trunk/sks/debian/changelog 2008-06-19 15:13:56 UTC (rev 157)
@@ -1,3 +1,14 @@
+sks (1.0.9-0.1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * New upstream patch incorporates the following patches:
+ - 208_show_revoked_in_ms
+ - 209_handle_attribute_uids_in_mr
+ - 210_only_latest_changetime_in_mr
+ - 211_content_type_utf8
+
+ -- Peter Palfrader <weasel at debian.org> Tue, 26 Oct 2004 01:33:45 +0200
+
sks (1.0.8-0.1) UNRELEASED; urgency=low
* New upstream release.
Deleted: sks/trunk/sks/debian/patches/208_show_revoked_in_ms
===================================================================
--- sks/trunk/sks/debian/patches/208_show_revoked_in_ms 2008-06-19 15:13:48 UTC (rev 156)
+++ sks/trunk/sks/debian/patches/208_show_revoked_in_ms 2008-06-19 15:13:56 UTC (rev 157)
@@ -1,18 +0,0 @@
-diff -ruN sks-1.0.7-old/mRindex.ml sks-1.0.7/mRindex.ml
---- sks-1.0.8-old/mRindex.ml Sun Oct 12 22:20:18 2003
-+++ sks-1.0.8/mRindex.ml Mon Aug 2 10:36:39 2004
-@@ -107,12 +107,13 @@
- | Some days -> sprintf "%Ld"
- (Int64.add pki.pk_ctime (Int64.mul daysecs (Int64.of_int days)))
- in
-- let key_line = sprintf "pub:%s:%d:%d:%Ld:%s:"
-+ let key_line = sprintf "pub:%s:%d:%d:%Ld:%s:%s"
- keyid
- pki.pk_alg
- pki.pk_keylen
- pki.pk_ctime
- exp_string
-+ (if (Index.is_revoked key) then "r" else "")
- in
- let uid_lines =
- List.map ~f:(fun (uid,sigs) -> uid_to_line full_keyid uid sigs) uids
Deleted: sks/trunk/sks/debian/patches/209_handle_attribute_uids_in_mr
===================================================================
--- sks/trunk/sks/debian/patches/209_handle_attribute_uids_in_mr 2008-06-19 15:13:48 UTC (rev 156)
+++ sks/trunk/sks/debian/patches/209_handle_attribute_uids_in_mr 2008-06-19 15:13:56 UTC (rev 157)
@@ -1,17 +0,0 @@
-diff -ruN sks-1.0.7-old/mRindex.ml sks-1.0.7/mRindex.ml
---- sks-1.0.8-old/mRindex.ml Mon Aug 2 10:45:27 2004
-+++ sks-1.0.8/mRindex.ml Mon Aug 2 10:49:51 2004
-@@ -116,7 +116,12 @@
- (if (Index.is_revoked key) then "r" else "")
- in
- let uid_lines =
-- List.map ~f:(fun (uid,sigs) -> uid_to_line full_keyid uid sigs) uids
-+ List.map ~f:(fun (uid,sigs) ->
-+ match uid.packet_type with
-+ User_ID_Packet -> uid_to_line full_keyid uid sigs
-+ | User_Attribute_Packet -> "uat::::"
-+ | _ -> "???::::"
-+ ) uids
- in
- key_line::uid_lines
-
Deleted: sks/trunk/sks/debian/patches/210_only_latest_changetime_in_mr
===================================================================
--- sks/trunk/sks/debian/patches/210_only_latest_changetime_in_mr 2008-06-19 15:13:48 UTC (rev 156)
+++ sks/trunk/sks/debian/patches/210_only_latest_changetime_in_mr 2008-06-19 15:13:56 UTC (rev 157)
@@ -1,29 +0,0 @@
-diff -ruN sks-1.0.7-old/mRindex.ml sks-1.0.7/mRindex.ml
---- sks-1.0.8-old/mRindex.ml Mon Aug 2 10:54:48 2004
-+++ sks-1.0.8/mRindex.ml Mon Aug 2 11:09:16 2004
-@@ -78,18 +78,20 @@
- sigs
-
- let time_to_string time = match time with
-- | None -> "-"
-+ | None -> ""
- | Some x -> sprintf "%Ld" x
-
- let uid_to_line keyid uid_packet sigs =
- let uid_string = escape_uid_string uid_packet.packet_body in
- let sigs = get_self_sigs keyid sigs in
- let times = List.map ~f:ParsePGP.get_times sigs in
-- let (ctimes,exptimes) = List.split times in
-+ let times = List.sort (fun (create1,exp1) (create2,exp2) -> compare create2 create1) times in
-+ let firsttime = List.hd times in
-+ let (ctime,exptime) = firsttime in
- sprintf "uid:%s:%s:%s:"
-- uid_string
-- (String.concat ~sep:" " (List.map ~f:time_to_string ctimes))
-- (String.concat ~sep:" " (List.map ~f:time_to_string exptimes))
-+ uid_string
-+ (time_to_string ctime)
-+ (time_to_string exptime)
-
- (** number of seconds in a day *)
- let daysecs = Int64.of_int (60 * 60 * 24)
Deleted: sks/trunk/sks/debian/patches/211_content_type_utf8
===================================================================
--- sks/trunk/sks/debian/patches/211_content_type_utf8 2008-06-19 15:13:48 UTC (rev 156)
+++ sks/trunk/sks/debian/patches/211_content_type_utf8 2008-06-19 15:13:56 UTC (rev 157)
@@ -1,87 +0,0 @@
-diff -ruN sks-1.0.8-old/dbserver.ml sks-1.0.8/dbserver.ml
---- sks-1.0.8-old/dbserver.ml 2004-10-06 10:40:48.000000000 +0200
-+++ sks-1.0.8/dbserver.ml 2004-10-18 22:41:20.000000000 +0200
-@@ -203,7 +203,7 @@
- match request.kind with
- | Stats ->
- plerror 4 "/pks/lookup: DB Stats request";
-- ("text/html", !last_stat_page)
-+ ("text/html; charset=UTF-8", !last_stat_page)
- | Get ->
- plerror 4 "/pks/lookup: Get request (%s)"
- (String.concat " " request.search);
-@@ -211,7 +211,7 @@
- let keys = clean_keys request keys in
- let keystr = Key.to_string_multiple keys in
- let aakeys = Armor.encode_pubkey_string keystr in
-- ("text/html",
-+ ("text/html; charset=UTF-8",
- HtmlTemplates.page
- ~title:(sprintf "Public Key Server -- Get ``%s ''"
- (String.concat ~sep:" " request.search))
-@@ -235,7 +235,7 @@
- in
- let keystr = Key.to_string key in
- let aakeys = Armor.encode_pubkey_string keystr in
-- ("text/html",
-+ ("text/html; charset=UTF-8",
- HtmlTemplates.page
- ~title:(sprintf "Public Key Server -- Get ``%s ''" hash_str)
- ~body:(sprintf "\r\n<pre>\r\n%s\r\n</pre>\r\n" aakeys)
-@@ -267,7 +267,7 @@
- let pre = HtmlTemplates.preformat_list
- (Index.keyinfo_header request :: output)
- in
-- ("text/html",
-+ ("text/html; charset=UTF-8",
- HtmlTemplates.page ~body:pre
- ~title:(sprintf "Search results for '%s'"
- (String.concat ~sep:" " request.search))
-@@ -387,7 +387,7 @@
- let fname = convert_web_fname "index.html" in
- let text = read_file fname in
- cout#write_string text;
-- "text/html"
-+ "text/html; charset=UTF-8"
- else
- (try
- let extension = get_extension base in
-@@ -450,7 +450,7 @@
- cout#write_string (sprintf "%d keys added succesfully.<br>" !ctr)
- );
- cout#write_string "</html></body>";
-- "text/html"
-+ "text/html; charset=UTF-8"
- | "/pks/hashquery" ->
- plerror 4 "Handling /pks/hashquery";
- let sin = new Channel.string_in_channel body 0 in
-@@ -466,7 +466,7 @@
- cout#write_string (HtmlTemplates.page
- ~title:"Unexpected POST request"
- ~body:"");
-- "text/html"
-+ "text/html; charset=UTF-8"
-
-
- (** Prepare handler for use with eventloop by transforming system
-diff -ruN sks-1.0.8-old/wserver.ml sks-1.0.8/wserver.ml
---- sks-1.0.8-old/wserver.ml 2004-10-04 04:07:50.000000000 +0200
-+++ sks-1.0.8/wserver.ml 2004-10-18 22:40:52.000000000 +0200
-@@ -236,7 +236,7 @@
-
-
-
--let send_result cout ?(error_code = 200) ?(content_type = "text/html") body =
-+let send_result cout ?(error_code = 200) ?(content_type = "text/html; charset=UTF-8") body =
- fprintf cout "HTTP/1.0 %03d OK\r\n" error_code;
- fprintf cout "Server: sks_www/%s\r\n" version;
- fprintf cout "Content-type: %s\r\n\r\n" content_type;
-@@ -301,7 +301,7 @@
- ignore (Unix.alarm recover_timeout);
- plerror 2 "Error handling request %s: %s"
- (request_to_string request) (Common.err_to_string e);
-- let content_type = "text/html" in
-+ let content_type = "text/html; charset=UTF-8" in
- let output =
- (HtmlTemplates.page ~title:"Error handling request"
- ~body:(sprintf "Error handling request. Exception raised: %s"
Modified: sks/trunk/sks/debian/rules
===================================================================
--- sks/trunk/sks/debian/rules 2008-06-19 15:13:48 UTC (rev 156)
+++ sks/trunk/sks/debian/rules 2008-06-19 15:13:56 UTC (rev 157)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-TAR_DIR = sks-1.0.8
+TAR_DIR = sks-1.0.9
# the dbs rules
include /usr/share/dbs/dbs-build.mk
Deleted: sks/trunk/sks/sks-1.0.8-fixed.debian.tgz
===================================================================
(Binary files differ)
Added: sks/trunk/sks/sks-1.0.9.debian.tar.gz
===================================================================
(Binary files differ)
Property changes on: sks/trunk/sks/sks-1.0.9.debian.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the Pkg-sks-commit
mailing list