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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 36 insertions, 46 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/Manifest b/net-mail/altermime/Manifest
index 0954982398b1..5f9731e4b79f 100644
--- a/net-mail/altermime/Manifest
+++ b/net-mail/altermime/Manifest
@@ -1,9 +1,8 @@
+AUX altermime-0.3.10-MIME_headers-overflow.patch 517 RMD160 86dd519445e0fcf62c155269380f640b616b6db6 SHA1 a35045fc7604861655240e8531d24c3340acd5ef SHA256 268b72a52512f8537e3ef2518ebea4626ba1317aeac900feca5f51ef184f3104
 AUX altermime-0.3.10-fprintf-fixes.patch 2156 RMD160 2e51be4a10212ede23cd58031adbfdacd954e409 SHA1 4134bbc57e20b50302cb5f065390ac1ce1a28d02 SHA256 924bebb750ceb8650175aa3acef8774f339c4a1cba949c50f0db9ed6e6ed64b5
 DIST altermime-0.3.10.tar.gz 85396 RMD160 e5d7f7ad1f0c7ed02e4cf85bd9233f5543e3b6cf SHA1 b94d83a86645b4916e4999e9cf41c09575e480ab SHA256 8334da6b55d4a05dfe1492389dfe1f289953053a21773849b060d7c856ddc36e
 DIST altermime-0.3.7.tar.gz 76212 RMD160 c49698221c7a1f139e4666fba492de187bf1d0ba SHA1 eabbc914c8bd9ddfb151b04641de437d4db03bb1 SHA256 643c573bceb2921ad4b8078e1eb7ac369d77e78499f95d95c7ba058cb42b43c9
-DIST altermime-0.3.8.tar.gz 82588 RMD160 6ea554e3427bfabf709c05a773f8c3f144c5b284 SHA1 407bc3ad986d078dd0c4941cb902879393f10f5b SHA256 1894a7a0c5de7274d98f177ffb511f70e17533852f8350a908e5563e1dccb898
-EBUILD altermime-0.3.10.ebuild 944 RMD160 19ed02c45055f90b9002e0ad8d876eb95cd3e68f SHA1 69924933ddd9e0ecec8eb45e6ed0c78ea6b99abf SHA256 1d63660d2852c8030d45cc4956fed38c0f77c6311ed0c1ff7eb3f202ec8845f9
+EBUILD altermime-0.3.10.ebuild 920 RMD160 504c92ee3b1fd28fb540aae9c487fd053ba20b53 SHA1 42bc48b24790f7cac072a38f97ce0ece994975d5 SHA256 30e87c558c8003bdbd5062b601c28612f1838e2b58a30bc9eaa8ae11ffd64e2b
 EBUILD altermime-0.3.7.ebuild 883 RMD160 c699ed4fe3246ebba930b66082d2857bcfda2933 SHA1 c81409b500ced6e71b420074ca089caf53eacc80 SHA256 a2ebf37012f2c9eebb50cb3f8b9d92a66bbe3d8c49c9dafb176fb730b9ce852c
-EBUILD altermime-0.3.8.ebuild 886 RMD160 5e158613f662082fa9531d922a0315d0c434be1d SHA1 bb443acbdd3cda5f095d897793d112636abc13d9 SHA256 f1bb1aef766b27c980bdc89f3057e80fa6410d87d173bee73a63737c54b22bcd
-MISC ChangeLog 2113 RMD160 f823b6ebd5d74585395f936db7fabfb07eb51960 SHA1 f7938143fd0409d8a6807a414bfceb22e3b94214 SHA256 9afba99e3d77b354c2bfb01cd992d8bef58bc57b88926672a9d4f69ce06db1a2
+MISC ChangeLog 2317 RMD160 36f2dccc7eb6986dc531ae7309273d2b255bebd1 SHA1 086b28fdb31da032fbb376e53624af3398df8b94 SHA256 93e4c7c24a8820b47b3bf92701b7e0bcbff27c7e7712e7c758e89003498db7c5
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
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));
+