OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Nov-2006 14:34:19
Branch: HEAD Handle: 2006110113341900
Modified files:
openpkg-src/pks pks.patch
Log:
take over upstream change for better HTML output
Summary:
Revision Changes Path
1.6 +43 -9 openpkg-src/pks/pks.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pks/pks.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 pks.patch
--- openpkg-src/pks/pks.patch 1 Nov 2006 12:27:38 -0000 1.5
+++ openpkg-src/pks/pks.patch 1 Nov 2006 13:34:19 -0000 1.6
@@ -1,6 +1,6 @@
Index: kd_delete.c
--- kd_delete.c.orig 2002-11-12 06:03:36 +0100
-+++ kd_delete.c 2006-11-01 13:20:18 +0100
++++ kd_delete.c 2006-11-01 13:30:03 +0100
@@ -207,7 +207,7 @@
/* fatal errors */
@@ -12,7 +12,7 @@
Index: kd_generic.c
--- kd_generic.c.orig 2002-09-08 22:54:24 +0200
-+++ kd_generic.c 2006-11-01 13:20:18 +0100
++++ kd_generic.c 2006-11-01 13:30:03 +0100
@@ -41,7 +41,7 @@
DB *worddb = NULL;
DB *timedb = NULL;
@@ -56,7 +56,7 @@
Index: kd_get.c
--- kd_get.c.orig 2002-10-08 06:04:42 +0200
-+++ kd_get.c 2006-11-01 13:20:18 +0100
++++ kd_get.c 2006-11-01 13:30:03 +0100
@@ -163,7 +163,7 @@
/* fatal errors */
@@ -68,7 +68,7 @@
Index: kd_index.c
--- kd_index.c.orig 2003-01-26 20:54:45 +0100
-+++ kd_index.c 2006-11-01 13:20:18 +0100
++++ kd_index.c 2006-11-01 13:30:03 +0100
@@ -107,7 +107,7 @@
char buf[512];
@@ -89,7 +89,7 @@
if (!xbuffer_append_str(s->xb, buf))
Index: kd_since.c
--- kd_since.c.orig 2002-09-04 23:00:23 +0200
-+++ kd_since.c 2006-11-01 13:20:18 +0100
++++ kd_since.c 2006-11-01 13:30:03 +0100
@@ -220,7 +220,7 @@
/* fatal errors */
@@ -101,7 +101,7 @@
Index: mail_req.c
--- mail_req.c.orig 2002-09-08 21:27:34 +0200
-+++ mail_req.c 2006-11-01 13:20:18 +0100
++++ mail_req.c 2006-11-01 13:30:03 +0100
@@ -236,6 +236,7 @@
if (hfrom == -1 || hfrom_len == 0) {
@@ -112,7 +112,7 @@
Index: pgputil.c
--- pgputil.c.orig 2003-01-26 17:08:58 +0100
-+++ pgputil.c 2006-11-01 13:20:42 +0100
++++ pgputil.c 2006-11-01 13:30:03 +0100
@@ -121,6 +121,11 @@
if (!decode_num(data, 2, &(mpi->nbits)))
return(0);
@@ -137,7 +137,7 @@
keyid->offset = 0;
Index: pkscheck.c
--- pkscheck.c.orig 2003-02-07 02:01:21 +0100
-+++ pkscheck.c 2006-11-01 13:20:18 +0100
++++ pkscheck.c 2006-11-01 13:30:03 +0100
@@ -83,6 +83,12 @@
log_error("main", buf);
}
@@ -163,7 +163,7 @@
((unsigned char *) kkey.data)[1],
Index: www.c
--- www.c.orig 2003-02-07 02:01:21 +0100
-+++ www.c 2006-11-01 13:20:18 +0100
++++ www.c 2006-11-01 13:33:37 +0100
@@ -33,7 +33,6 @@
#define TCPDSERVICE "pksd"
int allow_severity=LOG_WARNING ;
@@ -172,3 +172,37 @@
extern int hosts_ctl(char *daemon,
char *client_name, char *client_addr,char *client_user) ;
+@@ -109,7 +108,7 @@
+ char num[20];
+
+ if(content_type==NULL)
+- content_type="text/html";
++ content_type="text/html;charset=utf-8";
+
+ if ((xb = (xbuffer *) malloc(sizeof(xbuffer))) == NULL)
+ log_fatal("www_reply", "failed allocating memory for xbuffer");
+@@ -138,12 +137,20 @@
+ }
+
+ if ((status_code/100) == 4) {
+- if (!xbuffer_append_str(xb, "<HEAD><TITLE>") ||
++ if (!xbuffer_append_str(xb,
++ "<?xml version=\"1.0\"?>\015\012"
++ "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML
1.0 Strict//EN\"\015\012"
++ "
\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\";>\015\012"
++ "<html
xmlns=\"http://www.w3.org/1999/xhtml\";>\015\012"
++ " <head>\015\012"
++ " <title>") ||
+ !xbuffer_append_str(xb, num) ||
+ !xbuffer_append_str(xb, reason_phrase) ||
+- !xbuffer_append_str(xb, "</TITLE></HEAD><BODY>") ||
+- !xbuffer_append(xb, reply, replylen) ||
+- !xbuffer_append_str(xb, "</BODY>\015\012")) {
++ !xbuffer_append_str(xb, "</title>\015\012"
++ " </head>\015\012"
++ " <body>") ||
++ !xbuffer_append(xb, reply, replylen) ||
++ !xbuffer_append_str(xb, " </body>\015\012"
"</html>\015\012")) {
+ xbuffer_free(xb);
+ log_fatal("www_reply", "failed constructing www error reply");
+ }
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
