Update to 0.6.0:

Noteworthy changes in version 0.6.0 (2007-05-XX)
------------------------------------------------

* Dropped all internal random, cipher, digest libs and only use gcrypt
  for such tasks. The library should only provide functions dedicated
  to parsing and packet creation for the protocol.

* Adjust code for the new Libgcrypt interface.
  Now Libgcrypt >1.2.2 is required to build the code.

* This new version introduces an API change and thus incompatibilities
  to prior versions.

* Lots of cleanups all over the place. This also includes simplification
  for various code parts.

* Better support for larger files.

* Map the libgcrypt error directly and remove the
  invalid CDK_Gcry_Error type.

* Add more regression tests for the various code parts.

* We do not support ElGamal signatures any longer.

* Merged patches from the other opencdk branch which is
  currently used by GnuTLS.

* Provide user callback for the stream. As a sample
  implementation, socket callbacks are implemented
  and use in cdk_stream_sockopen().

* Drop most of the rfc1991 legacy format. This means
  we do not generate any rfc1991 data, but we still
  understand it. An exception is the packet header output.

* Removed gnulib interface for now because the lib
  is currently not in use.

* Interfaces changes relative to 0.5.x
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 functions:
 cdk_stream_tmp			CHANGED: is now cdk_stream_tmp_new
 cdk_stream_new_from_mem	CHANGED: new argument and return error code
 cdk_stream_control		CHANGED: is no available any longer
 cdk_stream_new_from_cbs	NEW
 cdk_stream_mmap_part		NEW
 cdk_keydb_new_from_file	NEW
 cdk_keydb_new_from_mem		NEW
 cdk_keydb_new_from_stream	NEW
 cdk_keydb_import		CHANGED: second argument removed.
 cdk_keydb_pk_cache_sigs	DELETED
 cdk_kbnode_write_to_mem_alloc	NEW
 cdk_lib_startup		NEW
 cdk_lib_shutdown		NEW
 cdk_handle_set_keyring		NEW
 cdk_handle_get_verify_result	NEW
 cdk_subpkt_find_next		NEW
 cdk_subpkt_find_nth		NEW
 cdk_set_progress_handler	DELETED
 cdk_userid_get_pref_array	DELETED
 cdk_pk_encrypt			CHANGED: last argument is now gcry_mpi_t
 cdk_pk_decrypt			CHANGED: last argument is now gcry_mpi_t
 cdk_pk_get_mpi			CHANGED: new argument nwritten.
 cdk_sk_get_mpi			CHANGED: new argument nwritten.
 cdk_pk_release			NEW
 cdk_sk_release			NEW
 cdk_pubkey_to_sexp		NEW
 cdk_seckey_to_sexp		NEW
 cdk_armor_encode_buffer	NEW
 cdk_keygen_set_mdc_feature	DELETED
 cdk_keygen_set_algo_info	CHANGED: new argument usage.
 cdk_seskey_new			DELETED
 cdk_seskey_free		DELETED
 cdk_dek_encode_pkcs1		CHANGED: not public any longer.
 cdk_dek_decode_pkcs1		CHANGED: not public any longer.
 cdk_stream_tell		CHANGED: return type is now off_t
 cdk_stream_seek		CHANGED: argument is now off_t
 cdk_pk_check_self_sig		NEW

 constants:
 CDK_No_Data			NEW
 CDK_CTL_TRUSTMODEL		DELETED
 CDK_CTL_FORCE_DIGEST		DELETED
 CDK_COMPRESS_BZIP2		NEW
 CDK_MD_SHA{256,384,512}	NEW
 CDK_MD_{TIGER, MD2}		DELETED
 CDK_CIPHER_{SAFER_SK128, DES_SK} DELETED
 CDK_CTL_COMPAT		  	  DELETED

 structures:
 cdk_md_hd_t			CHANGED: is now gcry_md_hd_t
 cdk_cipher_hd_t		CHANGED: is now gcry_cipher_hd_t
 cdk_sesskey_t			CHANGED: is now gcry_mpi_t

4 files changed, 21 insertions, 12 deletions

diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index 2968402d662..6aa57575313 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2007/02/05 22:59:00 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2007/06/05 05:35:19 wiz Exp $
 
