perl: update to 5.14.3

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>
This commit is contained in:
Kang Kai 2013-01-21 16:57:12 +08:00 committed by Richard Purdie
parent e80f02a93b
commit 5264982826
66 changed files with 29 additions and 113 deletions

View File

@ -1,31 +0,0 @@
Upstream-Status:Inappropriate [debian patches]
From f66e8575cb0ca11171f43efe0f9e3c6e790b75bc Mon Sep 17 00:00:00 2001
From: Samuel Thibault <sthibault@debian.org>
Date: Wed, 4 Aug 2010 13:34:05 +0300
Subject: Make hints/gnu.sh append to $ccflags rather than overriding them
Bug: http://rt.perl.org/rt3/Public/Bug/Display.html?id=92244
Bug-Debian: http://bugs.debian.org/587901
Origin: upstream, http://perl5.git.perl.org/perl.git/commit/a190e648879
Don't override possible extra $ccflags values given to Configure
on GNU/Hurd.
Patch-Name: fixes/hurd-ccflags.diff
---
hints/gnu.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hints/gnu.sh b/hints/gnu.sh
index 2cfce54..c1ba2db 100644
--- a/hints/gnu.sh
+++ b/hints/gnu.sh
@@ -19,7 +19,7 @@ lddlflags='-shared'
ccdlflags='-Wl,-E'
# Debian bug #258618
-ccflags='-D_GNU_SOURCE'
+ccflags="-D_GNU_SOURCE $ccflags"
# The following routines are only available as stubs in GNU libc.
# XXX remove this once metaconf detects the GNU libc stubs.

View File

