Update to wmbiff-0.4.27.
- remove no longer needed patches. - remove MAINTAINER upon his request. with tweaks and ok from ajacoutot@
This commit is contained in:
landry
parent
e68b25b9ba
commit
ad86753a71
@ -1,14 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.15 2007/09/16 00:17:07 merdely Exp $
|
||||
# $OpenBSD: Makefile,v 1.16 2007/10/25 21:10:22 landry Exp $
|
||||
|
||||
COMMENT= wm-dockapp; multiple mailbox checker
|
||||
DISTNAME= wmbiff-0.4.22
|
||||
COMMENT= multiple mailbox checker dockapp
|
||||
DISTNAME= wmbiff-0.4.27
|
||||
CATEGORIES= mail x11 x11/windowmaker
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wmbiff/}
|
||||
|
||||
HOMEPAGE= http://wmbiff.sourceforge.net/
|
||||
|
||||
MAINTAINER= Michael Schubert <michael@schubert.cx>
|
||||
|
||||
# GPL
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
@ -24,9 +22,9 @@ CONFIGURE_STYLE=gnu
|
||||
CONFIGURE_ENV+= ac_cv_path_CVS2CL=""
|
||||
|
||||
pre-configure:
|
||||
@perl -pi -e 's,/usr/share/doc/wmbiff/examples/sample.wmbiffrc,\
|
||||
${PREFIX}/share/examples/wmbiff/sample.wmbiffrc,g' \
|
||||
${WRKSRC}/wmbiff/{wmbiff.1,wmbiffrc.5}
|
||||
@perl -pi -e 's,/usr/share/doc/wmbiff/examples/,\
|
||||
${PREFIX}/share/examples/wmbiff/,g' \
|
||||
${WRKSRC}/wmbiff/{wmbiff.1,wmbiffrc.5.in}
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/wmbiff
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (wmbiff-0.4.22.tar.gz) = BI//gbKM7aZxQLvkPi3vFg==
|
||||
RMD160 (wmbiff-0.4.22.tar.gz) = AFbA9kBMOKoUjO6W3yj2qFBfaH0=
|
||||
SHA1 (wmbiff-0.4.22.tar.gz) = fGJkuHCHlJwpoKoL+m4bgwqMoeU=
|
||||
SHA256 (wmbiff-0.4.22.tar.gz) = fE09dCuVEFSQ6L0P+utBTUc0N0F4HDL4q6rfa7AsIcE=
|
||||
SIZE (wmbiff-0.4.22.tar.gz) = 194775
|
||||
MD5 (wmbiff-0.4.27.tar.gz) = UEZrbkoUPPTlVUazTVeS5g==
|
||||
RMD160 (wmbiff-0.4.27.tar.gz) = 0diDGWewU51W6w13KGRC66+4prg=
|
||||
SHA1 (wmbiff-0.4.27.tar.gz) = LISZPXjiK1BhGSQSFhvCeioaMAc=
|
||||
SHA256 (wmbiff-0.4.27.tar.gz) = wlt7PTpd27+p+Fuzn1U/W8ABGJ/GJOZ2HZhjaQaNfaM=
|
||||
SIZE (wmbiff-0.4.27.tar.gz) = 201713
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$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);
|
||||
@ -1,21 +0,0 @@
|
||||
$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);
|
||||
@ -1,12 +0,0 @@
|
||||
$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 */
|
||||
@ -1,19 +0,0 @@
|
||||
$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");
|
||||
|
||||
}
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
$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,
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-wmbiff_wmbiff_c,v 1.4 2004/05/08 06:52:46 sturm Exp $
|
||||
--- wmbiff/wmbiff.c.orig 2004-04-25 11:17:22.000000000 +0200
|
||||
+++ wmbiff/wmbiff.c 2004-04-25 11:16:54.000000000 +0200
|
||||
@@ -445,7 +445,7 @@ static void init_biff(char *config_file)
|
||||
" 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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user