cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to wmbiff 0.4.22

Browse Source 
use new libgcrypt

ok maintainer Michael Schubert <michael at schubert.cx>
This commit is contained in:
sturm 2004-05-08 06:50:10 +00:00
parent 779a56e919
commit 9e84dea72d
7 changed files with 100 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/wmbiff/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.10 2003/11/06 02:07:07 jolan Exp $
# $OpenBSD: Makefile,v 1.11 2004/05/08 06:50:10 sturm Exp $
COMMENT= "wm-dockapp; multiple mailbox checker"
DISTNAME= wmbiff-0.4.17
DISTNAME= wmbiff-0.4.22
CATEGORIES= mail x11 x11/windowmaker
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wmbiff/}
@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP= Yes
USE_X11= Yes
LIB_DEPENDS= gnutls.8.6::security/gnutls
LIB_DEPENDS= gnutls.12::security/gnutls
CONFIGURE_STYLE=gnu
CONFIGURE_ENV+= ac_cv_path_CVS2CL=""

6
mail/wmbiff/distinfo
View File

@ -1,3 +1,3 @@
MD5 (wmbiff-0.4.17.tar.gz) = 914820af94ee3221ad06683c99c16044
RMD160 (wmbiff-0.4.17.tar.gz) = 4683c129358785807f76b5d756b96571b93568f3
SHA1 (wmbiff-0.4.17.tar.gz) = aaa57296abf1def7f24e4f5a80342b64c30e3ad8
MD5 (wmbiff-0.4.22.tar.gz) = 048fff81b28ceda67140bbe43e2def16
RMD160 (wmbiff-0.4.22.tar.gz) = 0056c0f6404c38aa148cee96df28f6a8505f687d
SHA1 (wmbiff-0.4.22.tar.gz) = 7c6264b87087949c29a0aa0bfa6e1b830a8ca1e5

12
mail/wmbiff/patches/patch-wmbiff_Imap4Client_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-wmbiff_Imap4Client_c,v 1.1 2004/05/08 06:50:10 sturm Exp $
--- wmbiff/Imap4Client.c.orig 2004-04-25 11:22:07.000000000 +0200
+++ wmbiff/Imap4Client.c 2004-04-25 11:22:23.000000000 +0200
@@ -659,7 +659,7 @@ authenticate_md5(Pop3 pc,
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);

21
mail/wmbiff/patches/patch-wmbiff_Pop3Client_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-wmbiff_Pop3Client_c,v 1.1 2004/05/08 06:50:10 sturm Exp $
--- wmbiff/Pop3Client.c.orig 2004-03-28 01:44:11.000000000 +0100
+++ wmbiff/Pop3Client.c 2004-04-25 11:21:12.000000000 +0200
@@ -280,7 +280,7 @@ static FILE *authenticate_md5(Pop3 pc, F
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);
@@ -322,7 +322,7 @@ static FILE *authenticate_apop(Pop3 pc,
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);

12
mail/wmbiff/patches/patch-wmbiff_ShellClient_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-wmbiff_ShellClient_c,v 1.1 2004/05/08 06:50:10 sturm Exp $
--- wmbiff/ShellClient.c.orig 2004-04-25 11:31:49.000000000 +0200
+++ wmbiff/ShellClient.c 2004-04-25 11:36:16.000000000 +0200
@@ -189,7 +189,7 @@ int shellCmdCheck(Pop3 pc)
pc->UnreadMsgs = 0;
pc->TotalMsgs = count_status;
}
- } else if (strcasestr(commandOutput, "unable")) {
+ } else if (!strcasecmp(commandOutput, "unable")) {
return -1;
} else if (sscanf(commandOutput, "%9s\n", pc->TextStatus) == 1) {
/* validate the string input */

19
mail/wmbiff/patches/patch-wmbiff_gnutls-common_c Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-wmbiff_gnutls-common_c,v 1.1 2004/05/08 06:50:10 sturm Exp $
--- wmbiff/gnutls-common.c.orig 2004-04-25 11:30:08.000000000 +0200
+++ wmbiff/gnutls-common.c 2004-04-25 11:31:24.000000000 +0200
@@ -1,5 +1,6 @@
#include <stdio.h>
#include <gnutls/gnutls.h>
+#include <gnutls/compat4.h>
#include <gnutls/extra.h>
#include <time.h>
@@ -192,8 +193,6 @@ void print_cert_vrfy(GNUTLS_STATE state)
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");
}

30
mail/wmbiff/patches/patch-wmbiff_tlsComm_c Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-wmbiff_tlsComm_c,v 1.1 2004/05/08 06:50:10 sturm Exp $
--- wmbiff/tlsComm.c.orig 2004-04-25 11:23:08.000000000 +0200
+++ wmbiff/tlsComm.c 2004-04-25 11:29:18.000000000 +0200
@@ -22,6 +22,7 @@
#ifdef HAVE_GNUTLS_GNUTLS_H
#define USE_GNUTLS
#include <gnutls/gnutls.h>
+#include <gnutls/compat4.h>
#endif
#ifdef USE_DMALLOC
#include <dmalloc.h>
@@ -328,8 +329,6 @@ tls_check_certificate(struct connection_
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) {
@@ -402,8 +401,7 @@ struct connection_state *initialize_gnut
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_ARCFOUR, 0
+ GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_ARCFOUR, 0
};
const int compress[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
const int key_exch[] = { GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS,