Sat Nov 10 14:24:45 2012 UTC ()
1.1.4
  - Fix X-HKP-Results-Count so that limit=0 returns no results, but include
    the header, to let a client poll for how many results exist, without
    retrieving any. See:
    http://lists.nongnu.org/archive/html/sks-devel/2010-11/msg00015.html
  - Add UPGRADING document to explain upgrading Berkeley DB without
    rebuilding. System bdb versions often change with new SKS releases
    for .deb and .rpm distros.
  - Cleanup build errors for bdb/bdb_stubs.c. Patch from Mike Doty
  - Update cryptokit from version 1.0 to 1.5 without requiring OASIS
    build system or other additional dependencies
  - build, fastbuild, & pbuild fixed to ignore signals USR1 and USR2
  - common.ml and reconSC.ml were using different values for minumimum
    compatible version. This has been fixed.
  - Added new server mime-types, and trying another default document (Issue 6)
    In addition to the new MIME types added in 1.1.[23], the server now
    looks over a list and and serves the first index file that it finds
    Current list: index.html, index.htm, index.xhtml, index.xhtm, index.xml.
  - options=mr now works on get as well as (v)index operations. This is
    described in http://tools.ietf.org/html/draft-shaw-openpgp-hkp-00
    sections 3.2.1.1. and 5.1.
  - Updated copyright notices in source files
  - Added sksclient tool, similar to old pksclient
  - Add no-cache instructions to HTTP response (in order for reverse proxies
    not to cache the output from SKS)
  - Use unique timestamps for keydb to reduce occurrances of Ptree corruption.
  - Added Interface specifications (.mli files) for modules that were missing
    them
  - Yaron pruned some no longer needed source files from the tree.
  - Improved the HTTP status and HTTP error codes returned for various
    situations and added checks for more error conditions.
  - Add a suffix to version (+) indicating non-release or development builds
  - Add an option to specify the contact details of the server administrator
    that shows in the status page of the server. The information is in the
    form of an OpenPGP KeyID and set by server_contact: in sksconf
  - Add a `sks version` command to provide information on the setup.
  - Added configuration settings for the remaining database table files. If
    no pagesize settings are in sksconf, SKS will use 2048 bytes for key
    and 512 for ptree. The remainining files' pagesize will be set by BDB
    based on the filesystem settings, typically this is 4096 bytes.
    See sampleConfig/sksconf.typical for settings recommended by db_tuner.
  - Makefile: Added distclean target. Dropped autogenerated file from VCS.
  - Allow tuning BDB environment before creation in [fast]build and pbuild.
    If DB_CONFIG exists in basedir, copy it to DB dir before DB creation.
    Preference is given to DB_CONFIG.KDB and DB_CONFIG.PTree over DB_CONFIG.
  - Add support for Elliptic Curve Public keys (ECDSA, ECDH)
  - Add check if an upload is a revocation certificate, and if it is,
    produce an error message tailored for this.

1.1.3
  - Makefile fix for 'make dep' if .depend does not exist. Issue #4
  - Makefile fix: sks and sks_add_mail fail to link w/o '-ccopt -pg'
    Issue #23
  - Added -disable_mailsync and -disable_log_diffs to sks.pod
  - Added file extensions .css, .jpeg, .htm, .es, .js, .xml, .shtml, .xhtm,
    .xhtml and associated MIME types to server code. Part of Issue #6
  - Added sample configuration files in sampleConfig directory
  - Added sample web page files in sampleWeb directory. Issues #7, 9, 19
  - Allow requests for non-official options hget, hash, status, & clean to
    be preceded by '-x'. Closes issues #10, 11, 13, & 14.
  - Allow &search with long subkey ID (16 digit) and subkey fingerprint
    subkey lookup was failing with other than a short key ID. However,
    public key lookup was working with short and long key ID and fingerprints.
    This patch makes subkey lookup behave the same as full key lookup.
    http://lists.gnupg.org/pipermail/gnupg-users/2012-January/043495.html
  - Patch recon script so that POST includes HTTP version number.


