Update to 0.6.5:

Noteworthy changes in version 0.6.5 (2007-10-27)
------------------------------------------------

* Cleanups for the key export and import functionality.

* Clarified the semantic of cdk_pk_check_sigs.

* Now the by usage keydb function correctly finds the
  self signature.

patch-aa provided by drochner@; sent upstream, will be in next release.

4 files changed, 25 insertions, 10 deletions

diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index bba716687b6..adcfd7292f4 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2007/09/08 09:42:01 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2007/11/08 19:43:37 wiz Exp $
 
-DISTNAME=	opencdk-0.6.4
-PKGREVISION=	1
+DISTNAME=	opencdk-0.6.5
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.stud.uni-hannover.de/~twoaday/opencdk/ \
 		http://josefsson.org/gnutls/releases/opencdk/ \
@@ -24,13 +23,12 @@ NOT_FOR_COMPILER=	xlc
 
 REPLACE_PERL=		doc/gdoc
 
-DOCDIR=		${PREFIX}/share/doc/opencdk
 EGDIR=		${PREFIX}/share/examples/opencdk
 HTMLDIR=	${PREFIX}/share/doc/html/opencdk
 
 PKGCONFIG_OVERRIDE=	src/opencdk.pc.in
 
-INSTALLATION_DIRS=	${DOCDIR} ${HTMLDIR} ${EGDIR}
+INSTALLATION_DIRS=	${HTMLDIR} ${EGDIR}
 
 pre-install:
 	${INSTALL_DATA}	${WRKSRC}/doc/opencdk-api.html ${DESTDIR}${HTMLDIR}
diff --git a/security/opencdk/PLIST b/security/opencdk/PLIST
index 08098140fc9..8560875493b 100644
--- a/security/opencdk/PLIST
+++ b/security/opencdk/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.8 2007/09/08 09:42:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/11/08 19:43:38 wiz Exp $
 bin/opencdk-config
 include/opencdk.h
 lib/libopencdk.la
 lib/pkgconfig/opencdk.pc
 share/doc/html/opencdk/opencdk-api.html
 share/examples/opencdk/basic.c
+share/examples/opencdk/exp-key.gpg
 share/examples/opencdk/newkey.gpg
 share/examples/opencdk/photo-key.gpg
 share/examples/opencdk/plain-test-pubenc-part.gpg
diff --git a/security/opencdk/distinfo b/security/opencdk/distinfo
index 232c8393041..dd6a8eee2dd 100644
--- a/security/opencdk/distinfo
+++ b/security/opencdk/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.17 2007/06/15 22:42:33 wiz Exp $
+$NetBSD: distinfo,v 1.18 2007/11/08 19:43:38 wiz Exp $
 
-SHA1 (opencdk-0.6.4.tar.bz2) = 86cb010c9d1888f3390948d4948986d87cf1abb4
-RMD160 (opencdk-0.6.4.tar.bz2) = 789c0356824296f153df9f7ac6ffe6b08e33e74e
-Size (opencdk-0.6.4.tar.bz2) = 479117 bytes
+SHA1 (opencdk-0.6.5.tar.bz2) = 62d66ec8eb82bab61cb64dd022ed341653c90bb3
+RMD160 (opencdk-0.6.5.tar.bz2) = c088d2ae79c5894995dbdcf333550b57111d4e44
+Size (opencdk-0.6.5.tar.bz2) = 481673 bytes
+SHA1 (patch-aa) = 1cb44fe1abf4805fa1600bc5e7929fcad9704133
diff --git a/security/opencdk/patches/patch-aa b/security/opencdk/patches/patch-aa
new file mode 100644
index 00000000000..a3bf0f77bc8
--- /dev/null
+++ b/security/opencdk/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.5 2007/11/08 19:43:38 wiz Exp $
+
+--- src/stream.c.orig	2007-05-15 15:57:14.000000000 +0200
++++ src/stream.c
+@@ -1015,8 +1015,8 @@ stream_flush (cdk_stream_t s)
+ {
+   assert (s);
+   
+-  if (fflush (s->fp))
+-    return CDK_File_Error;
++  /* behaviour undefined if stream is not output or update */
++  (void)fflush (s->fp);
+   return 0;
+ }
+