diff --git a/security/sks/Makefile b/security/sks/Makefile index 779001f26af3a..c3e8a757d8f09 100644 --- a/security/sks/Makefile +++ b/security/sks/Makefile @@ -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 @@ -22,16 +21,21 @@ 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 @@ -39,6 +43,17 @@ post-install: ${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" diff --git a/security/sks/PLIST b/security/sks/PLIST index d2731bf5d05f7..6e61ef669377a 100644 --- a/security/sks/PLIST +++ b/security/sks/PLIST @@ -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 diff --git a/security/sks/distinfo b/security/sks/distinfo index 009a16ea79dfa..6fd2bbf0d027a 100644 --- a/security/sks/distinfo +++ b/security/sks/distinfo @@ -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 diff --git a/security/sks/patches/patch-aa b/security/sks/patches/patch-aa index 8180c8d716fdc..b1bca4ee5f3c8 100644 --- a/security/sks/patches/patch-aa +++ b/security/sks/patches/patch-aa @@ -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 #include #include -#include -+#include ++#include /* O_CREAT and others are not defined in db.h */ #include -@@ -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"); diff --git a/security/sks/patches/patch-ab b/security/sks/patches/patch-ab index 43b4153de2ccc..73eb33afcda90 100644 --- a/security/sks/patches/patch-ab +++ b/security/sks/patches/patch-ab @@ -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 @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2012/06/16 18:55:30 pettai Exp $ #include #include -#include -+#include ++#include /* O_CREAT and others are not defined in db.h */ #include diff --git a/security/sks/patches/patch-ac b/security/sks/patches/patch-ac index 9a4ad255b5bef..2235fc6ab6b49 100644 --- a/security/sks/patches/patch-ac +++ b/security/sks/patches/patch-ac @@ -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 @@ -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 diff --git a/security/sks/patches/patch-ad b/security/sks/patches/patch-ad index 8266a24a49c87..6fb7baf41fa63 100644 --- a/security/sks/patches/patch-ad +++ b/security/sks/patches/patch-ad @@ -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