From a529beb5e869b01a510331839c0649636d79d6e2 Mon Sep 17 00:00:00 2001 From: openeuler-basic Date: Tue, 7 Jan 2020 12:06:01 +0800 Subject: [PATCH] delete redundant files --- Fix-time-local-tests-in-2020.patch | 66 ++++++++ ...ibdir64.patch => change-lib-to-lib64.patch | 19 ++- ...oname.patch => create-libperl-soname.patch | 38 ++--- ...ch => delete-ext-GDBM_File-t-fatal.t.patch | 29 +--- disable-rpath-by-default.patch | 26 +++ macros.perl | 151 ------------------ perl-5.10.0-libresolv.patch | 12 -- ...to-libperl.so-with-EU-CBuilder-on-Li.patch | 65 -------- ...es-to-libperl.so-with-EU-MM-on-Linux.patch | 52 ------ ...-BigInt-CalcEmu-requires-Math-BigInt.patch | 30 ---- ...stall-libperl.so-to-shrpdir-on-Linux.patch | 61 ------- ...-MM-methods-as-standalone-ExtUtils-M.patch | 110 ------------- ...pendnecy-with-EU-MM-Utils-in-IPC-Cmd.patch | 34 ---- ...-little-more-careful-in-arybase-_tie.patch | 61 ------- ...ints-linux-Add-lphtread-to-lddlflags.patch | 61 ------- perl-USE_MM_LD_RUN_PATH.patch | 109 ------------- perl.spec | 62 ++----- perl.stp | 71 -------- perl_subpkg_license | 36 ----- 19 files changed, 152 insertions(+), 941 deletions(-) create mode 100644 Fix-time-local-tests-in-2020.patch rename perl-5.8.0-libdir64.patch => change-lib-to-lib64.patch (79%) rename perl-5.16.3-create_libperl_soname.patch => create-libperl-soname.patch (43%) rename perl-5.29.0-Remove-ext-GDBM_File-t-fatal.t.patch => delete-ext-GDBM_File-t-fatal.t.patch (71%) create mode 100644 disable-rpath-by-default.patch delete mode 100644 macros.perl delete mode 100644 perl-5.10.0-libresolv.patch delete mode 100644 perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch delete mode 100644 perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-MM-on-Linux.patch delete mode 100644 perl-5.18.1-Document-Math-BigInt-CalcEmu-requires-Math-BigInt.patch delete mode 100644 perl-5.22.0-Install-libperl.so-to-shrpdir-on-Linux.patch delete mode 100644 perl-5.22.1-Provide-ExtUtils-MM-methods-as-standalone-ExtUtils-M.patch delete mode 100644 perl-5.22.1-Replace-EU-MM-dependnecy-with-EU-MM-Utils-in-IPC-Cmd.patch delete mode 100644 perl-5.26.0-perl-131588-be-a-little-more-careful-in-arybase-_tie.patch delete mode 100644 perl-5.27.8-hints-linux-Add-lphtread-to-lddlflags.patch delete mode 100644 perl-USE_MM_LD_RUN_PATH.patch delete mode 100644 perl.stp delete mode 100644 perl_subpkg_license diff --git a/Fix-time-local-tests-in-2020.patch b/Fix-time-local-tests-in-2020.patch new file mode 100644 index 0000000..6e6f5d5 --- /dev/null +++ b/Fix-time-local-tests-in-2020.patch @@ -0,0 +1,66 @@ +From 836390962709d5856816807f13a3edfd4aff1fe1 Mon Sep 17 00:00:00 2001 +From: openEuler Buildteam +Date: Fri, 3 Jan 2020 15:31:48 +0800 +Subject: [PATCH] Fix time local tests in 2020 + +See details at here:https://rt.cpan.org/Public/Bug/Display.html?id=124787 +--- + cpan/Time-Local/t/Local.t | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t +index 6341396..e28c6d2 100644 +--- a/cpan/Time-Local/t/Local.t ++++ b/cpan/Time-Local/t/Local.t +@@ -96,7 +96,7 @@ SKIP: { + + # Test timelocal() + { +- my $year_in = $year < 70 ? $year + 1900 : $year; ++ my $year_in = $year + 1900; + my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in ); + + my ( $s, $m, $h, $D, $M, $Y ) = localtime($time); +@@ -111,7 +111,7 @@ SKIP: { + + # Test timegm() + { +- my $year_in = $year < 70 ? $year + 1900 : $year; ++ my $year_in = $year + 1900; + my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in ); + + my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time); +@@ -128,7 +128,6 @@ SKIP: { + + for (@bad_time) { + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; +- $year -= 1900; + $mon--; + + eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) }; +@@ -138,19 +137,19 @@ for (@bad_time) { + + { + is( +- timelocal( 0, 0, 1, 1, 0, 90 ) - timelocal( 0, 0, 0, 1, 0, 90 ), 3600, ++ timelocal( 0, 0, 1, 1, 0, 1990 ) - timelocal( 0, 0, 0, 1, 0, 1990 ), 3600, + 'one hour difference between two calls to timelocal' + ); + + is( +- timelocal( 1, 2, 3, 1, 0, 100 ) - timelocal( 1, 2, 3, 31, 11, 99 ), ++ timelocal( 1, 2, 3, 1, 0, 2000 ) - timelocal( 1, 2, 3, 31, 11, 1999 ), + 24 * 3600, + 'one day difference between two calls to timelocal' + ); + + # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days) + is( +- timegm( 0, 0, 0, 1, 2, 80 ) - timegm( 0, 0, 0, 1, 0, 80 ), ++ timegm( 0, 0, 0, 1, 2, 1980 ) - timegm( 0, 0, 0, 1, 0, 1980 ), + 60 * 24 * 3600, + '60 day difference between two calls to timegm' + ); +-- +1.8.3.1 + diff --git a/perl-5.8.0-libdir64.patch b/change-lib-to-lib64.patch similarity index 79% rename from perl-5.8.0-libdir64.patch rename to change-lib-to-lib64.patch index a29ee87..651d6c1 100644 --- a/perl-5.8.0-libdir64.patch +++ b/change-lib-to-lib64.patch @@ -1,6 +1,16 @@ -diff -up perl-5.28.0-RC1/Configure.orig perl-5.28.0-RC1/Configure ---- perl-5.28.0-RC1/Configure.orig 2018-05-21 12:44:04.000000000 +0200 -+++ perl-5.28.0-RC1/Configure 2018-05-22 12:21:53.908599933 +0200 +From 49abb326542984cecc5e61b3b66822b52cdc34e7 Mon Sep 17 00:00:00 2001 +From: openEuler Buildteam +Date: Mon, 30 Dec 2019 14:49:06 +0800 +Subject: [PATCH] change lib to lib64 + +--- + Configure | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/Configure b/Configure +index 3be9f05..1c53af7 100755 +--- a/Configure ++++ b/Configure @@ -7269,8 +7269,8 @@ esac' : Reproduce behavior of 5.005 and earlier, maybe drop that in 5.7. case "$installstyle" in @@ -45,3 +55,6 @@ diff -up perl-5.28.0-RC1/Configure.orig perl-5.28.0-RC1/Configure esac ;; *) dflt="$vendorlib" +-- +1.8.3.1 + diff --git a/perl-5.16.3-create_libperl_soname.patch b/create-libperl-soname.patch similarity index 43% rename from perl-5.16.3-create_libperl_soname.patch rename to create-libperl-soname.patch index 8bf53dc..4d5dc6f 100644 --- a/perl-5.16.3-create_libperl_soname.patch +++ b/create-libperl-soname.patch @@ -1,17 +1,16 @@ -From fa2f0dd5a7767223df10149d3f16d7ed7013e16f Mon Sep 17 00:00:00 2001 +From fe7ae3db489775f409b9284c5e81ce91ab8578da Mon Sep 17 00:00:00 2001 From: Torsten Veller -Date: Sat, 14 Apr 2012 13:49:18 +0200 -Subject: Set libperl soname +Date: Mon, 30 Dec 2019 15:10:30 +0800 +Subject: [PATCH] create libperl soname -Bug-Gentoo: https://bugs.gentoo.org/286840 +See details: https://bugs.gentoo.org/286840 -Patch-Name: gentoo/create_libperl_soname.diff --- - Makefile.SH | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) + Makefile.SH | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.SH b/Makefile.SH -index d1da0a0..7733a32 100755 +index 123903d..e73f0ec 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -68,7 +68,7 @@ true) @@ -19,34 +18,37 @@ index d1da0a0..7733a32 100755 -current_version \ ${revision}.${patchlevel}.${subversion} \ - -install_name \$(shrpdir)/\$@" -+ -install_name \$(shrpdir)/libperl.${revision}.${patchlevel}.dylib" ++ -install_name \$(shrpdir)/libperl.${revision}.${patchlevel}.dylib" ;; cygwin*) shrpldflags="$shrpldflags -Wl,--out-implib=libperl.dll.a -Wl,--image-base,0x52000000" -@@ -76,13 +76,15 @@ true) +@@ -76,13 +76,16 @@ true) ;; sunos*) linklibperl="-lperl" -+ shrpldflags="$shrpldflags -Wl,-soname -Wl,libperl.so.${revision}.${patchlevel}" ++ shrpldflags="$shrpldflags -Wl,-soname -Wl,libperl.so.${revision}.${patchlevel}" ;; netbsd*|freebsd[234]*|openbsd*|dragonfly*|bitrig*) linklibperl="-L. -lperl" -+ shrpldflags="$shrpldflags -Wl,-soname -Wl,libperl.so.${revision}.${patchlevel}" ++ shrpldflags="$shrpldflags -Wl,-soname -Wl,libperl.so.${revision}.${patchlevel}" ;; interix*) linklibperl="-L. -lperl" -- shrpldflags="$shrpldflags -Wl,--image-base,0x57000000" -+ shrpldflags="$shrpldflags -Wl,--image-base,0x57000000 -Wl,-soname -Wl,libperl.so.${revision}.${patchlevel}" + shrpldflags="$shrpldflags -Wl,--image-base,0x57000000" ++ shrpldflags="$shrpldflags -Wl,--image-base,0x57000000 -Wl,-soname -Wl,libperl.so.${revision}.${patchlevel}" ;; aix*) case "$cc" in -@@ -120,6 +122,9 @@ true) +@@ -120,6 +123,9 @@ true) linklibperl='libperl.x' DPERL_EXTERNAL_GLOB='' ;; -+ linux*) -+ shrpldflags="$shrpldflags -Wl,-soname -Wl,libperl.so.${revision}.${patchlevel}" -+ ;; ++ linux*) ++ shrpldflags="$shrpldflags -Wl,-soname -Wl,libperl.so.${revision}.${patchlevel}" ++ ;; esac case "$ldlibpthname" in '') ;; +-- +1.8.3.1 + diff --git a/perl-5.29.0-Remove-ext-GDBM_File-t-fatal.t.patch b/delete-ext-GDBM_File-t-fatal.t.patch similarity index 71% rename from perl-5.29.0-Remove-ext-GDBM_File-t-fatal.t.patch rename to delete-ext-GDBM_File-t-fatal.t.patch index bc4ac01..79c1fdc 100644 --- a/perl-5.29.0-Remove-ext-GDBM_File-t-fatal.t.patch +++ b/delete-ext-GDBM_File-t-fatal.t.patch @@ -1,21 +1,8 @@ -From 892e8b006aa99ac2c880cdc2a81fd16f06c1a0f3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 9 Jul 2018 16:18:36 +0200 -Subject: [PATCH] Remove ext/GDBM_File/t/fatal.t -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +From 4f712a7338a4aa692c118460f734a2c4a6710550 Mon Sep 17 00:00:00 2001 +From: openEuler Buildteam +Date: Mon, 30 Dec 2019 15:20:40 +0800 +Subject: [PATCH] delete ext GDBM_File t fatal.t -gdbm-1.15 defaults to a memory-mapped I/O and does not report any I/O -errors on store and close operations. Thus ext/GDBM_File/t/fatal.t -test that expects these fatal error reports fails. Because there is -no other way to provoke a fatal error in gdbm-1.15 this patch -removes the test. Future gdbm version promisses reporting a regular -error on closing a database. - -RT#133295 - -Signed-off-by: Petr Písař --- MANIFEST | 1 - ext/GDBM_File/t/fatal.t | 49 ------------------------------------------------- @@ -23,10 +10,10 @@ Signed-off-by: Petr Písař delete mode 100644 ext/GDBM_File/t/fatal.t diff --git a/MANIFEST b/MANIFEST -index 95fa539095..b07fed1f54 100644 +index 2005f54..f778051 100644 --- a/MANIFEST +++ b/MANIFEST -@@ -4100,7 +4100,6 @@ ext/GDBM_File/GDBM_File.pm GDBM extension Perl module +@@ -4089,7 +4089,6 @@ ext/GDBM_File/GDBM_File.pm GDBM extension Perl module ext/GDBM_File/GDBM_File.xs GDBM extension external subroutines ext/GDBM_File/hints/sco.pl Hint for GDBM_File for named architecture ext/GDBM_File/Makefile.PL GDBM extension makefile writer @@ -36,7 +23,7 @@ index 95fa539095..b07fed1f54 100644 ext/Hash-Util/Changes Change history of Hash::Util diff --git a/ext/GDBM_File/t/fatal.t b/ext/GDBM_File/t/fatal.t deleted file mode 100644 -index 0e426d4dbc..0000000000 +index 0e426d4..0000000 --- a/ext/GDBM_File/t/fatal.t +++ /dev/null @@ -1,49 +0,0 @@ @@ -90,5 +77,5 @@ index 0e426d4dbc..0000000000 - -unlink ; -- -2.14.4 +1.8.3.1 diff --git a/disable-rpath-by-default.patch b/disable-rpath-by-default.patch new file mode 100644 index 0000000..61d844d --- /dev/null +++ b/disable-rpath-by-default.patch @@ -0,0 +1,26 @@ +From 3a98cffd49b91e1b26846bb9a06446353a217b57 Mon Sep 17 00:00:00 2001 +From: openEuler Buildteam +Date: Mon, 30 Dec 2019 14:57:15 +0800 +Subject: [PATCH] disable rpath by default + +--- + cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm +index fe53be1..fd0f5b5 100644 +--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm ++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm +@@ -1045,9 +1045,6 @@ sub xs_make_dynamic_lib { + } + + my $ld_run_path_shell = ""; +- if ($self->{LD_RUN_PATH} ne "") { +- $ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" '; +- } + + push @m, sprintf <<'MAKE', $ld_run_path_shell, $ldrun, $dlsyms_arg, $ldfrom, $self->xs_obj_opt('$@'), $libs, $exportlist; + %s$(LD) %s $(LDDLFLAGS) %s %s $(OTHERLDFLAGS) %s $(MYEXTLIB) \ +-- +1.8.3.1 + diff --git a/macros.perl b/macros.perl deleted file mode 100644 index 9c1fd0c..0000000 --- a/macros.perl +++ /dev/null @@ -1,151 +0,0 @@ -# Sensible Perl-specific RPM build macros. -# -# Note that these depend on the generic filtering system being in place in -# rpm core; but won't cause a build to fail if they're not present. -# -# Chris Weyl 2009 -# Marcela Mašláňová 2011 - -# This macro unsets several common vars used to control how Makefile.PL (et -# al) build and install packages. We also set a couple to help some of the -# common systems be less interactive. This was blatantly stolen from -# cpanminus, and helps building rpms locally when one makes extensive use of -# local::lib, etc. -# -# Usage, in %build, before "%{__perl} Makefile.PL ..." -# -# %{?perl_ext_env_unset} - -%perl_ext_env_unset %{expand: -unset PERL_MM_OPT MODULEBUILDRC PERL5INC -export PERL_AUTOINSTALL="--defaultdeps" -export PERL_MM_USE_DEFAULT=1 -} - -############################################################################# -# Filtering macro incantations - -# keep track of what "revision" of the filtering we're at. Each time we -# change the filter we should increment this. - -%perl_default_filter_revision 3 - -# By default, for perl packages we want to filter all files in _docdir from -# req/prov scanning. -# Filtering out any provides caused by private libs in vendorarch/archlib -# (vendor/core) is done by rpmbuild since Fedora 20 -# . -# -# Note that this must be invoked in the spec file, preferably as -# "%{?perl_default_filter}", before any %description block. - -%perl_default_filter %{expand: \ -%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_docdir} -%global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}^%{_docdir} -%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\\\(VMS|^perl\\\\(Win32|^perl\\\\(DB\\\\)|^perl\\\\(UNIVERSAL\\\\) -%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\\\(VMS|^perl\\\\(Win32 -} - -############################################################################# -# Macros to assist with generating a "-tests" subpackage in a semi-automatic -# manner. -# -# The following macros are still in a highly experimental stage and users -# should be aware that the interface and behaviour may change. -# -# PLEASE, PLEASE CONDITIONALIZE THESE MACROS IF YOU USE THEM. -# -# See http://gist.github.com/284409 - -# These macros should be invoked as above, right before the first %description -# section, and conditionalized. e.g., for the common case where all our tests -# are located under t/, the correct usage is: -# -# %{?perl_default_subpackage_tests} -# -# If custom files/directories need to be specified, this can be done as such: -# -# %{?perl_subpackage_tests:%perl_subpackage_tests t/ one/ three.sql} -# -# etc, etc. - -%perl_version %(eval "`%{__perl} -V:version`"; echo $version) -%perl_testdir %{_libexecdir}/perl5-tests -%cpan_dist_name %(eval echo %{name} | %{__sed} -e 's/^perl-//') - -# easily mark something as required by -tests and BR to the main package -%tests_req() %{expand:\ -BuildRequires: %*\ -%%tests_subpackage_requires %*\ -} - -# fixup (and create if needed) the shbang lines in tests, so they work and -# rpmlint doesn't (correctly) have a fit -%fix_shbang_line() \ -TMPHEAD=`mktemp`\ -TMPBODY=`mktemp`\ -for file in %* ; do \ - head -1 $file > $TMPHEAD\ - tail -n +2 $file > $TMPBODY\ - %{__perl} -pi -e '$f = /^#!/ ? "" : "#!%{__perl}$/"; $_="$f$_"' $TMPHEAD\ - cat $TMPHEAD $TMPBODY > $file\ -done\ -%{__perl} -MExtUtils::MakeMaker -e "ExtUtils::MM_Unix->fixin(qw{%*})"\ -%{__rm} $TMPHEAD $TMPBODY\ -%{nil} - -# additional -tests subpackage requires, if any -%tests_subpackage_requires() %{expand: \ -%global __tests_spkg_req %{?__tests_spkg_req} %* \ -} - -# additional -tests subpackage provides, if any -%tests_subpackage_provides() %{expand: \ -%global __tests_spkg_prov %{?__tests_spkg_prov} %* \ -} - -# -# Runs after the body of %check completes. -# - -%__perl_check_pre %{expand: \ -%{?__spec_check_pre} \ -pushd %{buildsubdir} \ -%define perl_br_testdir %{buildroot}%{perl_testdir}/%{cpan_dist_name} \ -%{__mkdir_p} %{perl_br_testdir} \ -%{__tar} -cf - %{__perl_test_dirs} | ( cd %{perl_br_testdir} && %{__tar} -xf - ) \ -find . -maxdepth 1 -type f -name '*META*' -exec %{__cp} -vp {} %{perl_br_testdir} ';' \ -find %{perl_br_testdir} -type f -exec %{__chmod} -c -x {} ';' \ -T_FILES=`find %{perl_br_testdir} -type f -name '*.t'` \ -%fix_shbang_line $T_FILES \ -%{__chmod} +x $T_FILES \ -%{_fixperms} %{perl_br_testdir} \ -popd \ -} - -# -# The actual invoked macro -# - -%perl_subpackage_tests() %{expand: \ -%global __perl_package 1\ -%global __perl_test_dirs %* \ -%global __spec_check_pre %{expand:%{__perl_check_pre}} \ -%package tests\ -Summary: Test suite for package %{name}\ -Group: Development/Debug\ -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}\ -Requires: /usr/bin/prove \ -%{?__tests_spkg_req:Requires: %__tests_spkg_req}\ -%{?__tests_spkg_prov:Provides: %__tests_spkg_prov}\ -AutoReqProv: 0 \ -%description tests\ -This package provides the test suite for package %{name}.\ -%files tests\ -%defattr(-,root,root,-)\ -%{perl_testdir}\ -} - -# shortcut sugar -%perl_default_subpackage_tests %perl_subpackage_tests t/ - diff --git a/perl-5.10.0-libresolv.patch b/perl-5.10.0-libresolv.patch deleted file mode 100644 index d6ff1c7..0000000 --- a/perl-5.10.0-libresolv.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up perl-5.10.0/Configure.didi perl-5.10.0/Configure ---- perl-5.10.0/Configure.didi 2007-12-18 11:47:07.000000000 +0100 -+++ perl-5.10.0/Configure 2008-07-21 10:51:16.000000000 +0200 -@@ -1483,7 +1483,7 @@ archname='' - usereentrant='undef' - : List of libraries we want. - : If anyone needs extra -lxxx, put those in a hint file. --libswanted="cl pthread socket bind inet nsl ndbm gdbm dbm db malloc dl ld" -+libswanted="cl pthread socket resolv inet nsl ndbm gdbm dbm db malloc dl ld" - libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD" - : We probably want to search /usr/shlib before most other libraries. - : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. diff --git a/perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch b/perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch deleted file mode 100644 index 7887867..0000000 --- a/perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch +++ /dev/null @@ -1,65 +0,0 @@ -From b598ba3f2d4b8347c6621cff022b8e2329b79ea5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 3 Jul 2013 11:01:02 +0200 -Subject: [PATCH] Link XS modules to libperl.so with EU::CBuilder on Linux -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - - - -Signed-off-by: Petr Písař ---- - MANIFEST | 1 + - .../lib/ExtUtils/CBuilder/Platform/linux.pm | 26 ++++++++++++++++++++++ - 2 files changed, 27 insertions(+) - create mode 100644 dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/linux.pm - -diff --git a/MANIFEST b/MANIFEST -index 397252a..d7c519b 100644 ---- a/MANIFEST -+++ b/MANIFEST -@@ -3424,6 +3424,7 @@ dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/aix.pm CBuilder methods fo - dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/cygwin.pm CBuilder methods for cygwin - dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/darwin.pm CBuilder methods for darwin - dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/dec_osf.pm CBuilder methods for OSF -+dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/linux.pm CBuilder methods for Linux - dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/os2.pm CBuilder methods for OS/2 - dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/Unix.pm CBuilder methods for Unix - dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/VMS.pm CBuilder methods for VMS -diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/linux.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/linux.pm -new file mode 100644 -index 0000000..e3251c4 ---- /dev/null -+++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/linux.pm -@@ -0,0 +1,26 @@ -+package ExtUtils::CBuilder::Platform::linux; -+ -+use strict; -+use ExtUtils::CBuilder::Platform::Unix; -+use File::Spec; -+ -+use vars qw($VERSION @ISA); -+$VERSION = '0.280206'; -+@ISA = qw(ExtUtils::CBuilder::Platform::Unix); -+ -+sub link { -+ my ($self, %args) = @_; -+ my $cf = $self->{config}; -+ -+ # Link XS modules to libperl.so explicitly because multiple -+ # dlopen(, RTLD_LOCAL) hides libperl symbols from XS module. -+ local $cf->{lddlflags} = $cf->{lddlflags}; -+ if ($ENV{PERL_CORE}) { -+ $cf->{lddlflags} .= ' -L' . $self->perl_inc(); -+ } -+ $cf->{lddlflags} .= ' -lperl'; -+ -+ return $self->SUPER::link(%args); -+} -+ -+1; --- -1.8.1.4 - diff --git a/perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-MM-on-Linux.patch b/perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-MM-on-Linux.patch deleted file mode 100644 index f1f76ac..0000000 --- a/perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-MM-on-Linux.patch +++ /dev/null @@ -1,52 +0,0 @@ -From fc1f8ac36c34c35bad84fb7b99a26ab83c9ba075 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 3 Jul 2013 12:59:09 +0200 -Subject: [PATCH] Link XS modules to libperl.so with EU::MM on Linux -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - - - -Signed-off-by: Petr Písař ---- - cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -index a8b172f..a3fbce2 100644 ---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm -@@ -30,6 +30,7 @@ BEGIN { - $Is{IRIX} = $^O eq 'irix'; - $Is{NetBSD} = $^O eq 'netbsd'; - $Is{Interix} = $^O eq 'interix'; -+ $Is{Linux} = $^O eq 'linux'; - $Is{SunOS4} = $^O eq 'sunos'; - $Is{Solaris} = $^O eq 'solaris'; - $Is{SunOS} = $Is{SunOS4} || $Is{Solaris}; -@@ -1028,7 +1029,7 @@ sub xs_make_dynamic_lib { - push(@m," \$(RM_F) \$\@\n"); - - my $libs = '$(LDLOADLIBS)'; -- if (($Is{NetBSD} || $Is{Interix} || $Is{Android}) && $Config{'useshrplib'} eq 'true') { -+ if (($Is{Linux} || $Is{NetBSD} || $Is{Interix} || $Is{Android}) && $Config{'useshrplib'} eq 'true') { - # Use nothing on static perl platforms, and to the flags needed - # to link against the shared libperl library on shared perl - # platforms. We peek at lddlflags to see if we need -Wl,-R -@@ -1041,6 +1042,11 @@ sub xs_make_dynamic_lib { - # The Android linker will not recognize symbols from - # libperl unless the module explicitly depends on it. - $libs .= ' "-L$(PERL_INC)" -lperl'; -+ } else { -+ if ($ENV{PERL_CORE}) { -+ $libs .= ' "-L$(PERL_INC)"'; -+ } -+ $libs .= ' -lperl'; - } - } - --- -1.8.1.4 - diff --git a/perl-5.18.1-Document-Math-BigInt-CalcEmu-requires-Math-BigInt.patch b/perl-5.18.1-Document-Math-BigInt-CalcEmu-requires-Math-BigInt.patch deleted file mode 100644 index ce6a4d7..0000000 --- a/perl-5.18.1-Document-Math-BigInt-CalcEmu-requires-Math-BigInt.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 862c89c81d26dae0dcef138e19df8b45615e69c9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 2 Dec 2013 10:10:56 +0100 -Subject: [PATCH] Document Math::BigInt::CalcEmu requires Math::BigInt -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - - -Signed-off-by: Petr Písař ---- - dist/Math-BigInt/lib/Math/BigInt/CalcEmu.pm | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dist/Math-BigInt/lib/Math/BigInt/CalcEmu.pm b/dist/Math-BigInt/lib/Math/BigInt/CalcEmu.pm -index c82e153..0c0b496 100644 ---- a/cpan/Math-BigInt/lib/Math/BigInt/CalcEmu.pm -+++ b/cpan/Math-BigInt/lib/Math/BigInt/CalcEmu.pm -@@ -292,6 +292,7 @@ Math::BigInt::CalcEmu - Emulate low-level math with BigInt code - - =head1 SYNOPSIS - -+ use Math::BigInt; - use Math::BigInt::CalcEmu; - - =head1 DESCRIPTION --- -1.8.3.1 - diff --git a/perl-5.22.0-Install-libperl.so-to-shrpdir-on-Linux.patch b/perl-5.22.0-Install-libperl.so-to-shrpdir-on-Linux.patch deleted file mode 100644 index 49de388..0000000 --- a/perl-5.22.0-Install-libperl.so-to-shrpdir-on-Linux.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 9644657c4 10326749fd321d9c24944ec25afad2f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Thu, 20 Jun 2013 15:22:53 +0200 -Subject: [PATCH] Install libperl.so to shrpdir on Linux -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Petr Písař ---- - Configure | 7 ++++--- - Makefile.SH | 2 +- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/Configure b/Configure -index 2f30261..825496e 100755 ---- a/Configure -+++ b/Configure -@@ -8762,7 +8762,9 @@ esac - - # Detect old use of shrpdir via undocumented Configure -Dshrpdir - case "$shrpdir" in --'') ;; -+'') -+shrpdir=$archlibexp/CORE -+;; - *) $cat >&4 < -Date: Mon, 18 Apr 2016 16:24:03 +0200 -Subject: [PATCH] Provide ExtUtils::MM methods as standalone - ExtUtils::MM::Utils -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If you cannot afford depending on ExtUtils::MakeMaker, you can -depend on ExtUtils::MM::Utils instead. - - - -Signed-off-by: Petr Písař ---- - MANIFEST | 1 + - cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM/Utils.pm | 68 ++++++++++++++++++++++++ - 2 files changed, 69 insertions(+) - create mode 100644 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM/Utils.pm - -diff --git a/MANIFEST b/MANIFEST -index 6af238c..d4f0c56 100644 ---- a/MANIFEST -+++ b/MANIFEST -@@ -784,6 +784,7 @@ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm MakeMaker methods for OS/2 - cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm MakeMaker methods for OS/2 - cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm MakeMaker methods for QNX - cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm MakeMaker methods for Unix -+cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM/Utils.pm Independed MM methods - cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm MakeMaker methods for U/WIN - cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm MakeMaker methods for VMS - cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm MakeMaker methods for VOS -diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM/Utils.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM/Utils.pm -new file mode 100644 -index 0000000..6bbc0d8 ---- /dev/null -+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM/Utils.pm -@@ -0,0 +1,68 @@ -+package ExtUtils::MM::Utils; -+ -+require 5.006; -+ -+use strict; -+use vars qw($VERSION); -+$VERSION = '7.11_06'; -+$VERSION = eval $VERSION; ## no critic [BuiltinFunctions::ProhibitStringyEval] -+ -+=head1 NAME -+ -+ExtUtils::MM::Utils - ExtUtils::MM methods without dependency on ExtUtils::MakeMaker -+ -+=head1 SYNOPSIS -+ -+ require ExtUtils::MM::Utils; -+ MM->maybe_command($file); -+ -+=head1 DESCRIPTION -+ -+This is a collection of L subroutines that are used by many -+other modules but that do not need full-featured L. The -+issue with L is it pulls in Perl header files and that is -+an overkill for small subroutines. -+ -+An example is the L that caused installing GCC just because of -+three-line I from L. -+ -+The intentions is to use L instead of -+L for these trivial methods. You can still call them via -+L class name. -+ -+=head1 METHODS -+ -+=over 4 -+ -+=item maybe_command -+ -+Returns true, if the argument is likely to be a command. -+ -+=cut -+ -+if (!exists $INC{'ExtUtils/MM.pm'}) { -+ *MM::maybe_command = *ExtUtils::MM::maybe_command = \&maybe_command; -+} -+ -+sub maybe_command { -+ my($self,$file) = @_; -+ return $file if -x $file && ! -d $file; -+ return; -+} -+ -+1; -+ -+=back -+ -+=head1 BUGS -+ -+These methods are copied from L. Other operating systems -+are not supported yet. The reason is this -+L. -+ -+=head1 SEE ALSO -+ -+L, L -+ -+=cut --- -2.5.5 - diff --git a/perl-5.22.1-Replace-EU-MM-dependnecy-with-EU-MM-Utils-in-IPC-Cmd.patch b/perl-5.22.1-Replace-EU-MM-dependnecy-with-EU-MM-Utils-in-IPC-Cmd.patch deleted file mode 100644 index b702e85..0000000 --- a/perl-5.22.1-Replace-EU-MM-dependnecy-with-EU-MM-Utils-in-IPC-Cmd.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 216ddd39adb0043930acad70ff242c30a1b0c6cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 18 Apr 2016 16:39:32 +0200 -Subject: [PATCH] Replace EU::MM dependnecy with EU::MM::Utils in IPC::Cmd -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This allows to free from a run-time dependency on fat -ExtUtils::MakeMaker. - - - -Signed-off-by: Petr Písař ---- - cpan/IPC-Cmd/lib/IPC/Cmd.pm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cpan/IPC-Cmd/lib/IPC/Cmd.pm b/cpan/IPC-Cmd/lib/IPC/Cmd.pm -index 6a82bdf..b6cd7ef 100644 ---- a/cpan/IPC-Cmd/lib/IPC/Cmd.pm -+++ b/cpan/IPC-Cmd/lib/IPC/Cmd.pm -@@ -232,7 +232,7 @@ sub can_run { - } - - require File::Spec; -- require ExtUtils::MakeMaker; -+ require ExtUtils::MM::Utils; - - my @possibles; - --- -2.5.5 - diff --git a/perl-5.26.0-perl-131588-be-a-little-more-careful-in-arybase-_tie.patch b/perl-5.26.0-perl-131588-be-a-little-more-careful-in-arybase-_tie.patch deleted file mode 100644 index 59f6af9..0000000 --- a/perl-5.26.0-perl-131588-be-a-little-more-careful-in-arybase-_tie.patch +++ /dev/null @@ -1,61 +0,0 @@ -From cb2fda94b02c5b7e8d16582410034f5a3dae526f Mon Sep 17 00:00:00 2001 -From: Tony Cook -Date: Tue, 25 Jul 2017 16:21:22 +1000 -Subject: [PATCH] (perl #131588) be a little more careful in arybase::_tie_it() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Original patch by John Leitch -Petr Pisar: Ported to 5.26.0. - -Signed-off-by: Petr Písař ---- - ext/arybase/arybase.xs | 10 ++++++---- - ext/arybase/t/arybase.t | 4 +++- - 2 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/ext/arybase/arybase.xs b/ext/arybase/arybase.xs -index 880bbe3..216442a 100644 ---- a/ext/arybase/arybase.xs -+++ b/ext/arybase/arybase.xs -@@ -428,10 +428,12 @@ _tie_it(SV *sv) - INIT: - GV * const gv = (GV *)sv; - CODE: -- if (GvSV(gv)) -- /* This is *our* scalar now! */ -- sv_unmagic(GvSV(gv), PERL_MAGIC_sv); -- tie(aTHX_ GvSVn(gv), NULL, GvSTASH(CvGV(cv))); -+ if (isGV(gv)) { -+ if (GvSV(gv)) -+ /* This is *our* scalar now! */ -+ sv_unmagic(GvSV(gv), PERL_MAGIC_sv); -+ tie(aTHX_ GvSVn(gv), NULL, GvSTASH(CvGV(cv))); -+ } - - void - FETCH(...) -diff --git a/ext/arybase/t/arybase.t b/ext/arybase/t/arybase.t -index f3d3287..41e90df 100644 ---- a/ext/arybase/t/arybase.t -+++ b/ext/arybase/t/arybase.t -@@ -4,7 +4,7 @@ - # plus miscellaneous bug fix tests - - no warnings 'deprecated'; --use Test::More tests => 7; -+use Test::More tests => 8; - - sub outside_base_scope { return "${'['}" } - -@@ -34,4 +34,6 @@ is $@, "That use of \$[ is unsupported at $f line $l.\n", - - sub foo { my $x; $x = wait } # compilation of this routine used to crash - -+ok eval { arybase::_tie_it(1); 1 }, "don't crash on bad call to _tie_it()"; -+ - 1; --- -2.9.4 - diff --git a/perl-5.27.8-hints-linux-Add-lphtread-to-lddlflags.patch b/perl-5.27.8-hints-linux-Add-lphtread-to-lddlflags.patch deleted file mode 100644 index f68569f..0000000 --- a/perl-5.27.8-hints-linux-Add-lphtread-to-lddlflags.patch +++ /dev/null @@ -1,61 +0,0 @@ -From f6bc8fb3d26892ba1a84ba2df76beedd51998dd2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 29 Jan 2018 16:34:17 +0100 -Subject: [PATCH] hints/linux: Add -lphtread to lddlflags -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Passing -z defs to linker flags causes perl to fail to build if threads are -enabled: - -gcc -shared -Wl,-z,relro -Wl,-z,defs -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -L/usr/local/lib -fstack-protector-strong Bzip2.o -o ../../lib/auto/Compress/Raw/Bzip2/Bzip2.so \ - -L/usr/lib64 -lbz2 "-L../.." -lperl \ - -Bzip2.o: In function `deRef': -/builddir/build/BUILD/perl-5.26.1/cpan/Compress-Raw-Bzip2/Bzip2.xs:256: undefined reference to `pthread_getspecific' - -The reason is Bzip2.xs calls dTHX macro included from thread.h via perl.h that -expands to pthread_getspecific() function call that is defined in pthread -library. But the pthread library is not explicitly linked to Bzip.so (see the -gcc command). This is exactly what -z defs linker flag enforces. - -Underlinking ELFs can be dangerous because in case of versioned -symbols it can cause run-time binding to an improper version symbol or -even to an symbold from different library. - -This patch fixes hints for Linux by adding -lpthreads to lddlflags. It -also adds -shared there because Configure.sh adds it only hints return -lddlflags empty. - - - -Signed-off-by: Petr Písař ---- - hints/linux.sh | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/hints/linux.sh b/hints/linux.sh -index 3f38ea07f1..9ec3bc02ef 100644 ---- a/hints/linux.sh -+++ b/hints/linux.sh -@@ -353,12 +353,16 @@ if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then - echo "$libswanted" >&4 - fi - -+# Flags needed to produce shared libraries. -+lddlflags='-shared' -+ - # This script UU/usethreads.cbu will get 'called-back' by Configure - # after it has prompted the user for whether to use threads. - cat > UU/usethreads.cbu <<'EOCBU' - case "$usethreads" in - $define|true|[yY]*) - ccflags="-D_REENTRANT -D_GNU_SOURCE $ccflags" -+ lddlflags="-lpthread $lddlflags" - if echo $libswanted | grep -v pthread >/dev/null - then - set `echo X "$libswanted "| sed -e 's/ c / pthread c /'` --- -2.13.6 - diff --git a/perl-USE_MM_LD_RUN_PATH.patch b/perl-USE_MM_LD_RUN_PATH.patch deleted file mode 100644 index cf724fd..0000000 --- a/perl-USE_MM_LD_RUN_PATH.patch +++ /dev/null @@ -1,109 +0,0 @@ -diff -up perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm.usem perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm ---- perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm.usem 2011-05-08 05:10:08.000000000 +0200 -+++ perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm 2011-05-17 11:14:22.169115984 +0200 -@@ -89,6 +89,11 @@ libraries. LD_RUN_PATH is a colon separ - in LDLOADLIBS. It is passed as an environment variable to the process - that links the shared library. - -+Fedora extension: This generation of LD_RUN_PATH is disabled by default. -+To use the generated LD_RUN_PATH for all links, set the USE_MM_LD_RUN_PATH -+MakeMaker object attribute / argument, (or set the $USE_MM_LD_RUN_PATH -+environment variable). -+ - =head2 BSLOADLIBS - - List of those libraries that are needed but can be linked in -diff -up perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm.usem perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm ---- perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm.usem 2011-05-08 05:10:08.000000000 +0200 -+++ perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 2011-05-17 13:39:26.912586030 +0200 -@@ -317,7 +317,7 @@ sub full_setup { - PERM_DIR PERM_RW PERM_RWX MAGICXS - PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE - PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ -- SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST VERSION VERSION_FROM XS -+ SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS - XSBUILD XSMULTI XSOPT XSPROTOARG XS_VERSION - clean depend dist dynamic_lib linkext macro realclean tool_autosplit - -@@ -501,7 +501,27 @@ sub new { - # PRINT_PREREQ is RedHatism. - if ("@ARGV" =~ /\bPRINT_PREREQ\b/) { - $self->_PRINT_PREREQ; -- } -+ } -+ -+ # USE_MM_LD_RUN_PATH - another RedHatism to disable automatic RPATH generation -+ if ( ( ! $self->{USE_MM_LD_RUN_PATH} ) -+ &&( ("@ARGV" =~ /\bUSE_MM_LD_RUN_PATH(=([01]))?\b/) -+ ||( exists( $ENV{USE_MM_LD_RUN_PATH} ) -+ &&( $ENV{USE_MM_LD_RUN_PATH} =~ /([01])?$/ ) -+ ) -+ ) -+ ) -+ { -+ my $v = $1; -+ if( $v ) -+ { -+ $v = ($v=~/=([01])$/)[0]; -+ }else -+ { -+ $v = 1; -+ }; -+ $self->{USE_MM_LD_RUN_PATH}=$v; -+ }; - - print "MakeMaker (v$VERSION)\n" if $Verbose; - if (-f "MANIFEST" && ! -f "Makefile" && ! $UNDER_CORE){ -@@ -2821,6 +2841,40 @@ precedence. A typemap in the current di - precedence, even if it isn't listed in TYPEMAPS. The default system - typemap has lowest precedence. - -+=item USE_MM_LD_RUN_PATH -+ -+boolean -+The Fedora perl MakeMaker distribution differs from the standard -+upstream release in that it disables use of the MakeMaker generated -+LD_RUN_PATH by default, UNLESS this attribute is specified , or the -+USE_MM_LD_RUN_PATH environment variable is set during the MakeMaker run. -+ -+The upstream MakeMaker will set the ld(1) environment variable LD_RUN_PATH -+to the concatenation of every -L ld(1) option directory in which a -l ld(1) -+option library is found, which is used as the ld(1) -rpath option if none -+is specified. This means that, if your application builds shared libraries -+and your MakeMaker application links to them, that the absolute paths of the -+libraries in the build tree will be inserted into the RPATH header of all -+MakeMaker generated binaries, and that such binaries will be unable to link -+to these libraries if they do not still reside in the build tree directories -+(unlikely) or in the system library directories (/lib or /usr/lib), regardless -+of any LD_LIBRARY_PATH setting. So if you specified -L../mylib -lmylib , and -+ your 'libmylib.so' gets installed into /some_directory_other_than_usr_lib, -+ your MakeMaker application will be unable to link to it, even if LD_LIBRARY_PATH -+is set to include /some_directory_other_than_usr_lib, because RPATH overrides -+LD_LIBRARY_PATH. -+ -+So for Fedora MakeMaker builds LD_RUN_PATH is NOT generated by default for -+every link. You can still use explicit -rpath ld options or the LD_RUN_PATH -+environment variable during the build to generate an RPATH for the binaries. -+ -+You can set the USE_MM_LD_RUN_PATH attribute to 1 on the MakeMaker command -+line or in the WriteMakefile arguments to enable generation of LD_RUN_PATH -+for every link command. -+ -+USE_MM_LD_RUN_PATH will default to 1 (LD_RUN_PATH will be used) IF the -+$USE_MM_LD_RUN_PATH environment variable is set during a MakeMaker run. -+ - =item VENDORPREFIX - - Like PERLPREFIX, but only for the vendor install locations. -diff -up perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.usem perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm ---- perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.usem 2011-05-08 05:10:08.000000000 +0200 -+++ perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2011-05-17 11:14:22.172115972 +0200 -@@ -1045,7 +1045,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $ - } - - my $ld_run_path_shell = ""; -- if ($self->{LD_RUN_PATH} ne "") { -+ if (($self->{LD_RUN_PATH} ne "") && ($self->{USE_MM_LD_RUN_PATH})) { - $ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" '; - } - diff --git a/perl.spec b/perl.spec index 43435fb..370f30b 100644 --- a/perl.spec +++ b/perl.spec @@ -18,41 +18,21 @@ Name: perl License: (GPL+ or Artistic) and (GPLv2+ or Artistic) and HSRL and MIT and UCD and Public Domain and BSD Epoch: 4 Version: 5.28.0 -Release: 429 +Release: 430 Summary: A highly capable, feature-rich programming language Url: https://www.perl.org/ Source0: https://www.cpan.org/src/5.0/%{name}-%{version}.tar.xz -#we list the different licenses of subpackages in this file -Source1: perl_subpkg_license -Source2: macros.perl -#Systemtap tapset and example that make use of systemtap-sdt-devel -# build requirement. Written by lberk; Not yet upstream. -Source3: perl.stp # PATCH-FEATURE-OPENEULER -Patch1: perl-5.8.0-libdir64.patch -# PATCH-FIX-OPENEULER--rh#151127 -Patch2: perl-5.10.0-libresolv.patch +Patch1: change-lib-to-lib64.patch # PATCH-FEATURE-OPENEULER -Patch3: perl-USE_MM_LD_RUN_PATH.patch -# PATCH-FIX-OPENEULER--rh#1129443 -Patch4: perl-5.22.1-Provide-ExtUtils-MM-methods-as-standalone-ExtUtils-M.patch +Patch3: disable-rpath-by-default.patch # PATCH-FIX-OPENEULER -Patch5: perl-5.16.3-create_libperl_soname.patch -# PATCH-FEATURE-OPENEULER -Patch6: perl-5.22.0-Install-libperl.so-to-shrpdir-on-Linux.patch -# PATCH-FIX-OPENEULER--CPAN RT#85015 -Patch7: perl-5.18.1-Document-Math-BigInt-CalcEmu-requires-Math-BigInt.patch +Patch5: create-libperl-soname.patch # PATCH-FIX-OPENEULER--rh#1107543, RT#61912 -Patch8: perl-5.18.2-Destroy-GDBM-NDBM-ODBM-SDBM-_File-objects-only-from-.patch -# PATCH-FIX-OPENEULER--rh#1129443 -Patch9: perl-5.22.1-Replace-EU-MM-dependnecy-with-EU-MM-Utils-in-IPC-Cmd.patch -# PATCH-FIX-OPENEULER--RT#131588 -Patch10: perl-5.26.0-perl-131588-be-a-little-more-careful-in-arybase-_tie.patch -# PATCH-FIX-OPENEULER -Patch11: perl-5.27.8-hints-linux-Add-lphtread-to-lddlflags.patch +Patch8: perl-5.18.2-Destroy-GDBM-NDBM-ODBM-SDBM-_File-objects-only-from-.patch # PATCH-FIX-OPENEULER--RT#133295 -Patch12: perl-5.29.0-Remove-ext-GDBM_File-t-fatal.t.patch +Patch12: delete-ext-GDBM_File-t-fatal.t.patch # PATCH-FIX-UPSTREAM--RT#133204, upstream 5.29.0 Patch13: Perl_my_setenv-handle-integer-wrap.patch # PATCH-FIX-UPSTREAM-- upstream 5.29.0 @@ -80,10 +60,9 @@ Patch24: multiconcat-mutator-not-seen-in-lex.patch Patch25: perl-132683-don-t-try-to-convert-PL_sv_placeholder-i.patch # PATCH-FIX-UPSTREAM-- RT#132655, upstream 5.29.2 Patch26: perl-132655-nul-terminate-result-of-unpack-u-of-inva.patch -# PATCH-FIX-OPENEULER--rh#960048 -Patch27: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch -# PATCH-FIX-OPENEULER--rh#960048 -Patch28: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-MM-on-Linux.patch +# PATCH-FIX-OPENEULER +# In 2020, a year of 70 starts to mean 2070. So cpan/Time-Local/t/Local.t test +Patch27: Fix-time-local-tests-in-2020.patch Patch6000: CVE-2018-18312-1.patch Patch6001: CVE-2018-18312-2.patch @@ -93,7 +72,7 @@ BuildRequires: gcc bash findutils coreutils make tar procps bzip2-devel gdbm-de BuildRequires: zlib-devel systemtap-sdt-devel perl-interpreter perl-generators Requires: perl(:MODULE_COMPAT_5.28.0) perl-version perl-threads perl-threads-shared perl-parent -Requires: perl-devel = %{epoch}:%{version}-%{release} +Requires: perl-devel = %{epoch}:%{version}-%{release} %{_vendor}-rpm-config Requires: perl-Unicode-Collate perl-Unicode-Normalize perl-Time-Local perl-Time-HiRes Requires: perl-Thread-Queue perl-Text-Tabs+Wrap perl-Test-Simple perl-Test-Harness perl-devel Requires: perl-Text-Balanced perl-Text-ParseWords perl-Term-ANSIColor perl-Term-Cap @@ -147,8 +126,6 @@ This package contains the development files and test files for %{name}. %prep %autosetup -n %{name}-%{version} -p1 -cp -a %{SOURCE1} . - # Configure Compress::Zlib to use system zlib sed -i 's|BUILD_ZLIB = True|BUILD_ZLIB = False| s|INCLUDE = ./zlib-src|INCLUDE = %{_includedir}| @@ -211,10 +188,6 @@ done mkdir -p %{buildroot}%{perl_vendor_libdir}/auto mkdir -p %{buildroot}%{perl_vendor_datadir} -# perl RPM macros -mkdir -p %{buildroot}%{_rpmmacrodir} -install -p -m 644 %{SOURCE2} %{buildroot}%{_rpmmacrodir} - # This is a work-around for rpmbuild bug #878863. find %{buildroot} -type f -name '*.bs' -empty -delete chmod -R u+w %{buildroot}/* @@ -240,11 +213,6 @@ done -e 's"\A#!(?:perl|\./perl|/usr/bin/perl|/usr/bin/env perl)\b"$Config{startperl}"' \ $(find %{buildroot}%{_libexecdir}/perl5-tests/perl-tests -type f) -mkdir -p %{buildroot}%{_datadir}/systemtap/tapset - -sed -e "s|LIBRARY_PATH|%{_libdir}/%{soname}|" %{SOURCE3} \ - > %{buildroot}%{_datadir}/systemtap/tapset/libperl%{version}-64.stp - %check %{perl_new} -I/lib regen/lib_cleanup.pl cd t @@ -448,15 +416,11 @@ make test_harness %dir %{perl_datadir} %{perl_datadir}/* %{_libdir}/libperl.so.* -%{_rpmmacrodir}/macros.perl %files devel %{_bindir}/{h2xs,perlivp} %{perl_libdir}/CORE/*.h %{_libdir}/libperl.so -%dir %{_datadir}/systemtap -%dir %{_datadir}/systemtap/tapset -%{_datadir}/systemtap/tapset/libperl%{version}-64.stp %dir %{perl_libdir}/Devel %{perl_libdir}/Devel/Peek.pm %dir %{perl_libdir}/auto/Devel @@ -505,6 +469,12 @@ make test_harness %{_mandir}/man3/* %changelog +* Fri Jan 2 2020 openEuler Buildteam - 4:5.28.0-430 +- Type:NA +- ID:NA +- SUG:NA +- DESC:delete unneeded patch + * Mon Dec 23 2019 openEuler Buildteam - 4:5.28.0-429 - Type:NA - ID:NA diff --git a/perl.stp b/perl.stp deleted file mode 100644 index dbc51a8..0000000 --- a/perl.stp +++ /dev/null @@ -1,71 +0,0 @@ -/* - This probe will fire when the perl script enters a subroutine. - */ - -probe perl.sub.call = process("LIBRARY_PATH").mark("sub__entry") -{ - - sub = user_string($arg1) - filename = user_string($arg2) - lineno = $arg3 - package = user_string($arg4) - -} - -/* - This probe will fire when the return from a subroutine has been - hit. - */ - -probe perl.sub.return = process("LIBRARY_PATH").mark("sub__return") -{ - - sub = user_string($arg1) - filename = user_string($arg2) - lineno = $arg3 - package = user_string($arg4) - -} - -/* - This probe will fire when the Perl interperter changes state. - */ - -probe perl.phase.change = process("LIBRARY_PATH").mark("phase__change") -{ - newphase = user_string($arg1) - oldphase = user_string($arg2) - -} - - -/* - Fires when Perl has successfully loaded an individual file. - */ - -probe perl.loaded.file = process("LIBRARY_PATH").mark("loaded__file") -{ - filename = user_string($arg1) - -} - - -/* - Fires when Perl is about to load an individual file. - */ - -probe perl.loading.file = process("LIBRARY_PATH").mark("loading__file") -{ - filename = user_string($arg1) - -} - - -/* - Traces the execution of each opcode in the Perl runloop. - */ - -probe perl.op.entry = process("LIBRARY_PATH").mark("op__entry") -{ - opname = user_string($arg1) -} diff --git a/perl_subpkg_license b/perl_subpkg_license deleted file mode 100644 index 31a3496..0000000 --- a/perl_subpkg_license +++ /dev/null @@ -1,36 +0,0 @@ -# We found there many licenses of subpackages; We list here as below -# subpackages. -# dist/Tie-File/lib/Tie/File.pm: GPLv2+ or Artistic -# cpan/Getopt-Long/lib/Getopt/Long.pm: GPLv2+ or Artistic -# cpan/Compress-Raw-Zlib/Zlib.xs: (GPL+ or Artistic) and zlib -# cpan/Digest-MD5/MD5.xs: (GPL+ or Artistic) and BSD -# cpan/Time-Piece/Piece.xs: (GPL+ or Artistic) and BSD -# dist/PathTools/Cwd.xs: (GPL+ or Artistic) and BSD -# util.c: (GPL+ or Artistic) and BSD -# cpan/perlfaq/lib/perlfaq4.pod: (GPL+ or Artistic) and Public Domain -# cpan/Test-Simple/lib/Test/Tutorial.pod: (GPL+ or Artistic) and Public Domain -# cpan/MIME-Base64/Base64.xs: (GPL+ or Artistic) and MIT -# cpan/Test-Simple/lib/ok.pm: CC0 -# cpan/Text-Tabs/lib/Text/Wrap.pm: TTWL -# cpan/Encode/bin/encguess: Artistic 2.0 -# cpan/libnet/lib/Net/libnetFAQ.pod: Artistic (CPAN RT#117888) -# cpan/Unicode-Collate/Collate/allkeys.txt: Unicode -# lib/unicore: UCD -# ext/SDBM_File/sdbm.{c,h}: Public domain -# regexec.c, regcomp.c: HSRL -# cpan/Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm: MIT (with exception for Perl) -# time64.c: MIT -# pod/perlpodstyle.pod: MIT -# pod/perlunicook.pod: (GPL+ or Artistic) and Public Domain -# pod/perlgpl.pod: GPL text -# pod/perlartistic.pod: Artistic text -# ext/File-Glob/bsd_glob.{c,h}: BSD -# Other files: GPL+ or Artistic -# cpan/podlators/t/style/minimum-version.t MIT -# cpan/Term-ANSIColor/t/lib/Test/RRA/Config.pm: MIT -# cpan/Compress-Raw-Bzip2/bzip2-src: BSD -# cpan/Compress-Raw-Zlib/zlib-src: zlib - -### get this license from fedora -- Pod-Html-license-clarification -### https://src.fedoraproject.org/rpms/perl/blob/master/f/Pod-Html-license-clarification -# Pod::Html license: same as rest of Perl -- Gitee