(pettai)
diff -r1.6 -r1.7 pkgsrc/security/sks/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/security/sks/PLIST
diff -r1.1.1.1 -r1.2 pkgsrc/security/sks/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/security/sks/patches/patch-aa
diff -r1.1.1.1 -r1.2 pkgsrc/security/sks/patches/patch-ab
diff -r1.1.1.1 -r1.2 pkgsrc/security/sks/patches/patch-ac
diff -r1.1.1.1 -r1.2 pkgsrc/security/sks/patches/patch-ad

cvs diff -r1.6 -r1.7 pkgsrc/security/sks/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/security/sks/Attic/Makefile 2012/10/23 18:16:58 1.6
+++ pkgsrc/security/sks/Attic/Makefile 2012/11/10 14:24:44 1.7
@@ -1,44 +1,59 @@ @@ -1,44 +1,59 @@
1# $NetBSD: Makefile,v 1.6 2012/10/23 18:16:58 asau Exp $ 1# $NetBSD: Makefile,v 1.7 2012/11/10 14:24:44 pettai Exp $
2# 2#
3 3
4DISTNAME= sks-1.1.2 4DISTNAME= sks-1.1.4
5PKGREVISION= 3 
6CATEGORIES= security 5CATEGORIES= security
7MASTER_SITES= http://sks-keyserver.googlecode.com/files/ 6MASTER_SITES= http://cdn.bitbucket.org/skskeyserver/sks-keyserver/downloads/
8EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://minskyprimus.net/sks/ 10HOMEPAGE= https://bitbucket.org/skskeyserver/
12COMMENT= Self Replicating PGP Key Server 11COMMENT= Self Replicating PGP Key Server
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15MAKE_JOBS_SAFE= no 14MAKE_JOBS_SAFE= no
16 15
17BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.10.2 16BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.10.2
18BUILDLINK_API_DEPENDS.db4+= db4>=4.6.0 17BUILDLINK_API_DEPENDS.db4+= db4>=4.6.0
19 18
20REPLACE_SH= sks_build.sh 19REPLACE_SH= sks_build.sh
21 20
22USE_TOOLS+= gmake perl:run tar 21USE_TOOLS+= gmake perl:run tar
23BDB_ACCEPTED= db4 22BDB_ACCEPTED= db4
24 23
25MAKE_ENV+= LIBDB=-ldb46 \ 24EGDIR= ${PREFIX}/share/examples/sks
 25
 26MAKE_ENV+= LIBDB=-ldb4 \
26 BDBINCLUDE=-I${BUILDLINK_DIR}/include \ 27 BDBINCLUDE=-I${BUILDLINK_DIR}/include \
27 BDBLIB=-L${BUILDLINK_DIR}/lib \ 28 BDBLIB=-L${BUILDLINK_DIR}/lib \
28 PREFIX=${PREFIX:Q} \ 29 PREFIX=${PREFIX:Q} \
29 MANDIR=${PREFIX:Q}/man 30 MANDIR=${PREFIX:Q}/man
30 31
31INSTALLATION_DIRS= ${PKGMANDIR}/man8 bin 32INSTALLATION_DIRS= ${PKGMANDIR}/man8 bin ${EGDIR}
32 33
33.include "../../lang/ocaml/buildlink3.mk" 34.include "../../lang/ocaml/buildlink3.mk"
34.include "../../databases/db46/buildlink3.mk" 35.include "../../databases/db4/buildlink3.mk"
 36
 37pre-build:
 38 cd ${WRKSRC} && ${MAKE_PROGRAM} dep
