Bump version to 7.4.5

6 files changed, 42 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 068403cc5da3..fbd23bdbc55e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = php-zts
-	pkgver = 7.4.1
+	pkgver = 7.4.5
 	pkgrel = 1
 	url = https://www.php.net/
 	arch = x86_64
@@ -29,8 +29,8 @@ pkgbase = php-zts
 	makedepends = pcre2
 	makedepends = libnsl
 	makedepends = oniguruma
-	source = https://php.net/distributions/php-7.4.1.tar.xz
-	source = https://php.net/distributions/php-7.4.1.tar.xz.asc
+	source = https://php.net/distributions/php-7.4.5.tar.xz
+	source = https://php.net/distributions/php-7.4.5.tar.xz.asc
 	source = apache.patch
 	source = apache.conf
 	source = php-fpm.patch
@@ -39,14 +39,14 @@ pkgbase = php-zts
 	source = enchant-2.patch
 	validpgpkeys = 5A52880781F755608BF815FC910DEB46F53EA312
 	validpgpkeys = 42670A7FE4D0441C8E4632349E4FDC074A4EF02D
-	sha256sums = 561bb866bdd509094be00f4ece7c3543ec971c4d878645ee81437e291cffc762
+	sha256sums = d059fd7f55bdc4d2eada15a00a2976697010d3631ef6f83149cc5289e1f23c2c
 	sha256sums = SKIP
 	sha256sums = 537e6f9f8879de2ba021b5efcaf759fccebd0e7b506d03a7ce973a5f3a482219
 	sha256sums = 80c00b40b0de794d87fb0183cdce2f3c93869c849f7534e8ced42ca6c625f2f7
-	sha256sums = 41f23ebc2d986473b9a4eb3f233428349367b2baa2bb715c53e720cc34c9378c
+	sha256sums = 565a743a0a9d4775f8e22b70a455729b023cc90db06c0251adef6ebbe604d53a
 	sha256sums = 640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5
-	sha256sums = 03beeb8b62a499805a4b912cb19d048635cb5542478753e58364bf24fb42ff3c
-	sha256sums = 92a048073713c3600713b3dd46e96b33a2dde2aef1fbdf175d83da1dc679a0c5
+	sha256sums = f2040cc0648a395d0a84984dd6bf7aadf9f569b58838c666d84898bc4578fe04
+	sha256sums = d94d22ad8bcd13829addda84e9de6b73fa04be9bc6da8622086c7e19c97ab724
 
 pkgname = php-zts
 	pkgdesc = A general-purpose scripting language that is especially suited to web development(ZTS enabled)
@@ -56,8 +56,8 @@ pkgname = php-zts
 	depends = pcre2
 	depends = argon2
 	depends = oniguruma
-	provides = php=7.4.1
-	provides = php-ldap=7.4.1
+	provides = php=7.4.5
+	provides = php-ldap=7.4.5
 	conflicts = php
 	conflicts = php-ldap
 	replaces = php
@@ -67,7 +67,7 @@ pkgname = php-zts
 pkgname = php-zts-cgi
 	pkgdesc = CGI and FCGI SAPI for PHP
 	depends = php-zts
-	provides = php-cgi=7.4.1
+	provides = php-cgi=7.4.5
 	conflicts = php-cgi
 	replaces = php-cgi
 
@@ -76,7 +76,7 @@ pkgname = php-zts-apache
 	depends = php-zts
 	depends = apache
 	depends = libnsl
-	provides = php-apache=7.4.1
+	provides = php-apache=7.4.5
 	conflicts = php-apache
 	replaces = php-apache
 	backup = etc/httpd/conf/extra/php7_module.conf
@@ -85,7 +85,7 @@ pkgname = php-zts-fpm
 	pkgdesc = FastCGI Process Manager for PHP
 	depends = php-zts
 	depends = systemd
-	provides = php-fpm=7.4.1
+	provides = php-fpm=7.4.5
 	conflicts = php-fpm
 	replaces = php-fpm
 	options = !emptydirs
@@ -97,7 +97,7 @@ pkgname = php-zts-embed
 	depends = php-zts
 	depends = systemd-libs
 	depends = libnsl
-	provides = php-embed=7.4.1
+	provides = php-embed=7.4.5
 	conflicts = php-embed
 	replaces = php-embed
 	options = !emptydirs
@@ -105,7 +105,7 @@ pkgname = php-zts-embed
 pkgname = php-zts-phpdbg
 	pkgdesc = Interactive PHP debugger
 	depends = php-zts
-	provides = php-phpdbg=7.4.1
+	provides = php-phpdbg=7.4.5
 	conflicts = php-phpdbg
 	replaces = php-phpdbg
 	options = !emptydirs
@@ -114,7 +114,7 @@ pkgname = php-zts-dblib
 	pkgdesc = dblib module for PHP
 	depends = php-zts
 	depends = freetds
