From edf3f111d45d2316de5f5b22cf9fb1636578e0bb Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 3 Jul 2023 10:17:13 +0000 Subject: [PATCH 1/9] perl: update to 5.38.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Matthias Aßhauer Signed-off-by: Johannes Schindelin --- perl/0001-perl.cygwin-auto-image-base.patch | 25 --------- perl/0002-perl.cygwin-hints.patch | 19 +++---- ...0003-perl.cygwin-Configure-libsearch.patch | 55 ++++--------------- perl/0006-perl-5.36.0-msys2.patch | 8 +-- perl/PKGBUILD | 13 ++--- 5 files changed, 29 insertions(+), 91 deletions(-) delete mode 100644 perl/0001-perl.cygwin-auto-image-base.patch diff --git a/perl/0001-perl.cygwin-auto-image-base.patch b/perl/0001-perl.cygwin-auto-image-base.patch deleted file mode 100644 index e974040b8a2..00000000000 --- a/perl/0001-perl.cygwin-auto-image-base.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d5098f3924649936b561b5a2a4bdb7fd34c9736a Mon Sep 17 00:00:00 2001 -From: Alexey Pavlov -Date: Tue, 14 Feb 2017 14:45:21 +0300 -Subject: [PATCH 1/7] perl.cygwin-auto-image-base - ---- - Makefile.SH | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.SH b/Makefile.SH -index efeb8d6..e2490da 100755 ---- a/Makefile.SH -+++ b/Makefile.SH -@@ -73,7 +73,7 @@ true) - esac - ;; - cygwin*) -- shrpldflags="$shrpldflags -Wl,--out-implib=libperl.dll.a -Wl,--image-base,0x52000000" -+ shrpldflags="$shrpldflags -Wl,--out-implib=libperl.dll.a" - linklibperl="-L. -lperl" - ;; - sunos*) --- -2.37.1 - diff --git a/perl/0002-perl.cygwin-hints.patch b/perl/0002-perl.cygwin-hints.patch index 9123f1ebe9a..3f3d931b1a5 100644 --- a/perl/0002-perl.cygwin-hints.patch +++ b/perl/0002-perl.cygwin-hints.patch @@ -11,10 +11,17 @@ diff --git a/hints/cygwin.sh b/hints/cygwin.sh index 40edf5f..bda3da8 100644 --- a/hints/cygwin.sh +++ b/hints/cygwin.sh -@@ -25,12 +25,21 @@ libswanted=`echo " $libswanted " | sed -e 's/ c / /g'` +@@ -25,13 +25,13 @@ libswanted=`echo " $libswanted " | sed -e 's/ c / /g'` libswanted=`echo " $libswanted " | sed -e 's/ m / /g'` # - eliminate -lutil, symbols are all in libcygwin.a libswanted=`echo " $libswanted " | sed -e 's/ util / /g'` +-test -z "$ignore_versioned_solibs" && ignore_versioned_solibs='y' +-test -z "$usenm" && usenm='no' +-test -z "$libc" && libc='/usr/lib/libcygwin.a' +-test -z "$loclibpth" && loclibpth=' ' +-test -z "$glibpth" && glibpth=' ' +-test -z "$plibpth" && plibpth=' ' +-test -z "$libpth" && libpth=' ' +ignore_versioned_solibs='y' +usenm='no' +libc='/usr/lib/libcygwin.a' @@ -22,17 +29,9 @@ index 40edf5f..bda3da8 100644 +glibpth=' ' +plibpth=' ' +libpth=' ' -+PATH='.:/usr/bin/' + PATH='.:/usr/bin/' # - add libgdbm_compat $libswanted libswanted="$libswanted gdbm_compat" - test -z "$optimize" && optimize='-O3' - man3ext='3pm' - test -z "$use64bitint" && use64bitint='define' - test -z "$useithreads" && useithreads='define' -+test -z "$usemymalloc" && usemymalloc='undef' - ccflags="$ccflags -DPERL_USE_SAFE_PUTENV -U__STRICT_ANSI__ -D_GNU_SOURCE" - # - otherwise i686-cygwin - archname='cygwin' @@ -62,6 +71,13 @@ case "$osvers" in d_inetpton='undef' esac diff --git a/perl/0003-perl.cygwin-Configure-libsearch.patch b/perl/0003-perl.cygwin-Configure-libsearch.patch index bb55601ccde..6bc10d3f664 100644 --- a/perl/0003-perl.cygwin-Configure-libsearch.patch +++ b/perl/0003-perl.cygwin-Configure-libsearch.patch @@ -4,8 +4,8 @@ Date: Tue, 14 Feb 2017 14:45:21 +0300 Subject: [PATCH 3/7] perl.cygwin-Configure-libsearch --- - Configure | 62 ++++++++++++++++++++++++++++++++++--------------------- - 1 file changed, 39 insertions(+), 23 deletions(-) + Configure | 24 ++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Configure b/Configure index bd96249..4febcd8 100755 @@ -19,7 +19,7 @@ index bd96249..4febcd8 100755 lib_ext='' obj_ext='' path_sep='' -@@ -5256,29 +5257,44 @@ done +@@ -5251,20 +5252,25 @@ done for thislib in $libswanted; do for thisdir in $libspath; do xxx='' @@ -32,20 +32,6 @@ index bd96249..4febcd8 100755 - $test -f "$xxx" && libstyle=shared - fi - if test ! -f "$xxx"; then -- xxx=$thisdir/lib$thislib.$so -- $test -f "$xxx" && eval $libscheck -- $test -f "$xxx" && libstyle=shared -- fi -- if test ! -f "$xxx"; then -- xxx=$thisdir/lib$thislib$_a -- $test -f "$xxx" && eval $libscheck -- $test -f "$xxx" && libstyle=static -- fi -- if test ! -f "$xxx"; then -- xxx=$thisdir/$thislib$_a -- $test -f "$xxx" && eval $libscheck -- $test -f "$xxx" && libstyle=static -- fi + if $test ! -f "$xxx" -a "X$ignore_versioned_solibs" = "X"; then + xxx=`ls $thisdir/lib$thislib.$so.[0-9] 2>/dev/null|sed -n '$p'` + $test -f "$xxx" && eval $libscheck @@ -55,38 +41,19 @@ index bd96249..4febcd8 100755 + $test -f "$xxx" && libstyle=shared + fi + if test ! -f "$xxx"; then + xxx=$thisdir/lib$thislib.$so$_a + $test -f "$xxx" && eval $libscheck + $test -f "$xxx" && libstyle="import" + fi + if test ! -f "$xxx"; then + xxx=$thisdir/lib$thislib.$so$_a + $test -f "$xxx" && eval $libscheck + $test -f "$xxx" && libstyle="import" + fi + if test ! -f "$xxx"; then -+ xxx=$thisdir/$thislib.$so$_a -+ $test -f "$xxx" && eval $libscheck -+ $test -f "$xxx" && libstyle="import" -+ fi -+ if test ! -f "$xxx"; then -+ xxx=$thisdir/lib$thislib.$so -+ $test -f "$xxx" && eval $libscheck -+ $test -f "$xxx" && libstyle=shared -+ fi -+ if test ! -f "$xxx"; then -+ xxx=$thisdir/$libprefix$thislib.$so -+ $test -f "$xxx" && eval $libscheck -+ $test -f "$xxx" && libstyle="system" -+ fi -+ if test ! -f "$xxx"; then -+ xxx=$thisdir/lib$thislib$_a -+ $test -f "$xxx" && eval $libscheck -+ $test -f "$xxx" && libstyle=static -+ fi -+ if test ! -f "$xxx"; then -+ xxx=$thisdir/$thislib$_a -+ $test -f "$xxx" && eval $libscheck -+ $test -f "$xxx" && libstyle=static -+ fi - if test ! -f "$xxx"; then - xxx=$thisdir/lib${thislib}_s$_a - $test -f "$xxx" && eval $libscheck + xxx=$thisdir/$thislib.$so$_a + $test -f "$xxx" && eval $libscheck + $test -f "$xxx" && libstyle="import" -- 2.37.1 diff --git a/perl/0006-perl-5.36.0-msys2.patch b/perl/0006-perl-5.36.0-msys2.patch index fa970a8c04d..e7fbaa60aca 100644 --- a/perl/0006-perl-5.36.0-msys2.patch +++ b/perl/0006-perl-5.36.0-msys2.patch @@ -1177,8 +1177,8 @@ index 203d86b..9246a21 100644 $p->{port_num} = $port2; { -- local $TODO = "Believed not to work on $^O" if $^O =~ /^(?:hpux|MSWin32|os390|freebsd)$/; -+ local $TODO = "Believed not to work on $^O" if $^O =~ /^(?:hpux|MSWin32|msys|os390|freebsd)$/; +- local $TODO = "Believed not to work on $^O" if $^O =~ /^(?:MSWin32|os390)$/; ++ local $TODO = "Believed not to work on $^O" if $^O =~ /^(?:MSWin32|msys|os390)$/; is($p->ping("127.0.0.1"), 1, 'second port is reachable'); } @@ -1186,8 +1186,8 @@ index 203d86b..9246a21 100644 { local $TODO = "Believed not to work on $^O" -- if $^O =~ /^(?:hpux|MSWin32|os390|freebsd)$/; -+ if $^O =~ /^(?:hpux|MSWin32|msys|os390|freebsd)$/; +- if $^O =~ /^(?:MSWin32|os390)$/; ++ if $^O =~ /^(?:MSWin32|msys|os390)$/; is($p->ack(), '127.0.0.1', 'IP should be reachable'); } } diff --git a/perl/PKGBUILD b/perl/PKGBUILD index 181c8f6a795..b9a1ab5aff9 100644 --- a/perl/PKGBUILD +++ b/perl/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=perl -pkgver=5.36.1 +pkgver=5.38.0 _gccver=11.3.0 pkgrel=1 pkgdesc="A highly capable, feature-rich programming language" @@ -16,7 +16,6 @@ source=(https://www.cpan.org/src/5.0/perl-${pkgver}.tar.xz perlbin.csh perlbin.fish perl-binary-module-dependency-1.template - 0001-perl.cygwin-auto-image-base.patch 0002-perl.cygwin-hints.patch 0003-perl.cygwin-Configure-libsearch.patch 0004-perl.cygwin-Configure-libpth.patch @@ -144,24 +143,22 @@ provides=('perl-Archive-Tar=2.40' 'perl-version=0.9929') # Add your own provides here provides=(${provides[@]}) -sha256sums=('bd91217ea8a8c8b81f21ebbb6cefdf0d13ae532013f944cdece2cd51aef4b6a7' +sha256sums=('eca551caec3bc549a4e590c0015003790bdd1a604ffe19cc78ee631d51f7072e' '91bf8a45a3f04f51fe0eca146a71e278d41dbde19ba60dabc1e41c4639477c07' '478a52dc440d5ca324f4c95238b39cc8c90d5d7d8d5601fa085ffef79fea04f4' '11ce66bcf4803b0bf27179a32ce53f41bcdfa967c4c0d54ac103dbc4951d18a3' 'fe91f1de38af525cb82503feef553b71299c52ea52c01b1959143f48f4051ffa' - 'b3bd02ed1d8a2ae160d9b16359f0c4a347e7990206ed972a41849abe695ca337' - 'ba3259e3e82ee80820426fd407b5e3ddf01a6146d8309e2eabd5347221ab2ab3' - '48c58ecf9de7fbfe620504ed462bae4c855758dbd21f475d9d646bfa92c87aea' + 'e45df328a7128604a1a7b901e44da67f7ebb34162ca23c980b4e36553c0e7449' + 'a074ce00dabd7876293cf0fa8c8be26029992f51873e33cd2213b6acf60cafbb' '1bf02b601f670cc1c8f65e63ec7a10578f92c8ecd8a5752fe331479bd6115311' 'e05e20b29c950555edfa246d2b9177188a4b265d1887c262f5b272f382696474' - 'd8935f9a246ba112036d3081cf928f9539fcc5de777b678e83978877732f679f' + '3ec217cb7f47c34a79addb9396d522596495584aaf6b24b17c6caf6a16d2cb62' '4c44801139321e77a3ade921ce93b114100346ad5b17d03a67b2a92b85ee8a27') prepare() { chmod -R 0666 ${srcdir}/${pkgname}-${pkgver} cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/0001-perl.cygwin-auto-image-base.patch patch -p1 -i ${srcdir}/0002-perl.cygwin-hints.patch patch -p1 -i ${srcdir}/0003-perl.cygwin-Configure-libsearch.patch patch -p1 -i ${srcdir}/0004-perl.cygwin-Configure-libpth.patch From f2403cf93541d4b546e2c3cd46619e744b46497a Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sun, 6 Aug 2023 22:43:39 +0200 Subject: [PATCH 2/9] perl-Clone: upgrade to v0.46 Let's use the excuse of having to rebuild the Perl module after upgrading to a new Perl version anyway. Signed-off-by: Johannes Schindelin --- perl-Clone/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/perl-Clone/PKGBUILD b/perl-Clone/PKGBUILD index ba4fd609f9d..91f3abde558 100644 --- a/perl-Clone/PKGBUILD +++ b/perl-Clone/PKGBUILD @@ -2,8 +2,8 @@ _realname=Clone pkgname=perl-${_realname} -pkgver=0.45 -pkgrel=4 +pkgver=0.46 +pkgrel=1 pkgdesc='Recursive copy of nested objects.' arch=('i686' 'x86_64') url='https://search.cpan.org/~RDF/Clone' @@ -12,8 +12,8 @@ license=('GPL' 'PerlArtistic') depends=('perl') makedepends=('libcrypt-devel' 'gcc' 'make') options=('!emptydirs') -source=("https://search.cpan.org/CPAN/authors/id/A/AT/ATOOMIC/${_realname}-${pkgver}.tar.gz") -sha512sums=('4d91580fb60876cca7670411748e42e6af0eaba8fac25d60e7a50685ae7b1e697e12c8a2835693e3e4abf3c13c060a2740344eb804ec26ed274b895f599340af') +source=("https://search.cpan.org/CPAN/authors/id/G/GA/GARU/${_realname}-${pkgver}.tar.gz") +sha512sums=('f8bb1010364e94c7cc8bba25681cd9fd737ec2935a8be960ac53099359729fc679190a115dd082fccd239b35762dee2b3be3adbddce37e4ceae6fe934fbad545') build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ From 966133536ae69a6ea9b47c7919e41886d5630805 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sun, 6 Aug 2023 22:59:36 +0200 Subject: [PATCH 3/9] perl-HTML-Parser: upgrade to v3.81 Let's use the excuse of having to rebuild the Perl module after upgrading to a new Perl version anyway. Signed-off-by: Johannes Schindelin --- perl-HTML-Parser/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-HTML-Parser/PKGBUILD b/perl-HTML-Parser/PKGBUILD index 9c012aa1f26..bfa40a61009 100644 --- a/perl-HTML-Parser/PKGBUILD +++ b/perl-HTML-Parser/PKGBUILD @@ -2,7 +2,7 @@ _realname=HTML-Parser pkgname=perl-${_realname} -pkgver=3.78 +pkgver=3.81 pkgrel=1 pkgdesc="Perl HTML parser class" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('libcrypt-devel') checkdepends=('perl-Test-Pod') options=('!emptydirs') source=(https://www.cpan.org/authors/id/O/OA/OALDERS/${_realname}-${pkgver}.tar.gz) -sha256sums=('22564002f206af94c1dd8535f02b0d9735125d9ebe89dd0ff9cd6c000e29c29d') +sha256sums=('c0910a5c8f92f8817edd06ccfd224ba1c2ebe8c10f551f032587a1fc83d62ff2') build() { cd ${_realname}-${pkgver} From fdb048619ae317ed33ccc6320a0cac4058fd597e Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sun, 6 Aug 2023 23:02:26 +0200 Subject: [PATCH 4/9] perl-Locale-Gettext: rebuild after upgrading Perl Signed-off-by: Johannes Schindelin --- perl-Locale-Gettext/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-Locale-Gettext/PKGBUILD b/perl-Locale-Gettext/PKGBUILD index 01cb90752a7..57e7bbcd7a3 100644 --- a/perl-Locale-Gettext/PKGBUILD +++ b/perl-Locale-Gettext/PKGBUILD @@ -3,7 +3,7 @@ _realname=Locale-Gettext pkgname=perl-${_realname} pkgver=1.07 -pkgrel=6 +pkgrel=7 groups=('perl-modules') pkgdesc="Permits access from Perl to the gettext() family of functions" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://search.cpan.org/dist/${_realname}/" depends=('gettext' 'perl') makedepends=('libcrypt-devel') options=(!emptydirs) -source=(${_realname}-${pkgver}.tar.gz::"https://www.cpan.org/authors/id/P/PV/PVANDRY/gettext-${pkgver}.tar.gz") +source=(${_realname}-${pkgver}.tar.gz::"https://www.cpan.org/authors/id/P/PV/PVANDRY/Locale-gettext-${pkgver}.tar.gz") sha256sums=('909d47954697e7c04218f972915b787bd1244d75e3bd01620bc167d5bbc49c15') build() { From 0ad0f8930189600609fd4a585881db358f86104f Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sun, 6 Aug 2023 23:02:59 +0200 Subject: [PATCH 5/9] perl-Net-SSLeay: rebuild after upgrading Perl Signed-off-by: Johannes Schindelin --- perl-Net-SSLeay/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-Net-SSLeay/PKGBUILD b/perl-Net-SSLeay/PKGBUILD index 07b24a532a8..2071e2bbe46 100644 --- a/perl-Net-SSLeay/PKGBUILD +++ b/perl-Net-SSLeay/PKGBUILD @@ -3,7 +3,7 @@ _realname=Net-SSLeay pkgname=perl-${_realname} pkgver=1.92 -pkgrel=2 +pkgrel=3 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64') license=('custom:BSD') From 1a06ed3bf251354ae9db2c7bd5055e744aa89fc5 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sun, 6 Aug 2023 23:05:37 +0200 Subject: [PATCH 6/9] perl-TermReadKey: rebuild after Perl upgrade Signed-off-by: Johannes Schindelin --- perl-TermReadKey/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-TermReadKey/PKGBUILD b/perl-TermReadKey/PKGBUILD index 8dd5ea6b1e6..b4cb0e0f3fd 100644 --- a/perl-TermReadKey/PKGBUILD +++ b/perl-TermReadKey/PKGBUILD @@ -3,7 +3,7 @@ _realname=TermReadKey pkgname=perl-${_realname} pkgver=2.38 -pkgrel=7 +pkgrel=8 pkgdesc="Provides simple control over terminal driver modes" arch=('i686' 'x86_64') license=('custom') From 9b9da0a1c2bc3b51f17b92b443087e5afe5c894e Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sun, 6 Aug 2023 23:06:10 +0200 Subject: [PATCH 7/9] perl-XML-Parser: rebuild after Perl upgrade Signed-off-by: Johannes Schindelin --- perl-XML-Parser/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-XML-Parser/PKGBUILD b/perl-XML-Parser/PKGBUILD index 3aa3db826fe..74780844d8b 100644 --- a/perl-XML-Parser/PKGBUILD +++ b/perl-XML-Parser/PKGBUILD @@ -3,7 +3,7 @@ _realname=XML-Parser pkgname=perl-${_realname} pkgver=2.46 -pkgrel=6 +pkgrel=7 pkgdesc="Expat-based XML parser module for perl" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') From 1d9b5bdc63382ba6a5d50d3f010ac779248f7bf5 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sun, 6 Aug 2023 23:07:02 +0200 Subject: [PATCH 8/9] perl-YAML-Syck: rebuild after Perl upgrade Signed-off-by: Johannes Schindelin --- perl-YAML-Syck/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-YAML-Syck/PKGBUILD b/perl-YAML-Syck/PKGBUILD index 2d662b9c026..0fc4d372305 100644 --- a/perl-YAML-Syck/PKGBUILD +++ b/perl-YAML-Syck/PKGBUILD @@ -3,7 +3,7 @@ _realname=YAML-Syck pkgname=perl-YAML-Syck pkgver=1.34 -pkgrel=2 +pkgrel=3 pkgdesc="Fast, lightweight YAML loader and dumper" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/YAML-Syck/" From 075bae6053cfa2d9b7e9f0e19c7ad6221bf08d8c Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sun, 6 Aug 2023 23:07:55 +0200 Subject: [PATCH 9/9] subversion: rebuild after Perl upgrade Signed-off-by: Johannes Schindelin --- subversion/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subversion/PKGBUILD b/subversion/PKGBUILD index 7fa5bb4360d..2caad038041 100644 --- a/subversion/PKGBUILD +++ b/subversion/PKGBUILD @@ -2,7 +2,7 @@ pkgname=subversion pkgver=1.14.2 -pkgrel=1 +pkgrel=2 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') url="https://subversion.apache.org/"