Skip to content

Commit

Permalink
1.1.4
Browse files Browse the repository at this point in the history
  - 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.
  • Loading branch information
pettai committed Nov 10, 2012
1 parent 0d9f8e6 commit 6e92962
Show file tree
Hide file tree
Showing 7 changed files with 72 additions and 40 deletions.
31 changes: 23 additions & 8 deletions security/sks/Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# $NetBSD: Makefile,v 1.6 2012/10/23 18:16:58 asau Exp $
# $NetBSD: Makefile,v 1.7 2012/11/10 14:24:44 pettai Exp $
#

DISTNAME= sks-1.1.2
PKGREVISION= 3
DISTNAME= sks-1.1.4
CATEGORIES= security
MASTER_SITES= http://sks-keyserver.googlecode.com/files/
MASTER_SITES= http://cdn.bitbucket.org/skskeyserver/sks-keyserver/downloads/
EXTRACT_SUFX= .tgz

MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://minskyprimus.net/sks/
HOMEPAGE= https://bitbucket.org/skskeyserver/
COMMENT= Self Replicating PGP Key Server
LICENSE= gnu-gpl-v2

Expand All @@ -22,23 +21,39 @@ REPLACE_SH= sks_build.sh
USE_TOOLS+= gmake perl:run tar
BDB_ACCEPTED= db4

MAKE_ENV+= LIBDB=-ldb46 \
EGDIR= ${PREFIX}/share/examples/sks

MAKE_ENV+= LIBDB=-ldb4 \
BDBINCLUDE=-I${BUILDLINK_DIR}/include \
BDBLIB=-L${BUILDLINK_DIR}/lib \
PREFIX=${PREFIX:Q} \
MANDIR=${PREFIX:Q}/man

INSTALLATION_DIRS= ${PKGMANDIR}/man8 bin
INSTALLATION_DIRS= ${PKGMANDIR}/man8 bin ${EGDIR}

.include "../../lang/ocaml/buildlink3.mk"
.include "../../databases/db46/buildlink3.mk"
.include "../../databases/db4/buildlink3.mk"

pre-build:
cd ${WRKSRC} && ${MAKE_PROGRAM} dep

