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:39:45
Branch: HEAD Handle: 2006110113394500
Modified files:
openpkg-src/pks pks.patch
Log:
off-by-one fixes from upstream CVS
Summary:
Revision Changes Path
1.7 +29 -10 openpkg-src/pks/pks.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pks/pks.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 pks.patch
--- openpkg-src/pks/pks.patch 1 Nov 2006 13:34:19 -0000 1.6
+++ openpkg-src/pks/pks.patch 1 Nov 2006 13:39:45 -0000 1.7
@@ -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:30:03 +0100
++++ kd_delete.c 2006-11-01 14:35:37 +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:30:03 +0100
++++ kd_generic.c 2006-11-01 14:35:37 +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:30:03 +0100
++++ kd_get.c 2006-11-01 14:35:37 +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:30:03 +0100
++++ kd_index.c 2006-11-01 14:35:37 +0100
@@ -107,7 +107,7 @@
char buf[512];
@@ -89,8 +89,27 @@
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:30:03 +0100
-@@ -220,7 +220,7 @@
++++ kd_since.c 2006-11-01 14:35:52 +0100
+@@ -123,11 +123,13 @@
+ ows.err = err;
+ ows.append = kd_keys_elem_marshall;
+
+- for (i=0; i<entries.len; i+=12)
+- if (i && memcmp((void *) (entries.buf+i-12),
+- (void *) (entries.buf+i), 12) &&
+- (!kd_output_wde((void *) (entries.buf+i), (void *) &ows)))
+- return(0);
++ for (i = 12; i <= entries.len; i += 12) {
++ if (memcmp((void *)(entries.buf + i - 12),
++ (void *)(entries.buf + i), 12) &&
++ (!kd_output_wde((void *)(entries.buf + i - 12), (void *) &ows)))
{
++ return (0);
++ }
++ }
+
+ xbuffer_free(&entries);
+
+@@ -220,7 +222,7 @@
/* fatal errors */
if (err.fatal)
@@ -101,7 +120,7 @@
Index: mail_req.c
--- mail_req.c.orig 2002-09-08 21:27:34 +0200
-+++ mail_req.c 2006-11-01 13:30:03 +0100
++++ mail_req.c 2006-11-01 14:35:37 +0100
@@ -236,6 +236,7 @@
if (hfrom == -1 || hfrom_len == 0) {
@@ -112,7 +131,7 @@
Index: pgputil.c
--- pgputil.c.orig 2003-01-26 17:08:58 +0100
-+++ pgputil.c 2006-11-01 13:30:03 +0100
++++ pgputil.c 2006-11-01 14:35:37 +0100
@@ -121,6 +121,11 @@
if (!decode_num(data, 2, &(mpi->nbits)))
return(0);
@@ -137,7 +156,7 @@
keyid->offset = 0;
Index: pkscheck.c
--- pkscheck.c.orig 2003-02-07 02:01:21 +0100
-+++ pkscheck.c 2006-11-01 13:30:03 +0100
++++ pkscheck.c 2006-11-01 14:35:37 +0100
@@ -83,6 +83,12 @@
log_error("main", buf);
}
@@ -163,7 +182,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:33:37 +0100
++++ www.c 2006-11-01 14:35:37 +0100
@@ -33,7 +33,6 @@
#define TCPDSERVICE "pksd"
int allow_severity=LOG_WARNING ;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
