Revision bump, closes bug #85662

Package-Manager: portage-2.0.51.19

8 files changed, 41 insertions, 114 deletions

diff --git a/x11-plugins/wmbiff/ChangeLog b/x11-plugins/wmbiff/ChangeLog
index 9b46dd6d4ce4..9cdcc9bef907 100644
--- a/x11-plugins/wmbiff/ChangeLog
+++ b/x11-plugins/wmbiff/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/wmbiff
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/ChangeLog,v 1.16 2004/11/26 16:37:32 weeve Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/ChangeLog,v 1.17 2005/05/10 08:34:04 s4t4n Exp $
+
+*wmbiff-0.4.25-r1 (10 May 2005)
+
+  10 May 2005; Michele Noberasco <s4t4n@gentoo.org> wmbiff-0.4.25-r1.ebuild:
+  Revision bump, closes #85662.
 
   26 Nov 2004; Jason Wever <weeve@gentoo.org> wmbiff-0.4.25.ebuild:
   Stable on sparc.
diff --git a/x11-plugins/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
index 582a336d5260..bd21157ba9c8 100644
--- a/x11-plugins/wmbiff/Manifest
+++ b/x11-plugins/wmbiff/Manifest
@@ -1,7 +1,7 @@
-MD5 8c90cf1ab23ecf8b3fbb5735a7ccd2ea ChangeLog 2158
+MD5 39dfb21cfaf93f7d30b68b9a02a42402 wmbiff-0.4.25-r1.ebuild 1024
+MD5 1f33129dee148f95fe6f4ceadbd7aa0f ChangeLog 2301
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
-MD5 c3527e39cc4fa74c815824f4902dacd3 wmbiff-0.4.25.ebuild 833
-MD5 27138b124416b5509df89292bb40c892 wmbiff-0.4.20.ebuild 980
+MD5 8f7cc73ff9255104b8c20f346378870d wmbiff-0.4.25.ebuild 833
 MD5 e84517c77095652edc87803d423092d1 files/digest-wmbiff-0.4.25 65
-MD5 218b9bd8a41dfb0bcf674649d9fbc46e files/digest-wmbiff-0.4.20 65
-MD5 08fb71973cf15498b2586af8e4c5656e files/wmbiff-0.4.20-crypto-api-fix.patch 3547
+MD5 e84517c77095652edc87803d423092d1 files/digest-wmbiff-0.4.25-r1 65
+MD5 988ba1c28ca012c99a062db781ef997c files/wmbiff-0.4.25-crypto-api-fix.patch 646
diff --git a/x11-plugins/wmbiff/files/digest-wmbiff-0.4.20 b/x11-plugins/wmbiff/files/digest-wmbiff-0.4.20
deleted file mode 100644
index 5898bd29bda2..000000000000
--- a/x11-plugins/wmbiff/files/digest-wmbiff-0.4.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e9f93c4618e6ab35f4d89ced2ea477f5 wmbiff-0.4.20.tar.gz 194161
diff --git a/x11-plugins/wmbiff/files/digest-wmbiff-0.4.25-r1 b/x11-plugins/wmbiff/files/digest-wmbiff-0.4.25-r1
new file mode 100644
index 000000000000..e65ac741657e
--- /dev/null
+++ b/x11-plugins/wmbiff/files/digest-wmbiff-0.4.25-r1
@@ -0,0 +1 @@
+MD5 bf80e6b3e8c2776ec1f82060c941f81d wmbiff-0.4.25.tar.gz 200270
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
deleted file mode 100644
index 69838bd709e0..000000000000
--- a/x11-plugins/wmbiff/files/wmbiff-0.4.20-crypto-api-fix.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-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/files/wmbiff-0.4.25-crypto-api-fix.patch b/x11-plugins/wmbiff/files/wmbiff-0.4.25-crypto-api-fix.patch
new file mode 100644
index 000000000000..eb99b8f430d2
--- /dev/null
+++ b/x11-plugins/wmbiff/files/wmbiff-0.4.25-crypto-api-fix.patch
@@ -0,0 +1,14 @@
+diff -Naur wmbiff-0.4.25-orig/wmbiff/tlsComm.c wmbiff-0.4.25/wmbiff/tlsComm.c
+--- wmbiff-0.4.25-orig/wmbiff/tlsComm.c	2004-06-23 17:44:45.000000000 -0400
++++ wmbiff-0.4.25/wmbiff/tlsComm.c	2005-03-17 13:07:28.643262198 -0500
+@@ -407,10 +407,6 @@
+ 							"server's certificate is invalid or not X.509.\n"
+ 							"there may be a problem with the certificate stored in your certfile\n");
+ 		}
+-	} else if (certstat & GNUTLS_CERT_NOT_TRUSTED) {
+-		TDM(DEBUG_INFO, "server's certificate is not trusted.\n");
+-		TDM(DEBUG_INFO,
+-			"to verify that a certificate is trusted, use the certfile option.\n");
+ 	}
+ 
+ 	if (gnutls_x509_crt_init(&cert) < 0) {
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.20.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild
index c516df3f1e39..b4b6edb31706 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.20.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # 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.5 2004/06/24 23:05:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild,v 1.1 2005/05/10 08:34:04 s4t4n Exp $
 
 inherit eutils
 
@@ -9,15 +9,16 @@ SRC_URI="mirror://sourceforge/wmbiff/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/wmbiff/"
 
 DEPEND="virtual/x11
-		crypt? ( net-libs/gnutls
-			dev-libs/libgcrypt )"
+		crypt? ( >=net-libs/gnutls-1.0.4
+			>=dev-libs/libgcrypt-1.1.94 )"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc amd64 ppc"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
 IUSE="crypt"
 
-src_unpack() {
+src_unpack()
+{
 	unpack ${A}
 	cd ${S}
 	if use crypt; then
@@ -27,7 +28,8 @@ src_unpack() {
 	fi
 }
 
-src_compile() {
+src_compile()
+{
 	local myconf
 	if ! use crypt; then
 			myconf="--disable-crypto"
@@ -36,7 +38,8 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install()
+{
 	make DESTDIR="${D}" install || die
-	dodoc ChangeLog  FAQ NEWS  README  README.licq  TODO
+	dodoc ChangeLog  FAQ NEWS  README  README.licq  TODO  wmbiff/sample.wmbiffrc
 }
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild
index 785e7e4a375d..d5477170fc46 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild,v 1.5 2004/11/26 16:37:32 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild,v 1.6 2005/05/10 08:34:04 s4t4n Exp $
 
 DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes."
 SRC_URI="mirror://sourceforge/wmbiff/${P}.tar.gz"