Browse Source

perl 5.16.3-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8629 ec354946-7b23-47d6-9f5a-488ba84defc7
iwaim 9 years ago
parent
commit
e7f2109b4c
1 changed files with 41 additions and 31 deletions
  1. 41 31
      p/perl/perl-vl.spec

+ 41 - 31
p/perl/perl-vl.spec

@@ -11,8 +11,8 @@
 %define new_perl_flags LD_PRELOAD=/%{new_arch_lib}/CORE/libperl.so LD_LIBRARY_PATH=%{new_arch_lib}/CORE PERL5LIB=%{new_perl_lib}:%{comp_perl_lib}
 %define new_perl %{new_perl_flags} $RPM_BUILD_ROOT/%{_bindir}/perl
 
-%define perl_version 5.12.3
-%define perlrel 9
+%define perl_version 5.16.3
+%define perlrel 1
 %define perl_epoch 2
 
 Provides: perl(:WITH_PERLIO)
@@ -43,19 +43,18 @@ Epoch:        %{perl_epoch}
 License:      Artistic or GPL
 Group:        Development/Languages
 Url:	      http://www.perl.org/
-Source0: ftp://ftp.perl.org/pub/perl/CPAN/src/perl-%{perl_version}.tar.gz
+Source0: ftp://ftp.perl.org/pub/perl/CPAN/src/perl-%{perl_version}.tar.bz2
 Source10: system-owned-directories
 Source11: filter-depends.sh
 Source12: perl-5.8.0-libnet.cfg
-Patch1: perl-5.12.3-MANIFEST-gziped-Changes.patch
 Patch4: perl-5.6.1-prereq.patch
 Patch6: perl-5.8.0-fhs.patch
 Patch7: perl-5.6.0-buildroot.patch
 #Patch8: perl-5.8.0-errno.patch
 Patch9: perl-5.7.3-syslog.patch
 
-## from Fedora Core perl-5.8.5-9
-Patch13: perl-5.8.3-perlbug-tag.patch
+## from CentOS 7 Open QA – c7.00.04: perl-5.16.3-283.el7
+Patch13: perl-perlbug-tag.patch
 
 %define __perl_requires %{SOURCE11}
 
@@ -122,29 +121,25 @@ Patch1008:         perl-5.12.3-disable_test_hosts.patch
 # systems.
 Patch1010:        perl-5.10.0-x86_64-io-test-failure.patch
 
-## from Fedora 5.12.3-156.fc16
-# Do not leak when destroying thread; RT #77352, RHBZ #630667
-Patch1011: perl-5.12.1-fix_thread_leak.patch
+## patch(es) from CentOS
+# perl-5.16.3-283.el7
+Patch7000: porting-podcheck-regen.patch
 
 ## security
-# CVE-2011-1487
-# based http://perl5.git.perl.org/perl.git/commitdiff/539689e74a3bcb04d29e4cd9396de91a81045b99
-Patch2001: perl-5.12.3-CVE-2011-1487.patch
-Patch2010: perl-5.12.3_CVE-2012-3597.patch
 Patch2020: perl-5.12.3_CVE-2012-5195.patch
 Patch2030: perl-5.12.3_CVE-2012-5526.patch
-Patch2040: perl-5.12.5_CVE-2013-1667.patch
-Patch2050: perl-5.12.3_CVE-2012-6329.patch
+# from CentOS
+Patch2050: perl-5.17.6-Fix-misparsing-of-maketext-strings.patch
 
 Buildroot:    %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  gawk, grep, tcsh, gdbm-devel, db4-devel
-BuildRequires:  rpm-devel, gpm-devel, ncurses-devel, zlib-devel, netpbm-devel
+BuildRequires:  rpm-devel, ncurses-devel, zlib-devel, netpbm-devel
 BuildRequires:  libpng-devel, libtiff-devel, libelf, libjpeg-devel
 BuildRequires:  netpbm-devel, e2fsprogs-devel
 
 # without man installed, the variables installman[13]dir
 # in Config.pm will be undefined. This BuildPreReq will fix it.
