update to 8.0.29, fixed options and cflags

2 files changed, 103 insertions, 96 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c1c419241b2..5a251e597558 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by makepkg 6.0.2
-# Tue Feb 21 11:57:53 UTC 2023
 pkgbase = php80
-	pkgdesc = PHP 8.0.28 compiled as to not conflict with mainline php
-	pkgver = 8.0.28
+	pkgdesc = PHP 8.0.29 compiled as to not conflict with mainline php
+	pkgver = 8.0.29
 	pkgrel = 1
 	url = http://www.php.net
 	arch = x86_64
@@ -69,7 +67,7 @@ pkgbase = php80
 	source = pear-config-patcher.php
 	source = php-makefile-patcher.php
 	source = php-apache.conf
-	source = https://php.net/distributions/php-8.0.28.tar.xz
+	source = https://php.net/distributions/php-8.0.29.tar.xz
 	source = debian-php-8.0.patch
 	source = php-phpinfo.patch
 	source = timezonedb-guess.patch
@@ -78,7 +76,7 @@ pkgbase = php80
 	sha256sums = 0b7e98dca9c996ec10cb9b3f6296bb7547c68797fd5f35006fdfd3e97700672d
 	sha256sums = ba72fc64f77822755a469314160d5889d5298f4eb5758dd7939dac9b811afe52
 	sha256sums = 6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91
-	sha256sums = 5e07278a1f315a67d36a676c01343ca2d4da5ec5bdb15d018e4248b3012bc0cd
+	sha256sums = 14db2fbf26c07d0eb2c9fab25dbde7e27726a3e88452cca671f0896bbb683ca9
 	sha256sums = c9ab253399e58e24cf23cda5edd72a331b7b9aa9b2ac217b0ee04706cc67e93e
 	sha256sums = 558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c
 	sha256sums = 40bcc1e5058602302198d0925e431495391d8469499593af477f59d84d32f764
@@ -93,7 +91,7 @@ pkgname = php80
 
 pkgname = php80-cli
 	pkgdesc = cli (command-line executable) version for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = libxml2
 	depends = pcre2
 	depends = libedit
@@ -102,7 +100,7 @@ pkgname = php80-cli
 
 pkgname = php80-cgi
 	pkgdesc = CGI and FCGI SAPI for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = libxml2
 	depends = pcre2
 	depends = libedit
@@ -112,7 +110,7 @@ pkgname = php80-cgi
 pkgname = php80-fpm
 	pkgdesc = FastCGI Process Manager for php80
 	install = php-fpm.install
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = systemd-libs
 	depends = acl
 	depends = libxml2
@@ -126,7 +124,7 @@ pkgname = php80-fpm
 
 pkgname = php80-embed
 	pkgdesc = Embedded PHP SAPI library for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = ncurses
 	depends = systemd-libs
 	depends = libxcrypt
@@ -141,7 +139,7 @@ pkgname = php80-embed
 
 pkgname = php80-apache
 	pkgdesc = Apache SAPI for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = apache
 	depends = libxml2
 	depends = pcre2
@@ -154,7 +152,7 @@ pkgname = php80-apache
 
 pkgname = php80-litespeed
 	pkgdesc = LiteSpeed SAPI for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = libxml2
 	depends = pcre2
 	depends = libedit
@@ -163,18 +161,18 @@ pkgname = php80-litespeed
 
 pkgname = php80-pear
 	pkgdesc = PHP Extension and Application Repository (PEAR) for php80
-	depends = php80=8.0.28
-	depends = php80-xml=8.0.28
-	depends = php80-cli=8.0.28
-	depends = php80-phar=8.0.28
+	depends = php80=8.0.29
+	depends = php80-xml=8.0.29
+	depends = php80-cli=8.0.29
+	depends = php80-phar=8.0.29
 
 pkgname = php80-pecl
 	pkgdesc = PHP Extension Community Library (PECL) for php80
