update to fetchmail-6.4.1

This commit is contained in:
sthen 2020-01-27 13:48:45 +00:00
parent ef49b24e60
commit 00b10cf194
7 changed files with 16 additions and 89 deletions

View File

@ -1,13 +1,14 @@
# $OpenBSD: Makefile,v 1.152 2019/07/12 20:47:27 sthen Exp $
# $OpenBSD: Makefile,v 1.153 2020/01/27 13:48:45 sthen Exp $
COMMENT= mail retrieval utility for POP2, POP3, KPOP, IMAP and more
DISTNAME= fetchmail-6.3.26
DISTNAME= fetchmail-6.4.1
EXTRACT_SUFX= .tar.xz
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fetchmail/}
REVISION= 3
HOMEPAGE= http://www.fetchmail.info/
HOMEPAGE= https://www.fetchmail.info/
# GPLv2+
PERMIT_PACKAGE= Yes
@ -21,18 +22,16 @@ SUBST_VARS+= MODPY_LIBDIR
BUILD_DEPENDS= devel/bison
LIB_DEPENDS= devel/gettext,-runtime
CONFIGURE_STYLE= gnu
SEPARATE_BUILD= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.68
CFLAGS= -I${LOCALBASE}/include
PORTHOME= ${WRKDIR}
CONFIGURE_ENV= PYTHON=: YACC="bison -y"
CONFIGURE_ARGS= --with-ssl \
--enable-NTLM
USE_GROFF= Yes# uses www.tmac for .URL tags
EXTRACT_SUFX= .tar.xz
DOCS= FAQ NOTES FEATURES README COPYING fetchmail-FAQ.html \
fetchmail-features.html design-notes.html todo.html

View File

@ -1,2 +1,2 @@
SHA256 (fetchmail-6.3.26.tar.xz) = ebTFTNuvAsGpppHZlI/LGnehWRqBPpBCg6i2FLdX6FA=
SIZE (fetchmail-6.3.26.tar.xz) = 1283816
SHA256 (fetchmail-6.4.1.tar.xz) = PzPxHdCMPozD6dGO7GhrFibUgY9NWnJ5FQe7xNzmqaA=
SIZE (fetchmail-6.4.1.tar.xz) = 1257488

View File

@ -1,7 +1,9 @@
$OpenBSD: patch-Makefile_in,v 1.19 2014/06/21 07:58:28 jasper Exp $
--- Makefile.in.orig Tue Apr 23 23:36:56 2013
+++ Makefile.in Sat Jun 21 09:56:32 2014
@@ -1670,7 +1670,7 @@ info: info-recursive
$OpenBSD: patch-Makefile_in,v 1.20 2020/01/27 13:48:45 sthen Exp $
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -2102,7 +2102,7 @@ info: info-recursive
info-am:

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-config_h_in,v 1.2 2015/08/25 17:44:09 jca Exp $
Fixed upstream
https://gitlab.com/fetchmail/fetchmail/commit/a2ae6f8d15d7caf815d7bdd13df833fd1b2af5cc
--- config.h.in.orig Fri Jul 17 22:18:55 2015
+++ config.h.in Fri Jul 17 22:19:14 2015
@@ -53,6 +53,10 @@
if you don't. */
#undef HAVE_DECL_SSLV2_CLIENT_METHOD
+/* Define to 1 if you have the declaration of `SSLv3_client_method', and to 0
+ if you don't. */
+#undef HAVE_DECL_SSLV3_CLIENT_METHOD
+
/* Define to 1 if you have the declaration of `strerror', and to 0 if you
don't. */
#undef HAVE_DECL_STRERROR

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.6 2015/08/25 17:44:09 jca Exp $
Fixed upstream
https://gitlab.com/fetchmail/fetchmail/commit/a2ae6f8d15d7caf815d7bdd13df833fd1b2af5cc
--- configure.ac.orig Fri Jul 17 22:20:20 2015
+++ configure.ac Fri Jul 17 22:20:34 2015
@@ -803,6 +803,7 @@ fi
case "$LIBS" in *-lssl*)
AC_CHECK_DECLS([SSLv2_client_method],,,[#include <openssl/ssl.h>])
+ AC_CHECK_DECLS([SSLv3_client_method],,,[#include <openssl/ssl.h>])
;;
esac

View File

@ -1,33 +0,0 @@
$OpenBSD: patch-socket_c,v 1.10 2017/08/11 04:18:19 bluhm Exp $
Reported upstream
https://gitlab.com/fetchmail/fetchmail/merge_requests/5
Fixed upstream
https://gitlab.com/fetchmail/fetchmail/commit/a2ae6f8d15d7caf815d7bdd13df833fd1b2af5cc
Index: socket.c
--- socket.c.orig
+++ socket.c
@@ -111,7 +111,7 @@ static char *const *parse_plugin(const char *plugin, c
return NULL;
}
- while (plugin_copy_offset < plugin_copy_len)
+ while (plugin_offset < plugin_len && plugin_copy_offset < plugin_copy_len)
{ if ((plugin[plugin_offset] == '%') && (plugin[plugin_offset + 1] == 'h'))
{ strcpy(plugin_copy + plugin_copy_offset, host);
plugin_offset += 2;
@@ -914,7 +914,12 @@ int SSLOpen(int sock, char *mycert, char *mykey, const
return -1;
#endif
} else if(!strcasecmp("ssl3",myproto)) {
+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 > 0
_ctx[sock] = SSL_CTX_new(SSLv3_client_method());
+#else
+ report(stderr, GT_("Your operating system does not support SSLv3.\n"));
+ return -1;
+#endif
} else if(!strcasecmp("tls1",myproto)) {
_ctx[sock] = SSL_CTX_new(TLSv1_client_method());
} else if (!strcasecmp("ssl23",myproto)) {

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.21 2014/06/21 07:58:28 jasper Exp $
@comment $OpenBSD: PLIST,v 1.22 2020/01/27 13:48:45 sthen Exp $
@bin bin/fetchmail
bin/fetchmailconf
libexec/fetchmailconf.bin
@ -18,27 +18,21 @@ share/locale/ca/LC_MESSAGES/fetchmail.mo
share/locale/cs/LC_MESSAGES/fetchmail.mo
share/locale/da/LC_MESSAGES/fetchmail.mo
share/locale/de/LC_MESSAGES/fetchmail.mo
share/locale/el/LC_MESSAGES/fetchmail.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/fetchmail.mo
share/locale/eo/LC_MESSAGES/fetchmail.mo
share/locale/es/LC_MESSAGES/fetchmail.mo
share/locale/fi/LC_MESSAGES/fetchmail.mo
share/locale/fr/LC_MESSAGES/fetchmail.mo
share/locale/gl/LC_MESSAGES/fetchmail.mo
share/locale/id/LC_MESSAGES/fetchmail.mo
share/locale/it/LC_MESSAGES/fetchmail.mo
share/locale/ja/LC_MESSAGES/fetchmail.mo
share/locale/nl/LC_MESSAGES/fetchmail.mo
share/locale/pl/LC_MESSAGES/fetchmail.mo
share/locale/pt_BR/LC_MESSAGES/fetchmail.mo
share/locale/ru/LC_MESSAGES/fetchmail.mo
share/locale/sk/LC_MESSAGES/fetchmail.mo
share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/fetchmail.mo
share/locale/sv/LC_MESSAGES/fetchmail.mo
share/locale/tr/LC_MESSAGES/fetchmail.mo
share/locale/vi/LC_MESSAGES/fetchmail.mo
share/locale/zh_CN/LC_MESSAGES/fetchmail.mo