diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index 15552ccf7..605eeb6d2 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -9,7 +9,7 @@ # https://rt.perl.org/Public/Bug/Display.html?id=133803 pkgname=perl -pkgver=5.30.1 +pkgver=5.30.2 _baseversion="${pkgver%.*}" pkgrel=1 pkgdesc="A highly capable, feature-rich programming language" @@ -27,7 +27,7 @@ provides=('perl-archive-tar=2.32' 'perl-base=2.27' 'perl-bignum=0.51' 'perl-carp=1.50' - 'perl-compress-raw-bzip2=2.084' + 'perl-compress-raw-bzip2=2.089' 'perl-compress-raw-zlib=2.084' 'perl-config-perl-v=0.32' 'perl-constant=1.33' @@ -81,7 +81,7 @@ provides=('perl-archive-tar=2.32' 'perl-math-complex=1.5901' 'perl-memoize=1.03_01' 'perl-mime-base64=3.15' - 'perl-module-corelist=5.20191110' + 'perl-module-corelist=5.20200314' 'perl-module-load-conditional=0.68' 'perl-module-load=0.34' 'perl-module-loaded=0.08' @@ -132,7 +132,7 @@ provides=('perl-archive-tar=2.32' 'perl-version=0.9924' 'perl-xsloader=0.30') # Add your own provides here -provides=(${provides[@]}) +provides=("${provides[@]}") source=(https://www.cpan.org/src/5.0/perl-${pkgver}.tar.xz perlbin.sh perlbin.csh @@ -140,20 +140,20 @@ source=(https://www.cpan.org/src/5.0/perl-${pkgver}.tar.xz detect-old-perl-modules.sh detect-old-perl-modules.hook) options=('makeflags' '!purge' 'emptydirs') -sha512sums=('8f3339efdcd1bb58fa58a90042181bef86bb09e4598c737e446ed43b56d2ab23d67eced5e36fb08fc61e076acfdb572a12e46a1277f5299a3f412054df0b88bf' - '46724344828e7f86e016f9c8d588bf52b2e764e65e0acc1a38899a530c99bc6e4fd8b46fa0d4bbd685aa2074dd5bcbf9029ac3bb3f2d0ee9adfc4f6c0745f373' - 'fc1344a02c741d61af6f6b5967f29cc6f43c2059761522b150261924dd7e1989da5254c03ffa0627accd9af01bc152edd24e84a6b59579acb9ee1900b6ce9383' +sha512sums=('b945c95f44a58b9cc920c926e23017c4270c0dc8daf0bf8169cd7c8f6b8f980f1780bee4fbd525df518edc50f08364ba65988cb17e72a1667f50226459b65087' + 'b7678078d64cc593a3503c45f023c49915d0d703f1cea8282f4191f1e3aa62764cc6cfcae3dc3828101415b8e15d5ed8b1b79d423ef387550ae33172b0de92bc' + '53eb0cddfd637014f3d3a101665db8dcafe5ac5bf3d319a259974334eb89c1c405097518ae96b6d18e520194633c7be57c9b2cd9ae6398443eb08f1a2008d112' '881e2efe05ba818cd7300f126800b56bb0685cb5c9c5fb7e67ef6aaf5abd17d2391a979d5d16d109c5111f4b35504ba83d19b0e6eda4431e8421fcbea19d2f1a' 'bd48af7a6209f2ad51aa1747a7238ecb11607a53f61460d873202bf14b55c3b7dd6f66f4a9f2cac8a24240313789a9a44dbc81b73587de46a6b1866bdfca5e26' - '6b5b2ba606d443da22c6c1a754829abd36f3fdfef1089bcf06c8f9db0217f2c2f02ebc14958ffa7afe618c9a80bd1025e76704f67466c0c3db7d40ef2c0e56b3') + '063624b6fc3728339e4f352597e6913c476c4eaa8e1004b2a46c480b5cce9c42f3083d1e6960081202099acf2b7d0b5d13dc6b7ee0aa303c272826febdcd311e') # https://www.cpan.org/src/5.0/perl-$pkgver.tar.xz.sha256.txt prepare() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" } build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" if [ "${CARCH}" = "x86_64" ]; then # for x86_64 @@ -177,18 +177,21 @@ build() { -Dvendorscript=/usr/bin/vendor_perl \ -Dinc_version_list=none \ -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \ - -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}" $CONFIG + -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}" \ + -Dmyuname="archlinux" \ + -Dmyhostname="archlinux" \ + -Dcf_time="`date -u --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}"`" $CONFIG make } check() { - cd ${srcdir}/${pkgname}-${pkgver} - TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness -# make test + cd "${srcdir}/${pkgname}-${pkgver}" +# TEST_JOBS=$(echo "$MAKEFLAGS" | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness + make test } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="$pkgdir" install ### Perl Settings ### @@ -198,20 +201,20 @@ package() { sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \ -e "/^cf_email=/ s/'.*'/''/" \ -e "/^perladmin=/ s/'.*'/''/" \ - -i ${pkgdir}/usr/lib/perl5/$_baseversion/core_perl/Config_heavy.pl + -i "${pkgdir}/usr/lib/perl5/$_baseversion/core_perl/Config_heavy.pl" ### CPAN Settings ### # Set CPAN default config to use the site directories. sed -e '/(makepl_arg =>/ s/""/"INSTALLDIRS=site"/' \ -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \ - -i ${pkgdir}/usr/share/perl5/core_perl/CPAN/FirstTime.pm + -i "${pkgdir}/usr/share/perl5/core_perl/CPAN/FirstTime.pm" # Profile script to set paths to perl scripts. - install -D -m644 ${srcdir}/perlbin.sh \ - ${pkgdir}/etc/profile.d/perlbin.sh + install -D -m644 "${srcdir}/perlbin.sh" \ + "${pkgdir}/etc/profile.d/perlbin.sh" # Profile script to set paths to perl scripts on csh. (FS#22441) - install -D -m644 ${srcdir}/perlbin.csh \ - ${pkgdir}/etc/profile.d/perlbin.csh + install -D -m644 "${srcdir}/perlbin.csh" \ + "${pkgdir}/etc/profile.d/perlbin.csh" # Profile script to set paths to perl scripts on fish. (FS#51191) install -D -m 755 "$srcdir/perlbin.fish" \ "$pkgdir/usr/share/fish/vendor_conf.d/perlbin.fish" @@ -227,6 +230,6 @@ package() { install -D -m755 -t "$pkgdir/usr/share/libalpm/scripts" "$srcdir/detect-old-perl-modules.sh" install -D -m644 -t "$pkgdir/usr/share/libalpm/hooks" "$srcdir/detect-old-perl-modules.hook" - find $pkgdir -name perllocal.pod -delete - find $pkgdir -name .packlist -delete + find "$pkgdir" -name perllocal.pod -delete + find "$pkgdir" -name .packlist -delete } diff --git a/core/perl/detect-old-perl-modules.hook b/core/perl/detect-old-perl-modules.hook index 5ff80d1b4..cf86c5fd8 100644 --- a/core/perl/detect-old-perl-modules.hook +++ b/core/perl/detect-old-perl-modules.hook @@ -1,7 +1,7 @@ [Trigger] Operation = Install Operation = Upgrade -Type = File +Type = Path Target = usr/lib/perl5/*/ [Action] diff --git a/core/perl/perlbin.csh b/core/perl/perlbin.csh index fccecbdf5..ae9cf3641 100644 --- a/core/perl/perlbin.csh +++ b/core/perl/perlbin.csh @@ -1,13 +1,10 @@ # Set path to perl scriptdirs if they exist # https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_scripts # Added /usr/bin/*_perl dirs for scripts -# Remove /usr/lib/perl5/*_perl/bin in next release [ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl -[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/site_perl/bin [ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl -[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/vendor_perl/bin [ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl diff --git a/core/perl/perlbin.sh b/core/perl/perlbin.sh index 7e38f2047..78c8ed13b 100755 --- a/core/perl/perlbin.sh +++ b/core/perl/perlbin.sh @@ -1,13 +1,10 @@ # Set path to perl scriptdirs if they exist # https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_scripts # Added /usr/bin/*_perl dirs for scripts -# Remove /usr/lib/perl5/*_perl/bin in next release [ -d /usr/bin/site_perl ] && PATH=$PATH:/usr/bin/site_perl -[ -d /usr/lib/perl5/site_perl/bin ] && PATH=$PATH:/usr/lib/perl5/site_perl/bin [ -d /usr/bin/vendor_perl ] && PATH=$PATH:/usr/bin/vendor_perl -[ -d /usr/lib/perl5/vendor_perl/bin ] && PATH=$PATH:/usr/lib/perl5/vendor_perl/bin [ -d /usr/bin/core_perl ] && PATH=$PATH:/usr/bin/core_perl