From bbf4305a1e5dfb5c2ced142ac61f1ac268fdaf67 Mon Sep 17 00:00:00 2001
From: schmonz <schmonz@pkgsrc.org>
Date: Thu, 4 Jan 2024 11:28:17 +0000
Subject: [PATCH] swaks: update to 20240103.0. Changes:

New Features:

* Added cc and bcc options
* Numerous TLS debugging and verification improvements
      o Debug output contains whether a client cert was requested and
        whether one was sent
      o Add new options tls-verify-ca and tls-verify-host to
        differentiate between types of certificate verification (tls-
        verify does both)
      o Add tls-target option to allow setting of hostname to be used in
        hostname verification. This is useful in some inet debugging
        situations and required to do hostname verification with socket or
        pipe
      o Add tls-chain (#60, initial implementation by Wolfgang Karall-
        Ahlborn)
      o Add tls-get-peer-chain option (analogous to tls-get-peer-cert,
        #73)
      o Certificate debug now includes all client and peer certs, it a
        chain was used (#73)
      o Certificate debug now includes notAfter, commonName, and
        subjectAltName

Notable Changes:

* output-file, output-file-stderr, and output-file-stdout now truncate
  the specified file if it already exists
* Documentation improvements
* Extensive test harness improvements
* Add new stop-point XCLIENT-HELO to address lack of specificity when
  mixing XCLIENT usage with the HELO stop-point
* Add new stop-point PROXY
* Use IO::Socket::IP by default. Will still use IO::Socket::INET/INET6 to
  cover transition, but this is deprecated and will be removed in the
  future (#43)
* TLS session debug information is now printed even if we decide not to
  continue the session (eg for failed verification)
* Previously-deprecated functionality to allow some options to be either a
  filename or a literal string has been removed. Using the @ sigil is now
  the only was to specify file contents
* Previously-deprecated -g option removed

Notable Bugs Fixed:

* TLS certificate verification did not always work. It should now
---
 mail/swaks/Makefile   |  8 +++-----
 mail/swaks/distinfo   |  8 ++++----
 mail/swaks/options.mk | 14 --------------
 3 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100644 mail/swaks/options.mk

diff --git a/mail/swaks/Makefile b/mail/swaks/Makefile
index 8a46c88d4e18..fb64773fe11b 100644
--- a/mail/swaks/Makefile
+++ b/mail/swaks/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2022/06/28 11:34:35 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2024/01/04 11:28:17 schmonz Exp $
 
-DISTNAME=		swaks-20201014.0
-PKGREVISION=		2
+DISTNAME=		swaks-20240103.0
 CATEGORIES=		mail
 MASTER_SITES=		${HOMEPAGE}files/
 
@@ -13,6 +12,7 @@ LICENSE=		gnu-gpl-v2
 #DEPENDS+=		p5-Authen-NTLM (not in pkgsrc)
 DEPENDS+=		p5-Authen-SASL-[0-9]*:../../security/p5-Authen-SASL
 DEPENDS+=		p5-Net-DNS-[0-9]*:../../net/p5-Net-DNS
+DEPENDS+=		p5-Net-SSLeay-[0-9]*:../../security/p5-Net-SSLeay
 
 USE_TOOLS+=		perl:run
 USE_LANGUAGES=		# none
@@ -25,6 +25,4 @@ INSTALLATION_DIRS=	bin
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PKGBASE} ${DESTDIR}${PREFIX}/bin/${PKGBASE}
 
-.include "options.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/swaks/distinfo b/mail/swaks/distinfo
index ed5dfcb03d6b..d75ca24878ef 100644
--- a/mail/swaks/distinfo
+++ b/mail/swaks/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:54:31 nia Exp $
+$NetBSD: distinfo,v 1.8 2024/01/04 11:28:17 schmonz Exp $
 
-BLAKE2s (swaks-20201014.0.tar.gz) = 29ad6746b54a2795bb958302b8aa8f1208dbec9aa874a6f92879800d8ed7f42a
-SHA512 (swaks-20201014.0.tar.gz) = 8a4e8dc810a9c5943afdbc4db7130e110c42e211d6927ce1cdbab6f81fa49c31490e6c3668ec3cea79580c07b281ce30901b3b4a71325951167158cc9d70d9cc
-Size (swaks-20201014.0.tar.gz) = 110953 bytes
+BLAKE2s (swaks-20240103.0.tar.gz) = 6c0ad6b8ad8fa58598cffb100507da8ee8c7115f01e56f56c52e343479043151
+SHA512 (swaks-20240103.0.tar.gz) = 89d62cdb94630666c1acb1feb3b62585f36b4d59d14e56d998da6efe45538e9f5072379eebee43dd7244aa3981dbd8d6eb9a42ff7fa21a73127d171b8b3189f5
+Size (swaks-20240103.0.tar.gz) = 121308 bytes
diff --git a/mail/swaks/options.mk b/mail/swaks/options.mk
deleted file mode 100644
index 5c2eaf1d6ec5..000000000000
--- a/mail/swaks/options.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2017/01/08 20:35:55 schmonz Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.swaks
-PKG_SUPPORTED_OPTIONS=	inet6 ssl
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-DEPENDS+=		p5-IO-Socket-INET6-[0-9]*:../../net/p5-IO-Socket-INET6
-.endif
-
-.if !empty(PKG_OPTIONS:Mssl)
-DEPENDS+=		p5-Net-SSLeay-[0-9]*:../../security/p5-Net-SSLeay
-.endif