From 69da56efbc089642e94bdccf9528e4716ab8fc1a Mon Sep 17 00:00:00 2001 From: tron Date: Fri, 27 Aug 2004 10:10:22 +0000 Subject: Update "wmbiff" package to version 0.4.25. Changes since version 0.4.19: - Fix a build error in the new gnutls certificate verification code on s390. - Use GNUTLS 1.0.4 and GCRYPT 1.1.90, current Debian unstable package libgnutls10-dev. - Allow server hostnames in IMAP to be IP addresses (start with a number). - Skip examine/search unless requested with msglst option. - Exit if ssh-askpass permissions check fails. - Fix a bug where fetch times out to some IMAP servers. - Add --disable-crypto for source-based distributions while libgcrypt is unstable. - Sam Izzo's patch for changing the mouse click action depending on whether a box has new mail. The update is based on changes provided by Joel Carnat in private e-mail. --- mail/wmbiff/Makefile | 6 ++-- mail/wmbiff/distinfo | 10 +++---- mail/wmbiff/patches/patch-ab | 66 +++++++++++++++++++++----------------------- mail/wmbiff/patches/patch-ac | 22 --------------- mail/wmbiff/patches/patch-ad | 13 --------- 5 files changed, 38 insertions(+), 79 deletions(-) delete mode 100644 mail/wmbiff/patches/patch-ac delete mode 100644 mail/wmbiff/patches/patch-ad (limited to 'mail/wmbiff') diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile index 24e6a322c73..24080feaf51 100644 --- a/mail/wmbiff/Makefile +++ b/mail/wmbiff/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.16 2004/02/25 19:04:19 minskim Exp $ +# $NetBSD: Makefile,v 1.17 2004/08/27 10:10:22 tron Exp $ -DISTNAME= wmbiff-0.4.19 -PKGREVISION= 2 +DISTNAME= wmbiff-0.4.25 CATEGORIES= mail x11 windowmaker MASTER_SITES= $(MASTER_SITE_SOURCEFORGE:=wmbiff/) @@ -23,4 +22,5 @@ post-install: .include "../../graphics/xpm/buildlink3.mk" .include "../../wm/windowmaker/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" +.include "../../security/gnutls/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/wmbiff/distinfo b/mail/wmbiff/distinfo index d12e643d703..38fb472f5c4 100644 --- a/mail/wmbiff/distinfo +++ b/mail/wmbiff/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.7 2003/12/06 16:10:48 tron Exp $ +$NetBSD: distinfo,v 1.8 2004/08/27 10:10:22 tron Exp $ -SHA1 (wmbiff-0.4.19.tar.gz) = 178ff159eefea22b9420bd7a0a70ea42103f98a4 -Size (wmbiff-0.4.19.tar.gz) = 189405 bytes +SHA1 (wmbiff-0.4.25.tar.gz) = c5529766c55d692e2a76eaeb21d9c231da0780a8 +Size (wmbiff-0.4.25.tar.gz) = 200270 bytes SHA1 (patch-aa) = 2007bd498ef54b6fc9779092bcf0771e41dec8e0 -SHA1 (patch-ab) = f9de1d26626c6c78c337c5d267f7b4543f218a2b -SHA1 (patch-ac) = e6084c27e4ec33966fef498f4179fc84becd5203 -SHA1 (patch-ad) = 292cc16faf9c13b0e53f1dd547b170c32f18dbdb +SHA1 (patch-ab) = d84f1c4333d7c192748f5170460563ae7fe0955d diff --git a/mail/wmbiff/patches/patch-ab b/mail/wmbiff/patches/patch-ab index 59acc47d1cd..6017e33b4c4 100644 --- a/mail/wmbiff/patches/patch-ab +++ b/mail/wmbiff/patches/patch-ab @@ -1,39 +1,35 @@ -$NetBSD: patch-ab,v 1.4 2003/12/06 16:10:48 tron Exp $ +$NetBSD: patch-ab,v 1.5 2004/08/27 10:10:22 tron Exp $ ---- 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 - #include +--- wmbiff/ShellClient.c.orig 2004-06-18 23:28:16.000000000 +0200 ++++ wmbiff/ShellClient.c 2004-08-27 12:03:23.000000000 +0200 +@@ -152,6 +152,21 @@ + return (strdup_ordie(bigbuffer)); + } -+#if defined(FreeBSD) || defined(__NetBSD__) || defined(__OpenBSD__) -+#include -+#endif ++static char *mystrcasestr(const char *big, const char *little) ++{ ++ int blen, llen; + -+#ifndef _PATH_MAILDIR -+#define _PATH_MAILDIR "/var/mail" -+#endif ++ blen = strlen(big); ++ llen = strlen(little); ++ while (blen >= llen) { ++ if (strncasecmp(big, little, llen) == 0) ++ return (char *)big; ++ big++; ++ blen--; ++ } ++ return NULL; ++} + - #include "../wmgeneral/wmgeneral.h" - #include "../wmgeneral/misc.h" - -@@ -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 */ -- DMA(DEBUG_INFO, "Using /var/mail/%s.\n", m); -- strcpy(mbox[0].path, "/var/mail/"); -+ DMA(DEBUG_INFO, "Using " _PATH_MAILDIR "/%s.\n", m); -+ strcpy(mbox[0].path, _PATH_MAILDIR); - strcat(mbox[0].path, m); - } else { - DMA(DEBUG_ERROR, "Cannot open config file '%s' nor use the " + int shellCmdCheck(Pop3 pc) + { + int count_status = 0; +@@ -189,7 +204,7 @@ + pc->UnreadMsgs = 0; + pc->TotalMsgs = count_status; + } +- } else if (strcasestr(commandOutput, "unable")) { ++ } else if (mystrcasestr(commandOutput, "unable") != NULL) { + return -1; + } else if (sscanf(commandOutput, "%9s\n", pc->TextStatus) == 1) { + /* validate the string input */ diff --git a/mail/wmbiff/patches/patch-ac b/mail/wmbiff/patches/patch-ac deleted file mode 100644 index 2d2cd1a4631..00000000000 --- a/mail/wmbiff/patches/patch-ac +++ /dev/null @@ -1,22 +0,0 @@ -$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 deleted file mode 100644 index e27d191e143..00000000000 --- a/mail/wmbiff/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$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); -- cgit v1.2.3