Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Jul 2022 20:06:30 GMT
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 64c438d3f9fa - main - mail/fetchmail: update to 6.4.31.
Message-ID:  <202207182006.26IK6UdJ084064@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=64c438d3f9faf69d93a8437022c322c602d30835

commit 64c438d3f9faf69d93a8437022c322c602d30835
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2022-07-16 12:39:22 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
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 <ve@sci.fi>
 
 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;
- }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207182006.26IK6UdJ084064>