-	provides = php-dblib=7.4.1
+	provides = php-dblib=7.4.5
 	conflicts = php-dblib
 	replaces = php-dblib
 
@@ -122,7 +122,7 @@ pkgname = php-zts-enchant
 	pkgdesc = enchant module for PHP
 	depends = php-zts
 	depends = enchant
-	provides = php-enchant=7.4.1
+	provides = php-enchant=7.4.5
 	conflicts = php-enchant
 	replaces = php-enchant
 
@@ -130,7 +130,7 @@ pkgname = php-zts-gd
 	pkgdesc = gd module for PHP
 	depends = php-zts
 	depends = gd
-	provides = php-gd=7.4.1
+	provides = php-gd=7.4.5
 	conflicts = php-gd
 	replaces = php-gd
 
@@ -138,7 +138,7 @@ pkgname = php-zts-imap
 	pkgdesc = imap module for PHP
 	depends = php-zts
 	depends = c-client
-	provides = php-imap=7.4.1
+	provides = php-imap=7.4.5
 	conflicts = php-imap
 	replaces = php-imap
 
@@ -146,7 +146,7 @@ pkgname = php-zts-intl
 	pkgdesc = intl module for PHP
 	depends = php-zts
 	depends = icu
-	provides = php-intl=7.4.1
+	provides = php-intl=7.4.5
 	conflicts = php-intl
 	replaces = php-intl
 
@@ -154,7 +154,7 @@ pkgname = php-zts-sodium
 	pkgdesc = sodium module for PHP
 	depends = php-zts
 	depends = libsodium
-	provides = php-sodium=7.4.1
+	provides = php-sodium=7.4.5
 	conflicts = php-sodium
 	replaces = php-sodium
 
@@ -162,7 +162,7 @@ pkgname = php-zts-odbc
 	pkgdesc = ODBC modules for PHP
 	depends = php-zts
 	depends = unixodbc
-	provides = php-odbc=7.4.1
+	provides = php-odbc=7.4.5
 	conflicts = php-odbc
 	replaces = php-odbc
 
@@ -170,7 +170,7 @@ pkgname = php-zts-pgsql
 	pkgdesc = PostgreSQL modules for PHP
 	depends = php-zts
 	depends = postgresql-libs
-	provides = php-pgsql=7.4.1
+	provides = php-pgsql=7.4.5
 	conflicts = php-pgsql
 	replaces = php-pgsql
 
@@ -178,7 +178,7 @@ pkgname = php-zts-pspell
 	pkgdesc = pspell module for PHP
 	depends = php-zts
 	depends = aspell
-	provides = php-pspell=7.4.1
+	provides = php-pspell=7.4.5
 	conflicts = php-pspell
 	replaces = php-pspell
 
@@ -186,7 +186,7 @@ pkgname = php-zts-snmp
 	pkgdesc = snmp module for PHP
 	depends = php-zts
 	depends = net-snmp
-	provides = php-snmp=7.4.1
+	provides = php-snmp=7.4.5
 	conflicts = php-snmp
 	replaces = php-snmp
 
@@ -194,7 +194,7 @@ pkgname = php-zts-sqlite
 	pkgdesc = sqlite module for PHP
 	depends = php-zts
 	depends = sqlite
-	provides = php-sqlite=7.4.1
+	provides = php-sqlite=7.4.5
 	conflicts = php-sqlite
 	replaces = php-sqlite
 
@@ -202,7 +202,7 @@ pkgname = php-zts-tidy
 	pkgdesc = tidy module for PHP
 	depends = php-zts
 	depends = tidy
-	provides = php-tidy=7.4.1
+	provides = php-tidy=7.4.5
 	conflicts = php-tidy
 	replaces = php-tidy
 
@@ -210,7 +210,7 @@ pkgname = php-zts-xsl
 	pkgdesc = xsl module for PHP
 	depends = php-zts
 	depends = libxslt
-	provides = php-xsl=7.4.1
+	provides = php-xsl=7.4.5
 	conflicts = php-xsl
 	replaces = php-xsl
 
diff --git a/PKGBUILD b/PKGBUILD
index ab532243aaf4..5c2c3058e619 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,7 +24,7 @@ pkgname=("${pkgbase}"
          "${pkgbase}-tidy"
          "${pkgbase}-xsl")
 
-pkgver=7.4.1
+pkgver=7.4.5
 pkgrel=1
 arch=('x86_64')
 license=('PHP')
@@ -36,14 +36,14 @@ checkdepends=('procps-ng')
 source=("https://php.net/distributions/${_pkgbase}-${pkgver}.tar.xz"{,.asc}
         'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch'
         'enchant-2.patch')
