mirror of
https://git.yoctoproject.org/poky
synced 2026-03-06 23:39:40 +01:00
5264982826
There is a securty issue: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-5195 Update perl to 5.14.3 to resolve this problem. Patches hurd-ccflags.diff, h2ph-multiarch.diff, index-tainting.diff and hurd-hints.diff have been merged, so remove them from SRC_URI. Update patches config.sh and Makefile.SH.patch with new PV. [Yocto 3701] (From OE-Core rev: b1fd25e05308cabb56afe1d4276470bf7380ea59) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
Upstream-Status:Inappropriate [debian patches]
|
|
From ca66b95be369b47a6d372c3653be57cd737f7f21 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Marschke <andreas.marschke@googlemail.com>
|
|
Date: Sat, 17 Sep 2011 11:38:42 +0100
|
|
Subject: Configure CPAN::Distribution with correct name of html2text
|
|
|
|
Bug-Debian: http://bugs.debian.org/640479
|
|
Patch-Name: debian/find_html2text.diff
|
|
|
|
If you use cpan from Debian you usually wind up trying to read online
|
|
documentation through it. Unfortunately cpan can't find the
|
|
html2text.pl script even though it is installed using the Debian
|
|
package 'html2text'.
|
|
|
|
Please see the attached patch for a quick fix of this issue.
|
|
|
|
[Maintainer's note: html2text in Debian is not the same implementation
|
|
as the html2text.pl which is expected, but should provide similar
|
|
functionality].
|
|
---
|
|
cpan/CPAN/lib/CPAN/Distribution.pm | 2 +-
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/cpan/CPAN/lib/CPAN/Distribution.pm b/cpan/CPAN/lib/CPAN/Distribution.pm
|
|
index 637ab27..a8193d9 100644
|
|
--- a/cpan/CPAN/lib/CPAN/Distribution.pm
|
|
+++ b/cpan/CPAN/lib/CPAN/Distribution.pm
|
|
@@ -3715,7 +3715,7 @@ sub _display_url {
|
|
if $CPAN::DEBUG;
|
|
|
|
# should we define it in the config instead?
|
|
- my $html_converter = "html2text.pl";
|
|
+ my $html_converter = "html2text";
|
|
|
|
my $web_browser = $CPAN::Config->{'lynx'} || undef;
|
|
my $web_browser_out = $web_browser
|