projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 79aff80)
Bump for a bug in how File-MimeInfo handles utf8 in weird circumstances. Filed upstre...
authorMichael Cummings <mcummings@gentoo.org>
Wed, 6 Sep 2006 14:38:07 +0000 (14:38 +0000)
committerMichael Cummings <mcummings@gentoo.org>
Wed, 6 Sep 2006 14:38:07 +0000 (14:38 +0000)
Package-Manager: portage-2.1.1_rc1-r3

dev-perl/File-MimeInfo/ChangeLog patch | blob | history
dev-perl/File-MimeInfo/File-MimeInfo-0.13-r1.ebuild [new file with mode: 0644] patch | blob
dev-perl/File-MimeInfo/Manifest patch | blob | history
dev-perl/File-MimeInfo/files/digest-File-MimeInfo-0.13-r1 [new file with mode: 0644] patch | blob
dev-perl/File-MimeInfo/files/mimeinfo.patch [new file with mode: 0644] patch | blob
dev-perl/File-MimeInfo/files/test01.patch [new file with mode: 0644] patch | blob

diff --git a/dev-perl/File-MimeInfo/ChangeLog b/dev-perl/File-MimeInfo/ChangeLog
index 7f9e79c14b73ce44601aa5db1a5ca828c5157842..ff5d0c8a8ad2cc69db7799dbc2a66b8bbff612ce 100644 (file)
--- a/dev-perl/File-MimeInfo/ChangeLog
+++ b/dev-perl/File-MimeInfo/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-perl/File-MimeInfo
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MimeInfo/ChangeLog,v 1.25 2006/08/07 22:49:06 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MimeInfo/ChangeLog,v 1.26 2006/09/06 14:38:07 mcummings Exp $
+
+*File-MimeInfo-0.13-r1 (06 Sep 2006)
+
+  06 Sep 2006; Michael Cummings <mcummings@gentoo.org>
+  +files/mimeinfo.patch, +files/test01.patch, +File-MimeInfo-0.13-r1.ebuild:
+  Bump for a bug in how File-MimeInfo handles utf8 in weird circumstances.
+  Filed upstream as http://rt.cpan.org/Public/Bug/Display.html?id=20376 -
+  noticed when running filer ; Patched test01 for flakiness in detecting
+  plain/text.
 
   07 Aug 2006; Michael Cummings <mcummings@gentoo.org>
   File-MimeInfo-0.13.ebuild:
diff --git a/dev-perl/File-MimeInfo/File-MimeInfo-0.13-r1.ebuild b/dev-perl/File-MimeInfo/File-MimeInfo-0.13-r1.ebuild
new file mode 100644 (file)
index 0000000..da21181
--- /dev/null
+++ b/dev-perl/File-MimeInfo/File-MimeInfo-0.13-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MimeInfo/File-MimeInfo-0.13-r1.ebuild,v 1.1 2006/09/06 14:38:07 mcummings Exp $
+
+inherit perl-module
+
+DESCRIPTION="Determine file type"
+SRC_URI="mirror://cpan/authors/id/P/PA/PARDUS/${PN}/${P}.tar.gz"
+HOMEPAGE="http://search.cpan.org/CPAN/authors/id/P/PA/PARDUS/${PN}/${P}.readme"
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+SRC_TEST="do"
+PATCHES="${FILESDIR}/mimeinfo.patch
+               ${FILESDIR}/test01.patch"
+
+DEPEND="dev-perl/File-BaseDir
+       x11-misc/shared-mime-info
+       dev-lang/perl"
+RDEPEND="${DEPEND}"
+
diff --git a/dev-perl/File-MimeInfo/Manifest b/dev-perl/File-MimeInfo/Manifest
index deffd3807a966ed8375b4f5dff2f36f178028d91..b91134503bd7a81c9ef99319d6eedb8657d6dab4 100644 (file)
--- a/dev-perl/File-MimeInfo/Manifest
+++ b/dev-perl/File-MimeInfo/Manifest
@@ -1,6 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX mimeinfo.patch 790 RMD160 5487d39e247ca852c1b0e01efa5e592e7bb54319 SHA1 b44ff7374b093503ba930d3427fcd4a057ba15a9 SHA256 93118e4119e4b60e94d804d52f44640c66deab4016f158c00b5f0d1aab532205
+MD5 398a52b8c7c2dd6ff515fb5e8daf8dee files/mimeinfo.patch 790
+RMD160 5487d39e247ca852c1b0e01efa5e592e7bb54319 files/mimeinfo.patch 790
+SHA256 93118e4119e4b60e94d804d52f44640c66deab4016f158c00b5f0d1aab532205 files/mimeinfo.patch 790
+AUX test01.patch 307 RMD160 fbe7113e361f6ccd888d6c239d0df472d9a5b04d SHA1 f194487cfb647573d084011cba6f3de1e0279fbc SHA256 924e0fc81ad575c14412844ab45535f141a709c830663e19dad16fab909cff69
+MD5 c08ae9e6ebc271a249441607e1601e07 files/test01.patch 307
+RMD160 fbe7113e361f6ccd888d6c239d0df472d9a5b04d files/test01.patch 307
+SHA256 924e0fc81ad575c14412844ab45535f141a709c830663e19dad16fab909cff69 files/test01.patch 307
 DIST File-MimeInfo-0.10.tar.gz 16498
 DIST File-MimeInfo-0.11.tar.gz 18550
 DIST File-MimeInfo-0.12.tar.gz 23934
