From nobody Sat Nov 20 22:51:50 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 91E4018A31A0; Sat, 20 Nov 2021 22:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HxTLG31Xlz3jvm; Sat, 20 Nov 2021 22:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3F43A2429C; Sat, 20 Nov 2021 22:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AKMpo96020042; Sat, 20 Nov 2021 22:51:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AKMpowk020041; Sat, 20 Nov 2021 22:51:50 GMT (envelope-from git) Date: Sat, 20 Nov 2021 22:51:50 GMT Message-Id: <202111202251.1AKMpowk020041@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 1b50e97082ad - main - Revert "mail/fetchmail: update to 6.4.24 and block LibreSSL." List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b50e97082ad95373cf08f07a5e4194a9f89336c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=1b50e97082ad95373cf08f07a5e4194a9f89336c commit 1b50e97082ad95373cf08f07a5e4194a9f89336c Author: Matthias Andree AuthorDate: 2021-11-20 22:51:01 +0000 Commit: Matthias Andree CommitDate: 2021-11-20 22:51:30 +0000 Revert "mail/fetchmail: update to 6.4.24 and block LibreSSL." This reverts commit 30e97245f9dd9ddef1bffd874a9035a6fe9b6817. That wasn't the approved patch, but a later WIP one. Fixing up. --- mail/fetchmail/Makefile | 78 +++++++++++++++---------------------- mail/fetchmail/distinfo | 6 +-- mail/fetchmail/files/patch-LibreSSL | 14 +++++++ mail/fetchmailconf/Makefile | 21 +++++----- 4 files changed, 59 insertions(+), 60 deletions(-) diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 186cebe7492d..21a0b7561e00 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -1,8 +1,8 @@ # Created by: Ville Eerola PORTNAME?= fetchmail -DISTVERSION= 6.4.25 -PORTREVISION?= 0 +DISTVERSION= 6.4.22 +PORTREVISION= 1 CATEGORIES= mail # The next line is inherited by the fetchmailconf dependent port, # do NOT replace fetchmail by ${PORTNAME} @@ -11,73 +11,55 @@ MASTER_SITES= SF/fetchmail/branch_6.4/ MAINTAINER= chalpin@cs.wisc.edu COMMENT?= Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR -LICENSE= GPLv2+ +LICENSE= GPLv2 LGPL21 +LICENSE_COMB= dual .if empty(MASTERDIR) -USES= cpe gmake tar:xz -IGNORE_SSL= libressl libressl-devel -IGNORE_SSL_REASON=incompatible license/no GPLv2 clause 2b exception for LibreSSL -# The Free Software Foundation asserts that a GPL v2 clause 2b exception is -# required even for dynamically linked binaries. See -# https://www.gnu.org/licenses/gpl-faq.en.html#GPLStaticVsDynamic +CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss + +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-fallback=no \ - --enable-opie \ - --enable-RPA \ - --enable-SDPS \ - --without-hesiod \ - PYTHON=: +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 -PATCH_STRIP= -p1 -SUB_FILES= pkg-message -USERS= ${PORTNAME} -GROUPS= ${USERS} - -OPTIONS_DEFINE= CA_BUNDLE DOCS NLS -OPTIONS_DEFAULT= CA_BUNDLE GSSAPI_BASE OPENSSL -OPTIONS_SINGLE= GSSAPI TLS +OPTIONS_DEFINE= CA_BUNDLE NLS DOCS +OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE -OPTIONS_SINGLE_TLS= OPENSSL WOLFSSL - -OPTIONS_SUB= yes +OPTIONS_DEFAULT= CA_BUNDLE GSSAPI_BASE +OPTIONS_SUB= yes CA_BUNDLE_DESC= Install CA bundle for OpenSSL -CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss -GSSAPI_BASE_USES= gssapi -GSSAPI_BASE_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ - --with-gssapi=${GSSAPIBASEDIR} -GSSAPI_HEIMDAL_USES= gssapi:heimdal -GSSAPI_HEIMDAL_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ - --with-gssapi=${GSSAPIBASEDIR} -GSSAPI_MIT_USES= gssapi:mit -GSSAPI_MIT_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ - --with-kerberos5=${GSSAPIBASEDIR} +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_USES= gettext NLS_CONFIGURE_ENABLE= nls -OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} - -WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl -WOLFSSL_CONFIGURE_WITH= wolfssl=${LOCALBASE} -WOLFSSL_CONFIGURE_ON= WOLFSSL_TRUST_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt -WOLFSSL_USES_OFF= ssl - -PORTDOCS= FAQ FEATURES NEWS NOTES OLDNEWS README README.SSL \ - README.SSL-SERVER design-notes.html esrs-design-notes.html \ - fetchmail-FAQ.html fetchmail-features.html todo.html +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) @@ -86,6 +68,8 @@ post-patch: .endif +PATCH_STRIP= -p1 + .if empty(MASTERDIR) post-build: ${MAKE_CMD} -C ${WRKSRC} check ; { r=$$? ; ( set -x ; ${CAT} "${WRKSRC}/test-suite.log" ) ; exit $$r ; } diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo index 0d489a50c74e..fb8a0db605b6 100644 --- a/mail/fetchmail/distinfo +++ b/mail/fetchmail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1637433525 -SHA256 (fetchmail-6.4.25.tar.xz) = e661a3f46e967d3a01735f530563d3e1392de9e322301a1ea958d3f7a8e41f15 -SIZE (fetchmail-6.4.25.tar.xz) = 1334484 +TIMESTAMP = 1631567945 +SHA256 (fetchmail-6.4.22.tar.xz) = cc6818bd59435602169fa292d6d163d56b21c7f53112829470a3aceabe612c84 +SIZE (fetchmail-6.4.22.tar.xz) = 1330176 diff --git a/mail/fetchmail/files/patch-LibreSSL b/mail/fetchmail/files/patch-LibreSSL new file mode 100644 index 000000000000..15bb350256f2 --- /dev/null +++ b/mail/fetchmail/files/patch-LibreSSL @@ -0,0 +1,14 @@ +$OpenBSD: patch-tls-aux_h,v 1.1 2021/07/29 10:44:07 sthen Exp $ + +Index: tls-aux.h +--- tls-aux.h.orig ++++ tls-aux.h +@@ -8,7 +8,7 @@ + #ifdef SSL_ENABLE + #include + +-# if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x1010000fL ++# if OPENSSL_VERSION_NUMBER < 0x1010000fL + # undef OSSL110_API + # else + # define OSSL110_API 1 diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile index 63599abe7b3f..f25ceb941cec 100644 --- a/mail/fetchmailconf/Makefile +++ b/mail/fetchmailconf/Makefile @@ -7,30 +7,31 @@ DISTNAME= fetchmail-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} MAINTAINER= chalpin@cs.wisc.edu COMMENT= Python-based GUI to configure fetchmail -LICENSE= GPLv2+ +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 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \ fetchmail>=${PORTVERSION}:mail/fetchmail BUILD_DEPENDS+= ${RUN_DEPENDS} USES= python shebangfix tar:xz USE_PYTHON= py3kplist -GNU_CONFIGURE= yes -ALL_TARGET= fetchmailconf -INSTALL_TARGET= install-data-am install-nodist_binSCRIPTS install-man - FILESDIR= ${.CURDIR}/files PATCHDIR= ${FILESDIR} -NO_ARCH= yes SUB_FILES= fetchmailconf -SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \ - PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} +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