From 176e2929c6be0aa16f1af79fd99b6d6f52191d82 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Fri, 18 Jun 2021 22:02:52 +0530
Subject: [PATCH] pcre: Update to 8.45

---
 pcre/PKGBUILD                     | 10 +++----
 pcre/pcre-8.33-msys2-fix-ln.patch |  2 +-
 pcre/pcre-8.33-msys2.patch        | 50 +++----------------------------
 3 files changed, 10 insertions(+), 52 deletions(-)

diff --git a/pcre/PKGBUILD b/pcre/PKGBUILD
index 36baa51e..f66c3509 100644
--- a/pcre/PKGBUILD
+++ b/pcre/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=pcre
 pkgname=('pcre' 'libpcre' 'libpcre16' 'libpcre32' 'libpcrecpp' 'libpcreposix' 'pcre-devel')
-pkgver=8.44
+pkgver=8.45
 pkgrel=1
 pkgdesc="A library that implements Perl 5-style regular expressions"
 arch=('i686' 'x86_64')
@@ -12,11 +12,11 @@ makedepends=('libreadline-devel' 'libbz2-devel' 'zlib-devel')
 source=(https://ftp.pcre.org/pub/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig}
         pcre-8.33-msys2-fix-ln.patch
         pcre-8.33-msys2.patch)
-sha256sums=('19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d'
+sha256sums=('4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8'
             'SKIP'
-            '59d420f6e48f527a464902913a101be27297fb26318d532f67ec0a245ea39db8'
-            '26e0787a12ff5e8015773b318172166f541eb94d4f103989f51866672637b949')
-validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8')
+            'ef9fffef05c53450d196c7997a7de8883e58b8d8a5bbc0abb412d8a22797bb34'
+            '6e6e42b6a11bbb254541b0c6ea033cab5054272dfb54d7568976fcd08c5bd490')
+validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel <ph10@hermes.cam.ac.uk>
 
 prepare() {
   cd "${srcdir}"/${pkgname}-${pkgver}
diff --git a/pcre/pcre-8.33-msys2-fix-ln.patch b/pcre/pcre-8.33-msys2-fix-ln.patch
index 64d87ebe..e81a826b 100644
--- a/pcre/pcre-8.33-msys2-fix-ln.patch
+++ b/pcre/pcre-8.33-msys2-fix-ln.patch
@@ -1,6 +1,6 @@
 --- pcre-8.33-orig/Makefile.in	2013-05-28 09:09:27.000000000 +0000
 +++ pcre-8.33/Makefile.in	2013-06-02 10:12:03.825195300 +0000
-@@ -3155,58 +3155,58 @@
+@@ -3438,58 +3438,58 @@
  
  # Arrange for the per-function man pages to have 16- and 32-bit names as well.
  install-data-hook:
diff --git a/pcre/pcre-8.33-msys2.patch b/pcre/pcre-8.33-msys2.patch
index ce51c9d6..2bfb8cda 100644
--- a/pcre/pcre-8.33-msys2.patch
+++ b/pcre/pcre-8.33-msys2.patch
@@ -1,62 +1,20 @@
-diff -Naur pcre-8.33-orig/ar-lib pcre-8.33/ar-lib
---- pcre-8.33-orig/ar-lib	2013-05-27 15:56:00.000000000 +0000
-+++ pcre-8.33/ar-lib	2013-06-02 08:32:18.782226600 +0000
-@@ -53,7 +53,7 @@
- 	  MINGW*)
- 	    file_conv=mingw
- 	    ;;
--	  CYGWIN*)
-+	  CYGWIN*|MSYS*)
- 	    file_conv=cygwin
- 	    ;;
- 	  *)
-@@ -65,7 +65,7 @@
- 	mingw)
- 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
- 	  ;;
--	cygwin)
-+	cygwin|msys)
- 	  file=`cygpath -m "$file" || echo "$file"`
- 	  ;;
- 	wine)
-diff -Naur pcre-8.33-orig/compile pcre-8.33/compile
---- pcre-8.33-orig/compile	2013-05-27 15:56:00.000000000 +0000
-+++ pcre-8.33/compile	2013-06-02 08:32:45.157226600 +0000
-@@ -53,7 +53,7 @@
- 	  MINGW*)
- 	    file_conv=mingw
- 	    ;;
--	  CYGWIN*)
-+	  CYGWIN*|MSYS*)
- 	    file_conv=cygwin
- 	    ;;
- 	  *)
-@@ -67,7 +67,7 @@
- 	mingw/*)
- 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
- 	  ;;
--	cygwin/*)
-+	cygwin/*|msys/*)
- 	  file=`cygpath -m "$file" || echo "$file"`
- 	  ;;
- 	wine/*)
 diff -Naur pcre-8.33-orig/config.guess pcre-8.33/config.guess
 --- pcre-8.33-orig/config.guess	2013-05-27 15:56:00.000000000 +0000
 +++ pcre-8.33/config.guess	2013-06-02 08:33:13.797851600 +0000
-@@ -845,6 +845,9 @@
+@@ -903,6 +903,9 @@
      amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
+ 	echo x86_64-pc-cygwin
  	exit ;;
 +    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
 +	echo x86_64-unknown-msys
 +	exit ;;
      prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ 	echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
  	exit ;;
 diff -Naur pcre-8.33-orig/configure.ac pcre-8.33/configure.ac
 --- pcre-8.33-orig/configure.ac	2013-05-27 15:54:34.000000000 +0000
 +++ pcre-8.33/configure.ac	2013-06-02 08:34:06.329101600 +0000
-@@ -856,7 +856,7 @@
+@@ -892,7 +892,7 @@
  NO_UNDEFINED=
  EXPORT_ALL_SYMBOLS=
  case $host_os in