From nobody Mon Jul 18 20:06:30 2022 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 4LmtJk5GSYz4X3b4; Mon, 18 Jul 2022 20:06:30 +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 4LmtJk4k72z3mHb; Mon, 18 Jul 2022 20:06:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658174790; 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=gASGL8n14krFxUpu9GSMvrb1Wy3LPPS4zTcXLIu7sy0=; b=T9y95St+M6uL2ir2GrGPvMxkGpS++grF6ilM03pfjadPR0gCvfoXEL+X8Grw3ekdrZ4i8B 4w6AsLmH4aHn0ny3VFnV2PkKJzcDTZHkGczxNt6wWxVVtFxN+AV23SFTM79QXbSyvrB182 R0yqRDh3Cwnoc5uCW6YqAEDhx4sPrWNczgkKZBR8fIqyKQUoWBtWlQr2r5q0uPdeU4k9/n Tkd/22YZqTkv6H5NpCW196Da/YPhiZei4dcaj55zyZrTEEoDazaEHIFBEHWV4OiMhtwHdV tY99w9vr2SZfxIPSCHhLURkfsmBaVegLO6amGKZWwOfL2c0C9i+Nae67LigUnw== 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 4LmtJk3bdbzrsx; Mon, 18 Jul 2022 20:06:30 +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 26IK6UH5084065; Mon, 18 Jul 2022 20:06:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26IK6UdJ084064; Mon, 18 Jul 2022 20:06:30 GMT (envelope-from git) Date: Mon, 18 Jul 2022 20:06:30 GMT Message-Id: <202207182006.26IK6UdJ084064@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: 64c438d3f9fa - main - mail/fetchmail: update to 6.4.31. 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: 64c438d3f9faf69d93a8437022c322c602d30835 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658174790; 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=gASGL8n14krFxUpu9GSMvrb1Wy3LPPS4zTcXLIu7sy0=; b=pg0aUERGe0hxj1Yvtcw+ETW3CprLDRWgpuuRXGPnDexhYbrcMHbAynk0puwKH4cHHHvngu 7VYiQDl8hF6tE+Cvo+J79hqdhUQQ9XlWrkXtOdLAitICzxUsrEcxewr6AJ3HEjCPjMxSx+ bSnNlIh9kgS5U5osaMWRWl5kG2wqfRUOyBqQt4z7zRKuPOGRFcWULnMgne6c8hluQXSJ4p fmspi9ICObzwQFL+Csw8mIyRYX5Su4AFAH0Wwx1BijKA03aUCqaYKJEOKKK2rWiMNo9NHf +eNwTO0XANbQgJ4SDzj6aoG4tVkO5d7Bh4eqpy2bHBblZSHoZ5Jd/G37x1i8Dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658174790; a=rsa-sha256; cv=none; b=cPK3THCVn24wWLkWxlJ0K2Bf1JRMtB4caFE5cNop9AxANeOd3sQFDmHi9lU6ZwRmlZU6wy g7I4XupiCkrubLNk7HQ0rrY6fzrLYd/ytMGZZE6TjPJ51GHiIHN5QnLX7YnGUuxXcdsnkl lU3Qj/2zg4/sB/QPr2gqYTx4Rc1Ij7DJqxSbzyeezedMRpzVEeaCJHHVrViQQt06lrHYBK hpmpLbR1cbSb9RkjlMDlpozFUEpSQQYllXx24EY4/FhU3chQoZ+vaonMtwBiQsONhYxvqe R9mvSS0J83Ff+xIYIx/L8qbJ9lA0n2NikCvHX+zAMRU09h/Vkj/Ud2u1Bid2/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=64c438d3f9faf69d93a8437022c322c602d30835 commit 64c438d3f9faf69d93a8437022c322c602d30835 Author: Matthias Andree AuthorDate: 2022-07-16 12:39:22 +0000 Commit: Matthias Andree CommitDate: 2022-07-18 20:06:13 +0000 mail/fetchmail: update to 6.4.31. Since the distro was built with a newer autoconf, the patch-configure no longer applies and has been converted to a post-patch REINPLACE_CMD, also to avoid future breakage. This also adds one upstream Git patch to fix the version and date tags in the manual page. PR: 265251 Approved by: Corey Halpin (maintainer) --- mail/fetchmail/Makefile | 3 ++- mail/fetchmail/distinfo | 6 ++--- ...Z-841f6af0d1a820c5bb4379e72799d95b5a3ef77d.diff | 13 ++++++++++ mail/fetchmail/files/patch-configure | 30 ---------------------- 4 files changed, 18 insertions(+), 34 deletions(-) diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 260972a115af..fa86583d8300 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -1,7 +1,7 @@ # Created by: Ville Eerola PORTNAME?= fetchmail -DISTVERSION= 6.4.30 +DISTVERSION= 6.4.31 PORTREVISION?= 0 CATEGORIES= mail # The next line is inherited by the fetchmailconf dependent port, @@ -80,6 +80,7 @@ WOLFSSL_CONFIGURE_ON= WOLFSSL_TRUST_FILE=${LOCALBASE}/share/certs/ca-root-nss.cr WOLFSSL_CONFIGURE_WITH= wolfssl=${LOCALBASE} post-patch: + @${REINPLACE_CMD} -e 's,krb5_des_string_to_key,krb5int_des_init_state,g' ${WRKSRC}/configure .if !exists(/usr/lib/libcom_err.so) @${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure .endif diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo index 814456f6366f..e3bf6a53f6e2 100644 --- a/mail/fetchmail/distinfo +++ b/mail/fetchmail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651096631 -SHA256 (fetchmail-6.4.30.tar.xz) = 35824c20aa1d8d97e3f1611fef49b9f7f68396f7cbc4d3a807fed27ae9ea445a -SIZE (fetchmail-6.4.30.tar.xz) = 1333524 +TIMESTAMP = 1657974724 +SHA256 (fetchmail-6.4.31.tar.xz) = 904bf9247054df8e91b47b1a9fe15a31dda8478c25b5291da0424653744a28f7 +SIZE (fetchmail-6.4.31.tar.xz) = 1332264 diff --git a/mail/fetchmail/files/patch-ZZZ-841f6af0d1a820c5bb4379e72799d95b5a3ef77d.diff b/mail/fetchmail/files/patch-ZZZ-841f6af0d1a820c5bb4379e72799d95b5a3ef77d.diff new file mode 100644 index 000000000000..81159081ec70 --- /dev/null +++ b/mail/fetchmail/files/patch-ZZZ-841f6af0d1a820c5bb4379e72799d95b5a3ef77d.diff @@ -0,0 +1,13 @@ +diff --git a/fetchmail.man b/fetchmail.man +index 37792b81084549c1579de5b6844b10e55377468d..aebfdfdbeaf33a4435a5a074960059bbd337242b 100644 +--- a/fetchmail.man ++++ b/fetchmail.man +@@ -10,7 +10,7 @@ + .\" Load www macros to process .URL requests, this requires groff: + .mso www.tmac + .\" +-.TH fetchmail 1 2022-02-18 "fetchmail 6.4.30" "fetchmail reference manual" ++.TH fetchmail 1 2022-07-16 "fetchmail 6.4.31" "fetchmail reference manual" + + .SH NAME + fetchmail \- fetch mail from a POP, IMAP, ETRN, or ODMR-capable server diff --git a/mail/fetchmail/files/patch-configure b/mail/fetchmail/files/patch-configure deleted file mode 100644 index 196de8ea3975..000000000000 --- a/mail/fetchmail/files/patch-configure +++ /dev/null @@ -1,30 +0,0 @@ ---- 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" - #endif --char krb5_des_string_to_key (); -+char krb5int_des_init_state (); - int - main () - { --return krb5_des_string_to_key (); -+return krb5int_des_init_state (); - ; - return 0; - } -@@ -9591,11 +9591,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - #ifdef __cplusplus - extern "C" - #endif --char krb5_des_string_to_key (); -+char krb5int_des_init_state (); - int - main () - { --return krb5_des_string_to_key (); -+return krb5int_des_init_state (); - ; - return 0; - }