Update to 2.6.18 to address a security vulnerability. This should correct #349563. Also fix minor QA issues and update copyright dates.

(Portage version: 2.1.9.39/cvs/Linux x86_64)

7 files changed, 47 insertions, 15 deletions

diff --git a/net-mail/mhonarc/ChangeLog b/net-mail/mhonarc/ChangeLog
index ab96988b44ee..bf65f00117de 100644
--- a/net-mail/mhonarc/ChangeLog
+++ b/net-mail/mhonarc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/mhonarc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/ChangeLog,v 1.17 2011/02/06 10:13:45 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/ChangeLog,v 1.18 2011/02/13 11:21:04 kumba Exp $
+
+*mhonarc-2.6.18 (13 Feb 2011)
+
+  13 Feb 2011; Joshua Kinard <kumba@gentoo.org> mhonarc-2.6.10.ebuild,
+  mhonarc-2.6.11.ebuild, mhonarc-2.6.16-r1.ebuild, +mhonarc-2.6.18.ebuild:
+  Update to 2.6.18 to address a security vulnerability. This should correct
+  #349563. Also fix minor QA issues and update copyright dates.
 
   06 Feb 2011; Mart Raudsepp <leio@gentoo.org> mhonarc-2.6.10.ebuild:
   Drop to ~mips
diff --git a/net-mail/mhonarc/mhonarc-2.6.10.ebuild b/net-mail/mhonarc/mhonarc-2.6.10.ebuild
index 8600a459b011..c44832f2dd56 100644
--- a/net-mail/mhonarc/mhonarc-2.6.10.ebuild
+++ b/net-mail/mhonarc/mhonarc-2.6.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/mhonarc-2.6.10.ebuild,v 1.7 2011/02/06 10:13:45 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/mhonarc-2.6.10.ebuild,v 1.8 2011/02/13 11:21:04 kumba Exp $
 
 inherit perl-app
 
@@ -19,8 +19,8 @@ KEYWORDS="alpha ~amd64 ~mips ~ppc sparc x86"
 S="${WORKDIR}/${P/mhonarc/MHonArc}"
 
 src_install() {
-	mv ${S}/Makefile ${S}/Makefile.orig
+	mv "${S}"/Makefile "${S}"/Makefile.orig
 	sed -e "s:/usr:${D}/usr:g" -e "s:${D}/usr/bin/perl:/usr/bin/perl:g" \
-		${S}/Makefile.orig > ${S}/Makefile
+		"${S}"/Makefile.orig > "${S}"/Makefile
 	perl-module_src_install
 }
diff --git a/net-mail/mhonarc/mhonarc-2.6.11.ebuild b/net-mail/mhonarc/mhonarc-2.6.11.ebuild
index 82278bc994aa..4a3f6d09c0be 100644
--- a/net-mail/mhonarc/mhonarc-2.6.11.ebuild
+++ b/net-mail/mhonarc/mhonarc-2.6.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/mhonarc-2.6.11.ebuild,v 1.4 2007/07/02 14:56:07 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/mhonarc-2.6.11.ebuild,v 1.5 2011/02/13 11:21:04 kumba Exp $
 
 inherit perl-app
 
@@ -19,8 +19,8 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~amd64"
 S="${WORKDIR}/${P/mhonarc/MHonArc}"
 
 src_install() {
-	mv ${S}/Makefile ${S}/Makefile.orig
+	mv "${S}"/Makefile "${S}"/Makefile.orig
 	sed -e "s:/usr:${D}/usr:g" -e "s:${D}/usr/bin/perl:/usr/bin/perl:g" \
-		${S}/Makefile.orig > ${S}/Makefile
+		"${S}"/Makefile.orig > "${S}"/Makefile
 	perl-module_src_install
 }
diff --git a/net-mail/mhonarc/mhonarc-2.6.15.ebuild b/net-mail/mhonarc/mhonarc-2.6.15.ebuild
index bbf6872e6d2b..8384a56f9b51 100644
--- a/net-mail/mhonarc/mhonarc-2.6.15.ebuild
+++ b/net-mail/mhonarc/mhonarc-2.6.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/mhonarc-2.6.15.ebuild,v 1.3 2007/07/02 14:56:07 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/mhonarc-2.6.15.ebuild,v 1.4 2011/02/13 11:21:04 kumba Exp $
 
 inherit perl-app
 
diff --git a/net-mail/mhonarc/mhonarc-2.6.16-r1.ebuild b/net-mail/mhonarc/mhonarc-2.6.16-r1.ebuild
index 69c7e6066b19..be1e7e36a02a 100644
--- a/net-mail/mhonarc/mhonarc-2.6.16-r1.ebuild
+++ b/net-mail/mhonarc/mhonarc-2.6.16-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/mhonarc-2.6.16-r1.ebuild,v 1.3 2008/05/09 22:27:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/mhonarc-2.6.16-r1.ebuild,v 1.4 2011/02/13 11:21:04 kumba Exp $
 
 inherit perl-app
 
@@ -19,7 +19,7 @@ KEYWORDS="~alpha amd64 ~mips ~ppc ~sparc x86"
 S="${WORKDIR}/${P/mhonarc/MHonArc}"
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	epatch "${FILESDIR}"/${P}-list-output-order.patch
 }
 
diff --git a/net-mail/mhonarc/mhonarc-2.6.16-r2.ebuild b/net-mail/mhonarc/mhonarc-2.6.16-r2.ebuild
index 5e736eb2acb9..a3be79e70a02 100644
--- a/net-mail/mhonarc/mhonarc-2.6.16-r2.ebuild
+++ b/net-mail/mhonarc/mhonarc-2.6.16-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/mhonarc-2.6.16-r2.ebuild,v 1.1 2008/12/29 20:07:28 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/mhonarc-2.6.16-r2.ebuild,v 1.2 2011/02/13 11:21:04 kumba Exp $
 
 inherit perl-app
 
diff --git a/net-mail/mhonarc/mhonarc-2.6.18.ebuild b/net-mail/mhonarc/mhonarc-2.6.18.ebuild
new file mode 100644
index 000000000000..5dba010a38ff
--- /dev/null
+++ b/net-mail/mhonarc/mhonarc-2.6.18.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/mhonarc-2.6.18.ebuild,v 1.1 2011/02/13 11:21:04 kumba Exp $
+
+inherit perl-app
+
+IUSE=""
+
+SRC_URI="http://www.mhonarc.org/release/MHonArc/tar/MHonArc-${PV}.tar.bz2"
+RESTRICT="mirror"
+
+DESCRIPTION="Perl Mail-to-HTML Converter"
+HOMEPAGE="http://www.mhonarc.org/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+
+S="${WORKDIR}/${P/mhonarc/MHonArc}"
+
+src_install() {
+	sed -e "s|-prefix |-docpath '${D}/usr/share/doc/${PF}' -prefix '${D}'|g" -i Makefile
+	perl-module_src_install
+	prepalldocs
+}