deleted file mode 100644

@@ -1,49 +0,0 @@

-Submitted By: DJ Lucas <dj at linuxfromscratch dot org>

-Date: 2012-06-04

-Initial Package Version: 5.16.0

-Origin: Previous Perl-libc patch

-Status: Not Submitted - LFS Specific

-Description: This patch adapts some hard-wired paths to the C library and gcc.

-             It uses the $prefix variable to locate the correct libc.

-

-diff -Naurp perl-5.16.0-orig/hints/linux.sh perl-5.16.0/hints/linux.sh

-+++ perl-5.16.0/hints/linux.sh	2012-06-04 19:23:56.000000000 +0000

-@@ -66,9 +66,9 @@ libswanted="$libswanted gdbm_compat"

- # We don't use __GLIBC__ and  __GLIBC_MINOR__ because they

- # are insufficiently precise to distinguish things like

- # libc-2.0.6 and libc-2.0.7.

--if test -L /lib/libc.so.6; then

-+if test -L ${prefix}/lib/libc.so.6; then

-     libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'`

--    libc=/lib/$libc

-+    libc=${prefix}/lib/$libc

- fi

- 

- # Configure may fail to find lstat() since it's a static/inline

-@@ -167,11 +167,11 @@ esac

- # we don't want its libraries. So we try to prefer the system gcc

- # Still, as an escape hatch, allow Configure command line overrides to

- # plibpth to bypass this check.

--if [ -x /usr/bin/gcc ] ; then

--    gcc=/usr/bin/gcc

--else

-+#if [ -x /usr/bin/gcc ] ; then

-+#    gcc=/usr/bin/gcc

-+#else

-     gcc=gcc

--fi

-+#fi

- 

- case "$plibpth" in

