Date: Sat, 28 Sep 2019 21:29:29 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513169 - in head: . mail mail/fetchmail mail/fetchmail/files mail/fetchmailconf Message-ID: <201909282129.x8SLTTVE085072@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Sat Sep 28 21:29:28 2019 New Revision: 513169 URL: https://svnweb.freebsd.org/changeset/ports/513169 Log: mail/fetchmail: update to 6.4.1. Release notes: https://sourceforge.net/projects/fetchmail/files/branch_6.4/ While here, remove fetchmail64 port, now no longer needed. PR: 240908 Submitted by: chalpin@cs.wisc.edu (maintainer) Added: head/mail/fetchmail/files/patch-ZZZ-87626c2707cc0d82e49e160ab3c85430ff33534f (contents, props changed) Deleted: head/mail/fetchmail/files/patch-SNI-Gitlab-9b8b634 head/mail/fetchmail/files/patch-fetchmail.c head/mail/fetchmail/files/patch-socket.c Modified: head/MOVED head/mail/Makefile head/mail/fetchmail/Makefile head/mail/fetchmail/distinfo head/mail/fetchmail/files/patch-configure head/mail/fetchmail/pkg-plist head/mail/fetchmailconf/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Sat Sep 28 20:04:18 2019 (r513168) +++ head/MOVED Sat Sep 28 21:29:28 2019 (r513169) @@ -12980,3 +12980,4 @@ graphics/p5-Geo-Proj4||2019-09-28|Has expired: Can not misc/zygrib-maps||2019-09-28|Removed, depends on expired misc/zygrib graphics/p5-Geo-Point||2019-09-28|Removed, depends on expired graphics/p5-Geo-Proj4 x11/rubygem-gnome2|x11/rubygem-gnome|2019-09-28|Upstream changed the project name from Ruby-GNOME2 to Ruby-GNOME +mail/fetchmail64|mail/fetchmail|2019-09-28|mail/fetchmail now provides the same version Modified: head/mail/Makefile ============================================================================== --- head/mail/Makefile Sat Sep 28 20:04:18 2019 (r513168) +++ head/mail/Makefile Sat Sep 28 21:29:28 2019 (r513169) @@ -132,7 +132,6 @@ SUBDIR += fastforward SUBDIR += fdm SUBDIR += fetchmail - SUBDIR += fetchmail64 SUBDIR += fetchmailconf SUBDIR += filtermail SUBDIR += findmaildirs Modified: head/mail/fetchmail/Makefile ============================================================================== --- head/mail/fetchmail/Makefile Sat Sep 28 20:04:18 2019 (r513168) +++ head/mail/fetchmail/Makefile Sat Sep 28 21:29:28 2019 (r513169) @@ -2,15 +2,10 @@ # $FreeBSD$ PORTNAME?= fetchmail -PORTVERSION= 6.3.26 -PORTREVISION?= 11 +PORTVERSION= 6.4.1 CATEGORIES= mail ipv6 -MASTER_SITES= SF/${PORTNAME}/branch_6.3-obsolete/ \ - http://mandree.home.pages.de/${PORTNAME}/ +MASTER_SITES= SF/${PORTNAME}/branch_6.4/ -PATCH_SITES= https://src.fedoraproject.org/rpms/fetchmail/raw/master/f/:fedora -PATCHFILES= fetchmail-6.3.26-ssl-backport.patch:-p1:fedora - MAINTAINER= chalpin@cs.wisc.edu COMMENT?= Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR @@ -28,8 +23,6 @@ GROUPS= ${USERS} USE_RC_SUBR= fetchmail SUB_FILES= pkg-message -CONFLICTS_INSTALL= fetchmail-6.4* - GNU_CONFIGURE= yes # the added PYTHON=: suppresses python builds, @@ -37,14 +30,12 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-opie --enable-RPA --enable-SDPS \ --without-hesiod --enable-fallback=no \ --with-ssl=${OPENSSLBASE} PYTHON=: -# In case the user had an SSL-v2-capable SSL build, disable it: -CONFIGURE_ENV= ac_cv_have_decl_SSLv2_client_method=no # -Wl,--as-needed suppresses unneeded library references, # for instance, libcom_err.so on GSSAPI_NONE builds: LDFLAGS+= -L${LOCALBASE}/lib -Wl,--as-needed -OPTIONS_DEFINE= NLS NTLM POP2 DOCS +OPTIONS_DEFINE= NLS DOCS OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= GSSAPI_BASE @@ -58,20 +49,13 @@ GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --with-kerberos5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_NONE_CONFIGURE_ON= --without-gssapi -POP2_DESC= POP2 Protocol support [obsolete] - NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -NTLM_CONFIGURE_ENABLE= NTLM -NTLM_PORTDOCS= README.NTLM - -# POP2 is obsolete -POP2_CONFIGURE_ENABLE= POP2 - -PORTDOCS= FAQ FEATURES NEWS NOTES README README.SSL \ +PORTDOCS= FAQ FEATURES NEWS NOTES OLDNEWS \ + README README.SSL README.SSL-SERVER \ design-notes.html fetchmail-FAQ.html fetchmail-features.html \ - esrs-design-notes.html + esrs-design-notes.html todo.html post-patch: .if !exists(/usr/lib/libcom_err.so) @@ -80,11 +64,7 @@ post-patch: .endif -# this avoids rebuilding the autotools rigs, i. e. USES+=autoreconf. -# It will clobber the AC_CHECK_DECLS([SSLv3_client_method],,,[#include <openssl/ssl.h>]) -# so we've put that into files/patch-configure as well: -pre-configure: - @${TOUCH} -d 2010-01-01T00:00:00 ${WRKSRC}/configure.ac +PATCH_STRIP= -p1 .if empty(MASTERDIR) post-build: Modified: head/mail/fetchmail/distinfo ============================================================================== --- head/mail/fetchmail/distinfo Sat Sep 28 20:04:18 2019 (r513168) +++ head/mail/fetchmail/distinfo Sat Sep 28 21:29:28 2019 (r513169) @@ -1,7 +1,3 @@ -TIMESTAMP = 1546191531 -SHA256 (fetchmail-6.3.26.tar.xz) = 79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850 -SIZE (fetchmail-6.3.26.tar.xz) = 1283816 -SHA256 (9b8b634.patch) = b0a9f7e28e7e6a5a16669832ad7a7a7dca47b435ce446ef10bd0421deea4a848 -SIZE (9b8b634.patch) = 1023 -SHA256 (fetchmail-6.3.26-ssl-backport.patch) = a34b1a6becf731e2ef029a1c5ee3a82a7bbb1e2487b6f3be15bbb4e7dc8b500d -SIZE (fetchmail-6.3.26-ssl-backport.patch) = 31596 +TIMESTAMP = 1569677341 +SHA256 (fetchmail-6.4.1.tar.xz) = 3f33f11dd08c3e8cc3e9d18eec686b1626d4818f4d5a72791507bbc4dce6a9a0 +SIZE (fetchmail-6.4.1.tar.xz) = 1257488 Added: head/mail/fetchmail/files/patch-ZZZ-87626c2707cc0d82e49e160ab3c85430ff33534f ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/fetchmail/files/patch-ZZZ-87626c2707cc0d82e49e160ab3c85430ff33534f Sat Sep 28 21:29:28 2019 (r513169) @@ -0,0 +1,159 @@ +From 87626c2707cc0d82e49e160ab3c85430ff33534f Mon Sep 17 00:00:00 2001 +From: Matthias Andree <matthias.andree@gmx.de> +Date: Sat, 24 Aug 2019 17:53:08 +0200 +Subject: [PATCH] Properly report size of mailboxes of 2 GibiB or above. + +To fix Debian Bug#873668, reported by Andreas Schmidt. +This requires C99's new long long type. +--- + NEWS | 7 +++++++ + driver.c | 7 ++++--- + etrn.c | 2 +- + fetchmail.h | 2 +- + imap.c | 2 +- + odmr.c | 2 +- + pop2.c | 2 +- + pop3.c | 4 ++-- + 8 files changed, 18 insertions(+), 10 deletions(-) + +diff --git a/NEWS b/NEWS +index c01f9df9..9485edca 100644 +--- a/NEWS ++++ b/NEWS +@@ -63,5 +63,12 @@ + + -------------------------------------------------------------------------------- + ++## BUG FIXES ++* fetchmail can now report mailbox sizes of 2^31 octets and beyond. ++ This requires C99 support (for the long long type). ++ Fixes Debian Bug#873668, reported by Andreas Schmidt. ++ ++-------------------------------------------------------------------------------- ++ + fetchmail-6.4.1 (released 2019-09-28, 27473 LoC): + +diff --git a/driver.c b/driver.c +index d21a32ab..a5033729 100644 +--- a/driver.c ++++ b/driver.c +@@ -932,7 +932,7 @@ static int do_session( + { + /* sigsetjmp returned zero -> normal operation */ + char buf[MSGBUFSIZE+1], *realhost; +- int count, newm, bytes; ++ int count, newm; + int fetches, dispatches, transient_errors, oldphase; + struct idlist *idp; + +@@ -1306,6 +1306,7 @@ is restored.")); + + /* compute # of messages and number of new messages waiting */ + stage = STAGE_GETRANGE; ++ unsigned long long bytes; + err = (ctl->server.base_protocol->getrange)(mailserver_socket, ctl, idp->id, &count, &newm, &bytes); + if (err != 0) + goto cleanUp; +@@ -1335,10 +1336,10 @@ is restored.")); + "%d messages for %s", + count), + count, buf); +- if (bytes == -1) ++ if (bytes == (unsigned long long)-1) // mailbox size unsupported + report_complete(stdout, ".\n"); + else +- report_complete(stdout, GT_(" (%d octets).\n"), bytes); ++ report_complete(stdout, GT_(" (%llu octets).\n"), bytes); + } + else + { +diff --git a/etrn.c b/etrn.c +index f3fab0ce..12b9d3fd 100644 +--- a/etrn.c ++++ b/etrn.c +@@ -31,7 +31,7 @@ static int etrn_ok (int sock, char *argbuf) + } + + static int etrn_getrange(int sock, struct query *ctl, const char *id, +- int *countp, int *newp, int *bytes) ++ int *countp, int *newp, unsigned long long *bytes) + /* send ETRN and interpret the response */ + { + int ok, opts; +diff --git a/fetchmail.h b/fetchmail.h +index 23ba6e6e..72259e10 100644 +--- a/fetchmail.h ++++ b/fetchmail.h +@@ -210,7 +210,7 @@ struct method /* describe methods for protocol state machine */ + /* response_parsing function */ + int (*getauth)(int, struct query *, char *); + /* authorization fetcher */ +- int (*getrange)(int, struct query *, const char *, int *, int *, int *); ++ int (*getrange)(int, struct query *, const char *, int *, int *, unsigned long long *); + /* get message range to fetch */ + int (*getsizes)(int, int, int *); + /* get sizes of messages */ +diff --git a/imap.c b/imap.c +index 7b80679a..7836acd7 100644 +--- a/imap.c ++++ b/imap.c +@@ -883,7 +883,7 @@ static int imap_search(int sock, struct query *ctl, int count) + static int imap_getrange(int sock, + struct query *ctl, + const char *folder, +- int *countp, int *newp, int *bytes) ++ int *countp, int *newp, unsigned long long *bytes) + /* get range of messages to be fetched */ + { + int ok; +diff --git a/odmr.c b/odmr.c +index 85decb6d..d1c011c4 100644 +--- a/odmr.c ++++ b/odmr.c +@@ -36,7 +36,7 @@ static int odmr_ok (int sock, char *argbuf) + } + + static int odmr_getrange(int sock, struct query *ctl, const char *id, +- int *countp, int *newp, int *bytes) ++ int *countp, int *newp, unsigned long long *bytes) + /* send ODMR and then run a reverse SMTP session */ + { + int ok, opts, smtp_sock; +diff --git a/pop2.c b/pop2.c +index 7c843616..5a5a1bd1 100644 +--- a/pop2.c ++++ b/pop2.c +@@ -80,7 +80,7 @@ static int pop2_getauth(int sock, struct query *ctl, char *buf) + } + + static int pop2_getrange(int sock, struct query *ctl, const char *folder, +- int *countp, int *newp, int *bytes) ++ int *countp, int *newp, unsigned long long *bytes) + /* get range of messages to be fetched */ + { + (void)ctl; +diff --git a/pop3.c b/pop3.c +index 6efe1b7e..25efbaad 100644 +--- a/pop3.c ++++ b/pop3.c +@@ -969,7 +969,7 @@ static int pop3_slowuidl( int sock, struct query *ctl, int *countp, int *newp) + static int pop3_getrange(int sock, + struct query *ctl, + const char *folder, +- int *countp, int *newp, int *bytes) ++ int *countp, int *newp, unsigned long long *bytes) + /* get range of messages to be fetched */ + { + int ok; +@@ -992,7 +992,7 @@ static int pop3_getrange(int sock, + if (ok == 0) { + int asgn; + +- asgn = sscanf(buf,"%d %d", countp, bytes); ++ asgn = sscanf(buf,"%d %llu", countp, bytes); + if (asgn != 2) + return PS_PROTOCOL; + } else +-- +2.22.0 + Modified: head/mail/fetchmail/files/patch-configure ============================================================================== --- head/mail/fetchmail/files/patch-configure Sat Sep 28 20:04:18 2019 (r513168) +++ head/mail/fetchmail/files/patch-configure Sat Sep 28 21:29:28 2019 (r513169) @@ -1,5 +1,5 @@ ---- configure.orig 2013-04-23 21:36:55 UTC -+++ configure +--- a/configure.orig 2013-04-23 21:36:55 UTC ++++ b/configure @@ -9552,11 +9552,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" @@ -28,26 +28,3 @@ ; return 0; } -@@ -10131,6 +10131,22 @@ fi - - cat >>confdefs.h <<_ACEOF - #define HAVE_DECL_SSLV2_CLIENT_METHOD $ac_have_decl -+_ACEOF -+ -+ ;; -+esac -+ -+case "$LIBS" in *-lssl*) -+ ac_fn_c_check_decl "$LINENO" "SSLv3_client_method" "ac_cv_have_decl_SSLv3_client_method" "#include <openssl/ssl.h> -+" -+if test "x$ac_cv_have_decl_SSLv3_client_method" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_SSLV3_CLIENT_METHOD $ac_have_decl - _ACEOF - - ;; Modified: head/mail/fetchmail/pkg-plist ============================================================================== --- head/mail/fetchmail/pkg-plist Sat Sep 28 20:04:18 2019 (r513168) +++ head/mail/fetchmail/pkg-plist Sat Sep 28 21:29:28 2019 (r513169) @@ -4,24 +4,24 @@ man/man1/fetchmail.1.gz %%NLS%%share/locale/cs/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/da/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/de/LC_MESSAGES/fetchmail.mo -%%NLS%%share/locale/el/LC_MESSAGES/fetchmail.mo +@comment %%NLS%%share/locale/el/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/eo/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/es/LC_MESSAGES/fetchmail.mo -%%NLS%%share/locale/fi/LC_MESSAGES/fetchmail.mo +@comment %%NLS%%share/locale/fi/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/fr/LC_MESSAGES/fetchmail.mo -%%NLS%%share/locale/gl/LC_MESSAGES/fetchmail.mo +@comment %%NLS%%share/locale/gl/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/id/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/it/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/ja/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/nl/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/pl/LC_MESSAGES/fetchmail.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/fetchmail.mo +@comment %%NLS%%share/locale/pt_BR/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/ru/LC_MESSAGES/fetchmail.mo -%%NLS%%share/locale/sk/LC_MESSAGES/fetchmail.mo +@comment %%NLS%%share/locale/sk/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/sq/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/sv/LC_MESSAGES/fetchmail.mo -%%NLS%%share/locale/tr/LC_MESSAGES/fetchmail.mo +@comment %%NLS%%share/locale/tr/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/vi/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/fetchmail.mo @sample(fetchmail,fetchmail,600) etc/fetchmailrc.sample Modified: head/mail/fetchmailconf/Makefile ============================================================================== --- head/mail/fetchmailconf/Makefile Sat Sep 28 20:04:18 2019 (r513168) +++ head/mail/fetchmailconf/Makefile Sat Sep 28 21:29:28 2019 (r513169) @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= fetchmailconf -PORTREVISION= 1 DISTNAME= fetchmail-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} MAINTAINER= chalpin@cs.wisc.edu
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909282129.x8SLTTVE085072>