[Pkg-sks-commit] r93 - sks/trunk/sks/debian/patches
chrism at alioth.debian.org
chrism at alioth.debian.org
Thu Jun 19 14:56:05 UTC 2008
Author: chrism
Date: 2008-06-19 14:56:04 +0000 (Thu, 19 Jun 2008)
New Revision: 93
Removed:
sks/trunk/sks/debian/patches/503_server_version
sks/trunk/sks/debian/patches/506_show_revoked
sks/trunk/sks/debian/patches/507_iso_dates
Modified:
sks/trunk/sks/debian/patches/500_debian_fhs
sks/trunk/sks/debian/patches/501_makefile_cflags
sks/trunk/sks/debian/patches/502_makefile_misc_fixes
sks/trunk/sks/debian/patches/504_key_types
Log:
[project @ 94]
Forward port patches
Original author: weasel
Date: 2003-12-09 22:24:06.437674+00:00
Modified: sks/trunk/sks/debian/patches/500_debian_fhs
===================================================================
--- sks/trunk/sks/debian/patches/500_debian_fhs 2008-06-19 14:55:46 UTC (rev 92)
+++ sks/trunk/sks/debian/patches/500_debian_fhs 2008-06-19 14:56:04 UTC (rev 93)
@@ -1,6 +1,6 @@
diff -ruN sks-1.0.6-old/common.src.ml sks-1.0.6/common.src.ml
---- sks-1.0.6-old/common.src.ml 2003-12-02 11:23:52.000000000 +0100
-+++ sks-1.0.6/common.src.ml 2003-12-04 15:51:45.000000000 +0100
+--- sks-1.0.6-old/common.src.ml 2003-12-02 11:23:11.000000000 +0100
++++ sks-1.0.6/common.src.ml 2003-12-09 23:13:50.000000000 +0100
@@ -81,7 +81,7 @@
let set_logfile extension =
@@ -22,8 +22,8 @@
let db_command_addr = Unix.ADDR_UNIX db_command_name
let recon_command_addr = Unix.ADDR_UNIX recon_command_name
diff -ruN sks-1.0.6-old/dbserver.ml sks-1.0.6/dbserver.ml
---- sks-1.0.6-old/dbserver.ml 2003-12-02 12:03:33.000000000 +0100
-+++ sks-1.0.6/dbserver.ml 2003-12-04 15:51:45.000000000 +0100
+--- sks-1.0.6-old/dbserver.ml 2003-12-05 03:34:13.000000000 +0100
++++ sks-1.0.6/dbserver.ml 2003-12-09 23:13:50.000000000 +0100
@@ -336,7 +336,7 @@
let convert_web_fname fname =
@@ -34,8 +34,8 @@
(** Handler for HTTP requests *)
diff -ruN sks-1.0.6-old/getfileopts.ml sks-1.0.6/getfileopts.ml
---- sks-1.0.6-old/getfileopts.ml 2003-11-04 04:11:58.000000000 +0100
-+++ sks-1.0.6/getfileopts.ml 2003-12-04 15:51:45.000000000 +0100
+--- sks-1.0.6-old/getfileopts.ml 2003-12-09 22:33:49.000000000 +0100
++++ sks-1.0.6/getfileopts.ml 2003-12-09 23:13:50.000000000 +0100
@@ -106,7 +106,7 @@
(**************************************************************)
(**************************************************************)
@@ -47,7 +47,7 @@
Arg.current := 0;
diff -ruN sks-1.0.6-old/reconserver.ml sks-1.0.6/reconserver.ml
--- sks-1.0.6-old/reconserver.ml 2003-10-12 22:20:19.000000000 +0200
-+++ sks-1.0.6/reconserver.ml 2003-12-04 15:51:45.000000000 +0100
++++ sks-1.0.6/reconserver.ml 2003-12-09 23:13:50.000000000 +0100
@@ -181,7 +181,7 @@
print_hashes hashes;
if List.length elements > 0
@@ -67,18 +67,9 @@
hashes;
update_recover_list results http_addr;
diff -ruN sks-1.0.6-old/settings.ml sks-1.0.6/settings.ml
---- sks-1.0.6-old/settings.ml 2003-11-29 15:25:51.000000000 +0100
-+++ sks-1.0.6/settings.ml 2003-12-04 15:53:51.000000000 +0100
-@@ -90,7 +90,7 @@
- let max_uid_fetches = ref 1000
- let set_max_uid_fetches value = max_uid_fetches := value
-
--let basedir = ref "."
-+let basedir = ref ""
- let set_basedir value = basedir := value
-
- let dump_new = ref false
-@@ -176,7 +176,7 @@
+--- sks-1.0.6-old/settings.ml 2003-12-09 22:33:31.000000000 +0100
++++ sks-1.0.6/settings.ml 2003-12-09 23:14:11.000000000 +0100
+@@ -173,7 +173,7 @@
let command_timeout = ref 60
let set_command_timeout value = command_timeout := value
@@ -87,7 +78,7 @@
let set_sendmail_cmd value = sendmail_cmd := value
let membership_reload_time = ref (60. *. 60. *. 6.)
-@@ -194,13 +194,13 @@
+@@ -191,13 +191,13 @@
from_addr := Some addr;
addr
@@ -106,9 +97,18 @@
+let msgdir = ref "/var/spool/sks/messages"
+let failed_msgdir = ref "/var/spool/sks/failed_messages"
- let update_dir dirref =
- dirref := Filename.concat !basedir !dirref
-@@ -252,7 +252,7 @@
+ let update_dir basedir dirref =
+ dirref := Filename.concat basedir !dirref
+@@ -212,7 +212,7 @@
+ update_dir basedir failed_msgdir;
+ ()
+
+-let basedir = ref "."
++let basedir = ref ""
+ let set_basedir value =
+ basedir := value;
+ prepare_options !basedir
+@@ -254,7 +254,7 @@
("-hkp_address",Arg.String set_hkp_address, "Set hkp binding address");
("-use_port_80",Arg.Set use_port_80,
"Have the HKP interface listen on port 80, as well as the hkp_port");
Modified: sks/trunk/sks/debian/patches/501_makefile_cflags
===================================================================
--- sks/trunk/sks/debian/patches/501_makefile_cflags 2008-06-19 14:55:46 UTC (rev 92)
+++ sks/trunk/sks/debian/patches/501_makefile_cflags 2008-06-19 14:56:04 UTC (rev 93)
@@ -1,6 +1,33 @@
+diff -ruN sks-1.0.6-old/Makefile sks-1.0.6/Makefile
+--- sks-1.0.6-old/Makefile 2003-12-04 14:47:11.000000000 +0100
++++ sks-1.0.6/Makefile 2003-12-09 23:14:37.000000000 +0100
+@@ -17,8 +17,8 @@
+ CINCLUDES=-I`ocamlc -where`
+ CC=gcc
+ CXX=g++
+-CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
+-CXXFLAGS=-O3 $(CINCLUDES) -I .
++CFLAGS=$(DEBCFLAGS) -Werror-implicit-function-declaration $(CINCLUDES) -I .
++CXXFLAGS=$(DEBCFLAGS) $(CINCLUDES) -I .
+
+ ifndef OCAMLC
+ OCAMLC=ocamlc
+@@ -235,10 +235,10 @@
+ ##################################
+
+ bdb/bdb.cmxa: bdb/bdb_stubs.c bdb/bdb_stubs.h
+- cd bdb && $(MAKE) bdb.cmxa
++ cd bdb && $(MAKE) DEBCFLAGS="$(DEBCFLAGS)" bdb.cmxa
+
+ bdb/bdb.cma: bdb/bdb_stubs.c bdb/bdb_stubs.h
+- cd bdb && $(MAKE) bdb.cma
++ cd bdb && $(MAKE) DEBCFLAGS="$(DEBCFLAGS)" bdb.cma
+
+ bdbclean:
+ cd bdb && $(MAKE) clean
diff -ruN sks-1.0.6-old/bdb/Makefile sks-1.0.6/bdb/Makefile
--- sks-1.0.6-old/bdb/Makefile 2003-07-05 17:16:29.000000000 +0200
-+++ sks-1.0.6/bdb/Makefile 2003-12-03 17:38:25.000000000 +0100
++++ sks-1.0.6/bdb/Makefile 2003-12-09 23:14:37.000000000 +0100
@@ -16,8 +16,8 @@
CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE)
CC=gcc
@@ -14,7 +41,7 @@
RANLIB=ranlib
diff -ruN sks-1.0.6-old/cryptokit-1.0/Makefile sks-1.0.6/cryptokit-1.0/Makefile
--- sks-1.0.6-old/cryptokit-1.0/Makefile 2002-04-04 14:27:31.000000000 +0200
-+++ sks-1.0.6/cryptokit-1.0/Makefile 2003-12-03 17:38:25.000000000 +0100
++++ sks-1.0.6/cryptokit-1.0/Makefile 2003-12-09 23:14:37.000000000 +0100
@@ -13,7 +13,7 @@
INSTALLDIR=`$(OCAMLC) -where`
@@ -41,30 +68,3 @@
test: test.byt
$(OCAMLRUN) -I . ./test.byt
-diff -ruN sks-1.0.6-old/Makefile sks-1.0.6/Makefile
---- sks-1.0.6-old/Makefile 2003-11-29 13:46:30.000000000 +0100
-+++ sks-1.0.6/Makefile 2003-12-03 17:39:05.000000000 +0100
-@@ -17,8 +17,8 @@
- CINCLUDES=-I`ocamlc -where`
- CC=gcc
- CXX=g++
--CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
--CXXFLAGS=-O3 $(CINCLUDES) -I .
-+CFLAGS=$(DEBCFLAGS) -Werror-implicit-function-declaration $(CINCLUDES) -I .
-+CXXFLAGS=$(DEBCFLAGS) $(CINCLUDES) -I .
-
- ifndef OCAMLC
- OCAMLC=ocamlc
-@@ -226,10 +226,10 @@
- ##################################
-
- bdb/bdb.cmxa: bdb/bdb_stubs.c bdb/bdb_stubs.h
-- cd bdb && $(MAKE) bdb.cmxa
-+ cd bdb && $(MAKE) DEBCFLAGS="$(DEBCFLAGS)" bdb.cmxa
-
- bdb/bdb.cma: bdb/bdb_stubs.c bdb/bdb_stubs.h
-- cd bdb && $(MAKE) bdb.cma
-+ cd bdb && $(MAKE) DEBCFLAGS="$(DEBCFLAGS)" bdb.cma
-
- bdbclean:
- cd bdb && $(MAKE) clean
Modified: sks/trunk/sks/debian/patches/502_makefile_misc_fixes
===================================================================
--- sks/trunk/sks/debian/patches/502_makefile_misc_fixes 2008-06-19 14:55:46 UTC (rev 92)
+++ sks/trunk/sks/debian/patches/502_makefile_misc_fixes 2008-06-19 14:56:04 UTC (rev 93)
@@ -1,7 +1,7 @@
diff -ruN sks-1.0.6-old/Makefile sks-1.0.6/Makefile
---- sks-1.0.6-old/Makefile 2003-12-03 17:39:33.000000000 +0100
-+++ sks-1.0.6/Makefile 2003-12-03 17:41:59.000000000 +0100
-@@ -247,7 +247,7 @@
+--- sks-1.0.6-old/Makefile 2003-12-09 23:14:54.000000000 +0100
++++ sks-1.0.6/Makefile 2003-12-09 23:14:57.000000000 +0100
+@@ -256,7 +256,7 @@
CKDIR=cryptokit-1.0
$(CKDIR)/README:
@@ -10,7 +10,7 @@
$(CKDIR)/cryptokit.cma: $(CKDIR)/README
cd $(CKDIR) && $(MAKE) all
-@@ -273,7 +273,7 @@
+@@ -282,7 +282,7 @@
NXDIR=numerix-0.19
$(NXDIR)/READ.ME:
@@ -19,7 +19,7 @@
$(NXDIR)/config.status: $(NXDIR)/READ.ME
cd $(NXDIR) && \
-@@ -373,6 +373,7 @@
+@@ -382,6 +382,7 @@
# Clean up
mlclean:
@@ -27,7 +27,7 @@
rm -f *.cm[iox]
rm -f *.opt
rm -f *.bc
-@@ -384,8 +385,8 @@
+@@ -393,8 +394,8 @@
cleanall: clean bdbclean
rm -f lib/*
Deleted: sks/trunk/sks/debian/patches/503_server_version
===================================================================
--- sks/trunk/sks/debian/patches/503_server_version 2008-06-19 14:55:46 UTC (rev 92)
+++ sks/trunk/sks/debian/patches/503_server_version 2008-06-19 14:56:04 UTC (rev 93)
@@ -1,12 +0,0 @@
-diff -ruN sks-1.0.6-old/wserver.ml sks-1.0.6/wserver.ml
---- sks-1.0.6-old/wserver.ml Sun Oct 12 22:20:19 2003
-+++ sks-1.0.6/wserver.ml Tue Dec 9 22:38:59 2003
-@@ -238,7 +238,7 @@
-
- let send_result cout ?(error_code = 200) ?(content_type = "text/html") body =
- fprintf cout "HTTP/1.0 %03d OK\r\n" error_code;
-- fprintf cout "Server: sks_www/\r\n";
-+ fprintf cout "Server: sks_www/%s\r\n" Common.version;
- fprintf cout "Content-type: %s\r\n\r\n" content_type;
- fprintf cout "%s\r\n" body;
- flush cout
Modified: sks/trunk/sks/debian/patches/504_key_types
===================================================================
--- sks/trunk/sks/debian/patches/504_key_types 2008-06-19 14:55:46 UTC (rev 92)
+++ sks/trunk/sks/debian/patches/504_key_types 2008-06-19 14:56:04 UTC (rev 93)
@@ -1,40 +1,6 @@
-diff -ruN sks-1.0.6-old/htmlTemplates.ml sks-1.0.6/htmlTemplates.ml
---- sks-1.0.6-old/htmlTemplates.ml 2003-10-12 22:20:18.000000000 +0200
-+++ sks-1.0.6/htmlTemplates.ml 2003-12-09 20:05:44.000000000 +0100
-@@ -67,16 +67,27 @@
- let uidstr = String.concat ~sep:"\r\n " userids in
- base ^ uidstr
-
-+let keyalgorithm_text pki =
-+ match pki.pk_alg with
-+ 1 -> "R" (* RSA sign and encrypt *)
-+ | 2 -> "r" (* RSA encrypt *)
-+ | 3 -> "s" (* RSA sign *)
-+ | 16 -> "g" (* ElGamal encrypt *)
-+ | 20 -> "G" (* ElGamal sign and encrypt *)
-+ | 17 -> "D" (* DSA *)
-+ | _ -> "?" (* NoClue *)
-+
- let keyinfo_pks pki ~keyid ~link ~userids =
- let tm = gmtime (Int64.to_float pki.pk_ctime) in
-+ let algo = keyalgorithm_text pki in
- let base =
-- sprintf "pub %4d/<a href=\"%s\">%8s</a> %4d/%02d/%02d "
-- pki.pk_keylen link keyid
-+ sprintf "pub %4d%s/<a href=\"%s\">%8s</a> %4d/%02d/%02d "
-+ pki.pk_keylen algo link keyid
- (1900 + tm.tm_year)
- (tm.tm_mon + 1)
- tm.tm_mday
- in
-- let uidstr = String.concat ~sep:"\r\n " userids in
-+ let uidstr = String.concat ~sep:"\r\n " userids in
- base ^ uidstr
-
-
diff -ruN sks-1.0.6-old/index.ml sks-1.0.6/index.ml
---- sks-1.0.6-old/index.ml 2003-11-29 15:25:51.000000000 +0100
-+++ sks-1.0.6/index.ml 2003-12-09 20:05:15.000000000 +0100
+--- sks-1.0.6-old/index.ml 2003-12-09 22:32:55.000000000 +0100
++++ sks-1.0.6/index.ml 2003-12-09 23:17:30.000000000 +0100
@@ -202,7 +202,7 @@
| 0x11 -> " sig1"
| 0x12 -> " sig2"
@@ -53,16 +19,3 @@
sigtype_string keyid_string
sig_creation_string sig_expiration_string
key_expiration_string
-@@ -345,9 +345,11 @@
- ~port:http_port ~keyid:keyid_long )
- keyid_short
- in
-- let line = sprintf "%s %4d/%s %s %s "
-+ let algo = HtmlTemplates.keyalgorithm_text pki in
-+ let line = sprintf "%s %4d%s/%s %s %s "
- prefix
- pki.pk_keylen
-+ algo
- keyid_string
- creation_string expiration_string
- in
Deleted: sks/trunk/sks/debian/patches/506_show_revoked
===================================================================
--- sks/trunk/sks/debian/patches/506_show_revoked 2008-06-19 14:55:46 UTC (rev 92)
+++ sks/trunk/sks/debian/patches/506_show_revoked 2008-06-19 14:56:04 UTC (rev 93)
@@ -1,55 +0,0 @@
-diff -ruN sks-1.0.6-old/htmlTemplates.ml sks-1.0.6/htmlTemplates.ml
---- sks-1.0.6-old/htmlTemplates.ml 2003-12-09 20:07:47.000000000 +0100
-+++ sks-1.0.6/htmlTemplates.ml 2003-12-09 20:07:51.000000000 +0100
-@@ -77,15 +77,16 @@
- | 17 -> "D" (* DSA *)
- | _ -> "?" (* NoClue *)
-
--let keyinfo_pks pki ~keyid ~link ~userids =
-+let keyinfo_pks pki revoked ~keyid ~link ~userids =
- let tm = gmtime (Int64.to_float pki.pk_ctime) in
- let algo = keyalgorithm_text pki in
- let base =
-- sprintf "pub %4d%s/<a href=\"%s\">%8s</a> %4d/%02d/%02d "
-+ sprintf "pub %4d%s/<a href=\"%s\">%8s</a> %4d/%02d/%02d%s "
- pki.pk_keylen algo link keyid
- (1900 + tm.tm_year)
- (tm.tm_mon + 1)
- tm.tm_mday
-+ (if revoked then " *** KEY REVOKED *** [not verified]\r\n " else "")
- in
- let uidstr = String.concat ~sep:"\r\n " userids in
- base ^ uidstr
-diff -ruN sks-1.0.6-old/index.ml sks-1.0.6/index.ml
---- sks-1.0.6-old/index.ml 2003-12-09 20:07:48.000000000 +0100
-+++ sks-1.0.6/index.ml 2003-12-09 20:07:51.000000000 +0100
-@@ -502,6 +502,19 @@
- (* old style key index **********************************************)
- (********************************************************************)
-
-+let sig_is_revok siginfo =
-+ match siginfo.sigtype with
-+ | 0x20 | 0x28 | 0x30 -> true
-+ | _ -> false
-+
-+let is_revoked key =
-+ let pkey = KeyMerge.key_to_pkey key in
-+ let selfsigs = pkey.KeyMerge.selfsigs in
-+ List.exists ~f:(fun sign ->
-+ sig_is_revok (sig_to_siginfo sign)
-+ )
-+ selfsigs
-+
- (** oldstyle index lines *)
- let key_to_lines_normal request key =
- try
-@@ -524,7 +537,8 @@
- let userids = match userids with [] -> []
- | hd::tl -> (sprintf "<a href=\"%s\">%s</a>" ilink hd)::tl in
- let pki = ParsePGP.parse_pubkey_info (List.hd key) in
-- let keystr = HtmlTemplates.keyinfo_pks pki
-+ let revoked = is_revoked key in
-+ let keystr = HtmlTemplates.keyinfo_pks pki revoked
- ~keyid:keyid_short ~link ~userids in
- let lines = [] in
- let lines =
Deleted: sks/trunk/sks/debian/patches/507_iso_dates
===================================================================
--- sks/trunk/sks/debian/patches/507_iso_dates 2008-06-19 14:55:46 UTC (rev 92)
+++ sks/trunk/sks/debian/patches/507_iso_dates 2008-06-19 14:56:04 UTC (rev 93)
@@ -1,21 +0,0 @@
-diff -ruN sks-1.0.6-old/htmlTemplates.ml sks-1.0.6/htmlTemplates.ml
---- sks-1.0.6-old/htmlTemplates.ml Tue Dec 9 15:43:33 2003
-+++ sks-1.0.6/htmlTemplates.ml Tue Dec 9 15:46:14 2003
-@@ -60,7 +60,7 @@
- let keyinfo pki ~keyid ~link ~userids =
- let tm = gmtime (Int64.to_float pki.pk_ctime) in
- let base =
-- sprintf "%2d %4d <a href=\"%s\">%8s</a> %4d/%02d%02d "
-+ sprintf "%2d %4d <a href=\"%s\">%8s</a> %4d-%02d-%02d "
- pki.pk_version pki.pk_keylen link keyid
- (1900 + tm.tm_year) (tm.tm_mon + 1) tm.tm_mday
- in
-@@ -81,7 +81,7 @@
- let tm = gmtime (Int64.to_float pki.pk_ctime) in
- let algo = keyalgorithm_text pki in
- let base =
-- sprintf "pub %4d%s/<a href=\"%s\">%8s</a> %4d/%02d/%02d%s "
-+ sprintf "pub %4d%s/<a href=\"%s\">%8s</a> %4d-%02d-%02d%s "
- pki.pk_keylen algo link keyid
- (1900 + tm.tm_year)
- (tm.tm_mon + 1)
More information about the Pkg-sks-commit
mailing list