1.1.0:

- Numerix has been ripped out. OCaml's Big_int implementation is used instead. - version of Berkeley DB has been upgraded to 4.6. - The sks.pod file has been added to the src tarball - Some small changes to index view
2011-02-18 14:05:26 +00:00 · 2011-02-18 14:05:26 +00:00 · 20745407ac
commit 20745407ac
parent 19c0f6baae
11 changed files with 56 additions and 153 deletions
--- a/sks/Makefile
+++ b/sks/Makefile
@ -1,38 +1,39 @@
-# $NetBSD: Makefile,v 1.14 2010/11/01 00:08:22 thomasklausner Exp $
+# $NetBSD: Makefile,v 1.15 2011/02/18 14:05:26 pettai Exp $
 #

-DISTNAME=	sks-1.0.9
-PKGREVISION=	1
+DISTNAME=	sks-1.1.1
 CATEGORIES=	security
-MASTER_SITES=	http://savannah.nongnu.org/download/sks/
+MASTER_SITES=	http://sks-keyserver.googlecode.com/files/
 EXTRACT_SUFX=	.tgz

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

-BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.08.2
-BUILDLINK_API_DEPENDS.db4+=	db4>=4.3.0
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.10.2
+BUILDLINK_API_DEPENDS.db4+=	db4>=4.6.0

 USE_TOOLS+=	gmake perl:run tar
 BDB_ACCEPTED=	db4

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

-.include "../../lang/ocaml/buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 bin

-pre-patch:
-	cd ${WRKSRC} && ${TAR} xmfz numerix-0.19-3.tar.gz
+.include "../../lang/ocaml/buildlink3.mk"
+.include "../../databases/db46/buildlink3.mk"

 post-install:
 	cd ${WRKSRC} && ${MAKE_PROGRAM} sks.8
-	${INSTALL_PROGRAM} ${WRKSRC}/sks ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/sks_add_mail ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/sks.8 ${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_PROGRAM} ${WRKSRC}/sks ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/sks_add_mail ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/sks.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8

 .include "../../mk/bsd.pkg.mk"
--- a/sks/distinfo
+++ b/sks/distinfo
@ -1,14 +1,9 @@
-$NetBSD: distinfo,v 1.5 2006/10/14 00:19:37 adrian_p Exp $
+$NetBSD: distinfo,v 1.6 2011/02/18 14:05:26 pettai Exp $

-SHA1 (sks-1.0.9.tgz) = 301ecc30a1a0c99e6b87fae324925695287942b3
-RMD160 (sks-1.0.9.tgz) = 9cb98d68d2465a0c24ef040c4f24d4377fbc00e0
-Size (sks-1.0.9.tgz) = 925362 bytes
-SHA1 (patch-aa) = 1e3854f1be32bf39a85940ec779ad857a49d786d
-SHA1 (patch-ab) = 919846f9c31a89f23430081dbad853d088dcb7e5
-SHA1 (patch-ac) = 4f353811782e106c4d6dbf6e55fb114998674505
-SHA1 (patch-ad) = 52001a1167dc9fc938bfbc3977cb281e6b957bbf
-SHA1 (patch-ae) = 94efa21e9dc1a5866d4dc67e92578c204206acc3
-SHA1 (patch-af) = 3e044f84f0d7b839f84f60b7d71b7496c73c8a80
-SHA1 (patch-ag) = 209be1d3050c090ec4de6b15db224f40c56e07c8
-SHA1 (patch-ah) = f1deabd3b0701f421f83bba8365b533e6c306b7b
-SHA1 (patch-ai) = 5c4b2d75f43b177d462ecbbcb19bf1d08803edc6
+SHA1 (sks-1.1.1.tgz) = 692d731eccf127fbb5c131d41edba29c5d1422cb
+RMD160 (sks-1.1.1.tgz) = 93926ba70366cdd88e07d21091e1c516a4dda701
+Size (sks-1.1.1.tgz) = 273833 bytes
+SHA1 (patch-aa) = bd9106e971e4a49eaa1b9fb11ba7021f2e737164
+SHA1 (patch-ab) = a2e4be2adfdb9ccbfabfd0683e10a068b63cef20
+SHA1 (patch-ac) = 16bd6fbb9bcdbced63e56d2683bf93ff9a152366
+SHA1 (patch-ad) = 4f5f538a6ebed923dd394cea544b516333c34c1d
--- a/sks/patches/patch-aa
+++ b/sks/patches/patch-aa
@ -1,13 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/10/28 21:27:14 cubidou Exp $
+$NetBSD: patch-aa,v 1.2 2011/02/18 14:05:26 pettai Exp $