@@ -17,14 +25,18 @@ EBUILD File-MimeInfo-0.12.ebuild 636 RMD160 488a53153972a08cb61b4cce37301f9f642c
 MD5 b62b26d2ae69fe8b67d0350dd84cae0e File-MimeInfo-0.12.ebuild 636
 RMD160 488a53153972a08cb61b4cce37301f9f642c6d12 File-MimeInfo-0.12.ebuild 636
 SHA256 6dbde7fdfde88c5bba2e8294ab577ad577e2d758ab586af816728a7d6c7841fc File-MimeInfo-0.12.ebuild 636
+EBUILD File-MimeInfo-0.13-r1.ebuild 707 RMD160 ad4fb66d2375bd763b84f0ea75a1d9c76dccdf7e SHA1 39dbe07de517916e2e6a413ff648c2c5a2fa4584 SHA256 912efd95e82e4ff0ccbdf8a6ba34b63daea93c957bc41985f0cf2f0d914cbffb
+MD5 16c4ccd797f7688391ede7bdb6a3d468 File-MimeInfo-0.13-r1.ebuild 707
+RMD160 ad4fb66d2375bd763b84f0ea75a1d9c76dccdf7e File-MimeInfo-0.13-r1.ebuild 707
+SHA256 912efd95e82e4ff0ccbdf8a6ba34b63daea93c957bc41985f0cf2f0d914cbffb File-MimeInfo-0.13-r1.ebuild 707
 EBUILD File-MimeInfo-0.13.ebuild 637 RMD160 55f4997888e67a423781395218fc421ad15892b4 SHA1 75fda80286c993e68bce9bc5bac3b4aaa26ae3dd SHA256 3d3f65d0ba421a6ae1d4563c4da14eb852a77672293f998245e730a196cf0430
 MD5 b8a7e6bbad2fd0408497a488de55cf11 File-MimeInfo-0.13.ebuild 637
 RMD160 55f4997888e67a423781395218fc421ad15892b4 File-MimeInfo-0.13.ebuild 637
 SHA256 3d3f65d0ba421a6ae1d4563c4da14eb852a77672293f998245e730a196cf0430 File-MimeInfo-0.13.ebuild 637
-MISC ChangeLog 3219 RMD160 478da976aac504707ccb8f9631e9850910141c40 SHA1 d96c5a81a599c8a23eb1656ff213187b04978956 SHA256 7330bfe378c5df1bfddb79fb891622b9eee7ea332a99372c6d4221cd10a589c0
-MD5 a31a2599fc1def64bba3210b33910414 ChangeLog 3219
-RMD160 478da976aac504707ccb8f9631e9850910141c40 ChangeLog 3219
-SHA256 7330bfe378c5df1bfddb79fb891622b9eee7ea332a99372c6d4221cd10a589c0 ChangeLog 3219
+MISC ChangeLog 3626 RMD160 b8ecbedfa000902eb7a97dac06f179e8f6e94802 SHA1 37b140cdc898e1c8a9cf7ed95560ccfeeba68c82 SHA256 362c33cfb3da8f13afd27c53840f095f66b2015b8152ab862fd7f770db39ef79
+MD5 03c2dd3b9647c3cbc4f629bfd3ea109d ChangeLog 3626
+RMD160 b8ecbedfa000902eb7a97dac06f179e8f6e94802 ChangeLog 3626
+SHA256 362c33cfb3da8f13afd27c53840f095f66b2015b8152ab862fd7f770db39ef79 ChangeLog 3626
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
@@ -41,10 +53,13 @@ SHA256 46682f29407fca7a8717dcc0a66ad0423d8aa1241d6a653ed196e3c4e7178423 files/di
 MD5 d106c6dab723eaa55b968f48b69271f6 files/digest-File-MimeInfo-0.13 253
 RMD160 39b1871ab9d9e28bb5087250d517fef7beb8e009 files/digest-File-MimeInfo-0.13 253
 SHA256 80ad00b43eda575c4f0cec957f23f9d61474c193993813db78173462254dabf4 files/digest-File-MimeInfo-0.13 253