-	depends = php80-pear=8.0.28
+	depends = php80-pear=8.0.29
 
 pkgname = php80-phpdbg
 	pkgdesc = Interactive PHP debugger for php80 ()
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = libxml2
 	depends = pcre2
 	depends = libedit
@@ -184,136 +182,136 @@ pkgname = php80-phpdbg
 
 pkgname = php80-xml
 	pkgdesc = xml modules for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = libxml2
 
 pkgname = php80-xsl
 	pkgdesc = xsl module for php80
-	depends = php80-xml=8.0.28
-	depends = php80-dom=8.0.28
+	depends = php80-xml=8.0.29
+	depends = php80-dom=8.0.29
 	depends = libxslt
 
 pkgname = php80-xmlreader
 	pkgdesc = xmlreader module for php80
-	depends = php80-xml=8.0.28
+	depends = php80-xml=8.0.29
 
 pkgname = php80-xmlwriter
 	pkgdesc = xmlwriter module for php80
-	depends = php80-xml=8.0.28
+	depends = php80-xml=8.0.29
 
 pkgname = php80-dom
 	pkgdesc = dom module for php80
-	depends = php80-xml=8.0.28
+	depends = php80-xml=8.0.29
 
 pkgname = php80-simplexml
 	pkgdesc = simplexml module for php80
-	depends = php80-xml=8.0.28
+	depends = php80-xml=8.0.29
 
 pkgname = php80-openssl
 	pkgdesc = OpenSSL module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = krb5
 	depends = e2fsprogs
 	depends = openssl-1.1
 
 pkgname = php80-pdo
 	pkgdesc = pdo module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 
 pkgname = php80-mysql
 	pkgdesc = MySQL modules for php80
-	depends = php80=8.0.28
-	depends = php80-pdo=8.0.28
-	depends = php80-openssl=8.0.28
+	depends = php80=8.0.29
+	depends = php80-pdo=8.0.29
+	depends = php80-openssl=8.0.29
 
 pkgname = php80-phar
 	pkgdesc = phar module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 
 pkgname = php80-pcntl
 	pkgdesc = pcntl module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 
 pkgname = php80-posix
 	pkgdesc = posix module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 
 pkgname = php80-shmop
 	pkgdesc = shmop module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 
 pkgname = php80-sockets
 	pkgdesc = sockets module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 
 pkgname = php80-sysvmsg
 	pkgdesc = sysvmsg module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 
 pkgname = php80-sysvsem
 	pkgdesc = sysvsem module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 
 pkgname = php80-sysvshm
 	pkgdesc = sysvshm module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 
 pkgname = php80-tokenizer
 	pkgdesc = tokenizer module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 
 pkgname = php80-dba
 	pkgdesc = dba module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = db5.3
 	depends = lmdb
 
 pkgname = php80-pgsql
 	pkgdesc = PostgreSQL modules for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = postgresql-libs
-	depends = php80-pdo=8.0.28
+	depends = php80-pdo=8.0.29
 
 pkgname = php80-odbc
 	pkgdesc = ODBC modules for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = unixodbc
-	depends = php80-pdo=8.0.28
+	depends = php80-pdo=8.0.29
 
 pkgname = php80-firebird
 	pkgdesc = pdo_firebird module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = libfbclient
-	depends = php80-pdo=8.0.28
+	depends = php80-pdo=8.0.29
 
 pkgname = php80-dblib
 	pkgdesc = pdo_dblib module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = freetds
 
 pkgname = php80-sqlite
 	pkgdesc = sqlite module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = sqlite
-	depends = php80-pdo=8.0.28
+	depends = php80-pdo=8.0.29
 
 pkgname = php80-gd
 	pkgdesc = gd module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = gd
 
 pkgname = php80-exif
 	pkgdesc = exif module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 
 pkgname = php80-tidy
 	pkgdesc = tidy module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = tidy
 
 pkgname = php80-iconv
 	pkgdesc = iconv module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 
 pkgname = php80-bcmath
 	pkgdesc = bcmath module for php80