@ -1,49 +0,0 @@
Upstream-Status:Inappropriate [debian patches]
From d6fd7595fcd04b332e7449f59ea298639f10a183 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@debian.org>
Date: Wed, 10 Aug 2011 08:11:33 +0300
Subject: Improve general GNU hints, needed for GNU/Hurd.
Bug-Debian: http://bugs.debian.org/636609
Patch-Name: fixes/hurd-hints.diff
---
ext/ODBM_File/hints/gnu.pl | 1 +
hints/gnu.sh | 12 ++++++++++++
2 files changed, 13 insertions(+), 0 deletions(-)
create mode 100644 ext/ODBM_File/hints/gnu.pl
diff --git a/ext/ODBM_File/hints/gnu.pl b/ext/ODBM_File/hints/gnu.pl
new file mode 100644
index 0000000..db63567
--- /dev/null
+++ b/ext/ODBM_File/hints/gnu.pl
@@ -0,0 +1 @@
+do './hints/linux.pl' or die $@;
diff --git a/hints/gnu.sh b/hints/gnu.sh
index c1ba2db..f075642 100644
--- a/hints/gnu.sh
+++ b/hints/gnu.sh
@@ -8,10 +8,22 @@ set `echo X "$libswanted "| sed -e 's/ nsl / /' -e 's/ c / pthread /'`
shift
libswanted="$*"
+# Debian 4.0 puts ndbm in the -lgdbm_compat library.
+libswanted="$libswanted gdbm_compat"
+
case "$optimize" in
'') optimize='-O2' ;;
esac
+case "$plibpth" in
+'') plibpth=`gcc -print-search-dirs | grep libraries |
+ cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
+ set X $plibpth # Collapse all entries on one line
+ shift
+ plibpth="$*"
+ ;;
+esac
+
# Flags needed to produce shared libraries.
lddlflags='-shared'

View File

@ -232,8 +232,8 @@ Index: perl-5.14.2/Makefile.SH
+pod/perlmodlib.pod: pod/perlmodlib.PL MANIFEST
$(MINIPERL) $(Icwd) pod/perlmodlib.PL -q
pod/perl5142delta.pod: pod/perldelta.pod
$(LNS) perldelta.pod pod/perl5142delta.pod
pod/perl5143delta.pod: pod/perldelta.pod
$(LNS) perldelta.pod pod/perl5143delta.pod
-extra.pods: $(MINIPERL_EXE)
+extra.pods:

View File

@ -14,7 +14,7 @@
: Configure command line arguments.
config_arg0='Configure'
config_args='-des -Doptimize=-O2 -Dmyhostname=localhost -Dperladmin=root@localhost -Dcc=gcc -Dcf_by=Open Embedded -Dinstallprefix=@EXECPREFIX@ -Dprefix=@EXECPREFIX@ -Dvendorprefix=@EXECPREFIX@ -Dsiteprefix=@EXECPREFIX@ -Dotherlibdirs=@LIBDIR@/perl/5.14.2 -Duseshrplib -Dusethreads -Duseithreads -Duselargefiles -Ud_dosuid -Dd_semctl_semun -Ui_db -Ui_ndbm -Ui_gdbm -Di_shadow -Di_syslog -Dman3ext=3pm -Duseperlio -Dinstallusrbinperl -Ubincompat5005 -Uversiononly -Dpager=/usr/bin/less -isr'
config_args='-des -Doptimize=-O2 -Dmyhostname=localhost -Dperladmin=root@localhost -Dcc=gcc -Dcf_by=Open Embedded -Dinstallprefix=@EXECPREFIX@ -Dprefix=@EXECPREFIX@ -Dvendorprefix=@EXECPREFIX@ -Dsiteprefix=@EXECPREFIX@ -Dotherlibdirs=@LIBDIR@/perl/5.14.3 -Duseshrplib -Dusethreads -Duseithreads -Duselargefiles -Ud_dosuid -Dd_semctl_semun -Ui_db -Ui_ndbm -Ui_gdbm -Di_shadow -Di_syslog -Dman3ext=3pm -Duseperlio -Dinstallusrbinperl -Ubincompat5005 -Uversiononly -Dpager=/usr/bin/less -isr'
config_argc=28
config_arg1='-des'
config_arg2='-Doptimize=-O2'
@ -26,7 +26,7 @@ config_arg7='-Dinstallprefix=@EXECPREFIX@'
config_arg8='-Dprefix=@EXECPREFIX@'
config_arg9='-Dvendorprefix=@EXECPREFIX@'
config_arg10='-Dsiteprefix=@EXECPREFIX@'
config_arg11='-Dotherlibdirs=@LIBDIR@/perl/5.14.2'
config_arg11='-Dotherlibdirs=@LIBDIR@/perl/5.14.3'
config_arg12='-Duseshrplib'
config_arg13='-Dusethreads'
config_arg14='-Duseithreads'
@ -67,9 +67,9 @@ api_subversion='0'
api_version='14'
api_versionstring='5.14.0'
ar='ar'
archlib='@LIBDIR@/perl/5.14.2/@ARCH@-thread-multi'
archlibexp='@STAGINGDIR@@LIBDIR@/perl/5.14.2/@ARCH@-thread-multi'
archlib_exp='@LIBDIR@/perl/5.14.2/@ARCH@-thread-multi'
archlib='@LIBDIR@/perl/5.14.3/@ARCH@-thread-multi'
archlibexp='@STAGINGDIR@@LIBDIR@/perl/5.14.3/@ARCH@-thread-multi'
archlib_exp='@LIBDIR@/perl/5.14.3/@ARCH@-thread-multi'
archname64=''
archname='@ARCH@-thread-multi'
archobjs=''
@ -87,7 +87,7 @@ castflags='0'
cat='cat'
cc='gcc'
cccdlflags='-fPIC'
ccdlflags='-Wl,-E -Wl,-rpath,@LIBDIR@/perl/5.14.2/@ARCH@-thread-multi/CORE'
ccdlflags='-Wl,-E -Wl,-rpath,@LIBDIR@/perl/5.14.3/@ARCH@-thread-multi/CORE'
ccflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
ccname='gcc'
@ -747,7 +747,7 @@ inc_version_list_init='0'
incpath=''
inews=''
initialinstalllocation='@USRBIN@'
installarchlib='@LIBDIR@/perl/5.14.2/@ARCH@-thread-multi'
installarchlib='@LIBDIR@/perl/5.14.3/@ARCH@-thread-multi'
installbin='@USRBIN@'
installhtml1dir=''
installhtml3dir=''
@ -755,23 +755,23 @@ installman1dir=''
installman3dir=''
installprefix='@EXECPREFIX@'
installprefixexp='@EXECPREFIX@'
installprivlib='@LIBDIR@/perl/5.14.2'
installprivlib='@LIBDIR@/perl/5.14.3'
installscript='@USRBIN@'
installsitearch='@LIBDIR@/perl/site_perl/5.14.2/@ARCH@-thread-multi'
installsitearch='@LIBDIR@/perl/site_perl/5.14.3/@ARCH@-thread-multi'
installsitebin='@USRBIN@'
installsitehtml1dir=''
installsitehtml3dir=''
installsitelib='@LIBDIR@/perl/site_perl/5.14.2'
installsitelib='@LIBDIR@/perl/site_perl/5.14.3'
installsiteman1dir=''
installsiteman3dir=''
installsitescript='@USRBIN@'
installstyle='lib/perl'
installusrbinperl='define'
installvendorarch='@LIBDIR@/perl/vendor_perl/5.14.2/@ARCH@-thread-multi'
installvendorarch='@LIBDIR@/perl/vendor_perl/5.14.3/@ARCH@-thread-multi'
installvendorbin='@USRBIN@'
installvendorhtml1dir=''
installvendorhtml3dir=''
installvendorlib='@LIBDIR@/perl/vendor_perl/5.14.2'
installvendorlib='@LIBDIR@/perl/vendor_perl/5.14.3'
installvendorman1dir=''
installvendorman3dir=''
installvendorscript='@USRBIN@'
@ -881,7 +881,7 @@ optimize='-O2'
orderlib='false'
osname='linux'
osvers='2.6.37-rc5-yocto-standard+'
otherlibdirs='@LIBDIR@/perl/5.14.2'
otherlibdirs='@LIBDIR@/perl/5.14.3'
package='perl5'
pager='/usr/bin/less -isr'
passcat='cat /etc/passwd'
@ -901,8 +901,8 @@ pmake=''
pr=''
prefix='@EXECPREFIX@'
prefixexp='@EXECPREFIX@'
privlib='@LIBDIR@/perl/5.14.2'
privlibexp='@LIBDIR@/perl/5.14.2'
privlib='@LIBDIR@/perl/5.14.3'
privlibexp='@LIBDIR@/perl/5.14.3'
procselfexe='"/proc/self/exe"'
prototype='define'
randbits='48'
@ -954,17 +954,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0'
sig_size='69'
signal_t='void'
sitearch='@LIBDIR@/perl/site_perl/5.14.2/@ARCH@-thread-multi'
sitearchexp='@LIBDIR@/perl/site_perl/5.14.2/@ARCH@-thread-multi'
sitearch='@LIBDIR@/perl/site_perl/5.14.3/@ARCH@-thread-multi'
sitearchexp='@LIBDIR@/perl/site_perl/5.14.3/@ARCH@-thread-multi'
sitebin='@USRBIN@'
sitebinexp='@USRBIN@'
sitehtml1dir=''
sitehtml1direxp=''
sitehtml3dir=''
sitehtml3direxp=''
sitelib='@LIBDIR@/perl/site_perl/5.14.2'
sitelib='@LIBDIR@/perl/site_perl/5.14.3'
sitelib_stem='@LIBDIR@/perl/site_perl'
sitelibexp='@LIBDIR@/perl/site_perl/5.14.2'
sitelibexp='@LIBDIR@/perl/site_perl/5.14.3'
siteman1dir=''
siteman1direxp=''
siteman3dir=''
@ -1062,17 +1062,17 @@ uvtype='unsigned long'
uvuformat='"lu"'
uvxformat='"lx"'
vaproto='define'
vendorarch='@LIBDIR@/perl/vendor_perl/5.14.2/@ARCH@-thread-multi'
vendorarchexp='@LIBDIR@/perl/vendor_perl/5.14.2/@ARCH@-thread-multi'
vendorarch='@LIBDIR@/perl/vendor_perl/5.14.3/@ARCH@-thread-multi'
vendorarchexp='@LIBDIR@/perl/vendor_perl/5.14.3/@ARCH@-thread-multi'
vendorbin='@USRBIN@'
vendorbinexp='@USRBIN@'
vendorhtml1dir=' '
vendorhtml1direxp=''
vendorhtml3dir=' '
vendorhtml3direxp=''
vendorlib='@LIBDIR@/perl/vendor_perl/5.14.2'
vendorlib='@LIBDIR@/perl/vendor_perl/5.14.3'
vendorlib_stem='@LIBDIR@/perl/vendor_perl'
vendorlibexp='@LIBDIR@/perl/vendor_perl/5.14.2'
vendorlibexp='@LIBDIR@/perl/vendor_perl/5.14.3'
vendorman1dir=' '
vendorman1direxp=''
vendorman3dir=' '
@ -1081,7 +1081,7 @@ vendorprefix='/usr'
vendorprefixexp='/usr'
vendorscript='@USRBIN@'
vendorscriptexp='@USRBIN@'
version='5.14.2'
version='5.14.3'
version_patchlevel_string='version 14 subversion 2'
versiononly='undef'
vi=''

View File

@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
# We need gnugrep (for -I)
DEPENDS = "virtual/db grep-native"
DEPENDS += "gdbm zlib"
PR = "r18"
PR = "r0"
# 5.10.1 has Module::Build built-in
PROVIDES += "libmodule-build-perl"
@ -39,17 +39,13 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
file://debian/cpanplus_definstalldirs.diff \
file://debian/cpanplus_config_path.diff \
file://debian/deprecate-with-apt.diff \
file://debian/fixes/hurd-ccflags.diff \
file://debian/squelch-locale-warnings.diff \
file://debian/skip-upstream-git-tests.diff \
file://debian/fixes/extutils-cbuilder-cflags.diff \
file://debian/fixes/module-build-home-directory.diff \
file://debian/fixes/h2ph-multiarch.diff \
file://debian/fixes/index-tainting.diff \
file://debian/skip-kfreebsd-crash.diff \
file://debian/fixes/document_makemaker_ccflags.diff \
file://debian/fixes/sys-syslog-socket-timeout-kfreebsd.patch \
file://debian/fixes/hurd-hints.diff \
file://debian/fixes/pod_fixes.diff \
file://debian/find_html2text.diff \
\
@ -78,8 +74,8 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
file://config.sh-64-be"
# file://debian/fakeroot.diff
SRC_URI[md5sum] = "3306fbaf976dcebdcd49b2ac0be00eb9"
SRC_URI[sha256sum] = "6488359573bd7d41761bf935f66f827dc220fb3df961ef9b775d51fbd66548d3"
SRC_URI[md5sum] = "f6a3d878c688d111b495c87db56c5be5"
SRC_URI[sha256sum] = "03638a4f01bc26b81231233671524b4163849a3a9ea5cc2397293080c4ea339f"
inherit perlnative siteinfo