Fix building with _FORTIFY_SOURCE=2 wrt #320785 by Kevin Pyle.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 33 insertions, 42 deletions

diff --git a/net-mail/altermime/ChangeLog b/net-mail/altermime/ChangeLog
index aa13c717ffcb..29413b164960 100644
--- a/net-mail/altermime/ChangeLog
+++ b/net-mail/altermime/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/altermime
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/altermime/ChangeLog,v 1.15 2010/05/03 16:59:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/altermime/ChangeLog,v 1.16 2010/06/06 01:14:18 ssuominen Exp $
+
+  06 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  altermime-0.3.10.ebuild,
+  +files/altermime-0.3.10-MIME_headers-overflow.patch:
+  Fix building with _FORTIFY_SOURCE=2 wrt #320785 by Kevin Pyle.
 
 *altermime-0.3.10 (03 May 2010)
 
diff --git a/net-mail/altermime/altermime-0.3.10.ebuild b/net-mail/altermime/altermime-0.3.10.ebuild
index 660da03bb604..2de6e326c0f7 100644
--- a/net-mail/altermime/altermime-0.3.10.ebuild
+++ b/net-mail/altermime/altermime-0.3.10.ebuild
@@ -1,31 +1,34 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/altermime/altermime-0.3.10.ebuild,v 1.1 2010/05/03 16:59:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/altermime/altermime-0.3.10.ebuild,v 1.2 2010/06/06 01:14:18 ssuominen Exp $
 
-inherit toolchain-funcs eutils
+EAPI=2
+inherit eutils toolchain-funcs
 
 DESCRIPTION=" alterMIME is a small program which is used to alter your mime-encoded mailpacks"
 SRC_URI="http://www.pldaniels.com/altermime/${P}.tar.gz"
 HOMEPAGE="http://pldaniels.com/altermime/"
 
 LICENSE="Sendmail"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~s390 ~x86"
 IUSE=""
-SLOT="0"
 
-src_unpack() {
-	unpack ${A}
-	sed -i -e "/^CFLAGS[[:space:]]*=/ s/-O2/${CFLAGS}/" \
+src_prepare() {
+	sed -i \
+		-e "/^CFLAGS[[:space:]]*=/ s/-O2/${CFLAGS}/" \
 		-e 's/${CFLAGS} altermime.c/${CFLAGS} ${LDFLAGS} altermime.c/' \
-		"${S}"/Makefile || die "sed failed."
-	epatch "${FILESDIR}/${P}-fprintf-fixes.patch"
+		Makefile || die
+
+	epatch "${FILESDIR}"/${P}-fprintf-fixes.patch \
+		"${FILESDIR}"/${P}-MIME_headers-overflow.patch
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed."
+	emake CC="$(tc-getCC)" || die
 }
 
 src_install () {
-	dobin altermime || die "dobin failed."
-	dodoc CHANGELOG LICENCE README || die "dodoc failed."
+	dobin altermime || die
+	dodoc CHANGELOG README || die
 }
diff --git a/net-mail/altermime/altermime-0.3.8.ebuild b/net-mail/altermime/altermime-0.3.8.ebuild
deleted file mode 100644
index 65631f29a9c2..000000000000
--- a/net-mail/altermime/altermime-0.3.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/altermime/altermime-0.3.8.ebuild,v 1.1 2007/07/14 12:08:58 tove Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION=" alterMIME is a small program which is used to alter your mime-encoded mailpacks"
-SRC_URI="http://www.pldaniels.com/altermime/${P}.tar.gz"
-HOMEPAGE="http://pldaniels.com/altermime/"
-
-LICENSE="Sendmail"
-KEYWORDS="~amd64 ~ppc ~s390 ~x86"
-IUSE=""
-SLOT="0"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e "/^CFLAGS[[:space:]]*=/ s/-O2/${CFLAGS}/" \
-		-e 's/${CFLAGS} altermime.c/${CFLAGS} ${LDFLAGS} altermime.c/' \
-		"${S}"/Makefile || die "sed failed."
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed."
-}
-
-src_install () {
-	dobin altermime || die "dobin failed."
-	dodoc CHANGELOG LICENCE README || die "dodoc failed."
-}
diff --git a/net-mail/altermime/files/altermime-0.3.10-MIME_headers-overflow.patch b/net-mail/altermime/files/altermime-0.3.10-MIME_headers-overflow.patch
new file mode 100644
index 000000000000..bca39afba7f2
--- /dev/null
+++ b/net-mail/altermime/files/altermime-0.3.10-MIME_headers-overflow.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/320785
+
+--- MIME_headers.c
++++ MIME_headers.c
+@@ -2243,7 +2243,7 @@
+ 		{
+ 			if (MIMEH_DNORMAL) LOGGER_log("%s:%d:MIME_parse_contentlocation:DEBUG: filename = %s\n", FL, p);
+ 			snprintf(hinfo->name, sizeof(hinfo->name),"%s",p);
+-			snprintf(hinfo->filename, sizeof(hinfo->name),"%s",p);
++			snprintf(hinfo->filename, sizeof(hinfo->filename),"%s",p);
+ 			FNFILTER_filter(hinfo->filename, _MIMEH_FILENAMELEN_MAX);
+ 			SS_push(&(hinfo->ss_filenames), hinfo->filename, strlen(hinfo->filename));
+