summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Lamskoy2023-02-21 14:19:36 +0200
committerEugene Lamskoy2023-02-21 14:19:36 +0200
commit0afd4935a0cce92219dc6a27af1944e4555fd720 (patch)
treead84bb6ea0690289cb96d46e7c538e20a22ff860
parent5c10ea9f5e253963326e57a80e87d86267a9afe5 (diff)
downloadaur-0afd4935a0cce92219dc6a27af1944e4555fd720.tar.gz
dblib issues fixed. Openssl1.1 forced
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD28
-rw-r--r--debian-php-7.2.34.patch79
3 files changed, 23 insertions, 104 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a7bcf25b96e8..49d1efbd67a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by makepkg 6.0.2
-# Sat Nov 5 17:44:22 UTC 2022
+# Tue Feb 21 12:15:05 UTC 2023
pkgbase = php72
pkgdesc = PHP 7.2.34 compiled as to not conflict with mainline php
pkgver = 7.2.34
- pkgrel = 12
+ pkgrel = 14
url = http://www.php.net
arch = x86_64
license = PHP
@@ -34,10 +34,10 @@ pkgbase = php72
makedepends = findutils
makedepends = argon2
makedepends = libxslt
- makedepends = openssl
makedepends = e2fsprogs
+ makedepends = openssl-1.1
makedepends = lmdb
- makedepends = db
+ makedepends = db5.3
makedepends = postgresql-libs
makedepends = unixodbc
makedepends = libfbclient
@@ -71,7 +71,6 @@ pkgbase = php72
source = php-apache.conf
source = https://php.net/distributions/php-7.2.34.tar.xz
source = php71-phar-names.patch
- source = openssl-sslv3-consts.patch
source = fpm-numeric-uid-gid.patch
source = fpm-reload-sighup.patch
source = mysql-socket-php7.1.patch
@@ -90,7 +89,6 @@ pkgbase = php72
sha256sums = 6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91
sha256sums = 409e11bc6a2c18707dfc44bc61c820ddfd81e17481470f3405ee7822d8379903
sha256sums = ee6529d441b2446d784e80aba23aa956541e541bd73ad54aee480d4a1a6117ca
- sha256sums = aecd8dff7022e956718407a5b98dec19acdceef08b0a58e7266b483bc3845de6
sha256sums = d175f0c14fdb22855090c93f76e18f04320d7bf15afc057ffde947f9bb361242
sha256sums = f5ae925036744a5e88cea2698879aea0498e1e23aee7801923d90f16be383908
sha256sums = 0a3a6e8ff04ff1e0869befcf2c7bca4e886d94065da6d7a10b809a4750b961a0
@@ -99,7 +97,7 @@ pkgbase = php72
sha256sums = e07ebf146cea8e734c7704ba94f18279642df2b2f09d868781746d165041b8d5
sha256sums = ed3184d5a6f7a3bf35ee32169f8dc3b6cba09c38f60e868e24652fe9a7dd844d
sha256sums = c9f3b0dff07a7e9688f60b92a2a15817bd7cd59a8c5278cae629d856be66de5c
- sha256sums = 1377d3627fbccb6edca87742836771a6546ecca121bbd43c3981880217258c22
+ sha256sums = edfc52a057a5806bc5173d86b72c5443acc19672e762de79aeaec6ae688199c4
sha256sums = 558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c
sha256sums = 40bcc1e5058602302198d0925e431495391d8469499593af477f59d84d32f764
sha256sums = db38b1fe1f6d6aa80bbca3c142bf7a166e3e83212dcc1396f9ec706daad36ad2
@@ -281,7 +279,7 @@ pkgname = php72-tokenizer
pkgname = php72-dba
pkgdesc = dba module for php72
depends = php72=7.2.34
- depends = db
+ depends = db5.3
depends = lmdb
pkgname = php72-pgsql
@@ -417,7 +415,7 @@ pkgname = php72-soap
pkgname = php72-ftp
pkgdesc = FTP module for php72
depends = php72=7.2.34
- depends = openssl
+ depends = openssl-1.1
pkgname = php72-curl
pkgdesc = curl module for php72
@@ -428,7 +426,7 @@ pkgname = php72-snmp
pkgdesc = snmp module for php72
depends = php72=7.2.34
depends = net-snmp
- depends = openssl
+ depends = openssl-1.1
pkgname = php72-ldap
pkgdesc = ldap module for php72
@@ -443,7 +441,7 @@ pkgname = php72-imap
depends = krb5
depends = c-client
depends = libxcrypt
- depends = openssl
+ depends = openssl-1.1
pkgname = php72-sodium
pkgdesc = sodium (libsodium) module for php72
diff --git a/PKGBUILD b/PKGBUILD
index b899d6ff5f4d..86f19ff1df0a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,13 +16,14 @@
_phpbase="72"
_suffix=""
pkgver="7.2.34"
-pkgrel="12"
+pkgrel="14"
pkgbase="php72"
pkgdesc="PHP 7.2.34 compiled as to not conflict with mainline php"
_cppflags=" -DU_USING_ICU_NAMESPACE=1 -DU_DEFINE_FALSE_AND_TRUE=1 "
_build_apache_cfg="etc/httpd/conf/extra"
_build_bundled_gd="0"
_build_conf_d="etc/php72/conf.d"
+_build_forced_openssl_11="1"
_build_fpm_name="php-fpm72"
_build_fpm_service_name="php72-fpm"
_build_icu_src_dir="icu/source"
@@ -133,7 +134,6 @@ source=(
"php-apache.conf"
"https://php.net/distributions/php-${pkgver}.tar.xz"
"php71-phar-names.patch"
- "openssl-sslv3-consts.patch"
"fpm-numeric-uid-gid.patch"
"fpm-reload-sighup.patch"
"mysql-socket-php7.1.patch"
@@ -149,8 +149,6 @@ source=(
)
depends=(
)
-checkdepends=(
-)
makedepends=(
"acl"
"libtool"
@@ -177,10 +175,10 @@ makedepends=(
"findutils"
"argon2"
"libxslt"
- "openssl"
"e2fsprogs"
+ "openssl-1.1"
"lmdb"
- "db"
+ "db5.3"
"postgresql-libs"
"unixodbc"
"libfbclient"
@@ -212,7 +210,6 @@ arch=(
)
_patches=(
"php71-phar-names.patch"
- "openssl-sslv3-consts.patch"
"fpm-numeric-uid-gid.patch"
"fpm-reload-sighup.patch"
"mysql-socket-php7.1.patch"
@@ -235,11 +232,11 @@ _sapi_depends=(
_ext_depends_snmp=(
"php72=7.2.34"
"net-snmp"
- "openssl"
+ "openssl-1.1"
)
_ext_depends_ftp=(
"php72=7.2.34"
- "openssl"
+ "openssl-1.1"
)
_ext_depends_intl=(
"php72=7.2.34"
@@ -251,7 +248,7 @@ _ext_depends_imap=(
"krb5"
"c-client"
"libxcrypt"
- "openssl"
+ "openssl-1.1"
)
_ext_depends_gd=(
"php72=7.2.34"
@@ -263,7 +260,7 @@ _ext_depends_mysql=(
)
_ext_depends_dba=(
"php72=7.2.34"
- "db"
+ "db5.3"
"lmdb"
)
_ext_depends_odbc=(
@@ -293,7 +290,7 @@ _ext_depends_openssl=(
"php72=7.2.34"
"krb5"
"e2fsprogs"
- "openssl"
+ "openssl-1.1"
)
_phpconfig="\
--prefix=/usr \
@@ -529,6 +526,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 "
@@ -1548,7 +1549,6 @@ sha256sums=('e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b'
'6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91'
'409e11bc6a2c18707dfc44bc61c820ddfd81e17481470f3405ee7822d8379903'
'ee6529d441b2446d784e80aba23aa956541e541bd73ad54aee480d4a1a6117ca'
- 'aecd8dff7022e956718407a5b98dec19acdceef08b0a58e7266b483bc3845de6'
'd175f0c14fdb22855090c93f76e18f04320d7bf15afc057ffde947f9bb361242'
'f5ae925036744a5e88cea2698879aea0498e1e23aee7801923d90f16be383908'
'0a3a6e8ff04ff1e0869befcf2c7bca4e886d94065da6d7a10b809a4750b961a0'
@@ -1557,7 +1557,7 @@ sha256sums=('e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b'
'e07ebf146cea8e734c7704ba94f18279642df2b2f09d868781746d165041b8d5'
'ed3184d5a6f7a3bf35ee32169f8dc3b6cba09c38f60e868e24652fe9a7dd844d'
'c9f3b0dff07a7e9688f60b92a2a15817bd7cd59a8c5278cae629d856be66de5c'
- '1377d3627fbccb6edca87742836771a6546ecca121bbd43c3981880217258c22'
+ 'edfc52a057a5806bc5173d86b72c5443acc19672e762de79aeaec6ae688199c4'
'558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c'
'40bcc1e5058602302198d0925e431495391d8469499593af477f59d84d32f764'
'db38b1fe1f6d6aa80bbca3c142bf7a166e3e83212dcc1396f9ec706daad36ad2')
diff --git a/debian-php-7.2.34.patch b/debian-php-7.2.34.patch
index 6f6a8e208fa9..20ea0defa215 100644
--- a/debian-php-7.2.34.patch
+++ b/debian-php-7.2.34.patch
@@ -31,72 +31,6 @@ index 2cb93e1..c2b4771 100644
; This directive allows you to disable certain functions for security reasons.
diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index bc0fd55..0f270a8 100644
---- a/ext/dba/config.m4
-+++ b/ext/dba/config.m4
-@@ -346,61 +346,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 a003416..6cd3b4d 100644
--- a/ext/dba/dba.c
@@ -175,19 +109,6 @@ index 1ce958f..b8c7492 100644
.PHONY: $(ALWAYS) snapshot
diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index 0f270a8..7d074f7 100644
---- a/ext/dba/config.m4
-+++ b/ext/dba/config.m4
-@@ -116,6 +116,10 @@
- THIS_PREFIX=$i
- THIS_INCLUDE=$i/include/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 86edaa8..19e66a0 100644
--- a/sapi/fpm/php-fpm.8.in