@@ -321,40 +319,40 @@ pkgname = php80-bcmath
 
 pkgname = php80-gmp
 	pkgdesc = gmp module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = gmp
 
 pkgname = php80-zip
 	pkgdesc = zip module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = libzip
 
 pkgname = php80-bz2
 	pkgdesc = bz2 module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = bzip2
 
 pkgname = php80-fileinfo
 	pkgdesc = fileinfo module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 
 pkgname = php80-ctype
 	pkgdesc = ctype module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 
 pkgname = php80-mbstring
 	pkgdesc = mbstring module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = oniguruma
 
 pkgname = php80-pspell
 	pkgdesc = pspell module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = aspell
 
 pkgname = php80-enchant
 	pkgdesc = enchant module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = enchant
 	depends = libvoikko
 	depends = hspell
@@ -364,47 +362,47 @@ pkgname = php80-enchant
 
 pkgname = php80-intl
 	pkgdesc = intl module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = icu
 
 pkgname = php80-calendar
 	pkgdesc = calendar module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 
 pkgname = php80-gettext
 	pkgdesc = gettext module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 
 pkgname = php80-soap
 	pkgdesc = soap module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = libxml2
 
 pkgname = php80-ftp
 	pkgdesc = FTP module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = openssl-1.1
 
 pkgname = php80-curl
 	pkgdesc = curl module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = curl
 
 pkgname = php80-snmp
 	pkgdesc = snmp module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = net-snmp
 	depends = openssl-1.1
 
 pkgname = php80-ldap
 	pkgdesc = ldap module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = libldap
 	depends = libsasl
 
 pkgname = php80-imap
 	pkgdesc = imap module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = pam
 	depends = krb5
 	depends = c-client
@@ -413,14 +411,14 @@ pkgname = php80-imap
 
 pkgname = php80-sodium
 	pkgdesc = sodium (libsodium) module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = libsodium
 
 pkgname = php80-ffi
 	pkgdesc = ffi module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
 	depends = libffi
 
 pkgname = php80-opcache
 	pkgdesc = opcache zend module for php80
-	depends = php80=8.0.28
+	depends = php80=8.0.29
diff --git a/PKGBUILD b/PKGBUILD
index 4dc2ae590847..311c14b6d96c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,10 +15,10 @@
 ###############################################################################
 _phpbase="80"
 _suffix=""
-pkgver="8.0.28"
+pkgver="8.0.29"
 pkgrel="1"
 pkgbase="php80"
-pkgdesc="PHP 8.0.28 compiled as to not conflict with mainline php"
+pkgdesc="PHP 8.0.29 compiled as to not conflict with mainline php"
 _cppflags=" -DU_USING_ICU_NAMESPACE=1 "
 _build_apache_cfg="etc/httpd/conf/extra"
 _build_bundled_gd="0"