-sha256sums=('561bb866bdd509094be00f4ece7c3543ec971c4d878645ee81437e291cffc762'
+sha256sums=('d059fd7f55bdc4d2eada15a00a2976697010d3631ef6f83149cc5289e1f23c2c'
             'SKIP'
             '537e6f9f8879de2ba021b5efcaf759fccebd0e7b506d03a7ce973a5f3a482219'
             '80c00b40b0de794d87fb0183cdce2f3c93869c849f7534e8ced42ca6c625f2f7'
-            '41f23ebc2d986473b9a4eb3f233428349367b2baa2bb715c53e720cc34c9378c'
+            '565a743a0a9d4775f8e22b70a455729b023cc90db06c0251adef6ebbe604d53a'
             '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
-            '03beeb8b62a499805a4b912cb19d048635cb5542478753e58364bf24fb42ff3c'
-            '92a048073713c3600713b3dd46e96b33a2dde2aef1fbdf175d83da1dc679a0c5')
+            'f2040cc0648a395d0a84984dd6bf7aadf9f569b58838c666d84898bc4578fe04'
+            'd94d22ad8bcd13829addda84e9de6b73fa04be9bc6da8622086c7e19c97ab724')
 validpgpkeys=('5A52880781F755608BF815FC910DEB46F53EA312'
               '42670A7FE4D0441C8E4632349E4FDC074A4EF02D')
 
diff --git a/enchant-2.patch b/enchant-2.patch
index c2721d717ba4..5aee2f7294bb 100644
--- a/enchant-2.patch
+++ b/enchant-2.patch
@@ -11,7 +11,7 @@
    PHP_EVAL_LIBLINE($ENCHANT_LIBS, ENCHANT_SHARED_LIBADD)
 --- ext/enchant/enchant.c.orig
 +++ ext/enchant/enchant.c
-@@ -740,7 +740,7 @@
+@@ -738,7 +738,7 @@
  			for (i = 0; i < n_sugg; i++) {
  				add_next_index_string(sugg, suggs[i]);
  			}
@@ -20,7 +20,7 @@
  		}
  
  
-@@ -797,7 +797,7 @@
+@@ -793,7 +793,7 @@
  			add_next_index_string(return_value, suggs[i]);
  		}
  
@@ -29,7 +29,7 @@
  	}
  }
  /* }}} */
-@@ -817,7 +817,7 @@
+@@ -813,7 +813,7 @@
  
  	PHP_ENCHANT_GET_DICT;
  
@@ -38,7 +38,7 @@
  }
  /* }}} */
  
-@@ -855,7 +855,7 @@
+@@ -851,7 +851,7 @@
  
  	PHP_ENCHANT_GET_DICT;
  
diff --git a/generate_patches b/generate_patches
index eb196d506445..48ae47425999 100755
--- a/generate_patches
+++ b/generate_patches
@@ -4,7 +4,7 @@
 
 makepkg -o --nodeps --noprepare --skipinteg
 
-pushd src/${pkgbase}-${pkgver}
+pushd src/${_pkgbase}-${pkgver}
 
 sed -e '/if test "$APACHE_VERSION" -lt 2004001; then/i PHP_BUILD_THREAD_SAFE' \
 	-e '/if test "$APACHE_VERSION" -lt 2004001; then/,+10d' \
diff --git a/php-fpm.patch b/php-fpm.patch
index aa5fff9fc52f..c741342207a9 100644
--- a/php-fpm.patch
+++ b/php-fpm.patch
@@ -41,8 +41,8 @@
  
  ; Set listen(2) backlog.
  ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
-@@ -44,8 +44,8 @@
- ; BSD-derived systems allow connections regardless of permissions.
+@@ -45,8 +45,8 @@
+ ; and group can be specified either by name or by their numeric IDs.
  ; Default Values: user and group are set as the running user
  ;                 mode is set to 0660
 -;listen.owner = @php_fpm_user@
@@ -52,7 +52,7 @@
  ;listen.mode = 0660
  ; When POSIX Access Control Lists are supported you can set them using
  ; these options, value is a comma separated list of user/group names.
-@@ -370,7 +370,7 @@
+@@ -371,7 +371,7 @@
  ; Chdir to this directory at the start.
  ; Note: relative path can be used.
  ; Default Value: current directory or / when chroot
diff --git a/php.ini.patch b/php.ini.patch
index e1881058e56b..22b5abb16e10 100644
--- a/php.ini.patch
+++ b/php.ini.patch
@@ -9,7 +9,7 @@
  ; On windows:
  ;extension_dir = "ext"
  
-@@ -904,48 +904,45 @@
+@@ -904,49 +904,45 @@
  ; deprecated in a future PHP major version. So, when it is possible, please
  ; move to the new ('extension=<ext>) syntax.
  ;
@@ -28,9 +28,9 @@
 +;extension=enchant
 +;extension=exif
  ;extension=ffi
+ ;extension=ftp
 -;extension=fileinfo
 -;extension=gd2
-+;extension=ftp
 +;extension=gd
  ;extension=gettext
  ;extension=gmp