net-mail/mpack: Apply bugfix patches

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

5 files changed, 73 insertions, 9 deletions

diff --git a/net-mail/mpack/ChangeLog b/net-mail/mpack/ChangeLog
index ada94213edec..3dc860931af0 100644
--- a/net-mail/mpack/ChangeLog
+++ b/net-mail/mpack/ChangeLog
@@ -1,6 +1,10 @@
 # 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.19 2012/01/04 18:00:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mpack/ChangeLog,v 1.20 2012/01/08 16:48:58 sping Exp $
+
+  08 Jan 2012; Sebastian Pipping <sping@gentoo.org> mpack-1.6-r2.ebuild,
+  +files/mpack-1.6-filenames.patch, +files/mpack-1.6-usage.patch:
+  Apply bugfix patches
 
   04 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> mpack-1.6-r2.ebuild:
   x86 stable wrt bug #171075
diff --git a/net-mail/mpack/Manifest b/net-mail/mpack/Manifest
index 20e6cdcd1b9f..e837e5053928 100644
--- a/net-mail/mpack/Manifest
+++ b/net-mail/mpack/Manifest
@@ -1,25 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX mpack-1.5-malloc-fix.patch 824 RMD160 a991c4fe77bf5827b29bb3d5054fede5ebcc562f SHA1 1cfe57c2146da08b08ee224d081ad61004e09890 SHA256 1762b62ca1be741aa1a8423be80beb6a549325ab0205ae187c6c65e3b10cc1a4
 AUX mpack-1.5-r1.patch 2345 RMD160 8f51138c5fb59a92c2cb8b5f0fcd80f5246bded3 SHA1 38217e9014580233d7c9e3562dd7a5ff87af42c0 SHA256 e11b8ef09f241cdd826877845691b232fedc77b1f37998d9799119986d4b89c0
 AUX mpack-1.6-compile.patch 2652 RMD160 0922d163e4af74a7de8dc70962ba37fc22cdc656 SHA1 c05cf2bdf70a6475d555259c97907539f8b655f2 SHA256 190b6a97588203d3e1527b0aa5aa68137e80ca27ce8211bdd135cca2ffd1e2bb
 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-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
 DIST mpack-1.6.tar.gz 179850 RMD160 a83330aa15437dc3ca6475cbf6e35b09ab9cef07 SHA1 7fd3a73e0f131412920b6ff34872e7e7fa03e03b SHA256 274108bb3a39982a4efc14fb3a65298e66c8e71367c3dabf49338162d207a94c
 EBUILD mpack-1.5-r1.ebuild 823 RMD160 ad478bfa3ced02337e2b60f3687251ea65bb79c8 SHA1 e822f24d0a9edebc1392dd0c66e83189eaa1e275 SHA256 72e1f4c835d7b188cd25f7a4e1e32c851757bda8f2c0be49e1c2a768f7d767bc
 EBUILD mpack-1.5.ebuild 594 RMD160 eb834291cf4120466d87712dcca4dbb30742bf51 SHA1 aff06dcf57593e4401b4b76fd40208e6d4f59779 SHA256 c9fd3a62f0610b562723e2e173dc38e9987b361685f5a6339a30e462537346c3
 EBUILD mpack-1.6-r1.ebuild 750 RMD160 a1e3f182d8366899d835398648bc0785e833234b SHA1 67c2b9a0cb731fd363a9ab0d30433fa70a455bd5 SHA256 7484e40abc7f578f141f859daf68f99ca5b4cfd74b668115f37e278ef43c3356
-EBUILD mpack-1.6-r2.ebuild 848 RMD160 aa33f05fd689e2fc12e46845e4752aae6e8e4e23 SHA1 79a449a898775813057c2184545931e78ee14b05 SHA256 90e4f4e8ea0705cb8f373e52c0c852b70396a15edd72f47c1ee7395e3fa59ba5
+EBUILD mpack-1.6-r2.ebuild 926 RMD160 735c755f08d92c96ef9b8c8d477f33a5921b1b69 SHA1 e672ce56162d43a6e857f4234633c11a6f8c160c SHA256 02fe6e1dafc7c9f14cf760d1c7c872551e1458e33fa8020bc3eda493ecf598ce
 EBUILD mpack-1.6.ebuild 698 RMD160 757b0768b615bb5fc0589e16dbb976b29e90b7a9 SHA1 05b67313686aaa96761bc8b4c4170c5a24e9a07d SHA256 5b23f080d57b7643dab4eee7c77282b227882c566eeed30fadebf4bd131277af
