summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Lamskoy2023-01-11 12:12:14 +0200
committerEugene Lamskoy2023-01-11 12:12:14 +0200
commit5f2abbb9d0b19d7124de971f59a631edafd66258 (patch)
treec57a726ad8b7c952542c8b5c455a5ab8fc3dc64e
parente06e08560e801f73659497a2e294fda713d74017 (diff)
downloadaur-5f2abbb9d0b19d7124de971f59a631edafd66258.tar.gz
8.1.14
-rw-r--r--.SRCINFO154
-rw-r--r--PKGBUILD61
-rw-r--r--debian-php-8.1.patch81
3 files changed, 109 insertions, 187 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0293f184e8ba..d57b8b3351eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by makepkg 6.0.2
-# Sat Nov 5 17:17:26 UTC 2022
+# Wed Jan 11 10:10:52 UTC 2023
pkgbase = php81
- pkgdesc = PHP 8.1.12 compiled as to not conflict with mainline php
- pkgver = 8.1.12
- pkgrel = 1
+ pkgdesc = PHP 8.1.14 compiled as to not conflict with mainline php
+ pkgver = 8.1.14
+ pkgrel = 2
url = http://www.php.net
arch = x86_64
license = PHP
@@ -34,10 +34,10 @@ pkgbase = php81
makedepends = findutils
makedepends = argon2
makedepends = libxslt
- makedepends = openssl
makedepends = e2fsprogs
+ makedepends = openssl
makedepends = lmdb
- makedepends = db
+ makedepends = db5.3
makedepends = postgresql-libs
makedepends = unixodbc
makedepends = libfbclient
@@ -69,7 +69,7 @@ pkgbase = php81
source = pear-config-patcher.php
source = php-makefile-patcher.php
source = php-apache.conf
- source = https://php.net/distributions/php-8.1.12.tar.xz
+ source = https://php.net/distributions/php-8.1.14.tar.xz
source = debian-php-8.1.patch
source = php-phpinfo.patch
source = timezonedb-guess.patch
@@ -78,8 +78,8 @@ pkgbase = php81
sha256sums = 0b7e98dca9c996ec10cb9b3f6296bb7547c68797fd5f35006fdfd3e97700672d
sha256sums = ba72fc64f77822755a469314160d5889d5298f4eb5758dd7939dac9b811afe52
sha256sums = 6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91
- sha256sums = 08243359e2204d842082269eedc15f08d2eca726d0e65b93fb11f4bfc51bbbab
- sha256sums = 0df807d84bc0cf948a6ed0cf453e98213d47fbc7fdedc2747855a619dc616b3c
+ sha256sums = e16e47a872d58685913ac848ce92ec49f42c1828110c98c65fb6265a08724a1a
+ sha256sums = d1778f038dd742400707307d6845c1dc40ea1962ff9676f880be88a5ebdd8577
sha256sums = 558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c
sha256sums = 40bcc1e5058602302198d0925e431495391d8469499593af477f59d84d32f764
sha256sums = e2b4bad971ed569e9e898dcb2c7451d53e9b55f473123bbd4765d126efea6466
@@ -93,7 +93,7 @@ pkgname = php81
pkgname = php81-cli
pkgdesc = cli (command-line executable) version for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = libxml2
depends = pcre2
depends = libedit
@@ -102,7 +102,7 @@ pkgname = php81-cli
pkgname = php81-cgi
pkgdesc = CGI and FCGI SAPI for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = libxml2
depends = pcre2
depends = libedit
@@ -112,7 +112,7 @@ pkgname = php81-cgi
pkgname = php81-fpm
pkgdesc = FastCGI Process Manager for php81
install = php-fpm.install
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = systemd-libs
depends = acl
depends = libxml2
@@ -126,7 +126,7 @@ pkgname = php81-fpm
pkgname = php81-embed
pkgdesc = Embedded PHP SAPI library for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = ncurses
depends = systemd-libs
depends = libxcrypt
@@ -141,7 +141,7 @@ pkgname = php81-embed
pkgname = php81-apache
pkgdesc = Apache SAPI for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = apache
depends = libxml2
depends = pcre2
@@ -154,7 +154,7 @@ pkgname = php81-apache
pkgname = php81-litespeed
pkgdesc = LiteSpeed SAPI for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = libxml2
depends = pcre2
depends = libedit
@@ -163,18 +163,18 @@ pkgname = php81-litespeed
pkgname = php81-pear
pkgdesc = PHP Extension and Application Repository (PEAR) for php81
- depends = php81=8.1.12
- depends = php81-xml=8.1.12
- depends = php81-cli=8.1.12
- depends = php81-phar=8.1.12
+ depends = php81=8.1.14
+ depends = php81-xml=8.1.14
+ depends = php81-cli=8.1.14
+ depends = php81-phar=8.1.14
pkgname = php81-pecl
pkgdesc = PHP Extension Community Library (PECL) for php81
- depends = php81-pear=8.1.12
+ depends = php81-pear=8.1.14
pkgname = php81-phpdbg
pkgdesc = Interactive PHP debugger for php81 ()
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = libxml2
depends = pcre2
depends = libedit
@@ -184,136 +184,136 @@ pkgname = php81-phpdbg
pkgname = php81-xml
pkgdesc = xml modules for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = libxml2
pkgname = php81-xsl
pkgdesc = xsl module for php81
- depends = php81-xml=8.1.12
- depends = php81-dom=8.1.12
+ depends = php81-xml=8.1.14
+ depends = php81-dom=8.1.14
depends = libxslt
pkgname = php81-xmlreader
pkgdesc = xmlreader module for php81
- depends = php81-xml=8.1.12
+ depends = php81-xml=8.1.14
pkgname = php81-xmlwriter
pkgdesc = xmlwriter module for php81
- depends = php81-xml=8.1.12
+ depends = php81-xml=8.1.14
pkgname = php81-dom
pkgdesc = dom module for php81
- depends = php81-xml=8.1.12
+ depends = php81-xml=8.1.14
pkgname = php81-simplexml
pkgdesc = simplexml module for php81
- depends = php81-xml=8.1.12
+ depends = php81-xml=8.1.14
pkgname = php81-openssl
pkgdesc = OpenSSL module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = krb5
depends = e2fsprogs
depends = openssl
pkgname = php81-pdo
pkgdesc = pdo module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
pkgname = php81-mysql
pkgdesc = MySQL modules for php81
- depends = php81=8.1.12
- depends = php81-pdo=8.1.12
- depends = php81-openssl=8.1.12
+ depends = php81=8.1.14
+ depends = php81-pdo=8.1.14
+ depends = php81-openssl=8.1.14
pkgname = php81-phar
pkgdesc = phar module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
pkgname = php81-pcntl
pkgdesc = pcntl module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
pkgname = php81-posix
pkgdesc = posix module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
pkgname = php81-shmop
pkgdesc = shmop module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
pkgname = php81-sockets
pkgdesc = sockets module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
pkgname = php81-sysvmsg
pkgdesc = sysvmsg module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
pkgname = php81-sysvsem
pkgdesc = sysvsem module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
pkgname = php81-sysvshm
pkgdesc = sysvshm module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
pkgname = php81-tokenizer
pkgdesc = tokenizer module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
pkgname = php81-dba
pkgdesc = dba module for php81
- depends = php81=8.1.12
- depends = db
+ depends = php81=8.1.14
+ depends = db5.3
depends = lmdb
pkgname = php81-pgsql
pkgdesc = PostgreSQL modules for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = postgresql-libs
- depends = php81-pdo=8.1.12
+ depends = php81-pdo=8.1.14
pkgname = php81-odbc
pkgdesc = ODBC modules for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = unixodbc
- depends = php81-pdo=8.1.12
+ depends = php81-pdo=8.1.14
pkgname = php81-firebird
pkgdesc = pdo_firebird module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = libfbclient
- depends = php81-pdo=8.1.12
+ depends = php81-pdo=8.1.14
pkgname = php81-dblib
pkgdesc = pdo_dblib module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = freetds
pkgname = php81-sqlite
pkgdesc = sqlite module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = sqlite
- depends = php81-pdo=8.1.12
+ depends = php81-pdo=8.1.14
pkgname = php81-gd
pkgdesc = gd module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = gd
pkgname = php81-exif
pkgdesc = exif module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
pkgname = php81-tidy
pkgdesc = tidy module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = tidy
pkgname = php81-iconv
pkgdesc = iconv module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
pkgname = php81-bcmath
pkgdesc = bcmath module for php81
@@ -321,40 +321,40 @@ pkgname = php81-bcmath
pkgname = php81-gmp
pkgdesc = gmp module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = gmp
pkgname = php81-zip
pkgdesc = zip module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = libzip
pkgname = php81-bz2
pkgdesc = bz2 module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = bzip2
pkgname = php81-fileinfo
pkgdesc = fileinfo module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
pkgname = php81-ctype
pkgdesc = ctype module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
pkgname = php81-mbstring
pkgdesc = mbstring module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = oniguruma
pkgname = php81-pspell
pkgdesc = pspell module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = aspell
pkgname = php81-enchant
pkgdesc = enchant module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = enchant
depends = libvoikko
depends = hspell
@@ -364,47 +364,47 @@ pkgname = php81-enchant
pkgname = php81-intl
pkgdesc = intl module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = icu
pkgname = php81-calendar
pkgdesc = calendar module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
pkgname = php81-gettext
pkgdesc = gettext module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
pkgname = php81-soap
pkgdesc = soap module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = libxml2
pkgname = php81-ftp
pkgdesc = FTP module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = openssl
pkgname = php81-curl
pkgdesc = curl module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = curl
pkgname = php81-snmp
pkgdesc = snmp module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = net-snmp
depends = openssl
pkgname = php81-ldap
pkgdesc = ldap module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = libldap
depends = libsasl
pkgname = php81-imap
pkgdesc = imap module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = pam
depends = krb5
depends = c-client
@@ -413,14 +413,14 @@ pkgname = php81-imap
pkgname = php81-sodium
pkgdesc = sodium (libsodium) module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = libsodium
pkgname = php81-ffi
pkgdesc = ffi module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
depends = libffi
pkgname = php81-opcache
pkgdesc = opcache zend module for php81
- depends = php81=8.1.12
+ depends = php81=8.1.14
diff --git a/PKGBUILD b/PKGBUILD
index 14075b5ff527..c976d39705ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,14 +15,15 @@
###############################################################################
_phpbase="81"
_suffix=""
-pkgver="8.1.12"
-pkgrel="1"
+pkgver="8.1.14"
+pkgrel="2"
pkgbase="php81"
-pkgdesc="PHP 8.1.12 compiled as to not conflict with mainline php"
+pkgdesc="PHP 8.1.14 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"
_build_conf_d="etc/php81/conf.d"
+_build_forced_openssl_11="0"
_build_fpm_name="php-fpm81"
_build_fpm_service_name="php81-fpm"
_build_icu_src_dir="icu/source"
@@ -136,8 +137,6 @@ source=(
)
depends=(
)
-checkdepends=(
-)
makedepends=(
"acl"
"libtool"
@@ -164,10 +163,10 @@ makedepends=(
"findutils"
"argon2"
"libxslt"
- "openssl"
"e2fsprogs"
+ "openssl"
"lmdb"
- "db"
+ "db5.3"
"postgresql-libs"
"unixodbc"
"libfbclient"
@@ -210,20 +209,20 @@ _sapi_depends=(
"argon2"
)
_ext_depends_snmp=(
- "php81=8.1.12"
+ "php81=8.1.14"
"net-snmp"
"openssl"
)
_ext_depends_ftp=(
- "php81=8.1.12"
+ "php81=8.1.14"
"openssl"
)
_ext_depends_intl=(
- "php81=8.1.12"
+ "php81=8.1.14"
"icu"
)
_ext_depends_imap=(
- "php81=8.1.12"
+ "php81=8.1.14"
"pam"
"krb5"
"c-client"
@@ -231,45 +230,45 @@ _ext_depends_imap=(
"openssl"
)
_ext_depends_gd=(
- "php81=8.1.12"
+ "php81=8.1.14"
"gd"
)
_ext_depends_mysql=(
- "php81=8.1.12"
- "php81-pdo=8.1.12"
- "php81-openssl=8.1.12"
+ "php81=8.1.14"
+ "php81-pdo=8.1.14"
+ "php81-openssl=8.1.14"
)
_ext_depends_dba=(
- "php81=8.1.12"
- "db"
+ "php81=8.1.14"
+ "db5.3"
"lmdb"
)
_ext_depends_odbc=(
- "php81=8.1.12"
+ "php81=8.1.14"
"unixodbc"
- "php81-pdo=8.1.12"
+ "php81-pdo=8.1.14"
)
_ext_depends_pgsql=(
- "php81=8.1.12"
+ "php81=8.1.14"
"postgresql-libs"
- "php81-pdo=8.1.12"
+ "php81-pdo=8.1.14"
)
_ext_depends_firebird=(
- "php81=8.1.12"
+ "php81=8.1.14"
"libfbclient"
- "php81-pdo=8.1.12"
+ "php81-pdo=8.1.14"
)
_ext_depends_sqlite=(
- "php81=8.1.12"
+ "php81=8.1.14"
"sqlite"
- "php81-pdo=8.1.12"
+ "php81-pdo=8.1.14"
)
_ext_depends_mbstring=(
- "php81=8.1.12"
+ "php81=8.1.14"
"oniguruma"
)
_ext_depends_openssl=(
- "php81=8.1.12"
+ "php81=8.1.14"
"krb5"
"e2fsprogs"
"openssl"
@@ -504,6 +503,10 @@ build() {
export EXTENSION_DIR="/usr/lib/${pkgbase}/modules"
if ((_build_openssl_v10_patch)); then
export PHP_OPENSSL_DIR="/usr/lib/openssl-1.0"
+ export PKG_CONFIG_PATH="/usr/lib/openssl-1.0/pkgconfig"
+ elif ((_build_forced_openssl_11)); then
+ export PHP_OPENSSL_DIR="/usr/lib/openssl-1.1"
+ export PKG_CONFIG_PATH="/usr/lib/openssl-1.1/pkgconfig"
fi
if [[ ! -z "${_cppflags}" ]]; then
CPPFLAGS+=" $_cppflags "
@@ -1521,8 +1524,8 @@ sha256sums=('e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b'
'0b7e98dca9c996ec10cb9b3f6296bb7547c68797fd5f35006fdfd3e97700672d'
'ba72fc64f77822755a469314160d5889d5298f4eb5758dd7939dac9b811afe52'
'6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91'
- '08243359e2204d842082269eedc15f08d2eca726d0e65b93fb11f4bfc51bbbab'
- '0df807d84bc0cf948a6ed0cf453e98213d47fbc7fdedc2747855a619dc616b3c'
+ 'e16e47a872d58685913ac848ce92ec49f42c1828110c98c65fb6265a08724a1a'
+ 'd1778f038dd742400707307d6845c1dc40ea1962ff9676f880be88a5ebdd8577'
'558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c'
'40bcc1e5058602302198d0925e431495391d8469499593af477f59d84d32f764'
'e2b4bad971ed569e9e898dcb2c7451d53e9b55f473123bbd4765d126efea6466')
diff --git a/debian-php-8.1.patch b/debian-php-8.1.patch
index 8e78ee953046..d4af2ba1cf91 100644
--- a/debian-php-8.1.patch
+++ b/debian-php-8.1.patch
@@ -25,74 +25,6 @@ index 7564350..dda3c3a 100644
; Whether to use strict session mode.
; Strict session mode does not accept an uninitialized session ID, and
-diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
-index 1e80319..51bdd84 100644
---- a/ext/dba/config.m4
-+++ b/ext/dba/config.m4
-@@ -375,61 +375,13 @@
- dbdp4="/usr/local/BerkeleyDB.4."
- dbdp5="/usr/local/BerkeleyDB.5."
- for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do
-- if test -f "$i/db5/db.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/db5/db.h
-- break
-- elif test -f "$i/db4/db.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/db4/db.h
-- break
-- elif test -f "$i/include/db5.3/db.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/include/db5.3/db.h
-- break
-- elif test -f "$i/include/db5.1/db.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/include/db5.1/db.h
-- break
-- elif test -f "$i/include/db5.0/db.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/include/db5.0/db.h
-- break
-- elif test -f "$i/include/db4.8/db.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/include/db4.8/db.h
-- break
-- elif test -f "$i/include/db4.7/db.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/include/db4.7/db.h
-- break
-- elif test -f "$i/include/db4.6/db.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/include/db4.6/db.h
-- break
-- elif test -f "$i/include/db4.5/db.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/include/db4.5/db.h
-- break
-- elif test -f "$i/include/db4/db.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/include/db4/db.h
-- break
-- elif test -f "$i/include/db/db4.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/include/db/db4.h
-- break
-- elif test -f "$i/include/db4.h"; then
-- THIS_PREFIX=$i
-- THIS_INCLUDE=$i/include/db4.h
-- break
-- elif test -f "$i/include/db.h"; then
-+ if test -f "$i/include/db.h"; then
- THIS_PREFIX=$i
- THIS_INCLUDE=$i/include/db.h
- break
- fi
- done
-- PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
-+ PHP_DBA_DB_CHECK(4, db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
- fi
- PHP_DBA_STD_RESULT(db4,Berkeley DB4)
-
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 57bfb5e..2bfc368 100644
--- a/ext/dba/dba.c
@@ -134,19 +66,6 @@ index 57bfb5e..2bfc368 100644
+--EXPECT--
diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index 51bdd84..79136d5 100644
---- a/ext/dba/config.m4
-+++ b/ext/dba/config.m4
-@@ -145,6 +145,10 @@
- THIS_PREFIX=$i
- THIS_INCLUDE=$i/include/qdbm/depot.h
- break
-+ elif test -f "$i/include/qdbm/depot.h"; then
-+ THIS_PREFIX=$i
-+ THIS_INCLUDE=$i/include/qdbm/depot.h
-+ break
- fi
- done
-
diff --git a/sapi/fpm/php-fpm.8.in b/sapi/fpm/php-fpm.8.in
index 905946e..a4cf632 100644
--- a/sapi/fpm/php-fpm.8.in