CVS commit: pkgsrc/mail/heirloom-mailx

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri Oct 16 19:38:11 UTC 2026

Modified Files:
        pkgsrc/mail/heirloom-mailx: Makefile distinfo
        pkgsrc/mail/heirloom-mailx/patches: patch-openssl.c patch-sendout.c

Log Message:
heirloom-mailx: two bugfixes

- address deprecated timezone determination
- address deprecated TLS client method references

>From jgw in PR pkg/60569.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/mail/heirloom-mailx/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/heirloom-mailx/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/heirloom-mailx/patches/patch-openssl.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/heirloom-mailx/patches/patch-sendout.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/heirloom-mailx/Makefile
diff -u pkgsrc/mail/heirloom-mailx/Makefile:1.16 pkgsrc/mail/heirloom-mailx/Makefile:1.17
--- pkgsrc/mail/heirloom-mailx/Makefile:1.16    Mon Nov 17 11:01:04 2025
+++ pkgsrc/mail/heirloom-mailx/Makefile Fri Oct 16 19:38:11 2026
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2025/11/17 11:01:04 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2026/10/16 19:38:11 bsiegert Exp $
 #
 
 DISTNAME=      heirloom-mailx_12.5.orig
 PKGNAME=       heirloom-mailx-12.5
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/h/heirloom-mailx/}
 EXTRACT_SUFX=  .tar.gz

Index: pkgsrc/mail/heirloom-mailx/distinfo
diff -u pkgsrc/mail/heirloom-mailx/distinfo:1.7 pkgsrc/mail/heirloom-mailx/distinfo:1.8
--- pkgsrc/mail/heirloom-mailx/distinfo:1.7     Tue Oct 26 10:54:02 2021
+++ pkgsrc/mail/heirloom-mailx/distinfo Fri Oct 16 19:38:11 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:54:02 nia Exp $
+$NetBSD: distinfo,v 1.8 2026/10/16 19:38:11 bsiegert Exp $
 
 BLAKE2s (heirloom-mailx_12.5.orig.tar.gz) = e72b5cfbae36a3a3e6c6b3f2e84f6f2c942e09028ec363cfc04ee86368bb495c
 SHA512 (heirloom-mailx_12.5.orig.tar.gz) = eb4aea0c668354f6fe28137f72bf49d291ce58671a7b70c7775777532e17e59ac52156e68f02937256f0a2f90c132b7c0948553b55daad92a664bd8bbb64774f
@@ -11,5 +11,5 @@ SHA1 (patch-fio.c) = 0f850a28fb7c6d511af
 SHA1 (patch-getopt.c) = b238221ae17fdc7285febd1e9209ac9acac92069
 SHA1 (patch-mailx.1) = 070ae8af60dc22d0acc1c68caf66384ff390379e
 SHA1 (patch-names.c) = 5a7f4bd255f30a425114b5371430012079511d88
-SHA1 (patch-openssl.c) = 5b221586d5159788b22bdcefb9918ab49719e91f
-SHA1 (patch-sendout.c) = 1270c454ec7956ef4c3c3f3f71e847928bbbd2e3
+SHA1 (patch-openssl.c) = 849b38746db5f1a5c9ce3fa67d170da4106836e7
+SHA1 (patch-sendout.c) = 3a8ed851d7aea4162f19ff20e675f9a02f83962b

Index: pkgsrc/mail/heirloom-mailx/patches/patch-openssl.c
diff -u pkgsrc/mail/heirloom-mailx/patches/patch-openssl.c:1.2 pkgsrc/mail/heirloom-mailx/patches/patch-openssl.c:1.3
--- pkgsrc/mail/heirloom-mailx/patches/patch-openssl.c:1.2      Wed Jan 22 20:50:34 2020
+++ pkgsrc/mail/heirloom-mailx/patches/patch-openssl.c  Fri Oct 16 19:38:11 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-openssl.c,v 1.2 2020/01/22 20:50:34 sevan Exp $
+$NetBSD: patch-openssl.c,v 1.3 2026/10/16 19:38:11 bsiegert Exp $
 
 - remove SSL2 support since it is no longer supported by OpenSSL.
 - fix build against modern OpenSSL
@@ -30,11 +30,13 @@ $NetBSD: patch-openssl.c,v 1.2 2020/01/2
 +              #ifndef OPENSSL_NO_SSL3
 +              if (equal(cp, "ssl3"))
                        method = SSLv3_client_method();
-               else if (equal(cp, "tls1"))
-                       method = TLSv1_client_method();
+-              else if (equal(cp, "tls1"))
+-                      method = TLSv1_client_method();
++              else if (equal(cp, "tls"))
++                      method = TLS_client_method();
 +              #else
-+              if (equal(cp, "tls1"))
-+                      method = TLSv1_client_method();
++              if (equal(cp, "tls"))
++                      method = TLS_client_method();
 +              #endif
                else {
                        fprintf(stderr, catgets(catd, CATSET, 244,

Index: pkgsrc/mail/heirloom-mailx/patches/patch-sendout.c
diff -u pkgsrc/mail/heirloom-mailx/patches/patch-sendout.c:1.1 pkgsrc/mail/heirloom-mailx/patches/patch-sendout.c:1.2
--- pkgsrc/mail/heirloom-mailx/patches/patch-sendout.c:1.1      Sun Dec 28 14:16:14 2014
+++ pkgsrc/mail/heirloom-mailx/patches/patch-sendout.c  Fri Oct 16 19:38:11 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-sendout.c,v 1.1 2014/12/28 14:16:14 bsiegert Exp $
+$NetBSD: patch-sendout.c,v 1.2 2026/10/16 19:38:11 bsiegert Exp $
 
 Imported Debian package fixes:
 - disable option processing for email addresses when calling sendmail
@@ -32,3 +32,19 @@ Ref: patch-af,v 1.1.1.1 2008/10/30 13:01
                if (debug || value("debug")) {
                        printf(catgets(catd, CATSET, 181,
                                        "Sendmail arguments:"));
+@@ -1135,13 +1144,11 @@ mkdate(FILE *fo, const char *field)
+       int tzdiff, tzdiff_hour, tzdiff_min;
+ 
+       time(&t);
+-      tzdiff = t - mktime(gmtime(&t));
++      tmptr = localtime(&t);
++      tzdiff = tmptr->tm_gmtoff;
+       tzdiff_hour = (int)(tzdiff / 60);
+       tzdiff_min = tzdiff_hour % 60;
+       tzdiff_hour /= 60;
+-      tmptr = localtime(&t);
+-      if (tmptr->tm_isdst > 0)
+-              tzdiff_hour++;
+       return fprintf(fo, "%s: %s, %02d %s %04d %02d:%02d:%02d %+05d\n",
+                       field,
+                       weekday_names[tmptr->tm_wday],