-DISTNAME=	opencdk-0.5.13
+DISTNAME=	opencdk-0.6.0
 CATEGORIES=	security devel
 MASTER_SITES=	http://josefsson.org/gnutls/releases/opencdk/ \
 		ftp://ftp.gnutls.org/pub/gnutls/opencdk/
@@ -29,7 +29,6 @@ PKGCONFIG_OVERRIDE=	src/opencdk.pc.in
 INSTALLATION_DIRS=	${DOCDIR} ${HTMLDIR} ${EGDIR}
 
 pre-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/DETAILS ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA}	${WRKSRC}/doc/opencdk-api.html ${DESTDIR}${HTMLDIR}
 	cd ${WRKSRC}/tests && ${INSTALL_DATA} *.gpg *.c ${DESTDIR}${EGDIR}
 
diff --git a/security/opencdk/PLIST b/security/opencdk/PLIST
index 905275954a9..cd5b39fae9e 100644
--- a/security/opencdk/PLIST
+++ b/security/opencdk/PLIST
@@ -1,16 +1,26 @@
-@comment $NetBSD: PLIST,v 1.6 2006/10/31 22:49:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/06/05 05:35:20 wiz Exp $
 bin/opencdk-config
 include/opencdk.h
 lib/libopencdk.la
 lib/pkgconfig/opencdk.pc
 share/doc/html/opencdk/opencdk-api.html
-share/doc/opencdk/DETAILS
 share/examples/opencdk/basic.c
-share/examples/opencdk/minpg.c
+share/examples/opencdk/newkey.gpg
+share/examples/opencdk/photo-key.gpg
+share/examples/opencdk/plain-test-pubenc-part.gpg
+share/examples/opencdk/plain-test-sym.gpg
+share/examples/opencdk/plain-test.gpg
+share/examples/opencdk/pub-asc.gpg
 share/examples/opencdk/pub.gpg
 share/examples/opencdk/sec-with-pwd.gpg
 share/examples/opencdk/sec.gpg
+share/examples/opencdk/t-encr.c
+share/examples/opencdk/t-key.c
+share/examples/opencdk/t-keydb.c
+share/examples/opencdk/t-misc.c
+share/examples/opencdk/t-sign.c
 share/examples/opencdk/t-stream.c
+share/examples/opencdk/testpa.c
 share/examples/opencdk/ts.gpg
 share/examples/opencdk/wkold.gpg
 @dirrm share/examples/opencdk
diff --git a/security/opencdk/buildlink3.mk b/security/opencdk/buildlink3.mk
index edc1731b4f2..67323938e2a 100644
--- a/security/opencdk/buildlink3.mk
+++ b/security/opencdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/06/05 05:35:20 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENCDK_BUILDLINK3_MK:=	${OPENCDK_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}opencdk
 
 .if !empty(OPENCDK_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.opencdk+=	opencdk>=0.5.4nb1
-BUILDLINK_ABI_DEPENDS.opencdk+=	opencdk>=0.5.8nb1
+BUILDLINK_ABI_DEPENDS.opencdk+=	opencdk>=0.6.0
 BUILDLINK_PKGSRCDIR.opencdk?=	../../security/opencdk
 .endif	# OPENCDK_BUILDLINK3_MK
 
diff --git a/security/opencdk/distinfo b/security/opencdk/distinfo
index e2ce2194f4d..cc1d8fe0bbf 100644
--- a/security/opencdk/distinfo
+++ b/security/opencdk/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2007/02/05 22:59:00 wiz Exp $
+$NetBSD: distinfo,v 1.15 2007/06/05 05:35:20 wiz Exp $
 
-SHA1 (opencdk-0.5.13.tar.gz) = bff9daabfe8f20824e4d167a9dc11e0908f11370
-RMD160 (opencdk-0.5.13.tar.gz) = 587d3fb578b66c67f85aa751010140355b522774
-Size (opencdk-0.5.13.tar.gz) = 597475 bytes
+SHA1 (opencdk-0.6.0.tar.gz) = 40cffb5482d64a749e627ae7dd047a0c8f63366d
+RMD160 (opencdk-0.6.0.tar.gz) = 9b07ae5c022bf854ed8b9ef80bd65958779fee0b
+Size (opencdk-0.6.0.tar.gz) = 610395 bytes