CVS commit: pkgsrc/mail/s-nail

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Jan 17 23:43:02 UTC 2024

Modified Files:
        pkgsrc/mail/s-nail: Makefile PLIST distinfo
Added Files:
        pkgsrc/mail/s-nail/patches: patch-mk_make-install.sh
Removed Files:
        pkgsrc/mail/s-nail/patches: patch-make.rc

Log Message:
s-nail: updated s-nail to 14.9.24

Update prepared in wip by Kevin Bloom.

Packaging updates:
- removed unneeded patch in favor of MAKE_FLAGS

14.9.23 -> 14.9.24:
- Release tarball might be in --format=pax
- Again honour MTA arguments passed after the "--" command line
  "option" in non-send-only mode (broken since at least v14.9.12).
- Support Microsoft IMAP servers.
- Fix crash due to crafted emails.
- Fix expandargv (broken since v14.9.0).
- Fix a bug from nail 10.08 as of 2004-06-28 that leads to
  crashes when some file cannot be loaded.
  And while here fix one file-close overshoot of mine in since
  v14.9.16, that would cause panics in debug-enabled code.
- Deal with argc==0 aka CVE-2021-4034.

14.9.22 -> 14.9.23;
- VAL_RANDOM=getentropy was broken.
- An unset mta-bcc-ok could cause partial Bcc: content
  to be written to Cc: or To:.
- Date offset calculation was wrong for timezones which use
  a negative adjustment for "is daylight saving time active".
- Continue searching MIME handler sources if the first found one
  is not applicable in current context.
- Fixed `vexpr' shift operators broken for "optimization".
- Fixed `date-utc' subcommand which used two "dutc_month"
  instead of one plus "dutc_day".
- Temporarily set an unset $LESS to portable "RI" not "RXi".
- A couple of SIGALARM / alarm(2) fixes for the -keepalive-
  variable series.
- We drop inherited effective IDs upon startup.
- mimeview now also asks for text/ parts whether an action
  shall be applied.  And if there is no plain part we may
  use the rich one if possible.
- pipe-TYPE/SUBTYPE now support type-markers.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/s-nail/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/s-nail/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/s-nail/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/mail/s-nail/patches/patch-make.rc
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/s-nail/patches/patch-mk_make-install.sh

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

Modified files:

Index: pkgsrc/mail/s-nail/Makefile
diff -u pkgsrc/mail/s-nail/Makefile:1.5 pkgsrc/mail/s-nail/Makefile:1.6
--- pkgsrc/mail/s-nail/Makefile:1.5     Wed Jan  3 23:32:11 2024
+++ pkgsrc/mail/s-nail/Makefile Wed Jan 17 23:43:02 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2024/01/03 23:32:11 gdt Exp $
+# $NetBSD: Makefile,v 1.6 2024/01/17 23:43:02 gdt Exp $
 
-DISTNAME=              s-nail-14.9.22
-PKGREVISION=           2
+DISTNAME=              s-nail-14.9.24
 CATEGORIES=            mail
 MASTER_SITES=          https://www.sdaoden.eu/downloads/
 
@@ -13,9 +12,10 @@ LICENSE=             original-bsd AND osl AND mpl-1
 MAKE_FILE=             makefile
 
 EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
+MAKE_FLAGS+=           VAL_PREFIX=${PREFIX}
 MAKE_FLAGS+=           VAL_MANDIR=${PREFIX}/${PKGMANDIR}
-BUILD_MAKE_FLAGS+=     SYSCONFDIR=${PKG_SYSCONFDIR}
-INSTALL_MAKE_FLAGS+=   SYSCONFDIR=${EGDIR}
+MAKE_FLAGS+=           OPT_AUTOCC=no
+INSTALL_MAKE_FLAGS+=   PKGBASE=${PKGBASE}
 
 CONF_FILES=            ${EGDIR}/s-nail.rc ${PKG_SYSCONFDIR}/s-nail.rc
 

