Upadte cue to 20090209.

Patch provided by YAMAMOTO Takashi in PR 40623.
no changelog...

4 files changed, 6 insertions, 68 deletions

diff --git a/mail/cue/Makefile b/mail/cue/Makefile
index b58fa566208..c753a3ae40b 100644
--- a/mail/cue/Makefile
+++ b/mail/cue/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2008/05/02 03:55:38 obache Exp $
+# $NetBSD: Makefile,v 1.57 2009/02/15 07:07:23 obache Exp $
 
-DISTNAME=	cue-snap-20080211
+DISTNAME=	cue-snap-20090209
 PKGNAME=	${DISTNAME:S/snap-//}
 CATEGORIES=	mail
 MASTER_SITES=	ftp://sh.wide.ad.jp/WIDE/free-ware/cue/snap/
diff --git a/mail/cue/distinfo b/mail/cue/distinfo
index fc85d531add..0ca04936ac1 100644
--- a/mail/cue/distinfo
+++ b/mail/cue/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.30 2008/09/19 19:47:07 joerg Exp $
+$NetBSD: distinfo,v 1.31 2009/02/15 07:07:23 obache Exp $
 
-SHA1 (cue-snap-20080211.tar.gz) = 4f1e25f0ec6bfebe08393f424719f15e19322785
-RMD160 (cue-snap-20080211.tar.gz) = 7c138089a34c8bef88a408402ac01741ebe1748f
-Size (cue-snap-20080211.tar.gz) = 228255 bytes
+SHA1 (cue-snap-20090209.tar.gz) = 8f0a6269855c7fd19f298d18613422f71ce8761e
+RMD160 (cue-snap-20090209.tar.gz) = 94d0a6d5820c9c8ba71230ab5212196b0f0121c6
+Size (cue-snap-20090209.tar.gz) = 229115 bytes
 SHA1 (patch-aa) = c1ed53b1333b58dd8f794b2f028ed4c71a294c04
-SHA1 (patch-ab) = 1c7415aaf56d1552624293e6e3ee3c32eb66300b
 SHA1 (patch-ac) = 105da5dc78a6a493d3863de74ba91891653cc936
 SHA1 (patch-ad) = 0d3ce51529e2b0d7fcc051719bbd4ad008bd1b65
-SHA1 (patch-ae) = ec38b968d6439ad5038d5f2df12a2785c0572653
diff --git a/mail/cue/patches/patch-ab b/mail/cue/patches/patch-ab
deleted file mode 100644
index d583120b911..00000000000
--- a/mail/cue/patches/patch-ab
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2008/09/19 19:47:07 joerg Exp $
-
---- pgp.c.orig	2007-06-11 19:40:21.000000000 +0200
-+++ pgp.c
-@@ -37,6 +37,7 @@
- 
- #ifdef OPENSSL
- #include <openssl/bn.h>
-+#include <openssl/dsa.h>
- #include <openssl/rsa.h>
- #include <openssl/evp.h>
- #include <openssl/rand.h>
-@@ -987,7 +988,11 @@ pgp_decrypt_seskey(struct pgp_pkt *pkt, 
- 			return -1;
- 		if ((buf = malloc(len)) == NULL)
- 			return -1;
-+#if OPENSSL_VERSION_NUMBER >= 0x00909000L
-+		len = EVP_PKEY_decrypt_old(buf, p, len, seckey->un.pubkey.key);
-+#else
- 		len = EVP_PKEY_decrypt(buf, p, len, seckey->un.pubkey.key);
-+#endif
- 		break;
- 	case PGP_PUB_ELGAMAL_ENC:
- 	    {
-@@ -1073,7 +1078,11 @@ pgp_encrypt_seskey(struct pgp_pkt *pkt, 
- 	case PGP_PUB_RSA:
- 		if ((buf = malloc(EVP_PKEY_size(pubkey->un.pubkey.key) + 2)) == NULL)
- 			break;
-+#if OPENSSL_VERSION_NUMBER >= 0x00909000L
-+		len = EVP_PKEY_encrypt_old(buf + 2, pkt->un.pubses.seskey, pkt->un.pubses.seslen, pubkey->un.pubkey.key);
-+#else
- 		len = EVP_PKEY_encrypt(buf + 2, pkt->un.pubses.seskey, pkt->un.pubses.seslen, pubkey->un.pubkey.key);
-+#endif
- 		n = BN_bin2bn(buf + 2, len, NULL);
- 		i = BN_num_bits(n);
- 		BN_free(n);
diff --git a/mail/cue/patches/patch-ae b/mail/cue/patches/patch-ae
deleted file mode 100644
index e7111491f89..00000000000
--- a/mail/cue/patches/patch-ae
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2008/09/19 19:47:07 joerg Exp $
-
---- smime.c.orig	2007-06-11 19:40:21.000000000 +0200
-+++ smime.c
-@@ -41,6 +41,7 @@
- #include <openssl/pem.h>
- #include <openssl/pkcs7.h>
- #include <openssl/rand.h>
-+#include <openssl/opensslv.h>
- #else /* OPENSSL */
- #include <asn1.h>
- #include <err.h>
-@@ -1003,7 +1004,11 @@ smime_encrypt(struct state *state)
- 				buf = q;
- 				buflen = len;
- 			}
-+#if OPENSSL_VERSION_NUMBER >= 0x00909000L
-+			len = EVP_PKEY_encrypt_old(buf, key, keylen, pkey);
-+#else
- 			len = EVP_PKEY_encrypt(buf, key, keylen, pkey);
-+#endif
- 			ASN1_OCTET_STRING_set(ri->enc_key, buf, len);
- 		}
- 		if (buf)