See bug #37745

5 files changed, 146 insertions, 3 deletions

diff --git a/x11-plugins/wmbiff/ChangeLog b/x11-plugins/wmbiff/ChangeLog
index 13e4fd52e32f..65c89eab6932 100644
--- a/x11-plugins/wmbiff/ChangeLog
+++ b/x11-plugins/wmbiff/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmbiff
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/ChangeLog,v 1.7 2003/12/18 12:45:19 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/ChangeLog,v 1.8 2004/02/11 09:39:35 phosphan Exp $
+
+*wmbiff-0.4.20 (11 Feb 2004)
+
+  11 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> wmbiff-0.4.20.ebuild,
+  files/wmbiff-0.4.20-crypto-api-fix.patch:
+  Version bump; Added patch for new gnutls/libgcrypt (see bug #37745)
 
 *wmbiff-0.4.17 (18 Dec 2003)
 
diff --git a/x11-plugins/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
index a7beeadb0977..423cb7fbc812 100644
--- a/x11-plugins/wmbiff/Manifest
+++ b/x11-plugins/wmbiff/Manifest
@@ -1,8 +1,9 @@
 MD5 882238df298c4558f6ddc20e4ba01976 wmbiff-0.4.15.ebuild 634
 MD5 a1bc1e3d8e259fe4678c36e590eab7d7 wmbiff-0.4.17.ebuild 1024
-MD5 7d6de108682cc0c4976f55c5dfe3b4b6 ChangeLog 1003
+MD5 7790c9a815e0fd273d33b382bbc7b7dc ChangeLog 1223
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
-MD5 2989baae359d6718618ed467a989ae22 wmbiff-0.4.20.ebuild 804
+MD5 9c175a5337d91f3c9a0cbf07d5c4c6af wmbiff-0.4.20.ebuild 972
 MD5 8391e3fac11ce2c658e6c7b8803321de files/digest-wmbiff-0.4.15 65
 MD5 1c3db557c466c299ecf1fcf38194b155 files/digest-wmbiff-0.4.17 65
 MD5 218b9bd8a41dfb0bcf674649d9fbc46e files/digest-wmbiff-0.4.20 65
+MD5 08fb71973cf15498b2586af8e4c5656e files/wmbiff-0.4.20-crypto-api-fix.patch 3547
diff --git a/x11-plugins/wmbiff/files/digest-wmbiff-0.4.20 b/x11-plugins/wmbiff/files/digest-wmbiff-0.4.20
new file mode 100644
index 000000000000..5898bd29bda2
--- /dev/null
+++ b/x11-plugins/wmbiff/files/digest-wmbiff-0.4.20
@@ -0,0 +1 @@
+MD5 e9f93c4618e6ab35f4d89ced2ea477f5 wmbiff-0.4.20.tar.gz 194161
diff --git a/x11-plugins/wmbiff/files/wmbiff-0.4.20-crypto-api-fix.patch b/x11-plugins/wmbiff/files/wmbiff-0.4.20-crypto-api-fix.patch
new file mode 100644
index 000000000000..69838bd709e0
--- /dev/null
+++ b/x11-plugins/wmbiff/files/wmbiff-0.4.20-crypto-api-fix.patch
@@ -0,0 +1,95 @@
+Common subdirectories: wmbiff/.deps and wmbiff.new/.deps
+diff -u wmbiff/gnutls-common.c wmbiff.new/gnutls-common.c
+--- wmbiff/gnutls-common.c	2002-10-10 20:25:58.000000000 +0200
++++ wmbiff.new/gnutls-common.c	2004-02-11 10:22:25.006385211 +0100
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <gnutls/gnutls.h>
+ #include <gnutls/extra.h>
++#include <gnutls/compat4.h>
+ #include <time.h>
+ 
+ #define PRINTX(x,y) if (y[0]!=0) printf(" #   %s %s\n", x, y)
+@@ -192,8 +193,6 @@
+ 		printf("- Peer's certificate is NOT trusted\n");
+ 	else
+ 		printf("- Peer's certificate is trusted\n");
+-	if (status & GNUTLS_CERT_CORRUPTED)
+-		printf("- Peer's certificate is corrupted\n");
+ 
+ }
+ 
+diff -u wmbiff/tlsComm.c wmbiff.new/tlsComm.c
+--- wmbiff/tlsComm.c	2003-11-09 00:43:50.000000000 +0100
++++ wmbiff.new/tlsComm.c	2004-02-11 10:21:33.246296874 +0100
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <assert.h>
+ #ifdef HAVE_GNUTLS_GNUTLS_H
++#include <gnutls/compat4.h>
+ #define USE_GNUTLS
+ #include <gnutls/gnutls.h>
+ #endif
+@@ -325,8 +326,6 @@
+ 	certstat = gnutls_certificate_verify_peers(scs->tls_state);
+ 	if (certstat ==
+ 		(GNUTLS_CertificateStatus) GNUTLS_E_NO_CERTIFICATE_FOUND) {
+-	} else if (certstat & GNUTLS_CERT_CORRUPTED) {
+-		bad_certificate(scs, "server's certificate is corrupt.\n");
+ 	} else if (certstat & GNUTLS_CERT_REVOKED) {
+ 		bad_certificate(scs, "server's certificate has been revoked.\n");
+ 	} else if (certstat & GNUTLS_CERT_INVALID) {
+@@ -399,7 +398,7 @@
+ 		const int protocols[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
+ 		const int ciphers[] =
+ 			{ GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC,
+-			GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_TWOFISH_128_CBC,
++			GNUTLS_CIPHER_RIJNDAEL_256_CBC, 
+ 			GNUTLS_CIPHER_ARCFOUR, 0
+ 		};
+ 		const int compress[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
+--- wmbiff/Pop3Client_orig.c	2003-11-08 18:43:50.000000000 -0500
++++ wmbiff/Pop3Client.c	2004-01-05 16:53:38.325787224 -0500
+@@ -281,7 +281,7 @@
+ 	strcat(buf, " ");
+ 
+ 
+-	gmh = gcry_md_open(GCRY_MD_MD5, GCRY_MD_FLAG_HMAC);
++	gcry_md_open(&gmh, GCRY_MD_MD5, GCRY_MD_FLAG_HMAC);
+ 	gcry_md_setkey(gmh, PCU.password, strlen(PCU.password));
+ 	gcry_md_write(gmh, (unsigned char *) buf2, strlen(buf2));
+ 	gcry_md_final(gmh);
+@@ -323,7 +323,7 @@
+ 	POP_DM(pc, DEBUG_INFO, "APOP challenge: %s\n", apop_str);
+ 	strcat(apop_str, PCU.password);
+ 
+-	gmh = gcry_md_open(GCRY_MD_MD5, 0);
++	gcry_md_open(&gmh, GCRY_MD_MD5, 0);
+ 	gcry_md_write(gmh, (unsigned char *) apop_str, strlen(apop_str));
+ 	gcry_md_final(gmh);
+ 	md5 = gcry_md_read(gmh, 0);
+--- wmbiff/Imap4Client_orig.c	2004-01-01 02:36:05.000000000 -0500
++++ wmbiff/Imap4Client.c	2004-01-05 16:53:58.763980086 -0500
+@@ -648,7 +648,7 @@
+ 	strcpy(buf, PCU.userName);
+ 	strcat(buf, " ");
+ 	ask_user_for_password(pc, 0);
+-	gmh = gcry_md_open(GCRY_MD_MD5, GCRY_MD_FLAG_HMAC);
++	gcry_md_open(&gmh, GCRY_MD_MD5, GCRY_MD_FLAG_HMAC);
+ 	DEFROB(PCU.password);
+ 	gcry_md_setkey(gmh, PCU.password, strlen(PCU.password));
+ 	ENFROB(PCU.password);
+--- wmbiff/wmbiff_orig.c	2004-01-05 16:59:49.000000000 -0500
++++ wmbiff/wmbiff.c	2004-01-05 17:00:07.692306621 -0500
+@@ -423,10 +423,9 @@
+ 	if ((zok = gcry_control(GCRYCTL_INIT_SECMEM, 16384, 0)) != 0) {
+ 		DMA(DEBUG_ERROR,
+ 			"Error: gcry_control() to initialize secure memory returned non-zero: %d\n"
+-			" Message: %s\n"
+ 			" libgcrypt version: %s\n"
+ 			" recovering: will fail later if using CRAM-MD5 or APOP authentication.\n",
+-			zok, gcry_strerror(gcry_errno()), gcry_check_version(NULL));
++			zok, gcry_check_version(NULL));
+ 	};
+ #endif
+ 
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.20.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.20.ebuild
new file mode 100644
index 000000000000..8be84be9521b
--- /dev/null
+++ b/x11-plugins/wmbiff/wmbiff-0.4.20.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.20.ebuild,v 1.1 2004/02/11 09:39:35 phosphan Exp $
+
+DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes."
+SRC_URI="mirror://sourceforge/wmbiff/${P}.tar.gz"
+HOMEPAGE="http://sourceforge.net/projects/wmbiff/"
+
+DEPEND="virtual/x11
+		crypt? ( net-libs/gnutls
+			dev-libs/libgcrypt )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~amd64"
+IUSE="crypt"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if use crypt; then
+		if has_version ">dev-libs/libgcrypt-1.1.12"; then
+			epatch ${FILESDIR}/${P}-crypto-api-fix.patch
+		fi
+	fi
+}
+
+src_compile() {
+	local myconf
+	if ! use crypt; then
+			myconf="--disable-crypto"
+	fi
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die
+	dodoc ChangeLog  FAQ NEWS  README  README.licq  TODO
+}