-MISC ChangeLog 2950 RMD160 a308e86a201b110419232a9d43b7b8f5706e1ec5 SHA1 bfe485c952453d236eb6421ff2e2e3f087200eac SHA256 5a461aae7a17618f5803fd09f15ef584fd2ced2bacd22969b6e87b1d06a346c4
+MISC ChangeLog 3108 RMD160 11cfd91c6ff6b9112c1cfaef62cf0fe79e5058f3 SHA1 1bf760c79e9d821619beafb7d06641d54236a540 SHA256 24911b6a49fa214d6e318f4c56341d6a2a77a6d1cbba3350a97963fab883998d
 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)
 
-iEYEAREKAAYFAk8Ek9EACgkQuUQtlDBCeQKaywCdEEs78WkeRT+rZjzzVWPfnlng
-j8EAnjwe2o7uNWlIMIA5VtfxKHtS6qvI
-=xPKi
+iEYEARECAAYFAk8JyOkACgkQsAvGakAaFgDPfQCg2JfLwM59BDPkMCL5kGlDq2cT
+XC8AoKF28drihYvU+K0Y0R/5pNt1xDvP
+=jCnQ
 -----END PGP SIGNATURE-----
diff --git a/net-mail/mpack/files/mpack-1.6-filenames.patch b/net-mail/mpack/files/mpack-1.6-filenames.patch
new file mode 100644
index 000000000000..6a1fc225a791
--- /dev/null
+++ b/net-mail/mpack/files/mpack-1.6-filenames.patch
@@ -0,0 +1,30 @@
+From 10aad11d7baf7044328fff616b9c6f1859bd2cbd Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 8 Jan 2012 17:36:20 +0100
+Subject: [PATCH 1/2] Use actual filenames for unpacking (rather than
+ "part[0-9]+")
+
+Example:
+# curl http://pbot.rmdir.de/b224d87617c5d76d6cd938bd4410fabf | ./munpack
+---
+ decode.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/decode.c b/decode.c
+index 8b8df56..7349abd 100644
+--- a/decode.c
++++ b/decode.c
+@@ -546,8 +546,8 @@ getDispositionFilename(char *disposition)
+ 	SkipWhitespace(&disposition);
+ 	if (!disposition) return 0;
+ 
+-	/* If we're looking at a ";", we found what we're looking for */
+-	if (*disposition++ == ';') break;
++	/* If we're looking at a "=", we found what we're looking for */
++	if (*disposition++ == '=') break;
+     }
+ 
+     SkipWhitespace(&disposition);
+-- 
+1.7.8.3
+
diff --git a/net-mail/mpack/files/mpack-1.6-usage.patch b/net-mail/mpack/files/mpack-1.6-usage.patch
new file mode 100644
index 000000000000..f4f07e530ee9
--- /dev/null
+++ b/net-mail/mpack/files/mpack-1.6-usage.patch
@@ -0,0 +1,25 @@
+From 74fd172db4961ab07f134a60cd88955fb170f11d Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 8 Jan 2012 17:39:51 +0100
+Subject: [PATCH 2/2] Mention parameter -t in usage output
+
+---
+ unixunpk.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/unixunpk.c b/unixunpk.c
+index 0f5fa85..1320b70 100644
+--- a/unixunpk.c
++++ b/unixunpk.c
+@@ -101,7 +101,7 @@ int main(int argc, char **argv)
+ 
+ void usage(void) {
+     fprintf(stderr, "munpack version %s\n", MPACK_VERSION);
+-    fprintf(stderr, "usage: munpack [-f] [-q] [-C directory] [files...]\n");
++    fprintf(stderr, "usage: munpack [-f] [-q] [-t] [-C directory] [files...]\n");
+     exit(1);
+ }
+ 
+-- 
+1.7.8.3
+
diff --git a/net-mail/mpack/mpack-1.6-r2.ebuild b/net-mail/mpack/mpack-1.6-r2.ebuild
index 6b2eb070c37f..e92cb345f985 100644
--- a/net-mail/mpack/mpack-1.6-r2.ebuild
+++ b/net-mail/mpack/mpack-1.6-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.4 2012/01/04 18:00:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mpack/mpack-1.6-r2.ebuild,v 1.5 2012/01/08 16:48:58 sping Exp $
 
 EAPI="3"
 
@@ -18,6 +18,9 @@ KEYWORDS="amd64 ~sparc x86 ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-filenames.patch
+	epatch "${FILESDIR}"/${P}-usage.patch
+
 	# NOTE: These three patches replace <mpack-1.6-gentoo.patch>
 	epatch "${FILESDIR}"/${P}-compile.patch
 	epatch "${FILESDIR}"/${P}-paths.patch