post-install:
cd ${WRKSRC} && ${MAKE_PROGRAM} sks.8
${INSTALL_PROGRAM} ${WRKSRC}/sks ${DESTDIR}${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/sks_add_mail ${DESTDIR}${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/sks_build.sh ${DESTDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/sks.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
${INSTALL_DATA} ${WRKSRC}/sampleConfig/aliases.sample \
${DESTDIR}${EGDIR}
${INSTALL_DATA} ${WRKSRC}/sampleConfig/crontab.sample \
${DESTDIR}${EGDIR}
${INSTALL_DATA} ${WRKSRC}/sampleConfig/mailsync ${DESTDIR}${EGDIR}
${INSTALL_DATA} ${WRKSRC}/sampleConfig/membership ${DESTDIR}${EGDIR}
${INSTALL_DATA} ${WRKSRC}/sampleConfig/procmailrc ${DESTDIR}${EGDIR}
${INSTALL_DATA} ${WRKSRC}/sampleConfig/sksconf.minimal \
${DESTDIR}${EGDIR}
${INSTALL_DATA} ${WRKSRC}/sampleConfig/sksconf.typical \
${DESTDIR}${EGDIR}

.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
9 changes: 8 additions & 1 deletion security/sks/PLIST
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2012/06/16 18:55:30 pettai Exp $
@comment $NetBSD: PLIST,v 1.2 2012/11/10 14:24:44 pettai Exp $
bin/sks
bin/sks_add_mail
bin/sks_build.sh
man/man8/sks.8
share/examples/sks/aliases.sample
share/examples/sks/crontab.sample
share/examples/sks/mailsync
share/examples/sks/membership
share/examples/sks/procmailrc
share/examples/sks/sksconf.minimal
share/examples/sks/sksconf.typical
16 changes: 8 additions & 8 deletions security/sks/distinfo
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.1.1.1 2012/06/16 18:55:30 pettai Exp $
$NetBSD: distinfo,v 1.2 2012/11/10 14:24:44 pettai Exp $

SHA1 (sks-1.1.2.tgz) = 52db59822969a6b2d729dbe57c65e9e67b52c9e5
RMD160 (sks-1.1.2.tgz) = fa51a12ad258623df526648c66e4639aebecc5f4
Size (sks-1.1.2.tgz) = 275724 bytes
SHA1 (patch-aa) = bd9106e971e4a49eaa1b9fb11ba7021f2e737164
SHA1 (patch-ab) = a2e4be2adfdb9ccbfabfd0683e10a068b63cef20
SHA1 (patch-ac) = 16bd6fbb9bcdbced63e56d2683bf93ff9a152366
SHA1 (patch-ad) = 4f5f538a6ebed923dd394cea544b516333c34c1d
SHA1 (sks-1.1.4.tgz) = d0b3b387653115d106ebbcae13aeda06f0034909
RMD160 (sks-1.1.4.tgz) = 4b6deb6610c8f43e55b3172761904cf2e06e18b2
Size (sks-1.1.4.tgz) = 345249 bytes
SHA1 (patch-aa) = 04f74c6f141d71e3b0cd45e68896be93dffd0b7c
SHA1 (patch-ab) = 919846f9c31a89f23430081dbad853d088dcb7e5
SHA1 (patch-ac) = 0fbe22e67681970521ae66ca1903e9e95eda52ad
SHA1 (patch-ad) = f96b913bc7ad6b5bd11a51569fc28ee042b1667c
18 changes: 9 additions & 9 deletions security/sks/patches/patch-aa
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
$NetBSD: patch-aa,v 1.1.1.1 2012/06/16 18:55:30 pettai Exp $
$NetBSD: patch-aa,v 1.2 2012/11/10 14:24:45 pettai Exp $

--- bdb/bdb_stubs.c.orig 2009-03-26 01:18:03.000000000 +0000
--- bdb/bdb_stubs.c.orig 2012-10-07 19:59:39.000000000 +0000
+++ bdb/bdb_stubs.c
@@ -12,7 +12,7 @@
@@ -33,7 +33,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <limits.h>
-#include <db.h>
+#include <db46/db.h>
+#include <db4/db.h>
/* O_CREAT and others are not defined in db.h */
#include <fcntl.h>

@@ -1198,7 +1198,7 @@ value caml_txn_begin(value dbenv, value
@@ -1272,7 +1272,7 @@ value caml_txn_begin(value dbenv, value

err = UW_dbenv(dbenv)->txn_begin(UW_dbenv(dbenv), parent, &newtxn, flags);
if (err != 0) {
- if (err == ENOMEM) {
+ if (err == DB_BUFFER_SMALL) {
failwith("Maximum # of concurrent transactions reached");
- if (err == ENOMEM) {
+ if (err == DB_BUFFER_SMALL) {
failwith("Maximum # of concurrent transactions reached");
} else {
UW_dbenv(dbenv)->err(UW_dbenv(dbenv), err,"caml_txn_begin");
4 changes: 2 additions & 2 deletions security/sks/patches/patch-ab
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$NetBSD: patch-ab,v 1.1.1.1 2012/06/16 18:55:30 pettai Exp $
$NetBSD: patch-ab,v 1.2 2012/11/10 14:24:45 pettai Exp $

--- bdb/dbstubs.c.orig 2002-10-01 02:10:14.000000000 +0200
+++ bdb/dbstubs.c
Expand All @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2012/06/16 18:55:30 pettai Exp $
#include <sys/types.h>
#include <limits.h>
-#include <db.h>
+#include <db46/db.h>
+#include <db4/db.h>
/* O_CREAT and others are not defined in db.h */
#include <fcntl.h>

23 changes: 16 additions & 7 deletions security/sks/patches/patch-ac
Original file line number Diff line number Diff line change
@@ -1,20 +1,29 @@
$NetBSD: patch-ac,v 1.1.1.1 2012/06/16 18:55:30 pettai Exp $
$NetBSD: patch-ac,v 1.2 2012/11/10 14:24:45 pettai Exp $

--- Makefile.orig 2009-08-13 01:51:24.000000000 +0000
--- Makefile.orig 2012-11-10 12:39:36.000000000 +0000
+++ Makefile
@@ -14,7 +14,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
# USA
#
-CINCLUDES=-I`ocamlc -where`
+CINCLUDES=-I${PREFIX}/lib/ocaml
CC=gcc
CXX=g++
CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
@@ -125,10 +125,10 @@ keyMerge.cmx: keyMerge.ml
# Special targets
@@ -34,7 +34,7 @@ export OCAMLC
export OCAMLOPT
export CAMLP4O

install:
-include Makefile.local
+#include Makefile.local

ifndef PREFIX
PREFIX=/usr/local
@@ -126,10 +126,10 @@ keyMerge.cmx: keyMerge.ml
# Special targets

install:
- mkdir -p $(PREFIX)/bin
- install sks_build.sh sks sks_add_mail $(PREFIX)/bin
- mkdir -p $(MANDIR)/man8
Expand All @@ -24,5 +33,5 @@ $NetBSD: patch-ac,v 1.1.1.1 2012/06/16 18:55:30 pettai Exp $
+# mkdir -p $(MANDIR)/man8
+# install sks.8.gz $(MANDIR)/man8

install.bc:
install.bc:
mkdir -p $(PREFIX)/bin
11 changes: 6 additions & 5 deletions security/sks/patches/patch-ad
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
$NetBSD: patch-ad,v 1.1.1.1 2012/06/16 18:55:30 pettai Exp $
$NetBSD: patch-ad,v 1.2 2012/11/10 14:24:45 pettai Exp $

--- bdb/Makefile.orig 2011-02-18 10:14:32.000000000 +0000
--- bdb/Makefile.orig 2012-10-07 21:59:39.000000000 +0200
+++ bdb/Makefile
@@ -15,3 +15,3 @@

@@ -15 +15 @@
-include ../Makefile.local
+#include ../Makefile.local
@@ -17 +17 @@
-CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE)
+CINCLUDES=-I${PREFIX}/lib/ocaml $(BDBINCLUDE)
CC=gcc

0 comments on commit 6e92962

Please sign in to comment.