net-mail/mpack: 1.6-r3

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 105 insertions, 6 deletions

diff --git a/net-mail/mpack/ChangeLog b/net-mail/mpack/ChangeLog
index 5214dbfec45a..4a3408cff8b3 100644
--- a/net-mail/mpack/ChangeLog
+++ b/net-mail/mpack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/mpack
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mpack/ChangeLog,v 1.21 2012/01/14 18:44:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mpack/ChangeLog,v 1.22 2012/01/19 06:38:23 sping Exp $
+
+*mpack-1.6-r3 (19 Jan 2012)
+
+  19 Jan 2012; Sebastian Pipping <sping@gentoo.org> +mpack-1.6-r3.ebuild,
+  +files/mpack-1.6-munpack.patch:
+  Integrate bugfix patch for munpack
 
   14 Jan 2012; Raúl Porcel <armin76@gentoo.org> mpack-1.5.ebuild,
   mpack-1.5-r1.ebuild, mpack-1.6.ebuild, mpack-1.6-r1.ebuild,
diff --git a/net-mail/mpack/Manifest b/net-mail/mpack/Manifest
index 0bbf297c1620..777728a8d7a9 100644
--- a/net-mail/mpack/Manifest
+++ b/net-mail/mpack/Manifest
@@ -7,6 +7,7 @@ AUX mpack-1.6-compile.patch 2652 RMD160 0922d163e4af74a7de8dc70962ba37fc22cdc656
 AUX mpack-1.6-cve-2011-4919.patch 706 RMD160 778b3fab001eb8565fd643a54114892b7c046104 SHA1 221e6f392294420bb3ae68045c8c007ce17ffc48 SHA256 ff86494abdee7d4868656bf525a018ccfbd479cde75faf10e468e1c0c8f1fb0c
 AUX mpack-1.6-filenames.patch 882 RMD160 a48790a152c07f6d92585421ba5c3301d4043ef9 SHA1 f47e1ba21d283a65ee8d8c8955b356c6e8cec23c SHA256 1aad17f5b71a36a59edd1a5ee32257477534c7a0986032801990e6bd58e3d339
 AUX mpack-1.6-gentoo.patch 2022 RMD160 95459db0590644ae2b0acd94b05f748d2ff54820 SHA1 bd699376b38e8fa8fb9e8ff9f19513e79df928ad SHA256 7d00e9be884b8c672820b5801b46bc708f143cc93d356828044f9c1370b58feb
+AUX mpack-1.6-munpack.patch 1341 RMD160 4ee1fca306778f0ffcfcd2111c6366f5fe289150 SHA1 13b41da25f6b52f4f8c4a87ef18a6755c462ae9f SHA256 865c4cbeaf2f90a0e338a5ef4a9e371936c4bb5aa6a9f48947fde6ef2e39a2ed
 AUX mpack-1.6-paths.patch 2729 RMD160 1ffa7ad504ecd7a0886d81cafb0d6ca840983b6e SHA1 8b36a943d982d4c82ac601e35acf9954f9415683 SHA256 534e3e26d91bd72f3e476ccc09c3091d87b8525f5a521630b2edfe29b323ed42
 AUX mpack-1.6-usage.patch 721 RMD160 423067aad435da4eeaf668017d1ecfa925d9ad25 SHA1 90f95f8db2ac8d0332d82ccc9b38b03cf20dbcc0 SHA256 797dd899449256e0a1c029bc8402f86779b71aa58611c5f993875dd235ba153d
 DIST mpack-1.5-src.tar.Z 285360 RMD160 614c35b1f63c2a6027c978946941cd8755cba774 SHA1 1c5081edd9c7152d2a8c4585af2c5a3fc9f17d60 SHA256 78b442cf37889d56b11b368cade6e3ebe49b27d4a46fcec158669fb0b8ef1cf9
@@ -15,13 +16,14 @@ EBUILD mpack-1.5-r1.ebuild 817 RMD160 e67e112198c5a4ff81cb6ba8450bf13a07a19099 S
 EBUILD mpack-1.5.ebuild 588 RMD160 f5cb1180660c1b6b5fa6fe5f94e4591dd649d59f SHA1 a8186046a3d8a0f037e1c07a8340148f95f13ac3 SHA256 ca3bd48bc6549b9df0202c9ff6f655a4a955ae07771e2269773fb63896085ab8
 EBUILD mpack-1.6-r1.ebuild 745 RMD160 da80d33269e00c45369e0ebcd684bfbeb71d7698 SHA1 13040886b69a2d92d92378876f9e4a8726f51851 SHA256 a32a98295e8d33b9daedf7cff95871de293f0e703e91b515fcde4e899625a509
 EBUILD mpack-1.6-r2.ebuild 921 RMD160 7e39585b30c893750fe6b3800fc6422b9e4321f0 SHA1 8ebaed51cf13591b718f49ab865b3832898e25ea SHA256 34afcbaf3312ccfa6aa9cf3eb7cf55e14399927e792bc9b6aa96a517ab3c1d69
