s-nail: update to 4.10.0-alpha

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: s-nail: update to 4.10.0-alpha
From: Kevin Bloom (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Tue, 14 Apr 2026 14:34:05 +0000
Module Name:	pkgsrc-wip
Committed By:	Kevin Bloom <ktnb%NetBSD.org@localhost>
Pushed By:	nuclearkev
Date:		Tue Apr 14 10:33:07 2026 -0400
Changeset:	580f5f098e75edcb4ac892282b12c0543b501cad

Modified Files:
	s-nail/COMMIT_MSG
	s-nail/Makefile
	s-nail/PLIST
	s-nail/distinfo
Added Files:
	s-nail/patch-mk_make-install.sh
	s-nail/patches/patch-src_mx_iconv.c
Removed Files:
	s-nail/patches/patch-mk_make-install.sh

Log Message:
s-nail: update to 4.10.0-alpha

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=580f5f098e75edcb4ac892282b12c0543b501cad

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

diffstat:
 s-nail/COMMIT_MSG                       | 52 ++++++++++-----------------------
 s-nail/Makefile                         | 14 +++++++--
 s-nail/PLIST                            |  7 +++--
 s-nail/distinfo                         | 11 +++----
 s-nail/patch-mk_make-install.sh         | 21 +++++++++++++
 s-nail/patches/patch-mk_make-install.sh | 21 -------------
 s-nail/patches/patch-src_mx_iconv.c     | 13 +++++++++
 7 files changed, 71 insertions(+), 68 deletions(-)

diffs:
diff --git a/s-nail/COMMIT_MSG b/s-nail/COMMIT_MSG
index 279c88546c..46ba8519d6 100644
--- a/s-nail/COMMIT_MSG
+++ b/s-nail/COMMIT_MSG
@@ -1,39 +1,17 @@
-s-nail: updated s-nail to 14.9.24
+s-nail: updated to 14.10.0
 
-Update prepared in wip by Kevin Bloom.
+XXX: remember to cvs rm patches/patch-mk_make-install.sh
 
-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.
+- *v15-compat*=yes is now default (setting will disappear in v15)
+- Add OAUTHBEARER authentication for SMTP/POP3/IMAP
+- Add SMTP PIPELINING (RFC 2920) and 8BITMIME (RFC 6152) support
+- New shell-style if/elif with bash-like [[ ]] semantics
+- New $(( )) arithmetic evaluator
+- New *smtp-config* variable for SMTP configuration
+- MIME extension chain recognition (.tar.gz via ?o type-marker)
+- Rewritten character set detection with comprehensive database
+- Bracketed paste mode in line editor
+- New *on-compose-embed* and *on-mailbox-event* hooks
+- Optional Python3 OAuth helper script
+- Fix 11-year-old quoting bug in first message body lines
+- Remove obsolete Heirloom-style credential handling
diff --git a/s-nail/Makefile b/s-nail/Makefile
index 471d1a68d6..10dd207980 100644
--- a/s-nail/Makefile
+++ b/s-nail/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2023/10/24 22:09:50 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2024/06/28 13:01:31 ktnb Exp $
 
-DISTNAME=		s-nail-14.9.24
+DISTNAME=		s-nail-v14.10.0-alpha
+PKGNAME=		${DISTNAME:S/v//:S/-alpha//}
 CATEGORIES=		mail
 MASTER_SITES=		https://www.sdaoden.eu/downloads/
+EXTRACT_SUFX=        .tar.xz
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		https://www.sdaoden.eu/code.html
@@ -17,9 +19,17 @@ MAKE_FLAGS+=		VAL_MANDIR=${PREFIX}/${PKGMANDIR}
 MAKE_FLAGS+=		OPT_AUTOCC=no
 INSTALL_MAKE_FLAGS+=	PKGBASE=${PKGBASE}
 
+INSTALLATION_DIRS+=	share/examples/${PKGBASE}
+
+REPLACE_PYTHON+=	src/oauth-helper.py
+
 CONF_FILES=		${EGDIR}/s-nail.rc ${PKG_SYSCONFDIR}/s-nail.rc
 
+post-install:
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/s-nail.rc ${DESTDIR}${EGDIR}/s-nail.rc
+
 .include "../../devel/libidn2/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/s-nail/PLIST b/s-nail/PLIST
index dc97bd4f16..e453ead37c 100644
--- a/s-nail/PLIST
+++ b/s-nail/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.2 2024/01/17 23:43:02 gdt Exp $
 bin/s-nail
-libexec/s-nail-dotlock
+libexec/s-nail-dotlock-helper
+libexec/s-nail-oauth-helper.py
 man/man1/s-nail.1
+man/man7/s-nail-config.7
 share/examples/s-nail/s-nail.rc
-@comment etc/s-nail.rc
diff --git a/s-nail/distinfo b/s-nail/distinfo
index d7f7063254..0246db9548 100644
--- a/s-nail/distinfo
+++ b/s-nail/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 10:54:29 nia Exp $
+$NetBSD: distinfo,v 1.5 2024/06/28 13:01:31 ktnb Exp $
 
-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
+BLAKE2s (s-nail-v14.10.0-alpha.tar.xz) = 595f9388322d50249354a955acf7d6b751a71ec2078d91f8d785f1650baa35f9
+SHA512 (s-nail-v14.10.0-alpha.tar.xz) = 6a274b6a1b1709fa39a3420a4a0a62ba64ea0c1bab01b9825e1009c01122722605d7a69c19aff2593e83ab7513adad2441e5c120b71b518ffaccb657729cbcd0
+Size (s-nail-v14.10.0-alpha.tar.xz) = 1045516 bytes
+SHA1 (patch-mk_make-install.sh) = be64d86b1403a8d6bd22e19454466b0e7e086898
+SHA1 (patch-src_mx_iconv.c) = 6c484ac54eb97096aa2719ea4af94f90ff4eed3f
diff --git a/s-nail/patch-mk_make-install.sh b/s-nail/patch-mk_make-install.sh
new file mode 100644
index 0000000000..9fa0bc6532
--- /dev/null
+++ b/s-nail/patch-mk_make-install.sh
@@ -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	2026-04-08 15:18:19.000000000 +0000
++++ mk/make-install.sh
+@@ -66,12 +66,13 @@ __mkdir "$VAL_SYSCONFDIR"
+ __mkdir "$VAL_MANDIR/man1"
+ __mkdir "$VAL_MANDIR/man7"
+ __mkdir "$VAL_SYSCONFDIR"
++__mkdir "${VAL_PREFIX}/share/examples/${PKGBASE}"
+ 
+ __copyfile y 0755 "$OBJDIR"/"$VAL_UAGENT" "$VAL_BINDIR"/"$VAL_UAGENT"
+ __copyfile n 0444 "$OBJDIR"/uman.1 "$VAL_MANDIR"/man1/"$VAL_UAGENT".1
+ __copyfile n 0444 "$OBJDIR"/uman-config.7 "$VAL_MANDIR"/man7/"$VAL_UAGENT"-config.7
+ if [ -f "$DESTDIR$VAL_SYSCONFDIR/$VAL_SYSCONFRC" ]; then :; else
+-	__copyfile n 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
diff --git a/s-nail/patches/patch-mk_make-install.sh b/s-nail/patches/patch-mk_make-install.sh
deleted file mode 100644
index 53f3c68801..0000000000
--- a/s-nail/patches/patch-mk_make-install.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-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
diff --git a/s-nail/patches/patch-src_mx_iconv.c b/s-nail/patches/patch-src_mx_iconv.c
new file mode 100644
index 0000000000..67ccbf62d7
--- /dev/null
+++ b/s-nail/patches/patch-src_mx_iconv.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/mx/iconv.c.orig	2026-04-08 15:18:19.000000000 +0000
++++ src/mx/iconv.c
+@@ -293,7 +293,7 @@ n_iconv_reset(iconv_t cd){
+ # undef a_X
+ # if defined _ICONV_H_ && defined __ICONV_F_HIDE_INVALID
+   /* DragonFly 3.2.1 is special TODO newer DragonFly too, but different */
+-#  if su_OS_DRAGONFLY
++#  if su_OS_DRAGONFLY || su_OS_NETBSD
+ #   define a_X(X) S(char** __restrict__,S(void*,UNCONST(char*,X)))
+ #  else
+ #   define a_X(X) S(char const**,S(void*,UNCONST(char*,X)))
Prev by Date: fcft: remove, imported to pkgsrc
Next by Date: webkit-gtk: update to 2.52.2
Previous by Thread: fcft: remove, imported to pkgsrc
Next by Thread: webkit-gtk: update to 2.52.2
Indexes:
Home | Main Index | Thread Index | Old Index