35 39
36post-install: 40post-install:
37 cd ${WRKSRC} && ${MAKE_PROGRAM} sks.8 41 cd ${WRKSRC} && ${MAKE_PROGRAM} sks.8
38 ${INSTALL_PROGRAM} ${WRKSRC}/sks ${DESTDIR}${PREFIX}/bin 42 ${INSTALL_PROGRAM} ${WRKSRC}/sks ${DESTDIR}${PREFIX}/bin
39 ${INSTALL_PROGRAM} ${WRKSRC}/sks_add_mail ${DESTDIR}${PREFIX}/bin 43 ${INSTALL_PROGRAM} ${WRKSRC}/sks_add_mail ${DESTDIR}${PREFIX}/bin
40 ${INSTALL_SCRIPT} ${WRKSRC}/sks_build.sh ${DESTDIR}${PREFIX}/bin 44 ${INSTALL_SCRIPT} ${WRKSRC}/sks_build.sh ${DESTDIR}${PREFIX}/bin
41 ${INSTALL_MAN} ${WRKSRC}/sks.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 45 ${INSTALL_MAN} ${WRKSRC}/sks.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 46 ${INSTALL_DATA} ${WRKSRC}/sampleConfig/aliases.sample \
 47 ${DESTDIR}${EGDIR}
 48 ${INSTALL_DATA} ${WRKSRC}/sampleConfig/crontab.sample \
 49 ${DESTDIR}${EGDIR}
 50 ${INSTALL_DATA} ${WRKSRC}/sampleConfig/mailsync ${DESTDIR}${EGDIR}
 51 ${INSTALL_DATA} ${WRKSRC}/sampleConfig/membership ${DESTDIR}${EGDIR}
 52 ${INSTALL_DATA} ${WRKSRC}/sampleConfig/procmailrc ${DESTDIR}${EGDIR}
 53 ${INSTALL_DATA} ${WRKSRC}/sampleConfig/sksconf.minimal \
 54 ${DESTDIR}${EGDIR}
 55 ${INSTALL_DATA} ${WRKSRC}/sampleConfig/sksconf.typical \
 56 ${DESTDIR}${EGDIR}
42 57
43.include "../../devel/zlib/buildlink3.mk" 58.include "../../devel/zlib/buildlink3.mk"
44.include "../../mk/bsd.pkg.mk" 59.include "../../mk/bsd.pkg.mk"

cvs diff -r1.1.1.1 -r1.2 pkgsrc/security/sks/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/security/sks/Attic/PLIST 2012/06/16 18:55:30 1.1.1.1
+++ pkgsrc/security/sks/Attic/PLIST 2012/11/10 14:24:44 1.2
@@ -1,5 +1,12 @@ @@ -1,5 +1,12 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2012/06/16 18:55:30 pettai Exp $ 1@comment $NetBSD: PLIST,v 1.2 2012/11/10 14:24:44 pettai Exp $
2bin/sks 2bin/sks
3bin/sks_add_mail 3bin/sks_add_mail
4bin/sks_build.sh 4bin/sks_build.sh
5man/man8/sks.8 5man/man8/sks.8
 6share/examples/sks/aliases.sample
 7share/examples/sks/crontab.sample
 8share/examples/sks/mailsync
 9share/examples/sks/membership
 10share/examples/sks/procmailrc
 11share/examples/sks/sksconf.minimal
 12share/examples/sks/sksconf.typical

cvs diff -r1.1.1.1 -r1.2 pkgsrc/security/sks/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/security/sks/Attic/distinfo 2012/06/16 18:55:30 1.1.1.1
+++ pkgsrc/security/sks/Attic/distinfo 2012/11/10 14:24:44 1.2
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.1.1.1 2012/06/16 18:55:30 pettai Exp $ 1$NetBSD: distinfo,v 1.2 2012/11/10 14:24:44 pettai Exp $
2 2
3SHA1 (sks-1.1.2.tgz) = 52db59822969a6b2d729dbe57c65e9e67b52c9e5 3SHA1 (sks-1.1.4.tgz) = d0b3b387653115d106ebbcae13aeda06f0034909
4RMD160 (sks-1.1.2.tgz) = fa51a12ad258623df526648c66e4639aebecc5f4 4RMD160 (sks-1.1.4.tgz) = 4b6deb6610c8f43e55b3172761904cf2e06e18b2
5Size (sks-1.1.2.tgz) = 275724 bytes 5Size (sks-1.1.4.tgz) = 345249 bytes
6SHA1 (patch-aa) = bd9106e971e4a49eaa1b9fb11ba7021f2e737164 6SHA1 (patch-aa) = 04f74c6f141d71e3b0cd45e68896be93dffd0b7c
7SHA1 (patch-ab) = a2e4be2adfdb9ccbfabfd0683e10a068b63cef20 7SHA1 (patch-ab) = 919846f9c31a89f23430081dbad853d088dcb7e5
8SHA1 (patch-ac) = 16bd6fbb9bcdbced63e56d2683bf93ff9a152366 8SHA1 (patch-ac) = 0fbe22e67681970521ae66ca1903e9e95eda52ad
9SHA1 (patch-ad) = 4f5f538a6ebed923dd394cea544b516333c34c1d 9SHA1 (patch-ad) = f96b913bc7ad6b5bd11a51569fc28ee042b1667c

