From fd828c2e5f51c371cae372c43394ee6dd8b71764 Mon Sep 17 00:00:00 2001 From: dkwo Date: Wed, 23 Jun 2021 15:36:23 +0200 Subject: [PATCH 1/2] collectd: rebuild for perl-5.34 --- srcpkgs/collectd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template index 28fa815e85a9..cd6dd8f57813 100644 --- a/srcpkgs/collectd/template +++ b/srcpkgs/collectd/template @@ -1,7 +1,7 @@ # Template file for 'collectd' pkgname=collectd version=5.12.0 -revision=4 +revision=5 build_style=gnu-configure configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl) $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt From 902f734bf9e9a7b4c610158f746944696e200da7 Mon Sep 17 00:00:00 2001 From: dkwo Date: Wed, 23 Jun 2021 19:25:10 +0200 Subject: [PATCH 2/2] perl: update to 5.34 --- common/shlibs | 2 +- .../perl/patches/drop_fstack_protector.diff | 24 --- srcpkgs/perl/template | 140 +++++++++--------- 3 files changed, 72 insertions(+), 94 deletions(-) diff --git a/common/shlibs b/common/shlibs index 7b007a129e17..5f44ac6b9b81 100644 --- a/common/shlibs +++ b/common/shlibs @@ -57,7 +57,7 @@ libitm.so.1 libitm-4.7.3_1 liblto_plugin.so.0 gcc-4.7.3_1 libgcc_s.so.1 libgcc-4.4.0_1 libgo.so.16 libgo-10.2.0_1 -libperl.so.5.32 perl-5.32.0_1 +libperl.so.5.34 perl-5.34.0_1 libgmp.so.10 gmp-5.0.1_1 libgmpxx.so.4 gmpxx-6.0.0_2 libmpfr.so.6 mpfr-4.0.0_1 diff --git a/srcpkgs/perl/patches/drop_fstack_protector.diff b/srcpkgs/perl/patches/drop_fstack_protector.diff index 5602a0123270..3b5ba892a4c0 100644 --- a/srcpkgs/perl/patches/drop_fstack_protector.diff +++ b/srcpkgs/perl/patches/drop_fstack_protector.diff @@ -13,30 +13,6 @@ Original by Torsten Veller, ported to perl 5.20 diff -ruN perl-5.24.0-RC5.orig/Configure perl-5.24.0-RC5/Configure --- a/Configure 2016-04-27 00:11:09.000000000 +0200 +++ b/Configure 2016-05-05 21:32:53.575232970 +0200 -@@ -5474,23 +5474,6 @@ - # is to add the flag to the flags passed to the compiler at link time, - # as that way the compiler can do the right implementation dependant - # thing. (NWC) -- case "$osname" in -- amigaos) ;; # -fstack-protector builds but doesn't work -- *) case "$gccversion" in -- ?*) set stack-protector-strong -fstack-protector-strong -- eval $checkccflag -- case "$dflt" in -- *-fstack-protector-strong*) ;; # It got added. -- *) # Try the plain/older -fstack-protector. -- set stack-protector -fstack-protector -- eval $checkccflag -- ;; -- esac -- ;; -- esac -- ;; -- esac -- ;; - esac - - case "$mips_type" in @@ -5633,21 +5616,6 @@ ;; *) dflt="$ldflags";; diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template index 29da654b2f30..da223660988a 100644 --- a/srcpkgs/perl/template +++ b/srcpkgs/perl/template @@ -1,8 +1,8 @@ # Template file for 'perl' pkgname=perl -version=5.32.1 -revision=2 -_perl_cross_version=1.3.5 +version=5.34.0 +revision=1 +_perl_cross_version=1.3.6 build_style=gnu-configure hostmakedepends="less" makedepends="zlib-devel bzip2-devel gdbm-devel db-devel" @@ -14,127 +14,128 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://www.perl.org" distfiles="https://www.cpan.org/src/5.0/perl-${version}.tar.gz https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz" -checksum="03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c - 91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25" +checksum="551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a + 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5" # Before updating this package to a new major version, run ${FILESDIR}/provides.pl # against ${wrksrc} to find the list of built in packages. -provides="perl-Archive-Tar-2.36_1 +provides="perl-Archive-Tar-2.38_1 perl-Attribute-Handlers-1.01_1 perl-AutoLoader-5.74_1 - perl-CPAN-2.27_1 + perl-CPAN-2.28_1 perl-CPAN-Meta-2.150010_1 perl-CPAN-Meta-Requirements-2.140_1 perl-CPAN-Meta-YAML-0.018_1 - perl-Carp-1.50_1 - perl-Compress-Raw-Bzip2-2.093_1 - perl-Compress-Raw-Zlib-2.093_1 - perl-Config-Perl-V-0.32_1 - perl-DB_File-1.853_1 - perl-Data-Dumper-2.174.01_1 - perl-Devel-PPPort-3.57_1 + perl-Carp-1.52_1 + perl-Compress-Raw-Bzip2-2.101_1 + perl-Compress-Raw-Zlib-2.101_1 + perl-Config-Perl-V-0.33_1 + perl-DB_File-1.855_1 + perl-Data-Dumper-2.179_1 + perl-Devel-PPPort-3.62_1 perl-Devel-SelfStubber-1.06_1 - perl-Digest-1.17.01_1 - perl-Digest-MD5-2.55.01_1 + perl-Digest-1.19_1 + perl-Digest-MD5-2.58_1 perl-Digest-SHA-6.02_1 perl-Dumpvalue-1.21_1 - perl-Encode-3.06_1 - perl-Env-1.04_1 - perl-Exporter-5.74_1 - perl-ExtUtils-CBuilder-0.280234_1 + perl-Encode-3.08_1 + perl-Env-1.05_1 + perl-Exporter-5.76_1 + perl-ExtUtils-CBuilder-0.280236_1 perl-ExtUtils-Constant-0.25_1 - perl-ExtUtils-Install-2.14_1 - perl-ExtUtils-MakeMaker-7.44_1 - perl-ExtUtils-Manifest-1.72_1 - perl-ExtUtils-ParseXS-3.40_1 - perl-File-Fetch-0.56_1 - perl-File-Path-2.16_1 - perl-File-Temp-0.2309_1 + perl-ExtUtils-Install-2.20_1 + perl-ExtUtils-MakeMaker-7.62_1 + perl-ExtUtils-Manifest-1.73_1 + perl-ExtUtils-PL2Bat-0.004_1 + perl-ExtUtils-ParseXS-3.43_1 + perl-File-Fetch-1.00_1 + perl-File-Path-2.18_1 + perl-File-Temp-0.2311_1 perl-Filter-Simple-0.96_1 - perl-Filter-Util-Call-1.59_1 - perl-FindBin-1.51_1 - perl-Getopt-Long-2.51_1 + perl-Filter-Util-Call-1.60_1 + perl-FindBin-1.52_1 + perl-Getopt-Long-2.52_1 perl-HTTP-Tiny-0.076_1 perl-I18N-Collate-1.02_1 - perl-I18N-LangTags-0.44_1 - perl-IO-1.43_1 - perl-IO-Compress-2.093_1 - perl-IO-Socket-IP-0.39_1 - perl-IO-Zlib-1.10_1 + perl-I18N-LangTags-0.45_1 + perl-IO-1.46_1 + perl-IO-Compress-2.102_1 + perl-IO-Socket-IP-0.41_1 + perl-IO-Zlib-1.11_1 perl-IPC-Cmd-1.04_1 - perl-IPC-SysV-2.07_1 - perl-JSON-PP-4.04_1 + perl-IPC-SysV-2.09_1 + perl-JSON-PP-4.06_1 perl-Locale-Maketext-1.29_1 perl-Locale-Maketext-Simple-0.21.01_1 - perl-MIME-Base64-3.15_1 + perl-MIME-Base64-3.16_1 perl-Math-BigInt-1.999818_1 perl-Math-BigInt-FastCalc-0.5009_1 perl-Math-BigRat-0.2614_1 - perl-Math-Complex-1.59.01_1 + perl-Math-Complex-1.59.02_1 perl-Memoize-1.03.01_1 - perl-Module-CoreList-5.20210123_1 - perl-Module-Load-0.34_1 - perl-Module-Load-Conditional-0.70_1 + perl-Module-CoreList-5.20210520_1 + perl-Module-Load-0.36_1 + perl-Module-Load-Conditional-0.74_1 perl-Module-Loaded-0.08_1 perl-Module-Metadata-1.000037_1 - perl-NEXT-0.67.01_1 - perl-Net-Ping-2.72_1 + perl-NEXT-0.68_1 + perl-Net-Ping-2.74_1 perl-Params-Check-0.38_1 - perl-PathTools-3.78_1 + perl-PathTools-3.80_1 perl-Perl-OSType-1.010_1 - perl-PerlIO-via-QuotedPrint-0.08_1 - perl-Pod-Checker-1.73_1 + perl-PerlIO-via-QuotedPrint-0.09_1 + perl-Pod-Checker-1.74_1 perl-Pod-Escapes-1.07_1 perl-Pod-Perldoc-3.2801_1 - perl-Pod-Simple-3.40_1 - perl-Pod-Usage-1.69_1 - perl-Safe-2.41.01_1 + perl-Pod-Simple-3.42_1 + perl-Pod-Usage-2.01_1 + perl-Safe-2.43_1 perl-Scalar-List-Utils-1.55_1 perl-Search-Dict-1.07_1 perl-SelfLoader-1.26_1 - perl-Socket-2.029_1 - perl-Storable-3.21_1 + perl-Socket-2.031_1 + perl-Storable-3.23_1 perl-Sys-Syslog-0.36_1 perl-Term-ANSIColor-5.01_1 perl-Term-Cap-1.17_1 perl-Term-Complete-1.403_1 perl-Term-ReadLine-1.17_1 perl-Test-1.31_1 - perl-Test-Harness-3.42_1 - perl-Test-Simple-1.302175_1 + perl-Test-Harness-3.43_1 + perl-Test-Simple-1.302183_1 perl-Text-Abbrev-1.02_1 - perl-Text-Balanced-2.03_1 + perl-Text-Balanced-2.04_1 perl-Text-ParseWords-3.30_1 perl-Text-Tabs-2013.0523_1 perl-Thread-Queue-3.14_1 perl-Thread-Semaphore-2.13_1 perl-Tie-File-1.06_1 - perl-Tie-RefHash-1.39_1 - perl-Time-HiRes-1.9764_1 - perl-Time-Local-1.28_1 + perl-Tie-RefHash-1.40_1 + perl-Time-HiRes-1.9767_1 + perl-Time-Local-1.30_1 perl-Time-Piece-1.3401_1 - perl-Unicode-Collate-1.27_1 - perl-Unicode-Normalize-1.27_1 - perl-Win32-0.53_1 + perl-Unicode-Collate-1.29_1 + perl-Unicode-Normalize-1.28_1 + perl-Win32-0.57_1 perl-Win32API-File-0.1203.01_1 perl-XSLoader-0.30_1 - perl-autodie-2.32_1 + perl-autodie-2.34_1 perl-autouse-1.11_1 perl-base-2.27_1 perl-bignum-0.51_1 perl-constant-1.33_1 perl-encoding-warnings-0.13_1 - perl-experimental-0.020_1 - perl-if-0.0608_1 + perl-experimental-0.024_1 + perl-if-0.0609_1 perl-lib-0.65_1 - perl-libnet-3.11_1 + perl-libnet-3.13_1 perl-parent-0.238_1 - perl-perlfaq-5.20200523_1 + perl-perlfaq-5.20210411_1 perl-podlators-5.008_1 - perl-threads-2.25_1 - perl-threads-shared-1.61_1 - perl-version-0.9924_1" + perl-threads-2.26_1 + perl-threads-shared-1.62_1 + perl-version-0.9928_1" for f in ${provides}; do replaces+=" $($XBPS_UHELPER_CMD getpkgname ${f})>=0" @@ -187,6 +188,7 @@ do_configure() { do_check() { export LD="$CC" + export PERL_BUILD_PACKAGING=1 TEST_JOBS=${XBPS_MAKEJOBS} make test }