--- bdb/bdb_stubs.c.orig	2003-07-05 17:10:40.000000000 +0200
+--- bdb/bdb_stubs.c.orig	2009-03-26 01:18:03.000000000 +0000
 +++ bdb/bdb_stubs.c
@@ -12,7 +12,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <limits.h>
 -#include <db.h>
-+#include <db4/db.h>
+#include <db46/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 
+   
+   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"); 
+     } else {
+       UW_dbenv(dbenv)->err(UW_dbenv(dbenv), err,"caml_txn_begin");
--- a/sks/patches/patch-ab
+++ b/sks/patches/patch-ab
@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/10/28 21:27:14 cubidou Exp $
+$NetBSD: patch-ab,v 1.2 2011/02/18 14:05:26 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 2003/10/28 21:27:14 cubidou Exp $
 #include <sys/types.h>
 #include <limits.h>
 -#include <db.h>
-+#include <db4/db.h>
+#include <db46/db.h>
 /* O_CREAT and others are not defined in db.h */
 #include <fcntl.h>
 
--- a/sks/patches/patch-ac
+++ b/sks/patches/patch-ac
@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2005/01/13 23:07:59 adrian_p Exp $
+$NetBSD: patch-ac,v 1.2 2011/02/18 14:05:26 pettai Exp $

--- Makefile.orig	2004-10-21 03:56:02.000000000 +0100
-+++ Makefile	2005-01-13 22:55:39.000000000 +0000
+--- Makefile.orig	2009-08-13 01:51:24.000000000 +0000
+++ Makefile
@@ -14,7 +14,7 @@
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #   USA 
@ -11,21 +11,18 @@ $NetBSD: patch-ac,v 1.1 2005/01/13 23:07:59 adrian_p Exp $
 CC=gcc
 CXX=g++
 CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
-@@ -127,8 +127,6 @@
+@@ -125,10 +125,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
 -	install sks.8.gz $(MANDIR)/man8
+#	mkdir -p $(PREFIX)/bin
+#	install sks_build.sh sks sks_add_mail $(PREFIX)/bin
+#	mkdir -p $(MANDIR)/man8
+#	install sks.8.gz $(MANDIR)/man8
 
 install.bc: 
- 	install sks_build.bc.sh sks.bc sks_add_mail.bc $(PREFIX)/bin
-@@ -293,7 +291,7 @@
- NXDIR=numerix-0.19
- 
- $(NXDIR)/READ.ME:
-	tar xvmfz $(NXDIR)-3.tar.gz
-+	# tar xvmfz $(NXDIR)-3.tar.gz
- 
- $(NXDIR)/config.status: $(NXDIR)/READ.ME
- 	cd $(NXDIR) && \
+ 	mkdir -p $(PREFIX)/bin
--- a/sks/patches/patch-ad
+++ b/sks/patches/patch-ad
@ -1,17 +1,9 @@
-$NetBSD: patch-ad,v 1.1 2005/01/13 23:07:59 adrian_p Exp $
+$NetBSD: patch-ad,v 1.2 2011/02/18 14:05:26 pettai Exp $

--- bdb/bdb_stubs.c.orig	2004-09-18 16:55:30.000000000 +0100
-+++ bdb/bdb_stubs.c	2004-09-18 16:57:05.000000000 +0100
-@@ -223,10 +223,10 @@
+--- bdb/Makefile.orig	2011-02-18 10:14:32.000000000 +0000
+++ bdb/Makefile
+@@ -15,3 +15,3 @@
 
- // Declaration of flag enums in ocaml must be in same order as in C
- 
-static int dbenv_create_flags[] = { DB_CLIENT };
-+static int dbenv_create_flags[] = { DB_RPCCLIENT };
- 
- //+
-//+   type create_flag = CLIENT
-+//+   type create_flag = RPCCLIENT
- 
- static int dbenv_open_flags[] = {
-   DB_JOINENV, DB_INIT_CDB, DB_INIT_LOCK, DB_INIT_LOG, DB_INIT_MPOOL, 
+-CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE)
+CINCLUDES=-I${PREFIX}/lib/ocaml $(BDBINCLUDE)
+ CC=gcc
--- a/sks/patches/patch-ae
+++ b/sks/patches/patch-ae
@ -1,31 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/01/13 23:07:59 adrian_p Exp $
-
--- bdb/bdb_stubs.c.orig	2005-01-13 21:21:40.000000000 +0000
-+++ bdb/bdb_stubs.c	2005-01-13 21:37:37.000000000 +0000
-@@ -243,7 +243,7 @@
- //+     | LOCKDOWN | PRIVATE | SYSTEM_MEM | THREAD
- 
- static int dbenv_verbose_flags[] = {
-  DB_VERB_CHKPOINT, DB_VERB_DEADLOCK, DB_VERB_RECOVERY, DB_VERB_WAITSFOR
-+  DB_VERB_DEADLOCK, DB_VERB_RECOVERY, DB_VERB_WAITSFOR
- };
- 
- //+ 
-@@ -686,7 +686,7 @@
-   int size;
- 
-   test_db_closed(db);
-  err = UW_db(db)->stat(UW_db(db),&stat,0);
-+  err = UW_db(db)->stat(UW_db(db),(DB_TXN *)NULL,&stat,0);
-   if (err != 0) { UW_db(db)->err(UW_db(db),err,"caml_db_get_size"); }
-   switch (*(u_int32_t*)stat) {
-   case DB_BTREEMAGIC:
-@@ -1200,7 +1200,7 @@
-   
-   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"); 
-     } else {
-       UW_dbenv(dbenv)->err(UW_dbenv(dbenv), err,"caml_txn_begin");
--- a/sks/patches/patch-af
+++ b/sks/patches/patch-af
@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2006/10/14 00:19:37 adrian_p Exp $
-
--- mRandom.ml.orig	2005-01-13 21:41:33.000000000 +0000
-+++ mRandom.ml	2005-01-13 21:41:54.000000000 +0000
-@@ -92,7 +92,7 @@
- 
-   (* Low-entropy system-dependent initialisation. *)
- 
-  external random_seed: unit -> int = "sys_random_seed"
-+  external random_seed: unit -> int = "caml_sys_random_seed"
- 
-   let self_init () = init (random_seed())
- 
--- a/sks/patches/patch-ag
+++ b/sks/patches/patch-ag
@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2006/10/14 00:19:37 adrian_p Exp $
-
--- number.ml.orig	2005-01-13 21:42:57.000000000 +0000
-+++ number.ml	2005-01-13 21:43:15.000000000 +0000
-@@ -18,7 +18,7 @@
- (** Basic operations and definitions for multi-precistion integers. *)
- 
- (* Change to Dlong for non x86 platforms *)
-module Nx = Numerix.Slong
-+module Nx = Numerix.Clong
- 
- let two = Nx.of_int 2
- let one = Nx.of_int 1
--- a/sks/patches/patch-ah
+++ b/sks/patches/patch-ah
@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/01/13 23:07:59 adrian_p Exp $
-
--- numerix-0.19/lib/kernel/string.c.orig	2005-01-13 21:57:44.000000000 +0000
-+++ numerix-0.19/lib/kernel/string.c	2005-01-13 21:58:15.000000000 +0000
-@@ -38,7 +38,7 @@
-   longueur l;
- 
-   /* saute les blancs et le signe */
-  while isspace(*s) s++;
-+  while (isspace(*s)) s++;
-   if ((*s == '+') || (*s == '-')) s++;
- 
-   /* compte le nombre de chiffres décimaux */
-@@ -83,7 +83,7 @@
-   long i,j,l,n;
- 
-   /* saute les blancs et le signe */
-  while isspace(*s) s++;
-+  while (isspace(*s)) s++;
-   switch(*s) {
-   case '-' : sa = SIGN_m;
-   case '+' : s++;
--- a/sks/patches/patch-ai
+++ b/sks/patches/patch-ai
@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/01/13 23:07:59 adrian_p Exp $
-
--- numerix-0.19/configure.orig	2005-01-13 22:17:25.000000000 +0000
-+++ numerix-0.19/configure	2005-01-13 22:18:35.000000000 +0000
-@@ -4337,6 +4337,7 @@
-   echo "$as_me:$LINENO: checking for Ocaml version" >&5
- echo $ECHO_N "checking for Ocaml version... $ECHO_C" >&6
-   ocaml_version=`config/camlconf $ocamlc version`
-+  ocaml_version=${ocaml_version%%.*}
-   echo "$as_me:$LINENO: result: $ocaml_version" >&5
- echo "${ECHO_T}$ocaml_version" >&6
-   echo "$as_me:$LINENO: checking for Ocaml directory" >&5