commit 3fbe30bcdc9c017ead946ec4de19bf9d80f073c0
Author: Jan Palus <at...@pld-linux.org>
Date: Mon Jun 10 21:23:24 2024 +0200
up to 5.40.0
- microperl dropped upstream
perl-modules | 72 ++++++++++++++++----------------
perl-modules2 | 6 +--
perl.spec | 90 +++-------------------------------------
perl_585-microperl_uconfig.patch | 70 -------------------------------
4 files changed, 45 insertions(+), 193 deletions(-)
---
diff --git a/perl.spec b/perl.spec
index 5ffea7e..897d828 100644
--- a/perl.spec
+++ b/perl.spec
@@ -3,7 +3,6 @@
%bcond_without tests # do not perform "make test"
%bcond_without threads # build without support for threads
%bcond_without gdbm # build without the GDBM_File module
-%bcond_with microperl # build microperl (needs fixing)
#
# TODO:
# - fix "FIXME"s
@@ -25,7 +24,7 @@
# NOTE
# - modules in 5.20.0: http://search.cpan.org/~rjbs/perl-5.20.0/
-%define abi 5.38.0
+%define abi 5.40.0
%define perlthread %{?with_threads:-thread-multi}
%define perl_privlib %{_datadir}/perl5/%{ver}
@@ -43,7 +42,7 @@
%define perl_mod2verrel() %([ -f %{SOURCE4} ] && awk
-vp=%1 -vr=%2 '$1 == p { print $4"-"r }' %{SOURCE4} || echo ERROR)
%define perl_mod2version() %([ -f %{SOURCE4} ] && awk
-vp=%1 '$1 == p { m=$2; printf("perl-%s = %s\\n", p, $4)}END{if (!m) printf("#
Error looking up [%s]\\n", p) }' %{SOURCE4} || echo ERROR)
-%define ver 5.38.2
+%define ver 5.40.0
%define rel 1
Summary: Practical Extraction and Report Language (Perl)
Summary(cs.UTF-8): Programovací jazyk Perl
@@ -73,7 +72,7 @@ Epoch: 1
License: GPL v1+ or Artistic
Group: Development/Languages/Perl
Source0: https://www.cpan.org/src/5.0/%{name}-%{ver}.tar.xz
-# Source0-md5: d3957d75042918a23ec0abac4a2b7e0a
+# Source0-md5: cfe14ef0709b9687f9c514042e8e1e82
Source1:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: de47d7893f49ad7f41ba69c78511c0db
Source2: %{name}.prov
@@ -83,11 +82,6 @@ Patch0: x32-io-msg-skip.diff
Patch2: %{name}_580-errno_h-parsing.patch
Patch3: %{name}_581-soname.patch
Patch4: %{name}-test-noproc.patch
-# Test regen.t checks result of this patch.
-# To run test manually run, from BUILD/perl-*:
-# PERL5LIB=$(pwd) LD_LIBRARY_PATH=$(pwd) ./preload ./libperl.so ./perl
t/porting/regen.t
-# Make sure sha output from test matches sha from uconfig.h
-Patch5: %{name}_585-microperl_uconfig.patch
Patch6: %{name}-write-permissions.patch
Patch7: %{name}-t-syslog.patch
Patch8: %{name}-Destroy-GDBM-NDBM-ODBM-SDBM-_File-objects.patch
@@ -638,30 +632,6 @@ pod2usage - wypisanie informacji o używaniu programu z
dokumentacji
podchecker - kontrola składni dokumentacji w formacie POD
podselect - wypisanie wybranych sekcji z dokumentacji POD
-%package -n microperl
-Summary: A really minimal Perl, even more minimal than miniperl
-Summary(pl.UTF-8): Naprawdę minimalny Perl, nawet bardziej minimalny niż
miniperl
-Group: Development/Languages/Perl
-
-%description -n microperl
-microperl is supposed to be able a really minimal Perl, even more
-minimal than miniperl. No Configure is needed to build microperl, on
-the other hand this means that interfaces between Perl and your
-operating system are left very -- minimal.
-
-All this is experimental. If you don't know what to do with microperl
-you probably shouldn't. Do not report bugs in microperl; fix the bugs.
-
-%description -n microperl -l pl.UTF-8
-microperl ma być naprawdę minimalnym Perlem, nawet bardziej minimalnym
-od miniperla. Uruchamianie Configure nie jest potrzebne do zbudowania
-microperla, z drugiej strony oznacza to, że interfejs między Perlem a
-systemem operacyjnym pozostaje bardzo minimalny.
-
-Całość jest eksperymentalna. Jeśli nie wiesz co zrobić z microperlem,
-prawdopodobnie nie powinieneś tego robić. Nie zgłaszaj błędów w
-microperlu - popraw je.
-
%package Encode
Summary: Encode - character encodings
Summary(pl.UTF-8): Encode - kodowania znaków
@@ -727,7 +697,6 @@ zbyt duża, a rozmiar za mały na tworzenie oddzielnych
rozszerzeń.
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
@@ -744,15 +713,6 @@ exec %{buildroot}%{_bindir}/perl -e 'BEGIN { @INC =
("%{buildroot}%{perl_privlib
EOF
chmod a+x runperl
-# perl_585-microperl_uconfig.patch removes some variables
-# that are later verified by porting/checkcfgvar.t
-#
-# Disabling test for now but should also check if
-# perl porting/checkcfgvar.pl --regen --default=undef
-# makes better sense.
-%{__rm} t/porting/checkcfgvar.t
-%{__sed} -i -e '/^t\/porting\/checkcfgvar\.t.*/d' MANIFEST
-
%build
unset LD_SYMBOLIC_FUNCTIONS || :
sh Configure \
@@ -789,24 +749,6 @@ sh Configure \
LIBPERL_SONAME=libperl.so.%{abi} \
LDDLFLAGS="%{rpmcflags} -shared"
-## microperl
-%if %{with microperl}
-%{__rm} uconfig.h
-%{__make} -f Makefile.micro \
- archlib=%{perl_archlib} \
- archlibexp=%{perl_archlib} \
- privlib=%{perl_privlib} \
- privlibexp=%{perl_privlib} \
- archname=%{_target_platform}%{perlthread} \
- osname=%{_host} \
- bin=%{_bindir} \
- scriptdir=%{_bindir} \
- scriptdirexp=%{_bindir} \
- usemallocwrap='define' \
- CC="%{__cc}" \
- OPTIMIZE="%{rpmcflags}"
-%endif
-
%{?with_tests:%{__make} test -j1}
#%{?with_tests:%{__make} minitest}
@@ -816,7 +758,6 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%{?with_microperl:install microperl $RPM_BUILD_ROOT%{_bindir}}
install -d $RPM_BUILD_ROOT%{_mandir}/{ja,ko,zh_CN,zh_TW}/man1
## use symlinks instead of hardlinks
@@ -952,10 +893,6 @@ for m in $(awk '!/^#/ && !/^$/{print $1}' %{SOURCE3}); do
ExtUtils::CBuilder|Compress::Raw::Bzip2|Compress::Raw::Zlib)
v=$(%{__perl} -e "use $m; print
version->parse(\$$m::VERSION)->numify")
;;
- # this module has VERSION encoded as int in a way that it loses
trailing 0
- Getopt::Long)
- v=$(%{__perl} -e "use $m; print \$$m::VERSION_STRING")
- ;;
*)
v=$(%{__perl} -e "use $m; print \$$m::VERSION")
;;
@@ -1084,7 +1021,7 @@ rm -rf $RPM_BUILD_ROOT
%{perl_privlib}/Fatal.pm
%{_mandir}/man3/Fatal.3perl*
%{perl_privlib}/Getopt
-%{_mandir}/man3/Getopt::Long.3perl*
+%{_mandir}/man3/Getopt::Long*.3perl*
%{_mandir}/man3/Getopt::Std.3perl*
%{perl_privlib}/HTTP
%{_mandir}/man3/HTTP::Tiny.3perl*
@@ -1190,8 +1127,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{perl_archlib}/auto/PerlIO/encoding/encoding.so
%dir %{perl_archlib}/auto/PerlIO/mmap
%attr(755,root,root) %{perl_archlib}/auto/PerlIO/mmap/mmap.so
-%dir %{perl_archlib}/auto/PerlIO/scalar
-%attr(755,root,root) %{perl_archlib}/auto/PerlIO/scalar/scalar.so
%dir %{perl_archlib}/auto/PerlIO/via
%attr(755,root,root) %{perl_archlib}/auto/PerlIO/via/via.so
%{_mandir}/man3/PerlIO*.3perl*
@@ -1635,6 +1570,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/Term::Cap.3perl*
%{_mandir}/man3/Term::Complete.3perl*
%{_mandir}/man3/Term::ReadLine.3perl*
+%{_mandir}/man3/Term::Table*.3perl*
%{perl_privlib}/Test.pm
%{perl_privlib}/Test
@@ -1650,14 +1586,7 @@ rm -rf $RPM_BUILD_ROOT
%{perl_privlib}/Test2.pm
%{perl_privlib}/Test2
%{_mandir}/man3/Test2.3perl*
-%{_mandir}/man3/Test2::API*.3perl*
-%{_mandir}/man3/Test2::Event*.3perl*
-%{_mandir}/man3/Test2::Formatter*.3perl*
-%{_mandir}/man3/Test2::Hub*.3perl*
-%{_mandir}/man3/Test2::IPC*.3perl*
-%{_mandir}/man3/Test2::Tools::Tiny.3perl*
-%{_mandir}/man3/Test2::Transition.3perl*
-%{_mandir}/man3/Test2::Util*.3perl*
+%{_mandir}/man3/Test2::*.3perl*
%{perl_privlib}/Text
%{_mandir}/man3/Text::Abbrev.3perl*
@@ -1736,13 +1665,6 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/pod2*.1*
%{_mandir}/man1/podchecker.1*
-%if %{with microperl}
-%files -n microperl
-%defattr(644,root,root,755)
-%doc README.micro
-%attr(755,root,root) %{_bindir}/microperl
-%endif
-
%files Encode
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/enc2xs
diff --git a/perl-modules b/perl-modules
index 7048be2..1639470 100644
--- a/perl-modules
+++ b/perl-modules
@@ -1,82 +1,82 @@
-# Module versions from Perl 5.38.2 distribution.
-Archive::Tar = 2.40
+# Module versions from Perl 5.40.0 distribution.
+Archive::Tar = 3.02_001
Attribute::Handlers = 1.03
CPAN = 2.36
CPAN::Meta = 2.150010
CPAN::Meta::YAML = 0.018
-Compress::Raw::Bzip2 = 2.204001
-Compress::Raw::Zlib = 2.204001
-Compress::Zlib = 2.204
-Devel::PPPort = 3.71
-Devel::Peek = 1.33
+Compress::Raw::Bzip2 = 2.212
+Compress::Raw::Zlib = 2.212
+Compress::Zlib = 2.212
+Devel::PPPort = 3.72
+Devel::Peek = 1.34
Digest = 1.20
Digest::MD5 = 2.58_01
Digest::SHA = 6.04
-Encode = 3.19
-ExtUtils::CBuilder = 0.280238
+Encode = 3.21
+ExtUtils::CBuilder = 0.280240
ExtUtils::Command = 7.70
ExtUtils::Embed = 1.35
ExtUtils::Install = 2.22
ExtUtils::MakeMaker = 7.70
-ExtUtils::Manifest = 1.73
+ExtUtils::Manifest = 1.75
ExtUtils::ParseXS = 3.51
-File::Compare = 1.1007
+File::Compare = 1.1008
File::Temp = 0.2311
Filter::Simple = 0.96
-FindBin = 1.53
+FindBin = 1.54
GDBM_File = 1.24
-Getopt::Long = 2.54
-Hash::Util = 0.30
+Getopt::Long = 2.57
+Hash::Util = 0.32
I18N::LangTags = 0.45
-IO = 1.52
-IO::Zlib = 1.14
+IO = 1.55
+IO::Zlib = 1.15
IPC::Cmd = 1.04
IPC::SysV = 2.09
JSON::PP = 4.16
Locale::Maketext = 1.33
Locale::Maketext::Simple = 0.21_01
MIME::Base64 = 3.16_01
-Math::BigInt = 1.999837
-Math::BigInt::FastCalc = 0.5013
-Math::BigRat = 0.2624
+Math::BigInt = 2.003002
+Math::BigInt::FastCalc = 0.5018
+Math::BigRat = 2.003002
Math::Complex = 1.62
Math::Trig = 1.62
Memoize = 1.16
-Module::CoreList = 5.20231129
+Module::CoreList = 5.20240609
Module::Load = 0.36
Module::Load::Conditional = 0.74
-Module::Metadata = 1.000037
+Module::Metadata = 1.000038
NEXT = 0.69
Params::Check = 0.38
Parse::CPAN::Meta = 2.150010
Perl::OSType = 1.010
PerlIO::via::QuotedPrint = 0.10
Pod::Escapes = 1.07
-Pod::Simple = 3.43
-Safe = 2.44
-Socket = 2.036
+Pod::Simple = 3.45
+Safe = 2.46
+Socket = 2.038
Storable = 3.32
Sys::Syslog = 0.36
Term::ANSIColor = 5.01
Term::Cap = 1.18
Test = 1.31
-Test::Builder::Tester = 1.302194
-Test::Harness = 3.44
-Test::Simple = 1.302194
-Test::Tester = 1.302194
-Test::use::ok = 1.302194
+Test::Builder::Tester = 1.302199
+Test::Harness = 3.48
+Test::Simple = 1.302199
+Test::Tester = 1.302199
+Test::use::ok = 1.302199
Text::Balanced = 2.06
Text::ParseWords = 3.31
-Text::Tabs = 2021.0814
-Tie::File = 1.07
+Text::Tabs = 2024.001
+Tie::File = 1.09
Tie::RefHash = 1.40
-Time::HiRes = 1.9775
+Time::HiRes = 1.9777
Time::Piece = 1.3401_01
-UNIVERSAL = 1.15
+UNIVERSAL = 1.17
Unicode::Collate = 1.31
Unicode::Normalize = 1.32
-autodie = 2.36
-bignum = 0.66
+autodie = 2.37
+bignum = 0.67
libnet = 3.15
parent = 0.241
-version = 0.9929
+version = 0.9930
diff --git a/perl-modules2 b/perl-modules2
index d595a21..ae2ef57 100644
--- a/perl-modules2
+++ b/perl-modules2
@@ -1,4 +1,4 @@
-# Non-straight named module versions from Perl 5.38.2 distribution.
-IO-Compress IO::Compress::Base = 2.204
-PathTools File::Spec = 3.88
+# Non-straight named module versions from Perl 5.40.0 distribution.
+IO-Compress IO::Compress::Base = 2.212
+PathTools File::Spec = 3.90
Scalar-List-Utils List::Util = 1.63
diff --git a/perl_585-microperl_uconfig.patch b/perl_585-microperl_uconfig.patch
deleted file mode 100644
index 010261b..0000000
--- a/perl_585-microperl_uconfig.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -urNp -x '*.orig' perl-5.32.1.org/uconfig.h perl-5.32.1/uconfig.h
---- perl-5.32.1.org/uconfig.h 2020-12-18 11:04:36.000000000 +0100
-+++ perl-5.32.1/uconfig.h 2021-04-01 22:48:37.569619974 +0200
-@@ -5261,5 +5261,5 @@
-
- /* Generated from:
- * e17a83ff6ae98071d846d4a001f6ce1a669df08c357fe153c2370adc4910135e
config_h.SH
-- * 8d785207fec43bbad5118a8125e625d1cc654455994f09a76c1625b2ae2ae2d0 uconfig.sh
-+ * 73a966677d6c98ab485044fbaa1d3bf29e07ef78275e93ae3655889809bdefab uconfig.sh
- * ex: set ro ft=c: */
-diff -urNp -x '*.orig' perl-5.32.1.org/uconfig.sh perl-5.32.1/uconfig.sh
---- perl-5.32.1.org/uconfig.sh 2020-12-18 11:04:36.000000000 +0100
-+++ perl-5.32.1/uconfig.sh 2021-04-01 22:48:37.569619974 +0200
-@@ -6,12 +6,7 @@ afs='false'
- afsroot='/afs'
- alignbytes='4'
- aphostname='/bin/hostname'
--archlib='/usr/local/lib/perl5/5.38/unknown'
--archlibexp='/usr/local/lib/perl5/5.38/unknown'
--archname='unknown'
- asctime_r_proto='0'
--bin='/usr/local/bin'
--binexp='/usr/local/bin'
- bootstrap_charset='undef'
- byteorder='1234'
- castflags='0'
-@@ -48,7 +43,7 @@ d_accessx='undef'
- d_acosh='undef'
- d_aintl='undef'
- d_alarm='undef'
--d_archlib='undef'
-+d_archlib='define'
- d_asctime64='undef'
- d_asctime_r='undef'
- d_asinh='undef'
-@@ -292,7 +287,7 @@ d_llroundl='undef'
- d_localeconv_l='undef'
- d_localtime64='undef'
- d_localtime_r='undef'
--d_localtime_r_needs_tzset='undef'
-+d_localtime_r_needs_tzset='define'
- d_locconv='undef'
- d_lockf='undef'
- d_log1p='undef'
-@@ -774,16 +769,12 @@ obj_ext='.o'
- old_pthread_create_joinable=''
- optimize=''
- orderlib='false'
--osname='unknown'
--osvers='unknown'
- otherlibdirs=' '
- package='perl5'
- perl_static_inline='static'
- perl_thread_local=''
- phostname='hostname'
- pidtype=int
--privlib='/usr/local/lib/perl5/5.38'
--privlibexp='/usr/local/lib/perl5/5.38'
- procselfexe=''
- prototype='undef'
- ptrsize='4'
-@@ -813,8 +804,6 @@ sPRIu64='"Lu"'
- sPRIx64='"Lx"'
- sSCNfldbl='"llf"'
- sched_yield='sched_yield()'
--scriptdir='/usr/local/bin'
--scriptdirexp='/usr/local/bin'
- seedfunc='Perl_drand48_init'
- selectminbits='32'
- selecttype=int
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/perl.git/commitdiff/3fbe30bcdc9c017ead946ec4de19bf9d80f073c0
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
