Index: branches/2020Q3/mail/fetchmail/Makefile =================================================================== --- branches/2020Q3/mail/fetchmail/Makefile (revision 549454) +++ branches/2020Q3/mail/fetchmail/Makefile (revision 549455) @@ -1,98 +1,98 @@ # Created by: Ville Eerola # $FreeBSD$ PORTNAME?= fetchmail -DISTVERSION= 6.4.8 +DISTVERSION= 6.4.12 CATEGORIES= mail # The next line is inherited by the fetchmailconf slave port, # do NOT replace fetchmail by ${PORTNAME} MASTER_SITES= SF/fetchmail/branch_6.4/ MAINTAINER= chalpin@cs.wisc.edu COMMENT?= Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR LICENSE= GPLv2 LGPL21 LICENSE_COMB= dual .if empty(MASTERDIR) CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss -USES= cpe gmake tar:lz ssl +USES= cpe gmake tar:xz ssl USERS= ${PORTNAME} GROUPS= ${USERS} USE_RC_SUBR= fetchmail SUB_FILES= pkg-message GNU_CONFIGURE= yes # the added PYTHON=: suppresses python builds, # see ../../mail/fetchmailconf/ for the configuration tool CONFIGURE_ARGS= --enable-opie --enable-RPA --enable-SDPS \ --without-hesiod --enable-fallback=no \ --with-ssl=${OPENSSLBASE} PYTHON=: # -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= CA_BUNDLE NLS DOCS OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= CA_BUNDLE GSSAPI_BASE OPTIONS_SUB= yes CA_BUNDLE_DESC= Install CA bundle for OpenSSL GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --with-kerberos5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_NONE_CONFIGURE_ON= --without-gssapi NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls 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 todo.html post-patch: .if !exists(/usr/lib/libcom_err.so) @${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure .endif .endif PATCH_STRIP= -p1 .if empty(MASTERDIR) post-build: ${MAKE_CMD} -C ${WRKSRC} check ; { r=$$? ; ( set -x ; ${CAT} "${WRKSRC}/test-suite.log" ) ; exit $$r ; } post-install: ${INSTALL} -d ${STAGEDIR}/var/run/fetchmail ${INSTALL_DATA} ${FILESDIR}/fetchmailrc.sample \ ${STAGEDIR}${PREFIX}/etc/fetchmailrc.sample ${RM} ${STAGEDIR}${PREFIX}/bin/fetchmailconf ${RM} ${STAGEDIR}${PREFIX}/man/man1/fetchmailconf.1* post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .include .if ${ARCH:Mpowerpc*} && ${OSREL:R} < 13 # as of 2019-10-02, powerpc's base compiler does not yield a working fetchmail. # https://svnweb.freebsd.org/ports?view=revision&revision=513614 -- pkubaj@ USE_GCC= yes .endif .include Index: branches/2020Q3/mail/fetchmail/distinfo =================================================================== --- branches/2020Q3/mail/fetchmail/distinfo (revision 549454) +++ branches/2020Q3/mail/fetchmail/distinfo (revision 549455) @@ -1,3 +1,3 @@ -TIMESTAMP = 1592159098 -SHA256 (fetchmail-6.4.8.tar.lz) = d8e03112a4067e0bf930cba7da20de82d970ad657efa1aeb7fe4e35229cb0ce1 -SIZE (fetchmail-6.4.8.tar.lz) = 1280078 +TIMESTAMP = 1599207773 +SHA256 (fetchmail-6.4.12.tar.xz) = 2b84e0971dbf683ec7edd313f9218adbc7dc51c1de9825b3b549bf619c1a4887 +SIZE (fetchmail-6.4.12.tar.xz) = 1303532 Index: branches/2020Q3/mail/fetchmail/files/patch-ZZZ-87626c2707cc0d82e49e160ab3c85430ff33534f =================================================================== --- branches/2020Q3/mail/fetchmail/files/patch-ZZZ-87626c2707cc0d82e49e160ab3c85430ff33534f (revision 549454) +++ branches/2020Q3/mail/fetchmail/files/patch-ZZZ-87626c2707cc0d82e49e160ab3c85430ff33534f (revision 549455) @@ -1,159 +1,160 @@ From 87626c2707cc0d82e49e160ab3c85430ff33534f Mon Sep 17 00:00:00 2001 From: Matthias Andree 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 +diff -up work/fetchmail-6.4.10/NEWS.orig work/fetchmail-6.4.10/NEWS --- a/NEWS +++ b/NEWS -@@ -63,5 +63,12 @@ +@@ -63,7 +63,13 @@ removed from a 6.5.0 or newer release.) + * Fetchmail does not guarantee compatibility with EOL OpenSSL versions. Support + for end-of-life OpenSSL versions may be removed even from patchlevel releases. - -------------------------------------------------------------------------------- - +---------------------------------------------------------------------------------- ++-------------------------------------------------------------------------------- +## 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): + fetchmail-6.4.10 (released 2020-08-27, 27596 LoC): + # REGRESSION FIX: 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 Index: branches/2020Q3/mail/fetchmail/pkg-plist =================================================================== --- branches/2020Q3/mail/fetchmail/pkg-plist (revision 549454) +++ branches/2020Q3/mail/fetchmail/pkg-plist (revision 549455) @@ -1,29 +1,30 @@ bin/fetchmail man/man1/fetchmail.1.gz %%NLS%%share/locale/ca/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/cs/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/da/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/de/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 @comment %%NLS%%share/locale/fi/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/fr/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 @comment %%NLS%%share/locale/pt_BR/LC_MESSAGES/fetchmail.mo +%%NLS%%share/locale/ro/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/ru/LC_MESSAGES/fetchmail.mo @comment %%NLS%%share/locale/sk/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/sq/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/sr/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/sv/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 @dir(fetchmail,fetchmail,755) /var/run/fetchmail Index: branches/2020Q3/mail/fetchmailconf/Makefile =================================================================== --- branches/2020Q3/mail/fetchmailconf/Makefile (revision 549454) +++ branches/2020Q3/mail/fetchmailconf/Makefile (revision 549455) @@ -1,47 +1,47 @@ # $FreeBSD$ PORTNAME= fetchmailconf DISTNAME= fetchmail-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} # NOTE: MASTER_SITES in ../fetchmail must NOT use the $PORTNAME variable, # else _this_ port (fetchmailconf) becomes unfetchable MAINTAINER= chalpin@cs.wisc.edu COMMENT= Python-based GUI to configure fetchmail LICENSE= GPLv2 LGPL21 LICENSE_COMB= dual # minimum required version 6.4.2 - not codified, on the assumption # that fetchmail port updated at the same time BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \ fetchmail>=${PORTVERSION}:mail/fetchmail RUN_DEPENDS+= ${BUILD_DEPENDS} -USES= python shebangfix tar:lz +USES= python shebangfix tar:xz USE_PYTHON= py3kplist FILESDIR= ${.CURDIR}/files PATCHDIR= ${FILESDIR} SUB_FILES= fetchmailconf SUB_LIST= PYTHON_CMD=${PYTHON_CMD} PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} PLIST= ${.CURDIR}/pkg-plist NO_ARCH= yes GNU_CONFIGURE= yes ALL_TARGET= fetchmailconf INSTALL_TARGET= install-data-am install-nodist_binSCRIPTS install-man post-install: # first, run smoke tests - the version check makes sure we have all # modules listed in the *_DEPENDS variables: ${PYTHON_CMD} ${WRKSRC}/fetchmailconf.py -V # then install: ${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${STAGEDIR}${PREFIX}/bin ${RM} ${STAGEDIR}${PREFIX}/man/man1/fetchmail.1* MASTERDIR= ${.CURDIR}/../fetchmail .include "${MASTERDIR}/Makefile" Index: branches/2020Q3 =================================================================== --- branches/2020Q3 (revision 549454) +++ branches/2020Q3 (revision 549455) Property changes on: branches/2020Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r546739,547549