-BuildRequires:  man
+BuildRequires:  man-db
 
 Vendor:       Project Vine
 Distribution: Vine Linux
@@ -156,10 +151,10 @@ Provides: perl(VMS::Filespec)
 Provides: perl(VMS::Stdio)
 
 # Compat provides
-Provides: perl(:MODULE_COMPAT_5.12.3)
-Provides: perl(:MODULE_COMPAT_5.12.2)
-Provides: perl(:MODULE_COMPAT_5.12.1)
-Provides: perl(:MODULE_COMPAT_5.12.0)
+Provides: perl(:MODULE_COMPAT_5.16.3)
+Provides: perl(:MODULE_COMPAT_5.16.2)
+Provides: perl(:MODULE_COMPAT_5.16.1)
+Provides: perl(:MODULE_COMPAT_5.16.0)
 
 # Threading provides
 Provides: perl(:WITH_ITHREADS)
@@ -206,6 +201,7 @@ Provides: perl(timelocal.pl)
 Provides: perl(utf8_heavy.pl)
 Provides: perl(validate.pl)
 Provides: perl(Carp::Heavy)
+Provides: perl(unicore::Name)
 
 ## Requires
 # fix <BTS:VineLinux:1008>
@@ -250,7 +246,8 @@ Perl library directories in /usr/local
 
 %prep
 %setup -q
-%patch1 -p1
+%patch7000 -p1
+#%patch1 -p1
 %patch13 -p1
 
 %patch17 -p1 -b .sharedlinker
@@ -266,20 +263,12 @@ Perl library directories in /usr/local
 %patch1007 -p1
 %patch1008 -p1
 %patch1010 -p1
-%patch1011 -p1
 
 ## security patch(es)
-# CVE-2011-1487
-%patch2001 -p1
-%patch2010 -p1 -b .CVE-2012-3597
 %patch2020 -p1 -b .CVE-2012-5195
 %patch2030 -p1
-%patch2040 -p1 -b .CVE-2013-1667
 %patch2050 -p1 
 
-# Compress Changes* to save space
-%{__gzip} Changes*
-
 #
 # Candidates for doc recoding (need case by case review):
 # find . -name "*.pod" -o -name "README*" -o -name "*.pm" | xargs file -i | grep charset= | grep -v '\(us-ascii\|utf-8\)'
@@ -292,7 +281,8 @@ recode()
 recode README.cn euc-cn
 recode README.jp euc-jp
 recode README.ko euc-kr
-recode README.tw big5
+# TODO iconv fail on this one
+## recode README.tw big5
 recode pod/perlebcdic.pod
 recode pod/perlhack.pod
 recode pod/perlhist.pod
@@ -559,6 +549,26 @@ make test
 %dir %{_prefix}/local/lib/site_perl/%{perl_version}/%{_arch}-%{_os}%{thread_arch}
 
 %changelog
+* Fri Jun 27 2014 IWAI, Masaharu <iwai@alib.jp> 5.16.3-1
+- drop unnecessary patches
+ - fix thread leak patch (Patch1011): upstream fixed
+ - CVE-2011-1487 patch (Patch2001)
+ - CVE-2011-3597 patch (Digest, Patch2010)
+ - CVE-2013-1667 patch (rehashing, Patch2040)
+- update patches from perl-5.16.3-283.el7 (CentOS 7 Open QA – c7.00.04)
+ - perlbug tag patch (Patch13)
+ - Fix misparsing of maketext strings, CVE-2012-6329 patch (Patch2050)
+- stop coverting charactor encoding: README.tw (FIXME)
+- add patch from perl-5.16.3-283.el7 (CentOS 7 Open QA – c7.00.04)
+ - porting podcheck regen patch (Patch7000)
+- update BuildRequires
+ - s/man/man-db/
+ - drop gpm-devel
+- stop gzipped Changes
+ - drop Patch1
+- update Compat provides: 5.16.*
+- add Provides: perl(unicore::Name)
+
 * Wed Apr  3 2013 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> - 5.12.3-9
 - add patch2050 for fix CVE-2012-6329 (Guts.pm)