From nobody Sat Dec 11 12:50:56 2021 X-Original-To: dev-commits-ports-branches@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 5A11718CAD64; Sat, 11 Dec 2021 12:50:57 +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 4JB71D5p6Mz3G57; Sat, 11 Dec 2021 12:50:56 +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 A103C6253; Sat, 11 Dec 2021 12:50:56 +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 1BBCou2S018255; Sat, 11 Dec 2021 12:50:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BBCouA7018254; Sat, 11 Dec 2021 12:50:56 GMT (envelope-from git) Date: Sat, 11 Dec 2021 12:50:56 GMT Message-Id: <202112111250.1BBCouA7018254@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Andree Subject: git: 780726c8be59 - 2021Q4 - mail/fetchmail: update 6.4.25, add WOLFSSL support List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 780726c8be59e7fca07a04e904cc4c90cc7fba43 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639227056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LCQ4Dm+QRqDU/08vc+CzAUI+INO/A29bK2i2EL2lDeM=; b=loHMuqezm4KvSm4MpQ4SP6e7c1rN0WjFY6teqxD5tvx6pWMcGJFwrwmcz7n4nqCT7qqXjT qtR46lnBXowdGaaWTmhsjFKZf3TvqwndXEu/A7MY/lrJWu+SPZc0WWdH50joEGR+Fc4+bP jGfpzt5MiSSIZGdIzcmaD5zCGpMx8IB5cmBNt38EJEFNuYwID6onc6bplnBMdrmpmnfhf1 cFO/Ly//sOxEXEGfO2H1TEuAxuPRuv9OMRjXUQQXnP1oa3tNdD4ekYMV1xg4rD5caj0BDS +Ohtu7UIl4NcXvU4T9Rexs0BSo3RtFcyLYf9SNkEwGsJS0gV/HSArwjja5VVfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639227056; a=rsa-sha256; cv=none; b=AjMwCNCwLHyv0EwjAStQnk41o/EjAMyrLH+Zc0ZPDbbQZcRTvVCb55XxzxzPsY+InxNuQV JSdGrAL6JVqMWRhtmaHzX49n4kfyBmpO6UHin7e2LMWkjihc/WPg+z6B7eUITCbWnUAH+h mLADrhFRoiDDHnv59dro6KvANC2+2YqPDE5p8eH41WhmLnU1ep/kGdw1Ck5/bdeJuToMG8 gs9LQZsCrtN7k6p1UMLBxsFEezb79oQX7tAexSVfQa0Z23qjA50T2lz7duQeiKQ+UbAnDA XpZ7X4zuvPmNUyYRt/FohRJgxrF0UBrQ1i0IyssHjBYXRRXt4hMFP8oCYAyYRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=780726c8be59e7fca07a04e904cc4c90cc7fba43 commit 780726c8be59e7fca07a04e904cc4c90cc7fba43 Author: Matthias Andree AuthorDate: 2021-12-10 19:39:11 +0000 Commit: Matthias Andree CommitDate: 2021-12-11 12:46:37 +0000 mail/fetchmail: update 6.4.25, add WOLFSSL support WOLFSSL is a GPLv2+ licensed SSL library with OpenSSL compatibility layer. This is to permit shipping fetchmail under a clean GPLv2+ license with OpenSSL 1.1.1. (cherry picked from commit a1be1173a389c69879a2747a584728bba3a5d722) --- mail/fetchmail/Makefile | 28 ++++++++++++++++++---------- mail/fetchmail/distinfo | 6 +++--- mail/fetchmailconf/Makefile | 1 + 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 66474be62251..b4c4dcceb64f 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -1,7 +1,7 @@ # Created by: Ville Eerola PORTNAME?= fetchmail -DISTVERSION= 6.4.24 +DISTVERSION= 6.4.25 PORTREVISION?= 0 CATEGORIES= mail # The next line is inherited by the fetchmailconf dependent port, @@ -14,9 +14,9 @@ COMMENT?= Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR LICENSE= GPLv2+ .if empty(MASTERDIR) -USES= cpe gmake ssl tar:xz +USES= cpe gmake tar:xz IGNORE_SSL= libressl libressl-devel -IGNORE_SSL_REASON=incompatible license/no GPLv2 clause 2b exception for LibreSSL +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 @@ -31,7 +31,6 @@ CONFIGURE_ARGS= --enable-fallback=no \ --enable-opie \ --enable-RPA \ --enable-SDPS \ - --with-ssl=${OPENSSLBASE} \ --without-hesiod \ PYTHON=: @@ -44,11 +43,17 @@ SUB_FILES= pkg-message USERS= ${PORTNAME} GROUPS= ${USERS} +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 + OPTIONS_DEFINE= CA_BUNDLE DOCS NLS -OPTIONS_DEFAULT= CA_BUNDLE GSSAPI_BASE -OPTIONS_SINGLE= GSSAPI +OPTIONS_DEFAULT= CA_BUNDLE GSSAPI_BASE OPENSSL +OPTIONS_SINGLE= GSSAPI TLS OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE -OPTIONS_SUB= yes +OPTIONS_SINGLE_TLS= OPENSSL WOLFSSL + +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 @@ -67,9 +72,12 @@ 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 esrs-design-notes.html \ - fetchmail-FAQ.html fetchmail-features.html todo.html +OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} + +WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl +WOLFSSL_USES_OFF= ssl +WOLFSSL_CONFIGURE_ON= WOLFSSL_TRUST_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt +WOLFSSL_CONFIGURE_WITH= wolfssl=${LOCALBASE} post-patch: .if !exists(/usr/lib/libcom_err.so) diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo index c2d2a1175c8c..ecbfe5e751fb 100644 --- a/mail/fetchmail/distinfo +++ b/mail/fetchmail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1637401885 -SHA256 (fetchmail-6.4.24.tar.xz) = 9c961df25cd922f539218b0b56a77e7a47778e49ed907edaa5b4941ad3b253cf -SIZE (fetchmail-6.4.24.tar.xz) = 1331764 +TIMESTAMP = 1639176375 +SHA256 (fetchmail-6.4.25.tar.xz) = 7ebefbe89172fd59f0fd8317d8743a8436f375ccdcab3900e4c3ec06a8fbf27f +SIZE (fetchmail-6.4.25.tar.xz) = 1343360 diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile index 63599abe7b3f..442a37e5eefe 100644 --- a/mail/fetchmailconf/Makefile +++ b/mail/fetchmailconf/Makefile @@ -20,6 +20,7 @@ USES= python shebangfix tar:xz USE_PYTHON= py3kplist GNU_CONFIGURE= yes +CONFIGURE_ARGS= PKG_CONFIG=: ALL_TARGET= fetchmailconf INSTALL_TARGET= install-data-am install-nodist_binSCRIPTS install-man