+MD5 d106c6dab723eaa55b968f48b69271f6 files/digest-File-MimeInfo-0.13-r1 253
+RMD160 39b1871ab9d9e28bb5087250d517fef7beb8e009 files/digest-File-MimeInfo-0.13-r1 253
+SHA256 80ad00b43eda575c4f0cec957f23f9d61474c193993813db78173462254dabf4 files/digest-File-MimeInfo-0.13-r1 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFE18N9tG5z4I8BtQoRAoqcAJ9xztlHYpDutvslxHcknoVOvc3RiACfdm5+
-Tcyr8PLXX91B0JLcTWME7o0=
-=qZMj
+iD8DBQFE/t1VtG5z4I8BtQoRAqt5AJ4qFIvb/H+U4W3ePAwTiyy7sSA+KwCgifeX
+bu9CgE9Jpwcvjqmcg4SgSeE=
+=571o
 -----END PGP SIGNATURE-----
diff --git a/dev-perl/File-MimeInfo/files/digest-File-MimeInfo-0.13-r1 b/dev-perl/File-MimeInfo/files/digest-File-MimeInfo-0.13-r1
new file mode 100644 (file)
index 0000000..0e3e4be
--- /dev/null
+++ b/dev-perl/File-MimeInfo/files/digest-File-MimeInfo-0.13-r1
@@ -0,0 +1,3 @@
+MD5 f87b07e1608f4380bb3f53154ac671bb File-MimeInfo-0.13.tar.gz 24327
+RMD160 03de4611611c2b4b0042682a87001b5a3a407dd7 File-MimeInfo-0.13.tar.gz 24327
+SHA256 e7ca658a1b8da4ed2e93656449317b6108c6743b1dce51426ed78681657e9170 File-MimeInfo-0.13.tar.gz 24327
diff --git a/dev-perl/File-MimeInfo/files/mimeinfo.patch b/dev-perl/File-MimeInfo/files/mimeinfo.patch
new file mode 100644 (file)
index 0000000..50f7917
--- /dev/null
+++ b/dev-perl/File-MimeInfo/files/mimeinfo.patch
@@ -0,0 +1,19 @@
+--- File-MimeInfo-0.13.orig/MimeInfo.pm        2006-07-09 10:57:47.000000000 -0400
++++ File-MimeInfo-0.13/MimeInfo.pm     2006-07-09 10:59:12.000000000 -0400
+@@ -116,8 +116,14 @@ sub default {
+ 
+       {
+               no warnings; # warnings can be thrown when input is neither ascii or utf8
+-              $line =~ s/\s//g; # \n and \t are also control chars
+-              return 'text/plain' unless $line =~ /[\x00-\x1F\xF7]/;
++        if ($] < 5.008) {
++            $line =~ s/([^\0-\x7F])/do {my $o = ord($1); sprintf("%c%c", 0xc0 | ($o >> 6), 0x80 | ($o & 0x3f)) }/ge;
++        }
++        else
++        {
++            utf8::encode($line)
++        }
++        return 'text/plain' unless $line =~ /[\x00-\x1F\xF7]/;
+       }
+       print STDERR "> First 10 bytes of the file contain control chars\n" if $DEBUG;
+       return 'application/octet-stream';
diff --git a/dev-perl/File-MimeInfo/files/test01.patch b/dev-perl/File-MimeInfo/files/test01.patch
new file mode 100644 (file)
index 0000000..b5f5ce4
--- /dev/null
+++ b/dev-perl/File-MimeInfo/files/test01.patch
@@ -0,0 +1,8 @@
+diff -Naurp File-MimeInfo-0.13/t/default/plain_text File-MimeInfo-0.13.new/t/default/plain_text
+--- File-MimeInfo-0.13/t/default/plain_text    2003-07-12 12:39:39.000000000 -0400
++++ File-MimeInfo-0.13.new/t/default/plain_text        2006-09-06 10:19:44.000000000 -0400
+@@ -1,4 +1 @@
+-
+ This is a plain text file
+-
+-
Unnamed repository; edit this file 'description' to name the repository.