@@ -209,20 +209,20 @@ _sapi_depends=(
     "argon2"
 )
 _ext_depends_snmp=(
-    "php80=8.0.28"
+    "php80=8.0.29"
     "net-snmp"
     "openssl-1.1"
 )
 _ext_depends_ftp=(
-    "php80=8.0.28"
+    "php80=8.0.29"
     "openssl-1.1"
 )
 _ext_depends_intl=(
-    "php80=8.0.28"
+    "php80=8.0.29"
     "icu"
 )
 _ext_depends_imap=(
-    "php80=8.0.28"
+    "php80=8.0.29"
     "pam"
     "krb5"
     "c-client"
@@ -230,45 +230,45 @@ _ext_depends_imap=(
     "openssl-1.1"
 )
 _ext_depends_gd=(
-    "php80=8.0.28"
+    "php80=8.0.29"
     "gd"
 )
 _ext_depends_mysql=(
-    "php80=8.0.28"
-    "php80-pdo=8.0.28"
-    "php80-openssl=8.0.28"
+    "php80=8.0.29"
+    "php80-pdo=8.0.29"
+    "php80-openssl=8.0.29"
 )
 _ext_depends_dba=(
-    "php80=8.0.28"
+    "php80=8.0.29"
     "db5.3"
     "lmdb"
 )
 _ext_depends_odbc=(
-    "php80=8.0.28"
+    "php80=8.0.29"
     "unixodbc"
-    "php80-pdo=8.0.28"
+    "php80-pdo=8.0.29"
 )
 _ext_depends_pgsql=(
-    "php80=8.0.28"
+    "php80=8.0.29"
     "postgresql-libs"
-    "php80-pdo=8.0.28"
+    "php80-pdo=8.0.29"
 )
 _ext_depends_firebird=(
-    "php80=8.0.28"
+    "php80=8.0.29"
     "libfbclient"
-    "php80-pdo=8.0.28"
+    "php80-pdo=8.0.29"
 )
 _ext_depends_sqlite=(
-    "php80=8.0.28"
+    "php80=8.0.29"
     "sqlite"
-    "php80-pdo=8.0.28"
+    "php80-pdo=8.0.29"
 )
 _ext_depends_mbstring=(
-    "php80=8.0.28"
+    "php80=8.0.29"
     "oniguruma"
 )
 _ext_depends_openssl=(
-    "php80=8.0.28"
+    "php80=8.0.29"
     "krb5"
     "e2fsprogs"
     "openssl-1.1"
@@ -379,7 +379,7 @@ _phpextensions_fpm="\
     --with-fpm-acl"
 
 
-options=('!lto')
+options+=('!lto')
 arch=("$CARCH")
 checkdepends=('procps-ng' 'smtp-forwarder')
 license=('PHP')
@@ -392,6 +392,9 @@ url='http://www.php.net'
 prepare() {
     pushd "php-${pkgver}"
 
+    export CFLAGS="${CFLAGS} -fPIC" 
+    export CXXFLAGS="${CXXFLAGS} -fPIC"
+
     echo "[SED] scripts/phpize.in"
     sed -E "s|(includedir[\t ]*=.*/php)|\1${_phpbase}${_suffix}|g" \
         -i scripts/phpize.in
@@ -464,6 +467,8 @@ prepare() {
 }
 
 _build_sapi() {
+    export CFLAGS="${CFLAGS} -fPIC" 
+    export CXXFLAGS="${CXXFLAGS} -fPIC"
     _sapi="${1}"
     _commands="${2}"
     if (( _sapi == "cli" )); then
@@ -500,6 +505,8 @@ _build_sapi() {
 # BUILD them all
 ################################################################################
 build() {
+    export CFLAGS="${CFLAGS} -fPIC" 
+    export CXXFLAGS="${CXXFLAGS} -fPIC"
     export EXTENSION_DIR="/usr/lib/${pkgbase}/modules"
     if ((_build_openssl_v10_patch)); then
         export PHP_OPENSSL_DIR="/usr/lib/openssl-1.0"
@@ -664,6 +671,8 @@ build() {
 }
 
 check() {
+    export CFLAGS="${CFLAGS} -fPIC" 
+    export CXXFLAGS="${CXXFLAGS} -fPIC"
     pushd "build-cli"
     # Check if sendmail was configured correctly (FS#47600)
     export REPORT_EXIT_STATUS=1
@@ -1524,7 +1533,7 @@ sha256sums=('e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b'
             '0b7e98dca9c996ec10cb9b3f6296bb7547c68797fd5f35006fdfd3e97700672d'
             'ba72fc64f77822755a469314160d5889d5298f4eb5758dd7939dac9b811afe52'
             '6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91'
-            '5e07278a1f315a67d36a676c01343ca2d4da5ec5bdb15d018e4248b3012bc0cd'
+            '14db2fbf26c07d0eb2c9fab25dbde7e27726a3e88452cca671f0896bbb683ca9'
             'c9ab253399e58e24cf23cda5edd72a331b7b9aa9b2ac217b0ee04706cc67e93e'
             '558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c'
             '40bcc1e5058602302198d0925e431495391d8469499593af477f59d84d32f764'