diff options
author | obache <obache@pkgsrc.org> | 2010-07-06 07:33:43 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2010-07-06 07:33:43 +0000 |
commit | 83d9217e8bf948bacab9d846783b663842863cc6 (patch) | |
tree | a1acc35c851e2e5d6c365336a5022fa4869db1bb /mail/msmtp | |
parent | 0a14dcd65825714fd80a5a80c3164a91ff6b2ed1 (diff) | |
download | pkgsrc-83d9217e8bf948bacab9d846783b663842863cc6.tar.gz |
Update msmtp to 1.4.21.
Based on PR#43566, with additional clean up, exactly enable/disable options.
Version 1.4.21:
- No significant changes.
Version 1.4.20:
- Added support for authentication mechanism SCRAM-SHA-1 via GNU SASL.
- The new command tls_fingerprint allows one to trust one particular TLS
certificate, in case tls_trust_file cannot be used for some reason.
- The new script msmtp-gnome-tool.py manages Gnome Keyring passwords for msmtp.
Version 1.4.19:
- When using OpenSSL, msmtp now correctly handles NUL characters in the Common
Name and Subject Alternative Name fields of certificates. This fixes a
security problem. Note that msmtp is not affected by this problem if GnuTLS is
used.
Diffstat (limited to 'mail/msmtp')
-rw-r--r-- | mail/msmtp/Makefile | 6 | ||||
-rw-r--r-- | mail/msmtp/PLIST | 3 | ||||
-rw-r--r-- | mail/msmtp/distinfo | 9 | ||||
-rw-r--r-- | mail/msmtp/options.mk | 13 | ||||
-rw-r--r-- | mail/msmtp/patches/patch-ad | 15 |
5 files changed, 21 insertions, 25 deletions
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile index b9224b3a988..e4a93b2516b 100644 --- a/mail/msmtp/Makefile +++ b/mail/msmtp/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.24 2009/09/14 07:08:52 taca Exp $ +# $NetBSD: Makefile,v 1.25 2010/07/06 07:33:43 obache Exp $ -DISTNAME= msmtp-1.4.18 +DISTNAME= msmtp-1.4.21 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=msmtp/} EXTRACT_SUFX= .tar.bz2 @@ -15,7 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} EGDIR= ${PREFIX}/share/examples/msmtp CONF_FILES= ${EGDIR}/msmtprc-user.example \ diff --git a/mail/msmtp/PLIST b/mail/msmtp/PLIST index 4d56944b95d..e8e96f725ba 100644 --- a/mail/msmtp/PLIST +++ b/mail/msmtp/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:04:38 joerg Exp $ +@comment $NetBSD: PLIST,v 1.8 2010/07/06 07:33:43 obache Exp $ bin/msmtp info/msmtp.info man/man1/msmtp.1 share/examples/msmtp/msmtprc-user.example share/locale/de/LC_MESSAGES/msmtp.mo +share/locale/pt_BR/LC_MESSAGES/msmtp.mo diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo index e746ebfdc08..5ca6b4d3122 100644 --- a/mail/msmtp/distinfo +++ b/mail/msmtp/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.17 2009/09/14 07:08:52 taca Exp $ +$NetBSD: distinfo,v 1.18 2010/07/06 07:33:43 obache Exp $ -SHA1 (msmtp-1.4.18.tar.bz2) = f7b42a2a6f4c9c21687dde86dfa827d728a08d76 -RMD160 (msmtp-1.4.18.tar.bz2) = 5157815713363e94b62e2de5fe6ba9dd0c330180 -Size (msmtp-1.4.18.tar.bz2) = 818691 bytes -SHA1 (patch-ad) = e6a38d412fcd32ff6d807bacfeeb53ce8a2a4b09 +SHA1 (msmtp-1.4.21.tar.bz2) = 40aabe0c65b8f31d402b2429581178e15f8bfe90 +RMD160 (msmtp-1.4.21.tar.bz2) = 047605c85e0abe4ea8d3d01dc99cd75bbf33e3d0 +Size (msmtp-1.4.21.tar.bz2) = 947451 bytes diff --git a/mail/msmtp/options.mk b/mail/msmtp/options.mk index 465f1f25369..b90f8305913 100644 --- a/mail/msmtp/options.mk +++ b/mail/msmtp/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.10 2009/01/06 12:08:01 obache Exp $ +# $NetBSD: options.mk,v 1.11 2010/07/06 07:33:43 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.msmtp @@ -16,9 +16,11 @@ PKG_SUGGESTED_OPTIONS= ssl .if !empty(PKG_OPTIONS:Mssl) . include "../../security/openssl/buildlink3.mk" CONFIGURE_ARGS+= --with-ssl=openssl +CONFIGURE_ARGS+= --with-libssl-prefix=${BUILDLINK_PREFIX.openssl} .elif !empty(PKG_OPTIONS:Mgnutls) . include "../../security/gnutls/buildlink3.mk" CONFIGURE_ARGS+= --with-ssl=gnutls +CONFIGURE_ARGS+= --with-libgnutls-prefix=${BUILDLINK_PREFIX.gnutls} .else CONFIGURE_ARGS+= --disable-ssl .endif @@ -28,6 +30,10 @@ CONFIGURE_ARGS+= --disable-ssl ### .if !empty(PKG_OPTIONS:Mgsasl) . include "../../security/gsasl/buildlink3.mk" +CONFIGURE_ARGS+= --with-libgsasl +CONFIGURE_ARGS+= --with-libgsasl-prefix=${BUILDLINK_PREFIX.gsasl} +.else +CONFIGURE_ARGS+= --without-libgsasl .endif ### @@ -36,6 +42,9 @@ CONFIGURE_ARGS+= --disable-ssl .if !empty(PKG_OPTIONS:Midn) . include "../../devel/libidn/buildlink3.mk" CONFIGURE_ARGS+= --with-libidn +CONFIGURE_ARGS+= --with-libidn-prefix=${BUILDLINK_PREFIX.libidn} +.else +CONFIGURE_ARGS+= --without-libidn .endif ### @@ -45,4 +54,6 @@ CONFIGURE_ARGS+= --with-libidn . include "../../security/gnome-keyring/buildlink3.mk" CONFIGURE_ARGS+= --with-gnome-keyring USE_TOOLS+= pkg-config +.else +CONFIGURE_ARGS+= --without-gnome-keyring .endif diff --git a/mail/msmtp/patches/patch-ad b/mail/msmtp/patches/patch-ad deleted file mode 100644 index 31034b57562..00000000000 --- a/mail/msmtp/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2009/09/14 07:08:52 taca Exp $ - -Make it portable to OpenSSL 1.0. - ---- src/tls.c.orig 2008-12-26 02:58:43.000000000 +0900 -+++ src/tls.c -@@ -813,7 +813,7 @@ int tls_check_cert(tls_t *tls, const cha - char *buf; - int bufsize; - /* needed to get the DNS subjectAltNames: */ -- STACK *subj_alt_names; -+ STACK_OF(GENERAL_NAME) *subj_alt_names; - int subj_alt_names_count; - GENERAL_NAME *subj_alt_name; - /* did we find a name matching hostname? */ |