Merge pull request #4228 from lazka/perl-5.38.2

perl: Update to 5.38.2
msys2 · Dec 5, 2023 · 23d8fdf · 23d8fdf
2 parents a51c419 + a7fe773
commit 23d8fdf
Show file tree

Hide file tree

Showing 28 changed files with 123 additions and 178 deletions.
diff --git a/elinks/PKGBUILD b/elinks/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=elinks
 pkgver=0.16.1.1
-pkgrel=1
+pkgrel=2
 epoch=
 pkgdesc="Full-Featured Text WWW Browser (net-utils)"
 arch=("i686" "x86_64")
@@ -43,12 +43,19 @@ makedepends=('autotools'
 provides=("elinks-git")
 conflicts=("elinks-git")
 replaces=("elinks-git")
-source=("elinks-${pkgver}.tgz::https://github.com/rkd77/elinks/archive/v${pkgver}.tar.gz")
-sha256sums=('d07e55ede144d532212b2b5b92fb81df4360ddd2b156ccaf09cfa4aa218e1aed')
+source=("elinks-${pkgver}.tgz::https://github.com/rkd77/elinks/archive/v${pkgver}.tar.gz"
+        "https://github.com/rkd77/elinks/commit/5b1b478a07a977e82836d82486a5a0681b90d87f.patch"
+        "https://github.com/rkd77/elinks/commit/51273efada535811d65985df0743152e9660d338.patch")
+sha256sums=('d07e55ede144d532212b2b5b92fb81df4360ddd2b156ccaf09cfa4aa218e1aed'
+            '5054e56929248b84d8f5d40ff6bf6a597d24570b90b72ea373a0c6aac1ae9ae0'
+            '55c424e5f2794dc29268de962227d9175fcd17d38abee6d95002ed5f35c5a863')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
 
+  patch -Np1 -i ../5b1b478a07a977e82836d82486a5a0681b90d87f.patch
+  patch -Np1 -i ../51273efada535811d65985df0743152e9660d338.patch
+
   ./autogen.sh
 }
 

diff --git a/irssi/PKGBUILD b/irssi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=irssi
 replaces=(irssi-git)
 conflicts=(irssi-git)
 pkgver=1.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Modular text mode IRC client with Perl scripting"
 arch=('i686' 'x86_64')
 url="https://irssi.org/"

diff --git a/perl-Clone/PKGBUILD b/perl-Clone/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=Clone
 pkgname=perl-${_realname}
 pkgver=0.46
-pkgrel=1
+pkgrel=2
 pkgdesc='Recursive copy of nested objects.'
 arch=('i686' 'x86_64')
 url='https://github.com/garu/Clone'

diff --git a/perl-Compress-Bzip2/PKGBUILD b/perl-Compress-Bzip2/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=Compress-Bzip2
 pkgname=perl-${_realname}
 pkgver=2.28
-pkgrel=4
+pkgrel=5
 pkgdesc="Interface to Bzip2 compression library"
 arch=('i686' 'x86_64')
 license=(GPL2)

diff --git a/perl-DBI/PKGBUILD b/perl-DBI/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=DBI
 pkgname=perl-${_realname}
 pkgver=1.643
-pkgrel=5
+pkgrel=6
 pkgdesc="Database independent interface for Perl"
 arch=('i686' 'x86_64')
 url="https://metacpan.org/release/DBI"

diff --git a/perl-Digest-MD4/PKGBUILD b/perl-Digest-MD4/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=Digest-MD4
 pkgname=perl-${_realname}
 pkgver=1.9
-pkgrel=8
+pkgrel=9
 pkgdesc="Perl Module: Perl interface to the MD4 Algorithm."
 arch=('i686' 'x86_64')
 license=('PerlArtistic')

diff --git a/perl-HTML-Parser/PKGBUILD b/perl-HTML-Parser/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=HTML-Parser
 pkgname=perl-${_realname}
 pkgver=3.81
-pkgrel=1
+pkgrel=2
 pkgdesc="Perl HTML parser class"
 arch=('i686' 'x86_64')
 license=('spdx:Artistic-1.0-Perl' 'spdx:GPL-1.0-or-later')

diff --git a/perl-List-MoreUtils-XS/PKGBUILD b/perl-List-MoreUtils-XS/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=List-MoreUtils-XS
 pkgname=perl-${_realname}
 pkgver=0.430
-pkgrel=2
+pkgrel=3
 pkgdesc="Provide the stuff missing in List::Util"
 arch=('i686' 'x86_64')
 license=('GPL' 'PerlArtistic')

diff --git a/perl-Locale-Gettext/PKGBUILD b/perl-Locale-Gettext/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=Locale-Gettext
 pkgname=perl-${_realname}
 pkgver=1.07