+EBUILD mpack-1.6-r3.ebuild 962 RMD160 8fb7572509c5c8ac8f61afce79a971d96fa76e99 SHA1 99d8e6b675332d5e6c92a8fd7257e6ec94809a55 SHA256 33a2dc944a392cc3fd04e2855c1b47b29ea646444e5ede094b8a100798cf137d
 EBUILD mpack-1.6.ebuild 691 RMD160 15579dd07323159abef05a80db1294d92be096f2 SHA1 211044e489a14d5c6c87ef0fd21eaf752eaaf51b SHA256 596f192c7f446ed5b2742828b20ff6de0b08edce109b027ac9c9f512c259d576
-MISC ChangeLog 3285 RMD160 e5a8b2556a373321f6a37a08088f8acf4e91dd75 SHA1 78e98881126b20f717f6cdd046ec78ca573ca08b SHA256 7e3af692e0d3e96e7da94665790ea521b8119cba6264bdcfaa39f3d200dff4ab
+MISC ChangeLog 3458 RMD160 13f5197d56f85e338254498c3006eb44de40e98d SHA1 e260f12a100996f2f379466beae813a06dd0a97b SHA256 c8009bb7d8f0a4a093c89b57062cee62852e686d2324920185e007e8f64634f2
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8RzTAACgkQuQc30/atMkCCYQCdEKtb71ofT3slQeoaCuTgiQ/7
-kcAAoLUYlWDdbM4u+IaPVxXKPSNP8oxx
-=7i/V
+iEYEARECAAYFAk8Xuk4ACgkQsAvGakAaFgD/TwCeP9PcdVQ8TjVMG8H884KI1q1d
+KwgAoI+HU8THYwy0w1n8IDdmNMO+16US
+=i2zH
 -----END PGP SIGNATURE-----
diff --git a/net-mail/mpack/files/mpack-1.6-munpack.patch b/net-mail/mpack/files/mpack-1.6-munpack.patch
new file mode 100644
index 000000000000..9d5c8af6e814
--- /dev/null
+++ b/net-mail/mpack/files/mpack-1.6-munpack.patch
@@ -0,0 +1,55 @@
+From a4ececa89969adfa53c30878b21178e1427cb6c5 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 18 Jan 2012 05:22:25 +0100
+Subject: [PATCH] Fix unpacking of multiple parts
+
+The problem was reported by Dirk Meyer of FreeBSD.
+
+He shared these commands to reproduce:
+$ ./mpack -s Subject -m 1700 -o zparts md5c.c
+$ ./munpack zparts.*
+---
+ decode.c |    2 +-
+ unixos.c |   13 +++++++++++++
+ 2 files changed, 14 insertions(+), 1 deletions(-)
+
+diff --git a/decode.c b/decode.c
+index 7349abd..e8e8d56 100644
+--- a/decode.c
++++ b/decode.c
+@@ -633,7 +633,7 @@ int handlePartial(struct part *inpart, char *headers, params contentParams, int
+ 	}
+ 	/* Store number of parts in reassembly directory */
+ 	sprintf(buf, "%sCT", dir);
+-	partfile = os_createnewfile(buf);
++	partfile = os_resetfile(buf);
+ 	if (!partfile) {
+ 	    os_perror(buf);
+ 	    goto ignore;
+diff --git a/unixos.c b/unixos.c
+index 0e2f469..1650594 100644
+--- a/unixos.c
++++ b/unixos.c
+@@ -146,6 +146,19 @@ FILE *os_createnewfile(char *fname)
+     return ret;
+ }
+ 
++FILE *os_resetfile(char *fname)
++{
++    int fd;
++    FILE *ret;
++
++    fd=open(fname, O_RDWR|O_CREAT|O_TRUNC, 0600);
++    if (fd == -1)
++        return NULL;
++
++    ret=fdopen(fd, "w");
++    return ret;
++}
++
+      
+ /*
+  * Create a new file, with suggested filename "fname".
+-- 
+1.7.8.3
+
diff --git a/net-mail/mpack/mpack-1.6-r3.ebuild b/net-mail/mpack/mpack-1.6-r3.ebuild
new file mode 100644
index 000000000000..4130118ea769
--- /dev/null
+++ b/net-mail/mpack/mpack-1.6-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mpack/mpack-1.6-r3.ebuild,v 1.1 2012/01/19 06:38:23 sping Exp $
+
+EAPI="3"
+
+AT_M4DIR=cmulocal
+
+inherit eutils autotools
+
+DESCRIPTION="Command-line MIME encoding and decoding utilities"
+HOMEPAGE="ftp://ftp.andrew.cmu.edu/pub/mpack/"
+SRC_URI="ftp://ftp.andrew.cmu.edu/pub/mpack/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-filenames.patch
+	epatch "${FILESDIR}"/${P}-usage.patch
+	epatch "${FILESDIR}"/${P}-munpack.patch
+
+	# NOTE: These three patches replace <mpack-1.6-gentoo.patch>
+	epatch "${FILESDIR}"/${P}-compile.patch
+	epatch "${FILESDIR}"/${P}-paths.patch
+	epatch "${FILESDIR}"/${P}-cve-2011-4919.patch
+
+	eautoreconf
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+	dodoc README.* Changes
+}