diff options
author | Eugene Lamskoy | 2023-02-21 14:41:38 +0200 |
---|---|---|
committer | Eugene Lamskoy | 2023-02-21 14:41:38 +0200 |
commit | 3c5666cd8cd059335a7e0daf018dea215e4af3db (patch) | |
tree | 9bd0bf2d07bc8f9b349dab649632502004b6c4f9 | |
parent | 1f6cb91eebf50ad53ba5e2977f93251e2ada2f43 (diff) | |
download | aur-3c5666cd8cd059335a7e0daf018dea215e4af3db.tar.gz |
dblib issues fixed. Openssl1.1 forced
-rw-r--r-- | .SRCINFO | 11 | ||||
-rw-r--r-- | PKGBUILD | 14 | ||||
-rw-r--r-- | debian-php-5.3.29.patch | 13 |
3 files changed, 14 insertions, 24 deletions
@@ -1,9 +1,9 @@ # Generated by makepkg 6.0.2 -# Sat Nov 5 21:54:42 UTC 2022 +# Tue Feb 21 12:41:17 UTC 2023 pkgbase = php53 pkgdesc = PHP 5.3.29 compiled as to not conflict with mainline php pkgver = 5.3.29 - pkgrel = 16 + pkgrel = 18 url = http://www.php.net arch = x86_64 license = PHP @@ -34,10 +34,9 @@ pkgbase = php53 makedepends = findutils makedepends = autoconf2.13 makedepends = libxslt - makedepends = openssl makedepends = e2fsprogs makedepends = openssl-1.0 - makedepends = db + makedepends = db5.3 makedepends = postgresql-libs makedepends = unixodbc makedepends = libfbclient @@ -108,7 +107,7 @@ pkgbase = php53 sha256sums = c9b3c4153596b605a41456e8242d98e474be6391d6fb4b6ce70a21c4c23b5203 sha256sums = 7e59ff3e1669d55f2a26ccdd748bfed6bbfd85d5d9206c1241cfd4443994f42c sha256sums = 616ec8aa12070fb058be511abdae703a62d1c99387dd6d2a7bb47cb1b5bbda5f - sha256sums = eb70c67b4d76ae7936489fc050affdacddbe3792970850091cfd922893419e54 + sha256sums = 576d301ad50cf71782773f970b418ec9a569e8e4fccb2ae982895f3553309794 sha256sums = 558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c pkgname = php53 @@ -267,7 +266,7 @@ pkgname = php53-tokenizer pkgname = php53-dba pkgdesc = dba module for php53 depends = php53=5.3.29 - depends = db + depends = db5.3 pkgname = php53-pgsql pkgdesc = PostgreSQL modules for php53 @@ -16,13 +16,14 @@ _phpbase="53" _suffix="" pkgver="5.3.29" -pkgrel="16" +pkgrel="18" pkgbase="php53" pkgdesc="PHP 5.3.29 compiled as to not conflict with mainline php" _cppflags=" -DU_USING_ICU_NAMESPACE=1 -DOPENSSL_NO_SSL3=1 -DOPENSSL_NO_SSL2=1 -DU_DEFINE_FALSE_AND_TRUE=1 " _build_apache_cfg="etc/httpd/conf/extra" _build_bundled_gd="1" _build_conf_d="etc/php53/conf.d" +_build_forced_openssl_11="0" _build_fpm_name="php-fpm53" _build_fpm_service_name="php53-fpm" _build_icu_src_dir="icu/source" @@ -177,10 +178,9 @@ makedepends=( "findutils" "autoconf2.13" "libxslt" - "openssl" "e2fsprogs" "openssl-1.0" - "db" + "db5.3" "postgresql-libs" "unixodbc" "libfbclient" @@ -265,7 +265,7 @@ _ext_depends_mysql=( ) _ext_depends_dba=( "php53=5.3.29" - "db" + "db5.3" ) _ext_depends_odbc=( "php53=5.3.29" @@ -518,6 +518,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 " @@ -1552,5 +1556,5 @@ sha256sums=('e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b' 'c9b3c4153596b605a41456e8242d98e474be6391d6fb4b6ce70a21c4c23b5203' '7e59ff3e1669d55f2a26ccdd748bfed6bbfd85d5d9206c1241cfd4443994f42c' '616ec8aa12070fb058be511abdae703a62d1c99387dd6d2a7bb47cb1b5bbda5f' - 'eb70c67b4d76ae7936489fc050affdacddbe3792970850091cfd922893419e54' + '576d301ad50cf71782773f970b418ec9a569e8e4fccb2ae982895f3553309794' '558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c') diff --git a/debian-php-5.3.29.patch b/debian-php-5.3.29.patch index 813649fcf09c..1c1820958909 100644 --- a/debian-php-5.3.29.patch +++ b/debian-php-5.3.29.patch @@ -94,19 +94,6 @@ index 3eb2616..98e55ea 100644 .PHONY: $(ALWAYS) snapshot diff --git a/ext/dba/config.m4 b/ext/dba/config.m4 index 1e8d51b..d2e6fd9 100644 ---- a/ext/dba/config.m4 -+++ b/ext/dba/config.m4 -@@ -113,6 +113,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 cb1224e..794f508 100644 --- a/sapi/fpm/php-fpm.8.in |