-pkgrel=10
+pkgrel=11
 groups=('perl-modules')
 pkgdesc="Permits access from Perl to the gettext() family of functions"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url="https://search.cpan.org/dist/Locale-gettext/"
 depends=('gettext' 'perl')
 makedepends=('perl-devel' 'make' 'gcc' 'gettext-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://cpan.metacpan.org/authors/id/P/PV/PVANDRY/gettext-${pkgver}.tar.gz")
 sha256sums=('909d47954697e7c04218f972915b787bd1244d75e3bd01620bc167d5bbc49c15')
 
 build() {

diff --git a/perl-Math-Int64/PKGBUILD b/perl-Math-Int64/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=Math-Int64
 pkgname=perl-${_realname}
 pkgver=0.54
-pkgrel=7
+pkgrel=8
 pkgdesc="Math::Int64 - Manipulate 64 bits integers in Perl"
 arch=('i686' 'x86_64')
 license=('GPL' 'PerlArtistic')

diff --git a/perl-Net-SSLeay/PKGBUILD b/perl-Net-SSLeay/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=Net-SSLeay
 pkgname=perl-${_realname}
 pkgver=1.92
-pkgrel=5
+pkgrel=6
 pkgdesc="Perl extension for using OpenSSL"
 arch=('i686' 'x86_64')
 license=('custom:BSD')

diff --git a/perl-Params-Util/PKGBUILD b/perl-Params-Util/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=Params-Util
 pkgname=perl-${_realname}
 pkgver=1.102
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple, compact and correct param-checking functions"
 arch=('i686' 'x86_64')
 url="https://metacpan.org/release/Params-Util"

diff --git a/perl-PerlIO-gzip/PKGBUILD b/perl-PerlIO-gzip/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=PerlIO-gzip
 pkgname=perl-${_realname}
 pkgver=0.20
-pkgrel=4
+pkgrel=5
 pkgdesc="Perl extension to provide a PerlIO layer to gzip/gunzip"
 arch=('i686' 'x86_64')
 url="https://metacpan.org/release/PerlIO-gzip"

diff --git a/perl-Socket6/PKGBUILD b/perl-Socket6/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=Socket6
 pkgname="perl-${_realname}"
 pkgver=0.29
-pkgrel=6
+pkgrel=7
 pkgdesc="A getaddrinfo/getnameinfo support module"
 arch=('i686' 'x86_64')
 url='https://metacpan.org/release/Socket6'

diff --git a/perl-TermReadKey/PKGBUILD b/perl-TermReadKey/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=TermReadKey
 pkgname=perl-${_realname}
 pkgver=2.38
-pkgrel=5
+pkgrel=6
 pkgdesc="Provides simple control over terminal driver modes"
 arch=('i686' 'x86_64')
 license=('custom')

diff --git a/perl-Text-CharWidth/PKGBUILD b/perl-Text-CharWidth/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=Text-CharWidth
 pkgname=perl-${_realname}
 pkgver=0.04
-pkgrel=10
+pkgrel=11
 pkgdesc="Text::CharWidth - Get number of occupied columns of a string on terminal"
 arch=('i686' 'x86_64')
 url="https://metacpan.org/dist/Text-CharWidth/"

diff --git a/perl-Unicode-LineBreak/PKGBUILD b/perl-Unicode-LineBreak/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=Unicode-LineBreak
 pkgname=perl-${_realname}
 pkgver=2019.001
-pkgrel=5
+pkgrel=6
 pkgdesc="UAX #14 Unicode Line Breaking Algorithm"
 arch=('i686' 'x86_64')
 url="https://metacpan.org/release/${_realname}"

diff --git a/perl-XML-LibXML/PKGBUILD b/perl-XML-LibXML/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=XML-LibXML
 pkgname=perl-${_realname}
 pkgver=2.0208
-pkgrel=1
+pkgrel=2
 pkgdesc="Interface to the libxml library"
 arch=('i686' 'x86_64')
 license=('GPL' 'PerlArtistic')

diff --git 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')

diff --git 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="https://metacpan.org/release/YAML-Syck"

diff --git a/perl/0001-perl.cygwin-auto-image-base.patch b/perl/0001-perl.cygwin-auto-image-base.patch
diff --git a/perl/0002-perl.cygwin-hints.patch b/perl/0002-perl.cygwin-hints.patch
@@ -11,28 +11,27 @@ 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'
 +loclibpth=' '
 +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
@@ -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
@@ -1177,17 +1177,17 @@ 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');
  }
 
 @@ -133,7 +133,7 @@ SKIP: {
 
    {
      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');
    }
  }