- '') plibpth=`LANG=C LC_ALL=C $gcc -print-search-dirs | grep libraries |

-@@ -466,3 +466,8 @@ case "$libdb_needs_pthread" in

-     libswanted="$libswanted pthread"

-     ;;

- esac

-+

-+locincpth=""

-+loclibpth=""

-+glibpth="${prefix}/lib"

-+usrinc="${prefix}/include"

-

new file mode 100644

@@ -0,0 +1,345 @@

+From cee96d52c39b1e7b36e1c62d38bcd8d86e9a41ab Mon Sep 17 00:00:00 2001

+From: Tony Cook <tony@develop-help.com>

+Date: Tue, 21 Jun 2016 10:02:02 +1000

+Subject: [PATCH] (perl #127834) remove . from the end of @INC if complex

+ modules are loaded

+

+While currently Encode and Storable are know to attempt to load modules

+not included in the core, updates to other modules may lead to those

+also attempting to load new modules, so be safe and remove . for those

+as well.

+---

+ cpan/Archive-Tar/bin/ptar                 | 1 +

+ cpan/Archive-Tar/bin/ptardiff             | 1 +

+ cpan/Archive-Tar/bin/ptargrep             | 1 +

+ cpan/CPAN/scripts/cpan                    | 1 +

+ cpan/Digest-SHA/shasum                    | 1 +

+ cpan/Encode/bin/enc2xs                    | 1 +

+ cpan/Encode/bin/encguess                  | 1 +

+ cpan/Encode/bin/piconv                    | 1 +

+ cpan/Encode/bin/ucmlint                   | 1 +

+ cpan/Encode/bin/unidump                   | 1 +

+ cpan/ExtUtils-MakeMaker/bin/instmodsh     | 1 +

+ cpan/IO-Compress/bin/zipdetails           | 1 +

+ cpan/JSON-PP/bin/json_pp                  | 1 +

+ cpan/Test-Harness/bin/prove               | 1 +

+ dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp | 1 +

+ dist/Module-CoreList/corelist             | 1 +

+ ext/Pod-Html/bin/pod2html                 | 1 +

+ utils/c2ph.PL                             | 1 +

+ utils/h2ph.PL                             | 2 ++

+ utils/h2xs.PL                             | 2 ++

+ utils/libnetcfg.PL                        | 1 +

+ utils/perlbug.PL                          | 1 +

+ utils/perldoc.PL                          | 5 ++++-

+ utils/perlivp.PL                          | 2 ++

+ utils/splain.PL                           | 6 ++++++

+ 25 files changed, 36 insertions(+), 1 deletion(-)

+

+diff --git a/cpan/Archive-Tar/bin/ptar b/cpan/Archive-Tar/bin/ptar

+index 0eaffa7..9dc6402 100644

+--- a/cpan/Archive-Tar/bin/ptar

+@@ -1,6 +1,7 @@

+ #!/usr/bin/perl

+ use strict;

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use File::Find;

+ use Getopt::Std;

+ use Archive::Tar;

+diff --git a/cpan/Archive-Tar/bin/ptardiff b/cpan/Archive-Tar/bin/ptardiff

+index 66bd859..4668fa6 100644

+--- a/cpan/Archive-Tar/bin/ptardiff

+@@ -1,5 +1,6 @@

+ #!/usr/bin/perl

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use strict;

+ use Archive::Tar;

+ use Getopt::Std;

+diff --git a/cpan/Archive-Tar/bin/ptargrep b/cpan/Archive-Tar/bin/ptargrep

+index 1a320f1..8dc6b4f 100644

+--- a/cpan/Archive-Tar/bin/ptargrep

+@@ -4,6 +4,7 @@

+ # archive.  See 'ptargrep --help' for more documentation.

+ #

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use strict;

+ use warnings;

+ 

+diff --git a/cpan/CPAN/scripts/cpan b/cpan/CPAN/scripts/cpan

+index 5555090..cceab30 100644

+--- a/cpan/CPAN/scripts/cpan

+@@ -1,5 +1,6 @@

+ #!/usr/local/bin/perl

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use strict;

+ use vars qw($VERSION);

+ 

+diff --git a/cpan/Digest-SHA/shasum b/cpan/Digest-SHA/shasum

+index 14ddd60..62a2b0e 100644

+--- a/cpan/Digest-SHA/shasum

+@@ -13,6 +13,7 @@

+ 	## "-0" option for reading bit strings, and

+ 	## "-p" option for portable digests (to be deprecated).

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use strict;

+ use warnings;

+ use Fcntl;

+diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs

+index ec4732c..f8d9f52 100644

+--- a/cpan/Encode/bin/enc2xs

+@@ -4,6 +4,7 @@ BEGIN {

+     # with $ENV{PERL_CORE} set

+     # In case we need it in future...

+     require Config; import Config;

++    pop @INC if $INC[-1] eq '.';

+ }

+ use strict;

+ use warnings;

+diff --git a/cpan/Encode/bin/encguess b/cpan/Encode/bin/encguess

+index 5d7ac80..0be5c7c 100644

+--- a/cpan/Encode/bin/encguess

+@@ -1,5 +1,6 @@

+ #!./perl

+ use 5.008001;

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use strict;

+ use warnings;

+ use Encode;

+diff --git a/cpan/Encode/bin/piconv b/cpan/Encode/bin/piconv

+index c1dad9e..60b2a59 100644

+--- a/cpan/Encode/bin/piconv

+@@ -1,6 +1,7 @@

+ #!./perl

+ # $Id: piconv,v 2.7 2014/05/31 09:48:48 dankogai Exp $

+ #

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use 5.8.0;

+ use strict;

+ use Encode ;

+diff --git a/cpan/Encode/bin/ucmlint b/cpan/Encode/bin/ucmlint

+index 622376d..25e0d67 100644

+--- a/cpan/Encode/bin/ucmlint

+@@ -3,6 +3,7 @@

+ # $Id: ucmlint,v 2.2 2008/03/12 09:51:11 dankogai Exp $

+ #

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use strict;

+ our  $VERSION = do { my @r = (q$Revision: 2.2 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };

+ 

+diff --git a/cpan/Encode/bin/unidump b/cpan/Encode/bin/unidump

+index ae0da30..f190827 100644

+--- a/cpan/Encode/bin/unidump

+@@ -1,5 +1,6 @@

+ #!./perl

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use strict;

+ use Encode;

+ use Getopt::Std;

+diff --git a/cpan/ExtUtils-MakeMaker/bin/instmodsh b/cpan/ExtUtils-MakeMaker/bin/instmodsh

+index 8b9aa95..ab0f9d1 100644

+--- a/cpan/ExtUtils-MakeMaker/bin/instmodsh

+@@ -1,5 +1,6 @@

+ #!/usr/bin/perl -w

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use strict;

+ use IO::File;

+ use ExtUtils::Packlist;

+diff --git a/cpan/IO-Compress/bin/zipdetails b/cpan/IO-Compress/bin/zipdetails

+index 0249850..1b9c70a 100644

+--- a/cpan/IO-Compress/bin/zipdetails

+@@ -5,6 +5,7 @@

+ # Display info on the contents of a Zip file

+ #

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use strict;

+ use warnings ;

+ 

+diff --git a/cpan/JSON-PP/bin/json_pp b/cpan/JSON-PP/bin/json_pp

+index 3362dec..39bed4d 100644

+--- a/cpan/JSON-PP/bin/json_pp

+@@ -1,5 +1,6 @@

+ #!/usr/bin/perl

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use strict;

+ use Getopt::Long;

+ 

+diff --git a/cpan/Test-Harness/bin/prove b/cpan/Test-Harness/bin/prove

+index 6637cc4..d71b238 100644

+--- a/cpan/Test-Harness/bin/prove

+@@ -1,5 +1,6 @@

+ #!/usr/bin/perl -w

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use strict;

+ use warnings;

+ use App::Prove;

+diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp b/dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp

+index e2ac71a..d596cdf 100644

+--- a/dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp

+@@ -1,5 +1,6 @@

+ #!perl

+ use 5.006;

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use strict;

+ eval {

+   require ExtUtils::ParseXS;

+diff --git a/dist/Module-CoreList/corelist b/dist/Module-CoreList/corelist

+index aa4a945..bbe61cc 100644

+--- a/dist/Module-CoreList/corelist

+@@ -130,6 +130,7 @@ requested perl versions.

+ 

+ =cut

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use Module::CoreList;

+ use Getopt::Long qw(:config no_ignore_case);

+ use Pod::Usage;

+diff --git a/ext/Pod-Html/bin/pod2html b/ext/Pod-Html/bin/pod2html

+index b022859..7d1d232 100644

+--- a/ext/Pod-Html/bin/pod2html

+@@ -216,6 +216,7 @@ This program is distributed under the Artistic License.

+ 

+ =cut

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use Pod::Html;

+ 

+ pod2html @ARGV;

+diff --git a/utils/c2ph.PL b/utils/c2ph.PL

+index 466223c..ea87a6f 100644

+--- a/utils/c2ph.PL

+@@ -280,6 +280,7 @@ Anyway, here it is.  Should run on perl v4 or greater.  Maybe less.

+ 

+ $RCSID = '$Id: c2ph,v 1.7 95/10/28 10:41:47 tchrist Exp Locker: tchrist $';

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use File::Temp;

+ 

+ ######################################################################

+diff --git a/utils/h2ph.PL b/utils/h2ph.PL

+index d082f22..2523c0a 100644

+--- a/utils/h2ph.PL

+@@ -36,6 +36,8 @@ $Config{startperl}

+ 

+ print OUT <<'!NO!SUBS!';

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

++

+ use strict;

+ 

+ use Config;

+diff --git a/utils/h2xs.PL b/utils/h2xs.PL

+index 4cb0943..8fda87b 100644

+--- a/utils/h2xs.PL

+@@ -35,6 +35,8 @@ $Config{startperl}

+ 

+ print OUT <<'!NO!SUBS!';

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

++

+ use warnings;

+ 

+ =head1 NAME

+diff --git a/utils/libnetcfg.PL b/utils/libnetcfg.PL

+index 59a2de8..26d2f99 100644

+--- a/utils/libnetcfg.PL

+@@ -97,6 +97,7 @@ Jarkko Hietaniemi, conversion into libnetcfg for inclusion into Perl 5.8.

+ 

+ # $Id: Configure,v 1.8 1997/03/04 09:22:32 gbarr Exp $

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use strict;

+ use IO::File;

+ use Getopt::Std;

+diff --git a/utils/perlbug.PL b/utils/perlbug.PL

+index 720cf12..b0b2c12 100644

+--- a/utils/perlbug.PL

+@@ -57,6 +57,7 @@ print OUT <<'!NO!SUBS!';

+ my @patches = Config::local_patches();

+ my $patch_tags = join "", map /(\S+)/ ? "+$1 " : (), @patches;

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

+ use warnings;

+ use strict;

+ use Config;

+diff --git a/utils/perldoc.PL b/utils/perldoc.PL

+index e201de9..cd60bd4 100644

+--- a/utils/perldoc.PL

+@@ -44,7 +44,10 @@ $Config{startperl}

+ # This "$file" file was generated by "$0"

+ 

+ require 5;

+-BEGIN { \$^W = 1 if \$ENV{'PERLDOCDEBUG'} }

++BEGIN {

++    \$^W = 1 if \$ENV{'PERLDOCDEBUG'};

++    pop \@INC if \$INC[-1] eq '.';

++}

+ use Pod::Perldoc;

+ exit( Pod::Perldoc->run() );

+ 

+diff --git a/utils/perlivp.PL b/utils/perlivp.PL

+index c2f0a11..e522913 100644

+--- a/utils/perlivp.PL

+@@ -39,6 +39,8 @@ print OUT "\n# perlivp $^V\n";

+ 

+ print OUT <<'!NO!SUBS!';

+ 

++BEGIN { pop @INC if $INC[-1] eq '.' }

++

+ sub usage {

+     warn "@_\n" if @_;

+     print << "    EOUSAGE";

+diff --git a/utils/splain.PL b/utils/splain.PL

+index 9c70b61..cae84a0 100644

+--- a/utils/splain.PL

+@@ -38,6 +38,12 @@ $Config{startperl}

+ 	if \$running_under_some_shell;

+ !GROK!THIS!

+ 

++print <<'!NO!SUBS!';

++

++BEGIN { pop @INC if $INC[-1] eq '.' }

++

++!NO!SUBS!

++

+ while (<IN>) {

+     print OUT unless /^package diagnostics/;

+ }

+-- 

+2.10.0-rc1-260-gbdd1a2a

+

@@ -6,30 +6,32 @@

 # for F in $(find lib -type f); do perl -e '$/ = undef; $_ = <>; if (/^package #\R([\w:]*);/m) { print qq{|^perl\\\\($1\\\\)} }' "$F"; done

 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Locale::Codes::Country_Retired\\)|^perl\\(Locale::Codes::LangFam_Retired\\)|^perl\\(Locale::Codes::Script_Retired\\)|^perl\\(Locale::Codes::LangExt_Codes\\)|^perl\\(Locale::Codes::LangFam_Codes\\)|^perl\\(Locale::Codes::Script_Codes\\)|^perl\\(Locale::Codes::Language_Codes\\)|^perl\\(Locale::Codes::LangExt_Retired\\)|^perl\\(Locale::Codes::Currency_Codes\\)|^perl\\(Locale::Codes::LangVar_Retired\\)|^perl\\(Locale::Codes::Language_Retired\\)|^perl\\(Locale::Codes::Country_Codes\\)|^perl\\(Locale::Codes::LangVar_Codes\\)|^perl\\(Locale::Codes::Currency_Retired\\)

-Summary:	Practical Extraction and Report Language

-Name:		perl

-Version:	5.22.1

-Release:	3%{?dist}

-License:	GPLv1+

-URL:		http://www.perl.org/

-Group:		Development/Languages

-Vendor:		VMware, Inc.

-Distribution:	Photon

-Source0:	http://www.cpan.org/src/5.0/%{name}-%{version}.tar.bz2

+Summary:        Practical Extraction and Report Language

+Name:           perl

+Version:        5.22.1

+Release:        4%{?dist}

+License:        GPLv1+

+URL:            http://www.perl.org/

+Group:          Development/Languages

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Source0:        http://www.cpan.org/src/5.0/%{name}-%{version}.tar.bz2

 %define sha1 perl=29f9b320b0299577a3e1d02e9e8ef8f26f160332

-Provides:	perl >= 0:5.003000

-Provides:	perl(getopts.pl)

-Provides:   /bin/perl

+Patch0:         perl-CVE-2016-1238.patch

+Provides:       perl >= 0:5.003000

+Provides:       perl(getopts.pl)

+Provides:       /bin/perl

 BuildRequires:  zlib-devel, bzip2-devel

-Requires:	zlib 

-Requires:	gdbm

-Requires:	glibc

-Requires:	libgcc

+Requires:       zlib 

+Requires:       gdbm

+Requires:       glibc

+Requires:       libgcc

 %description

 The Perl package contains the Practical Extraction and

 Report Language.

 %prep

 %setup -q

+%patch0 -p1

 sed -i 's/-fstack-protector/&-all/' Configure

@@ -39,21 +41,21 @@ export BUILD_BZIP2=0

 CFLAGS="%{_optflags}"

 sh Configure -des \

-	-Dprefix=%{_prefix} \

-	-Dvendorprefix=%{_prefix} \

-	-Dman1dir=%{_mandir}/man1 \

-	-Dman3dir=%{_mandir}/man3 \

-	-Dpager=%{_bindir}"/less -isR" \

-	-Duseshrplib \

-	-Dusethreads \

+    -Dprefix=%{_prefix} \

+    -Dvendorprefix=%{_prefix} \

+    -Dman1dir=%{_mandir}/man1 \

+    -Dman3dir=%{_mandir}/man3 \

+    -Dpager=%{_bindir}"/less -isR" \

+    -Duseshrplib \

+    -Dusethreads \

         -DPERL_RANDOM_DEVICE="/dev/erandom"

 make VERBOSE=1 %{?_smp_mflags}

 %install

 make DESTDIR=%{buildroot} install

 unset BUILD_ZLIB BUILD_BZIP2

-%post	-p /sbin/ldconfig

-%postun	-p /sbin/ldconfig

+%post   -p /sbin/ldconfig

+%postun -p /sbin/ldconfig

 %files

 %defattr(-,root,root)

 %{_bindir}/*

@@ -62,13 +64,16 @@ unset BUILD_ZLIB BUILD_BZIP2

 %{_libdir}/perl5/%{version}/*

 %{_mandir}/*/*

 %changelog

-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.22.1-3

--	GA - Bump release of all rpms

-*	Thu Jan 26 2016 Anish Swaminathan <anishs@vmware.com> 5.22.1-2

--	Enable threads

-*	Tue Jan 12 2016 Anish Swaminathan <anishs@vmware.com> 5.22.1-1

--	Update version

-*	Thu Jun 4 2015 Touseef Liaqat <tliaqat@vmware.com> 5.18.2-2

--	Provide /bin/perl.

-*	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 5.18.2-1

--	Initial build. First version

+*   Thu Oct 20 2016 Xiaolin Li <xiaolinl@vmware.com> 5.22.1-4

+-   CVE-2016-1238 patch from http://perl5.git.perl.org/perl.git/commit/cee96d52c39b1e7b36e1c62d38bcd8d86e9a41ab.

+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.22.1-3

+-   GA - Bump release of all rpms

+*   Thu Jan 26 2016 Anish Swaminathan <anishs@vmware.com> 5.22.1-2

+-   Enable threads

+*   Tue Jan 12 2016 Anish Swaminathan <anishs@vmware.com> 5.22.1-1

+-   Update version

+*   Thu Jun 4 2015 Touseef Liaqat <tliaqat@vmware.com> 5.18.2-2

+-   Provide /bin/perl.

+*   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 5.18.2-1

+-   Initial build. First version

+