diff options
Diffstat (limited to 'mail/wmbiff')
| -rw-r--r-- | mail/wmbiff/Makefile | 5 | ||||
| -rw-r--r-- | mail/wmbiff/distinfo | 10 | ||||
| -rw-r--r-- | mail/wmbiff/patches/patch-ab | 19 | ||||
| -rw-r--r-- | mail/wmbiff/patches/patch-ac | 22 | ||||
| -rw-r--r-- | mail/wmbiff/patches/patch-ad | 13 |
5 files changed, 57 insertions, 12 deletions
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile index 253f222a5d3..e88273d7492 100644 --- a/mail/wmbiff/Makefile +++ b/mail/wmbiff/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2003/07/13 13:52:28 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2003/12/06 16:10:48 tron Exp $ -DISTNAME= wmbiff-0.4.13 -PKGREVISION= 2 +DISTNAME= wmbiff-0.4.19 CATEGORIES= mail x11 windowmaker MASTER_SITES= $(MASTER_SITE_SOURCEFORGE:=wmbiff/) diff --git a/mail/wmbiff/distinfo b/mail/wmbiff/distinfo index da2303cfe83..d12e643d703 100644 --- a/mail/wmbiff/distinfo +++ b/mail/wmbiff/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.6 2003/01/31 12:57:07 tron Exp $ +$NetBSD: distinfo,v 1.7 2003/12/06 16:10:48 tron Exp $ -SHA1 (wmbiff-0.4.13.tar.gz) = 3e8efffb6a2d0456b88bc4f0f990ffaf41f8fa10 -Size (wmbiff-0.4.13.tar.gz) = 176897 bytes +SHA1 (wmbiff-0.4.19.tar.gz) = 178ff159eefea22b9420bd7a0a70ea42103f98a4 +Size (wmbiff-0.4.19.tar.gz) = 189405 bytes SHA1 (patch-aa) = 2007bd498ef54b6fc9779092bcf0771e41dec8e0 -SHA1 (patch-ab) = 297984c76e062f11ead42a2b834ab9dc81d2bdd5 +SHA1 (patch-ab) = f9de1d26626c6c78c337c5d267f7b4543f218a2b +SHA1 (patch-ac) = e6084c27e4ec33966fef498f4179fc84becd5203 +SHA1 (patch-ad) = 292cc16faf9c13b0e53f1dd547b170c32f18dbdb diff --git a/mail/wmbiff/patches/patch-ab b/mail/wmbiff/patches/patch-ab index 069f25fc3a4..59acc47d1cd 100644 --- a/mail/wmbiff/patches/patch-ab +++ b/mail/wmbiff/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2003/01/31 12:57:08 tron Exp $ +$NetBSD: patch-ab,v 1.4 2003/12/06 16:10:48 tron Exp $ ---- wmbiff/wmbiff.c.orig Sat Jan 25 07:02:17 2003 -+++ wmbiff/wmbiff.c Thu Jan 30 13:30:38 2003 -@@ -24,6 +24,14 @@ +--- wmbiff/wmbiff.c.orig Sun Nov 9 00:43:50 2003 ++++ wmbiff/wmbiff.c Sat Dec 6 17:04:32 2003 +@@ -25,6 +25,14 @@ #include <errno.h> #include <string.h> @@ -17,7 +17,16 @@ $NetBSD: patch-ab,v 1.3 2003/01/31 12:57:08 tron Exp $ #include "../wmgeneral/wmgeneral.h" #include "../wmgeneral/misc.h" -@@ -363,8 +371,8 @@ +@@ -370,7 +378,7 @@ + " 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_strerror(zok), gcry_check_version(NULL)); + }; + #endif + +@@ -384,8 +392,8 @@ strcpy(mbox[0].path, m); } else if ((m = getenv("USER")) != NULL) { /* we are using MAIL environment var. type mbox */ diff --git a/mail/wmbiff/patches/patch-ac b/mail/wmbiff/patches/patch-ac new file mode 100644 index 00000000000..2d2cd1a4631 --- /dev/null +++ b/mail/wmbiff/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1 2003/12/06 16:10:48 tron Exp $ + +--- wmbiff/Pop3Client.c.orig Sun Nov 9 00:43:50 2003 ++++ wmbiff/Pop3Client.c Sat Dec 6 16:57:51 2003 +@@ -281,7 +281,7 @@ + strcat(buf, " "); + + +- gmh = gcry_md_open(GCRY_MD_MD5, GCRY_MD_FLAG_HMAC); ++ (void) 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); ++ (void) 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); diff --git a/mail/wmbiff/patches/patch-ad b/mail/wmbiff/patches/patch-ad new file mode 100644 index 00000000000..e27d191e143 --- /dev/null +++ b/mail/wmbiff/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2003/12/06 16:10:48 tron Exp $ + +--- wmbiff/Imap4Client.c.orig Sun Nov 9 00:43:50 2003 ++++ wmbiff/Imap4Client.c Sat Dec 6 16:59:14 2003 +@@ -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); ++ (void) 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); |