Update to msmtp-1.4.5. This addresses PR/32517. Notable changes include:

- gnulib update.
- adapted configure.ac for new pkg-config version
- Use gnulib socklen module for socklen_t.
- Lock the logfile.
- W32/DJGPP: Use all files/streams in binary mode.
- W32: Allow %HOME% to override default user configuration directory.
- W32: Enable getpass and netrc functionality.
- Use gnulib getpass module since it now works on Win32.
- Shut down a GnuTLS TLS session with GNUTLS_SHUT_WR instead of
  GNUTLS_SHUT_RDWR. This prevents session hangs in certain situations.
  It is safe to do this because we never reuse a connection when TLS was shut
  down. Thanks to Jens Kammler for the problem report!
- Do not rely on a failing malloc setting errno in xalloc_die()
- Make the GnuTLS code accept old version 1 CA certificates when verifying
  certificates.
- Renamed LOCK_(READ|WRITE) to OSENV_LOCK_(READ|WRITE) in os_env.[ch] to avoid
  name clashes with <fcntl.h>

3 files changed, 13 insertions, 9 deletions

diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 0b912df3821..1c9055ff1f5 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2006/01/01 17:02:21 ben Exp $
+# $NetBSD: Makefile,v 1.14 2006/01/14 20:08:20 ben Exp $
 
-DISTNAME=	msmtp-1.4.4
+DISTNAME=	msmtp-1.4.5
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=msmtp/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,8 +10,14 @@ HOMEPAGE=	http://msmtp.sourceforge.net/
 COMMENT=	SMTP plugin for MUAs
 
 GNU_CONFIGURE=		yes
+USE_PKGINSTALL=		yes
+USE_TOOLS+=		pkg-config
+
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 EGDIR=		${PREFIX}/share/examples/msmtp
+CONF_FILES=	${EGDIR}/msmtprc-user.example \
+		${PKG_SYSCONFDIR}/msmtprc
 
 INFO_FILES=	msmtp.info
 
@@ -24,7 +30,6 @@ CPPFLAGS+=	-D__WINSOCK
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/msmtprc-system.example ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/msmtprc-user.example ${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/msmtp/PLIST b/mail/msmtp/PLIST
index 09a03170ff5..ccff680a27d 100644
--- a/mail/msmtp/PLIST
+++ b/mail/msmtp/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2005/04/04 08:45:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/01/14 20:08:20 ben Exp $
 bin/msmtp
 man/man1/msmtp.1
-share/examples/msmtp/msmtprc-system.example
 share/examples/msmtp/msmtprc-user.example
 @dirrm share/examples/msmtp
diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo
index eef9379e5b4..76d24b8e218 100644
--- a/mail/msmtp/distinfo
+++ b/mail/msmtp/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2006/01/08 16:38:41 joerg Exp $
+$NetBSD: distinfo,v 1.13 2006/01/14 20:08:20 ben Exp $
 
-SHA1 (msmtp-1.4.4.tar.bz2) = 2b8437bb613a4054f51e94f4a6a4784b2abe3458
-RMD160 (msmtp-1.4.4.tar.bz2) = c83018a31815e031cd1b34bceb71862fb7a5399f
-Size (msmtp-1.4.4.tar.bz2) = 480904 bytes
+SHA1 (msmtp-1.4.5.tar.bz2) = 2734c4b0ab50d221c6c8248cdafc4af6ee0f6cf5
+RMD160 (msmtp-1.4.5.tar.bz2) = 21428a4d7c93da8383fe8f752b224dd2c0aff014
+Size (msmtp-1.4.5.tar.bz2) = 489336 bytes
 SHA1 (patch-aa) = 30be9810fdbdd1de0c4727c94d5c799317548bdb
 SHA1 (patch-ab) = 9ce732fb3258f0b5fcafaabaa92960489a62124e
 SHA1 (patch-ac) = 54b47760510320c08cf9703ce79ea431a69115e4