Index: pkgsrc/mail/s-nail/PLIST
diff -u pkgsrc/mail/s-nail/PLIST:1.1 pkgsrc/mail/s-nail/PLIST:1.2
--- pkgsrc/mail/s-nail/PLIST:1.1        Tue May 25 15:24:20 2021
+++ pkgsrc/mail/s-nail/PLIST    Wed Jan 17 23:43:02 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/05/25 15:24:20 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/01/17 23:43:02 gdt Exp $
 bin/s-nail
 libexec/s-nail-dotlock
 man/man1/s-nail.1

Index: pkgsrc/mail/s-nail/distinfo
diff -u pkgsrc/mail/s-nail/distinfo:1.3 pkgsrc/mail/s-nail/distinfo:1.4
--- pkgsrc/mail/s-nail/distinfo:1.3     Tue Oct 26 10:54:29 2021
+++ pkgsrc/mail/s-nail/distinfo Wed Jan 17 23:43:02 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 10:54:29 nia Exp $
+$NetBSD: distinfo,v 1.4 2024/01/17 23:43:02 gdt Exp $
 
-BLAKE2s (s-nail-14.9.22.tar.gz) = 8f6b3cd6254044a623aa97dd73faf2659d0c139ce5bd2a15458dbe998f71abb4
-SHA512 (s-nail-14.9.22.tar.gz) = 502784947ee60720c6dbe353dd87d07fa0a01e69d5d2d406d6f9c79b1fc0ddb5727cc863e879046a762c5386ce2fa3125867261286e33915932b78daa9fc2b4d
-Size (s-nail-14.9.22.tar.gz) = 1090859 bytes
-SHA1 (patch-make.rc) = 383372deed01c34a984c8696c3d15619aa04aafa
+BLAKE2s (s-nail-14.9.24.tar.gz) = 649bd9205d714677bcdefdef0d5370432025d20858d06f99d3a0cb728c815a0d
+SHA512 (s-nail-14.9.24.tar.gz) = 15101019a9c14fef8162fbce1a15133d2c70f27476b08a7f183d195fb52ed2854731984f833236c543fd681e299c3d93ec508154573b5897d707a0ec5c216575
+Size (s-nail-14.9.24.tar.gz) = 1105199 bytes
+SHA1 (patch-mk_make-install.sh) = a7537f2e6b65fc32a6257f1def5b06bc39e2fe91

Added files:

Index: pkgsrc/mail/s-nail/patches/patch-mk_make-install.sh
diff -u /dev/null pkgsrc/mail/s-nail/patches/patch-mk_make-install.sh:1.1
--- /dev/null   Wed Jan 17 23:43:02 2024
+++ pkgsrc/mail/s-nail/patches/patch-mk_make-install.sh Wed Jan 17 23:43:02 2024
@@ -0,0 +1,21 @@
+$NetBSD: patch-mk_make-install.sh,v 1.1 2024/01/17 23:43:02 gdt Exp $
+
+Put the default config in EGDIR so we can use CONF_FILES
+
+--- mk/make-install.sh.orig    2022-03-26 15:28:51.000000000 +0000
++++ mk/make-install.sh
+@@ -51,12 +51,13 @@ echo >> "${OBJDIR}/${VAL_UAGENT}-uninsta
+ __mkdir "${VAL_BINDIR}"
+ __mkdir "${VAL_MANDIR}/man1"
+ __mkdir "${VAL_SYSCONFDIR}"
++__mkdir "${VAL_PREFIX}/share/examples/${PKGBASE}"
+ 
+ __stripfile "${OBJDIR}"/"${VAL_UAGENT}"
+ __copyfile 0755 "${OBJDIR}"/"${VAL_UAGENT}" "${VAL_BINDIR}"/"${VAL_UAGENT}"
+ __copyfile 0444 "${OBJDIR}"/uman.1 "${VAL_MANDIR}"/man1/"${VAL_UAGENT}".1
+ if [ -f "${DESTDIR}${VAL_SYSCONFDIR}/${VAL_SYSCONFRC}" ]; then :; else
+-   __copyfile 0444 "${OBJDIR}"/urc.rc "${VAL_SYSCONFDIR}/${VAL_SYSCONFRC}"
++   __copyfile 0444 "${OBJDIR}"/urc.rc "${VAL_PREFIX}/share/examples/${PKGBASE}/${VAL_SYSCONFRC}"
+ fi
+ 
+ if [ "${OPT_DOTLOCK}" != 0 ]; then