diff options
| author | shattered <shattered@pkgsrc.org> | 2012-02-22 21:01:53 +0000 |
|---|---|---|
| committer | shattered <shattered@pkgsrc.org> | 2012-02-22 21:01:53 +0000 |
| commit | ead3a993878a1dbdae3bd83ba8b9fb050e80dc01 (patch) | |
| tree | f9a01d070a6bd095de37d5fafa2da7702b222774 /converters | |
| parent | 0d840aba4489a6053b992d1d3cb341d33606abd6 (diff) | |
| download | pkgsrc-ead3a993878a1dbdae3bd83ba8b9fb050e80dc01.tar.gz | |
Fix PR/42308 "munpack no longer preserve filenames", using the patch from
Debian bug 212283.
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/mpack/Makefile | 4 | ||||
| -rw-r--r-- | converters/mpack/distinfo | 4 | ||||
| -rw-r--r-- | converters/mpack/patches/patch-ag | 13 |
3 files changed, 16 insertions, 5 deletions
diff --git a/converters/mpack/Makefile b/converters/mpack/Makefile index ad9c8d416b7..c2b2b3eb198 100644 --- a/converters/mpack/Makefile +++ b/converters/mpack/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2012/01/10 21:09:55 tez Exp $ +# $NetBSD: Makefile,v 1.23 2012/02/22 21:01:53 shattered Exp $ DISTNAME= mpack-1.6 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= converters mail news MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/mpack/ diff --git a/converters/mpack/distinfo b/converters/mpack/distinfo index ab8c13e13ec..b3d3a0d49a1 100644 --- a/converters/mpack/distinfo +++ b/converters/mpack/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2012/01/10 21:09:55 tez Exp $ +$NetBSD: distinfo,v 1.15 2012/02/22 21:01:53 shattered Exp $ SHA1 (mpack-1.6.tar.gz) = 7fd3a73e0f131412920b6ff34872e7e7fa03e03b RMD160 (mpack-1.6.tar.gz) = a83330aa15437dc3ca6475cbf6e35b09ab9cef07 @@ -8,5 +8,5 @@ SHA1 (patch-ac) = a69986a5c1b7659fac6df05f4db9a44df3110892 SHA1 (patch-ad) = 76f32d163021a81d73d8316f72b141ef3edf4f14 SHA1 (patch-ae) = 7cbc232a310d0aa2c18b8f2fc3dba0a3fae311b8 SHA1 (patch-af) = 2b38171d450ddbe1f9bb7a520d5e114a15afab9d -SHA1 (patch-ag) = 9075ca42dd37e349284e5bb44bc15b740998a987 +SHA1 (patch-ag) = c74c5e0f6f79a0c975172863c082152d7f4ff990 SHA1 (patch-uudecode_c) = ca9ccf61afeef850fca198346105c437023ba4e3 diff --git a/converters/mpack/patches/patch-ag b/converters/mpack/patches/patch-ag index 8ef9451ad4e..3cb14094f3f 100644 --- a/converters/mpack/patches/patch-ag +++ b/converters/mpack/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1 2010/11/17 22:24:40 is Exp $ +$NetBSD: patch-ag,v 1.2 2012/02/22 21:01:53 shattered Exp $ --- decode.c.orig 2003-07-21 20:47:54.000000000 +0000 +++ decode.c @@ -10,6 +10,17 @@ $NetBSD: patch-ag,v 1.1 2010/11/17 22:24:40 is Exp $ #include <stdio.h> #include <string.h> #include <ctype.h> +@@ -545,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); @@ -601,7 +602,7 @@ int handlePartial(struct part *inpart, c { char *id, *dir, *p; |