[Pkg-sks-commit] r75 - sks/trunk/sks/debian/patches

[chrism at alioth.debian.org]

Author: chrism
Date: 2008-06-19 14:51:17 +0000 (Thu, 19 Jun 2008)
New Revision: 75

Modified:
   sks/trunk/sks/debian/patches/504_key_types
Log:
[project @ 76]
Make this patch nicer

Original author: weasel
Date: 2003-12-09 13:22:47.548756+00:00

Modified: sks/trunk/sks/debian/patches/504_key_types
===================================================================
--- sks/trunk/sks/debian/patches/504_key_types	2008-06-19 14:50:48 UTC (rev 74)
+++ sks/trunk/sks/debian/patches/504_key_types	2008-06-19 14:51:17 UTC (rev 75)
@@ -1,10 +1,12 @@
---- sks-1.0.6/htmlTemplates.ml.orig	Sun Dec  7 00:30:06 2003
-+++ sks-1.0.6/htmlTemplates.ml	Sun Dec  7 00:30:39 2003
-@@ -69,9 +69,18 @@
+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 14:13:44.000000000 +0100
+@@ -67,11 +67,22 @@
+   let uidstr = String.concat ~sep:"\r\n                           " userids in
+   base ^ uidstr
  
- let keyinfo_pks pki ~keyid ~link ~userids = 
-   let tm = gmtime (Int64.to_float pki.pk_ctime) in
-+  let algo = match pki.pk_alg with
++let keyalgorithm_text pki = 
++  match pki.pk_alg with
 +       1 -> "R"  (* RSA sign and encrypt *)
 +    |  2 -> "r"  (* RSA encrypt *)
 +    |  3 -> "s"  (* RSA sign *)
@@ -12,7 +14,10 @@
 +    | 20 -> "G"  (* ElGamal sign and encrypt *)
 +    | 17 -> "D"  (* DSA *)
 +    | _  -> "?"  (* NoClue *)
-+    in
++
+ 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 
@@ -21,25 +26,19 @@
        (1900 + tm.tm_year) 
        (tm.tm_mon + 1) 
        tm.tm_mday 
---- sks-1.0.6/index.ml.orig	2003-12-07 00:45:02.000000000 +0100
-+++ sks-1.0.6/index.ml	2003-12-07 00:45:29.000000000 +0100
-@@ -345,8 +345,18 @@
+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 14:14:13.000000000 +0100
+@@ -345,9 +345,11 @@
  	   ~port:http_port ~keyid:keyid_long ) 
  	keyid_short
    in
 -  let line = sprintf "%s  %4d/%s %s %s "
-+  let algo = 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 *)
-+    in
++  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