Changes 2.5.5:

* rfc2045/rfc2045reply.c (mkreply): Fix copying of the contents of the
  original message.
* rfc2045/reformime.c (do_print_info): rfc2231_udecodeDisposition()
  failure is not fatal.
* rfc2045/reformime.c (get_suitable_filename): Ditto.
* rfc2045/reformime.c (main2): Fixed segfault on some arches from an
  initial null given to strtok.
* mailbot: add "feedback" and "replyfeedback" formats, generating
  RFC 5965-formatted feedback report. -a option attaches the entire
  original message, instead of only its headers, for "replydsn",
  "feedback", and "replyfeedback" formats.
* rfc2045/reformime.c (main2): On ia64 and arm, argv is in readonly
  memory.

3 files changed, 20 insertions, 20 deletions

diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index c87ac24a5b2..9cb9659948b 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2012/03/03 00:14:26 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2012/06/09 11:50:20 adam Exp $
 
-DISTNAME=	maildrop-2.5.4
-PKGREVISION=	1
+DISTNAME=	maildrop-2.5.5
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -27,7 +26,6 @@ PKG_SUGGESTED_OPTIONS=	authlib
 
 # These are the users that may invoke maildrop with the "-d user"
 # argument (mailbox delivery mode).
-#
 MAILDROP_TRUSTED_USERS?=	${REAL_ROOT_USER} ${COURIER_USER} qmaild
 
 CONFIGURE_ARGS+=	--datadir=${DATADIR}
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index 00979212ec4..8cab4ca2593 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2011/11/10 15:37:55 adam Exp $
+$NetBSD: distinfo,v 1.18 2012/06/09 11:50:20 adam Exp $
 
-SHA1 (maildrop-2.5.4.tar.bz2) = 6d9514bb1df207a2036779e14e4f0ea350f5d1ee
-RMD160 (maildrop-2.5.4.tar.bz2) = a71c08fc2951dd122740870186693ac112e59ebd
-Size (maildrop-2.5.4.tar.bz2) = 2082167 bytes
-SHA1 (patch-aa) = 85956cf69abc361264a92ec1748cd3ef23b52089
+SHA1 (maildrop-2.5.5.tar.bz2) = 57b307972b884b4f8fea840c56d2ff37f95139a3
+RMD160 (maildrop-2.5.5.tar.bz2) = a614d3761c8b35cee0ea838d6ab5239bde4e08dd
+Size (maildrop-2.5.5.tar.bz2) = 2158846 bytes
+SHA1 (patch-aa) = 5f888d5304107ef52af2faf9516c69501bb0b98e
 SHA1 (patch-ab) = 448fb6c46f05e634534c4a7c1547d54323b24dfa
 SHA1 (patch-ac) = 2dbda2413f35808ce6805289f1a44be3dfa59ea3
diff --git a/mail/maildrop/patches/patch-aa b/mail/maildrop/patches/patch-aa
index 3c532bf48f1..306288222c6 100644
--- a/mail/maildrop/patches/patch-aa
+++ b/mail/maildrop/patches/patch-aa
@@ -1,20 +1,22 @@
-$NetBSD: patch-aa,v 1.8 2010/06/15 23:14:47 pettai Exp $
+$NetBSD: patch-aa,v 1.9 2012/06/09 11:50:20 adam Exp $
 
---- Makefile.in.orig	2010-05-30 23:36:17.000000000 +0200
-+++ Makefile.in	2010-06-13 12:28:00.000000000 +0200
-@@ -294,16 +294,14 @@
+--- Makefile.in.orig	2011-12-03 21:26:32.000000000 +0000
++++ Makefile.in
+@@ -295,17 +295,15 @@ EXTRA_DIST = README.html INSTALL.html UP
  	maildroptips.txt COPYING.GPL manpage.css pgpkeys.txt
  
  scriptdir = $(pkgdatadir)/scripts
 -DELIVERQUOTAHTMLSOURCE = maildirquota.html deliverquota.html
 -DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
 -DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
--MAILDROPHTML = lockmail.html maildirmake.html maildropex.html \
+-MAILDROPHTML = lockmail.html maildiracl.html maildirkw.html \
+-	maildirmake.html maildropex.html \
 -	maildir.html \
-+DELIVERQUOTAHTMLSOURCE = 
-+DELIVERQUOTAHTML = 
-+DELIVERQUOTAMAN = 
-+MAILDROPHTML = lockmail.html maildropex.html \
++DELIVERQUOTAHTMLSOURCE =
++DELIVERQUOTAHTML =
++DELIVERQUOTAMAN =
++MAILDROPHTML = lockmail.html \
++	maildropex.html \
  	maildropfilter.html maildropgdbm.html maildrop.html mailbot.html \
  	makemime.html reformail.html reformime.html
  
@@ -24,7 +26,7 @@ $NetBSD: patch-aa,v 1.8 2010/06/15 23:14:47 pettai Exp $
  	maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1
  
  EXTRA_LTLIBRARIES = librfc822.la librfc2045.la
-@@ -1140,12 +1138,8 @@
+@@ -1143,12 +1141,8 @@ uninstall-man: uninstall-man1 uninstall-
  #  Create a soft link from bindir/deliverquota to libdir/bin/deliverquota
  
  install-deliverquota:
@@ -37,7 +39,7 @@ $NetBSD: patch-aa,v 1.8 2010/06/15 23:14:47 pettai Exp $
  
  install-data-local: install-man install-deliverquota install-maildrop
  
-@@ -1173,23 +1167,24 @@
+@@ -1176,23 +1170,24 @@ install-maildrop:
  		$(INSTALL_PROGRAM) maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \
  	done
  	$(INSTALL_PROGRAM) liblock/lockmail $(DESTDIR)$(bindir)/lockmail