cvs diff -r1.1.1.1 -r1.2 pkgsrc/security/sks/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/security/sks/patches/Attic/patch-aa 2012/06/16 18:55:30 1.1.1.1
+++ pkgsrc/security/sks/patches/Attic/patch-aa 2012/11/10 14:24:45 1.2
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-aa,v 1.1.1.1 2012/06/16 18:55:30 pettai Exp $ 1$NetBSD: patch-aa,v 1.2 2012/11/10 14:24:45 pettai Exp $
2 2
3--- bdb/bdb_stubs.c.orig 2009-03-26 01:18:03.000000000 +0000 3--- bdb/bdb_stubs.c.orig 2012-10-07 19:59:39.000000000 +0000
4+++ bdb/bdb_stubs.c 4+++ bdb/bdb_stubs.c
5@@ -12,7 +12,7 @@ 5@@ -33,7 +33,7 @@
6 #include <sys/stat.h> 6 #include <sys/stat.h>
7 #include <sys/types.h> 7 #include <sys/types.h>
8 #include <limits.h> 8 #include <limits.h>
9-#include <db.h> 9-#include <db.h>
10+#include <db46/db.h> 10+#include <db4/db.h>
11 /* O_CREAT and others are not defined in db.h */ 11 /* O_CREAT and others are not defined in db.h */
12 #include <fcntl.h> 12 #include <fcntl.h>
13  13
14@@ -1198,7 +1198,7 @@ value caml_txn_begin(value dbenv, value  14@@ -1272,7 +1272,7 @@ value caml_txn_begin(value dbenv, value
15  15
16 err = UW_dbenv(dbenv)->txn_begin(UW_dbenv(dbenv), parent, &newtxn, flags); 16 err = UW_dbenv(dbenv)->txn_begin(UW_dbenv(dbenv), parent, &newtxn, flags);
17 if (err != 0) { 17 if (err != 0) {
18- if (err == ENOMEM) {  18- if (err == ENOMEM) {
19+ if (err == DB_BUFFER_SMALL) {  19+ if (err == DB_BUFFER_SMALL) {
20 failwith("Maximum # of concurrent transactions reached");  20 failwith("Maximum # of concurrent transactions reached");
21 } else { 21 } else {
22 UW_dbenv(dbenv)->err(UW_dbenv(dbenv), err,"caml_txn_begin"); 22 UW_dbenv(dbenv)->err(UW_dbenv(dbenv), err,"caml_txn_begin");

cvs diff -r1.1.1.1 -r1.2 pkgsrc/security/sks/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/security/sks/patches/Attic/patch-ab 2012/06/16 18:55:30 1.1.1.1
+++ pkgsrc/security/sks/patches/Attic/patch-ab 2012/11/10 14:24:45 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ab,v 1.1.1.1 2012/06/16 18:55:30 pettai Exp $ 1$NetBSD: patch-ab,v 1.2 2012/11/10 14:24:45 pettai Exp $
2 2
3--- bdb/dbstubs.c.orig 2002-10-01 02:10:14.000000000 +0200 3--- bdb/dbstubs.c.orig 2002-10-01 02:10:14.000000000 +0200
4+++ bdb/dbstubs.c 4+++ bdb/dbstubs.c
5@@ -22,7 +22,7 @@ 5@@ -22,7 +22,7 @@
6  6
7 #include <sys/types.h> 7 #include <sys/types.h>
8 #include <limits.h> 8 #include <limits.h>
9-#include <db.h> 9-#include <db.h>
10+#include <db46/db.h> 10+#include <db4/db.h>
11 /* O_CREAT and others are not defined in db.h */ 11 /* O_CREAT and others are not defined in db.h */
12 #include <fcntl.h> 12 #include <fcntl.h>
13  13

cvs diff -r1.1.1.1 -r1.2 pkgsrc/security/sks/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/security/sks/patches/Attic/patch-ac 2012/06/16 18:55:30 1.1.1.1
+++ pkgsrc/security/sks/patches/Attic/patch-ac 2012/11/10 14:24:45 1.2
@@ -1,28 +1,37 @@ @@ -1,28 +1,37 @@
1$NetBSD: patch-ac,v 1.1.1.1 2012/06/16 18:55:30 pettai Exp $ 1$NetBSD: patch-ac,v 1.2 2012/11/10 14:24:45 pettai Exp $
2 2
3--- Makefile.orig 2009-08-13 01:51:24.000000000 +0000 3--- Makefile.orig 2012-11-10 12:39:36.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -14,7 +14,7 @@ 5@@ -14,7 +14,7 @@
6 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 6 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
7 # USA  7 # USA
8 # 8 #
9-CINCLUDES=-I`ocamlc -where` 9-CINCLUDES=-I`ocamlc -where`
10+CINCLUDES=-I${PREFIX}/lib/ocaml 10+CINCLUDES=-I${PREFIX}/lib/ocaml
11 CC=gcc 11 CC=gcc
12 CXX=g++ 12 CXX=g++
13 CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I . 13 CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
14@@ -125,10 +125,10 @@ keyMerge.cmx: keyMerge.ml 14@@ -34,7 +34,7 @@ export OCAMLC
15 # Special targets  15 export OCAMLOPT
 16 export CAMLP4O
16  17
17 install:  18-include Makefile.local
 19+#include Makefile.local
 20
 21 ifndef PREFIX
 22 PREFIX=/usr/local
 23@@ -126,10 +126,10 @@ keyMerge.cmx: keyMerge.ml
 24 # Special targets
 25
 26 install:
18- mkdir -p $(PREFIX)/bin 27- mkdir -p $(PREFIX)/bin
19- install sks_build.sh sks sks_add_mail $(PREFIX)/bin 28- install sks_build.sh sks sks_add_mail $(PREFIX)/bin
20- mkdir -p $(MANDIR)/man8 29- mkdir -p $(MANDIR)/man8
21- install sks.8.gz $(MANDIR)/man8 30- install sks.8.gz $(MANDIR)/man8
22+# mkdir -p $(PREFIX)/bin 31+# mkdir -p $(PREFIX)/bin
23+# install sks_build.sh sks sks_add_mail $(PREFIX)/bin 32+# install sks_build.sh sks sks_add_mail $(PREFIX)/bin
24+# mkdir -p $(MANDIR)/man8 33+# mkdir -p $(MANDIR)/man8
25+# install sks.8.gz $(MANDIR)/man8 34+# install sks.8.gz $(MANDIR)/man8
26  35
27 install.bc:  36 install.bc:
28 mkdir -p $(PREFIX)/bin 37 mkdir -p $(PREFIX)/bin

cvs diff -r1.1.1.1 -r1.2 pkgsrc/security/sks/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/security/sks/patches/Attic/patch-ad 2012/06/16 18:55:30 1.1.1.1
+++ pkgsrc/security/sks/patches/Attic/patch-ad 2012/11/10 14:24:45 1.2
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: patch-ad,v 1.1.1.1 2012/06/16 18:55:30 pettai Exp $ 1$NetBSD: patch-ad,v 1.2 2012/11/10 14:24:45 pettai Exp $
2 2
3--- bdb/Makefile.orig 2011-02-18 10:14:32.000000000 +0000 3--- bdb/Makefile.orig 2012-10-07 21:59:39.000000000 +0200
4+++ bdb/Makefile 4+++ bdb/Makefile
5@@ -15,3 +15,3 @@ 5@@ -15 +15 @@
6  6-include ../Makefile.local
 7+#include ../Makefile.local
 8@@ -17 +17 @@
7-CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE) 9-CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE)
8+CINCLUDES=-I${PREFIX}/lib/ocaml $(BDBINCLUDE) 10+CINCLUDES=-I${PREFIX}/lib/ocaml $(BDBINCLUDE)
9 CC=gcc