Update to 1.0.23, fixing a security problem.

Version 1.0.23:
- No significant changes.

Version 1.0.22:
- A new command 'received_header' with a corresponding '--received-header'
  option allows to disable the default Received header if required.
- A new command 'passwordeval' with a corresponding '--passwordeval' option
  allows to set the password to the output of a command.

Version 1.0.21:
- No significant changes.

Version 1.0.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 mpop-gnome-tool.py manages Gnome Keyring passwords for mpop.

Version 1.0.19:
- When using OpenSSL, mpop now correctly handles NUL characters in the Common
  Name and Subject Alternative Name fields of certificates. This fixes a
  security problem. Note that mpop is not affected by this problem if GnuTLS is
  used.
- Mpop can now handle mail boxes larger than 2 GiB on 32bit systems. Previously,
  this only worked on 64bit systems.

Version 1.0.18:
- Delivery to MS Exchange pickup directories is now supported, thanks to Julien
  Larigaldie.

Version 1.0.17:
- No significant changes.

Version 1.0.16:
- Mpop now also reads SYSCONFDIR/netrc if the password was not found in
  ~/.netrc.
- Support for the GNOME keyring was added by Satoru SATOH.

Version 1.0.15:
- This version fixes two bad bugs that prevented mpop from correctly retrieving
  mails under certain cicumstances.

Version 1.0.14:
- The configuration command tls_crl_file was added. This allows to use
  certificate revocation lists (CRLs) during certificate verification.
- The configuration command tls_min_dh_prime_bits was added. This is needed to
  use TLS/SSL with servers that use a small Diffie-Hellman (DH) prime size.
- The configuration command tls_priorities was added. This allows to fine tune
  TLS/SSL session parameters.

Version 1.0.13:
- Support for the Mac OS X keychain was added by Jay Soffian.

5 files changed, 9 insertions, 61 deletions

diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
index 6b8aa612635..aa2501e8888 100644
--- a/mail/mpop/Makefile
+++ b/mail/mpop/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2010/02/04 02:31:29 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2011/04/01 11:40:34 wiz Exp $
 #
 
-DISTNAME=	mpop-1.0.12
-PKGREVISION=	1
+DISTNAME=	mpop-1.0.23
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mpop/}
 EXTRACT_SUFX=	.tar.bz2
@@ -17,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config
-INFO_FILES=		# PLIST
+INFO_FILES=		yes
 
 CONFIGURE_ARGS+=	--enable-nls
 
diff --git a/mail/mpop/PLIST b/mail/mpop/PLIST
index 7965abdc1f0..6d98dcbd588 100644
--- a/mail/mpop/PLIST
+++ b/mail/mpop/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:04:38 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/04/01 11:40:34 wiz Exp $
 bin/mpop
 info/mpop.info
 man/man1/mpop.1
 share/examples/mpop/mpoprc.example
 share/locale/de/LC_MESSAGES/mpop.mo
 share/locale/es/LC_MESSAGES/mpop.mo
+share/locale/pt_BR/LC_MESSAGES/mpop.mo
diff --git a/mail/mpop/distinfo b/mail/mpop/distinfo
index acae4224497..3dd6d0db994 100644
--- a/mail/mpop/distinfo
+++ b/mail/mpop/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.6 2011/01/10 10:42:02 obache Exp $
+$NetBSD: distinfo,v 1.7 2011/04/01 11:40:34 wiz Exp $
 
-SHA1 (mpop-1.0.12.tar.bz2) = 4618832ddbc84a7f00e8222d1a92ef2ae1f5c60f
-RMD160 (mpop-1.0.12.tar.bz2) = 7e6b609cf59535a67653040a09f2d58aa55cd6cd
-Size (mpop-1.0.12.tar.bz2) = 732061 bytes
-SHA1 (patch-aa) = 79a89fb4e3a64d5c40df00fba498ce44819f472f
-SHA1 (patch-ah) = b077b61112a637ea5cf76cf810d5f0d4af3dc7b1
+SHA1 (mpop-1.0.23.tar.bz2) = ff6300db6b52fdfa572aa8f2b63e923d30612bd7
+RMD160 (mpop-1.0.23.tar.bz2) = 7811dd6d87b8cdde841a9aebe27783b810ae4b91
+Size (mpop-1.0.23.tar.bz2) = 968418 bytes
diff --git a/mail/mpop/patches/patch-aa b/mail/mpop/patches/patch-aa
deleted file mode 100644
index 57ab6549202..00000000000
--- a/mail/mpop/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/12/27 17:59:53 joerg Exp $
-
---- gnulib/stdint.in.h.orig	2007-12-27 16:11:09.000000000 +0000
-+++ gnulib/stdint.in.h
-@@ -82,15 +82,6 @@
- # include <sys/bitypes.h>
- #endif
- 
--#if ! defined __cplusplus || defined __STDC_CONSTANT_MACROS
--
--/* Get WCHAR_MIN, WCHAR_MAX.  */
--# if ! (defined WCHAR_MIN && defined WCHAR_MAX)
--#  include <wchar.h>
--# endif
--
--#endif
--
- /* Minimum and maximum values for a integer type under the usual assumption.
-    Return an unspecified value if BITS == 0, adding a check to pacify
-    picky compilers.  */
-@@ -512,5 +503,14 @@ typedef int _verify_intmax_size[2 * (siz
- 
- #endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */
- 
-+#if ! defined __cplusplus || defined __STDC_CONSTANT_MACROS
-+
-+/* Get WCHAR_MIN, WCHAR_MAX.  */
-+# if ! (defined WCHAR_MIN && defined WCHAR_MAX)
-+#  include <wchar.h>
-+# endif
-+
-+#endif
-+
- #endif /* _GL_STDINT_H */
- #endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
diff --git a/mail/mpop/patches/patch-ah b/mail/mpop/patches/patch-ah
deleted file mode 100644
index d0e01b5a8dd..00000000000
--- a/mail/mpop/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2011/01/10 10:42:02 obache Exp $
-
-* Use proper OpenSSL stack API.
-
---- src/tls.c.orig	2007-07-16 20:19:37.000000000 +0000
-+++ src/tls.c
-@@ -807,7 +807,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? */