| 1 |
commit: 817446c1e669f2c20e017dff61428542b9e3967c |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 1 21:04:37 2021 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 1 22:10:40 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=817446c1 |
| 7 |
|
| 8 |
dev-lang/php: new point releases to fix CVE-2021-2170[45]. |
| 9 |
|
| 10 |
We also require libsodium[-minimal] in the new ebuilds, to avoid |
| 11 |
problems (bug 686602) with the build-time feature detection in |
| 12 |
PHP. This is unrelated to the security fixes. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/686602 |
| 15 |
Package-Manager: Portage-3.0.20, Repoman-3.0.2 |
| 16 |
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> |
| 17 |
|
| 18 |
dev-lang/php/Manifest | 5 +- |
| 19 |
.../php/{php-7.4.20.ebuild => php-7.3.29.ebuild} | 248 +++++++++++---------- |
| 20 |
.../php/{php-7.4.20.ebuild => php-7.4.21.ebuild} | 2 +- |
| 21 |
.../php/{php-8.0.7.ebuild => php-8.0.8.ebuild} | 2 +- |
| 22 |
4 files changed, 133 insertions(+), 124 deletions(-) |
| 23 |
|
| 24 |
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest |
| 25 |
index 42bb39b662b..0f6e5d6212b 100644 |
| 26 |
--- a/dev-lang/php/Manifest |
| 27 |
+++ b/dev-lang/php/Manifest |
| 28 |
@@ -1,5 +1,6 @@ |
| 29 |
DIST php-7.3.28.tar.xz 12139380 BLAKE2B 696c573878866e97fcae5fe3e33e83e75bf706d0eec2a66b2532ec54ce730e3f4b3fa6f0659ebf14193b6b2a6292d624bf478706790aab60b13b5cea0a1299fb SHA512 91f4f23fea6e2c5ea1fa5774075e1b1f7cfcc46064ab0d2f03e4f1b9b6c3dd7fd5a59854ed3fe3a8e2962283045f6a1c3273438b4bc0c68b11f41b9338f44274 |
| 30 |
+DIST php-7.3.29.tar.xz 12139492 BLAKE2B 7e1287e0fd236252f5bc92009e4ff51676eccd197c1c579f0e79a5428fa3920b5d1f95a459cdd77c22699fbe83984a6d726ab4fc0fc1e309da8b34e0e3998071 SHA512 8a495546d575a31f864f85139d8d7931361e6ac421f2cf5ef3b4cb57f59c44568cb9ad0c8793f50169d8d9933abdcec14ab90add2d7fab056e19e7f66d60689f |
| 31 |
DIST php-7.4.19.tar.xz 10341424 BLAKE2B b5f549603a2d108d2d4c16dfb15c2088612e040e9e4756cc7c1403c67e152ad3461d84915e4f542b1e558469ae3143721c6d7ec25ef03c3b4a6142fe972bd775 SHA512 2ac51b9920069ebe8ac68a94f8e9aac2b3d44d69668f340aba95f8303632fe1bfc4c3f2ce398cc7e2c2ea48583d8e04dedfc66f7147c1f4470a55417554d0071 |
| 32 |
-DIST php-7.4.20.tar.xz 10345912 BLAKE2B 4efb53a30caee049aec11269aa64a4f60d3fc9f7abc3c1ee861cfad94b5533833c4d4d1c8aa740db4161d58e58071e9b077488fd970d4e1e53e17367ed751971 SHA512 40261c5a85341fa7c495db86ef3526d1ae2751c6abb05251819c2b7080050715eb44a19c3f8655d101f4308209487ce16dcf94067b71b084c912470796b217f7 |
| 33 |
+DIST php-7.4.21.tar.xz 10346628 BLAKE2B f758d6bef60f5e0c99bd097533d1663640362c2b752a3bd54389acc3bd7d173c1ba5d4b1c119b6ad50f5029aabe2349bb4646a33212dc3cf34fd294f24def401 SHA512 778ddbfe614fdc6a00bc82c61f4c636bdbe815ce3398415a29bd24a2fd4ca2113b3b804303585d8830242e04b0c202bbc7c725a46c9bad79b070a0e896e5e681 |
| 34 |
DIST php-8.0.6.tar.xz 10764932 BLAKE2B 9ab23dfcefe2c94a88184fbb3e18267c38fdcabeca0e9ba12a616528895f85790b1238fdb6e0578db2183b6eee26f26d9d7b744b7344495ea20a6e58668136d1 SHA512 4915b9b5024ce1fb7bc3ba7c1a00831841bc970ebb68b6b1e6a00cbec4d8dcbbca3ca043882ffd9c4719a988d08275f77f9cee07ff3d45a71402dfc51bd31e04 |
| 35 |
-DIST php-8.0.7.tar.xz 10769208 BLAKE2B 6c20cf6c49c56112199bfe4a3154269b1bade7035e07341ec9031ac2a7d0202ecdcaa465baf1f08c76ce09e966f3ca6bf8ce32c111fb710b0e971ca366dfbab8 SHA512 54d0355977a69c3c466054e9e277147874eaab192bc384a199eb98582f9fcccebc685b370dabeb65d2de3bad4d2e4b2490c0164d2ce406af76b0e972ea67bbd0 |
| 36 |
+DIST php-8.0.8.tar.xz 10674548 BLAKE2B d2446ae5b80e692106b89418864e4253e000741addb7526599ec8db96713f91a5ab3bccd5bbd2f536b16cc58afafdf22b19996d424dfdce3218a8083ee2bdf37 SHA512 1f8b94083b64705e24365af57169f8ff08115f31a7471238d9ed7a24b692e46c789f3fc00ff2bef2205243b9cd9c4736831e995a004afc7fc4127f3b74932428 |
| 37 |
|
| 38 |
diff --git a/dev-lang/php/php-7.4.20.ebuild b/dev-lang/php/php-7.3.29.ebuild |
| 39 |
similarity index 83% |
| 40 |
copy from dev-lang/php/php-7.4.20.ebuild |
| 41 |
copy to dev-lang/php/php-7.3.29.ebuild |
| 42 |
index 7b09eb440f4..ca53010503c 100644 |
| 43 |
--- a/dev-lang/php/php-7.4.20.ebuild |
| 44 |
+++ b/dev-lang/php/php-7.3.29.ebuild |
| 45 |
@@ -3,8 +3,6 @@ |
| 46 |
|
| 47 |
EAPI="7" |
| 48 |
|
| 49 |
-WANT_AUTOMAKE="none" |
| 50 |
- |
| 51 |
inherit flag-o-matic systemd autotools |
| 52 |
|
| 53 |
MY_PV=${PV/_rc/RC} |
| 54 |
@@ -35,44 +33,15 @@ IUSE="${IUSE} |
| 55 |
|
| 56 |
IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk |
| 57 |
coverage +ctype curl debug |
| 58 |
- enchant exif ffi +fileinfo +filter firebird |
| 59 |
- +flatfile ftp gd gdbm gmp +iconv imap inifile |
| 60 |
+ enchant exif +fileinfo +filter firebird |
| 61 |
+ +flatfile ftp gd gdbm gmp +hash +iconv imap inifile |
| 62 |
intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb |
| 63 |
mhash mssql mysql mysqli nls |
| 64 |
oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm |
| 65 |
- readline selinux +session session-mm sharedmem |
| 66 |
+ readline recode selinux +session session-mm sharedmem |
| 67 |
+simplexml snmp soap sockets sodium spell sqlite ssl |
| 68 |
- sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp |
| 69 |
- +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" |
| 70 |
- |
| 71 |
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang. |
| 72 |
-# The Oracle instant client provides its own incompatible ldap library. |
| 73 |
-REQUIRED_USE=" |
| 74 |
- || ( cli cgi fpm apache2 embed phpdbg ) |
| 75 |
- cli? ( ^^ ( readline libedit ) ) |
| 76 |
- !cli? ( ?? ( readline libedit ) ) |
| 77 |
- truetype? ( gd zlib ) |
| 78 |
- webp? ( gd zlib ) |
| 79 |
- cjk? ( gd zlib ) |
| 80 |
- exif? ( gd zlib ) |
| 81 |
- xpm? ( gd zlib ) |
| 82 |
- gd? ( zlib ) |
| 83 |
- simplexml? ( xml ) |
| 84 |
- soap? ( xml ) |
| 85 |
- xmlrpc? ( xml iconv ) |
| 86 |
- xmlreader? ( xml ) |
| 87 |
- xmlwriter? ( xml ) |
| 88 |
- xslt? ( xml ) |
| 89 |
- ldap-sasl? ( ldap ) |
| 90 |
- oci8-instant-client? ( !ldap ) |
| 91 |
- qdbm? ( !gdbm ) |
| 92 |
- session-mm? ( session !threads ) |
| 93 |
- mysql? ( || ( mysqli pdo ) ) |
| 94 |
- firebird? ( pdo ) |
| 95 |
- mssql? ( pdo ) |
| 96 |
-" |
| 97 |
- |
| 98 |
-RESTRICT="!test? ( test )" |
| 99 |
+ sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp |
| 100 |
+ +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib" |
| 101 |
|
| 102 |
# The supported (that is, autodetected) versions of BDB are listed in |
| 103 |
# the ./configure script. Other versions *work*, but we need to stick to |
| 104 |
@@ -94,29 +63,32 @@ COMMON_DEPEND=" |
| 105 |
coverage? ( dev-util/lcov ) |
| 106 |
curl? ( >=net-misc/curl-7.10.5 ) |
| 107 |
enchant? ( <app-text/enchant-2.0:0 ) |
| 108 |
- ffi? ( >=dev-libs/libffi-3.0.11 ) |
| 109 |
firebird? ( dev-db/firebird ) |
| 110 |
- gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) |
| 111 |
+ gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) |
| 112 |
gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) |
| 113 |
gmp? ( dev-libs/gmp:0= ) |
| 114 |
iconv? ( virtual/libiconv ) |
| 115 |
imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) |
| 116 |
intl? ( dev-libs/icu:= ) |
| 117 |
+ iodbc? ( dev-db/libiodbc ) |
| 118 |
kerberos? ( virtual/krb5 ) |
| 119 |
ldap? ( >=net-nds/openldap-1.2.11 ) |
| 120 |
- ldap-sasl? ( dev-libs/cyrus-sasl ) |
| 121 |
+ ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) |
| 122 |
libedit? ( dev-libs/libedit ) |
| 123 |
lmdb? ( dev-db/lmdb:= ) |
| 124 |
mssql? ( dev-db/freetds[mssql] ) |
| 125 |
nls? ( sys-devel/gettext ) |
| 126 |
oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) |
| 127 |
- odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) |
| 128 |
+ odbc? ( >=dev-db/unixODBC-1.8.13 ) |
| 129 |
postgres? ( dev-db/postgresql:* ) |
| 130 |
qdbm? ( dev-db/qdbm ) |
| 131 |
readline? ( sys-libs/readline:0= ) |
| 132 |
+ recode? ( app-text/recode:0= ) |
| 133 |
session-mm? ( dev-libs/mm ) |
| 134 |
+ simplexml? ( >=dev-libs/libxml2-2.6.8 ) |
| 135 |
snmp? ( >=net-analyzer/net-snmp-5.2 ) |
| 136 |
- sodium? ( dev-libs/libsodium:= ) |
| 137 |
+ soap? ( >=dev-libs/libxml2-2.6.8 ) |
| 138 |
+ sodium? ( dev-libs/libsodium:=[-minimal] ) |
| 139 |
spell? ( >=app-text/aspell-0.50 ) |
| 140 |
sqlite? ( >=dev-db/sqlite-3.7.6.3 ) |
| 141 |
ssl? ( >=dev-libs/openssl-1.0.1:0= ) |
| 142 |
@@ -124,11 +96,16 @@ COMMON_DEPEND=" |
| 143 |
tokyocabinet? ( dev-db/tokyocabinet ) |
| 144 |
truetype? ( =media-libs/freetype-2* ) |
| 145 |
unicode? ( dev-libs/oniguruma:= ) |
| 146 |
+ wddx? ( >=dev-libs/libxml2-2.6.8 ) |
| 147 |
webp? ( media-libs/libwebp:0= ) |
| 148 |
- xml? ( >=dev-libs/libxml2-2.7.6 ) |
| 149 |
+ xml? ( >=dev-libs/libxml2-2.6.8 ) |
| 150 |
+ xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) |
| 151 |
+ xmlreader? ( >=dev-libs/libxml2-2.6.8 ) |
| 152 |
+ xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) |
| 153 |
xpm? ( x11-libs/libXpm ) |
| 154 |
- xslt? ( dev-libs/libxslt ) |
| 155 |
- zip? ( >=dev-libs/libzip-1.2.0:= ) |
| 156 |
+ xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) |
| 157 |
+ zip? ( >=sys-libs/zlib-1.2.0.4:0= ) |
| 158 |
+ zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) |
| 159 |
zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) |
| 160 |
" |
| 161 |
|
| 162 |
@@ -147,12 +124,43 @@ DEPEND="${COMMON_DEPEND} |
| 163 |
|
| 164 |
BDEPEND="virtual/pkgconfig" |
| 165 |
|
| 166 |
-PHP_MV="$(ver_cut 1)" |
| 167 |
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang. |
| 168 |
+# The Oracle instant client provides its own incompatible ldap library. |
| 169 |
+REQUIRED_USE=" |
| 170 |
+ || ( cli cgi fpm apache2 embed phpdbg ) |
| 171 |
+ cli? ( ^^ ( readline libedit ) ) |
| 172 |
+ truetype? ( gd zlib ) |
| 173 |
+ webp? ( gd zlib ) |
| 174 |
+ cjk? ( gd zlib ) |
| 175 |
+ exif? ( gd zlib ) |
| 176 |
+ xpm? ( gd zlib ) |
| 177 |
+ gd? ( zlib ) |
| 178 |
+ simplexml? ( xml ) |
| 179 |
+ soap? ( xml ) |
| 180 |
+ wddx? ( xml ) |
| 181 |
+ xmlrpc? ( || ( xml iconv ) ) |
| 182 |
+ xmlreader? ( xml ) |
| 183 |
+ xslt? ( xml ) |
| 184 |
+ ldap-sasl? ( ldap ) |
| 185 |
+ mhash? ( hash ) |
| 186 |
+ oci8-instant-client? ( !ldap ) |
| 187 |
+ phar? ( hash ) |
| 188 |
+ qdbm? ( !gdbm ) |
| 189 |
+ readline? ( !libedit ) |
| 190 |
+ recode? ( !imap !mysqli !mysql ) |
| 191 |
+ session-mm? ( session !threads ) |
| 192 |
+ mysql? ( || ( mysqli pdo ) ) |
| 193 |
+ zip-encryption? ( zip ) |
| 194 |
+" |
| 195 |
+ |
| 196 |
+RESTRICT="!test? ( test )" |
| 197 |
|
| 198 |
PATCHES=( |
| 199 |
- "${FILESDIR}"/php-iodbc-header-location.patch |
| 200 |
+ "${FILESDIR}/php-freetype-2.9.1.patch" |
| 201 |
) |
| 202 |
|
| 203 |
+PHP_MV="$(ver_cut 1)" |
| 204 |
+ |
| 205 |
php_install_ini() { |
| 206 |
local phpsapi="${1}" |
| 207 |
|
| 208 |
@@ -221,11 +229,10 @@ src_prepare() { |
| 209 |
sapi/fpm/php-fpm.conf.in \ |
| 210 |
|| die 'failed to move the include directory in php-fpm.conf' |
| 211 |
|
| 212 |
- # Emulate buildconf to support cross-compilation |
| 213 |
- rm -fr aclocal.m4 autom4te.cache config.cache \ |
| 214 |
- configure main/php_config.h.in || die |
| 215 |
- eautoconf --force |
| 216 |
- eautoheader |
| 217 |
+ # Bug 669566 - necessary so that build tools are updated for commands like pecl |
| 218 |
+ # Force rebuilding aclocal.m4 |
| 219 |
+ rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare" |
| 220 |
+ eautoreconf |
| 221 |
} |
| 222 |
|
| 223 |
src_configure() { |
| 224 |
@@ -249,88 +256,96 @@ src_configure() { |
| 225 |
|
| 226 |
our_conf+=( |
| 227 |
$(use_with argon2 password-argon2 "${EPREFIX}/usr") |
| 228 |
- $(use_enable bcmath) |
| 229 |
+ $(use_enable bcmath bcmath) |
| 230 |
$(use_with bzip2 bz2 "${EPREFIX}/usr") |
| 231 |
- $(use_enable calendar) |
| 232 |
+ $(use_enable calendar calendar) |
| 233 |
$(use_enable coverage gcov) |
| 234 |
- $(use_enable ctype) |
| 235 |
- $(use_with curl) |
| 236 |
+ $(use_enable ctype ctype) |
| 237 |
+ $(use_with curl curl "${EPREFIX}/usr") |
| 238 |
$(use_enable xml dom) |
| 239 |
- $(use_with enchant) |
| 240 |
- $(use_enable exif) |
| 241 |
- $(use_with ffi) |
| 242 |
- $(use_enable fileinfo) |
| 243 |
- $(use_enable filter) |
| 244 |
- $(use_enable ftp) |
| 245 |
+ $(use_with enchant enchant "${EPREFIX}/usr") |
| 246 |
+ $(use_enable exif exif) |
| 247 |
+ $(use_enable fileinfo fileinfo) |
| 248 |
+ $(use_enable filter filter) |
| 249 |
+ $(use_enable ftp ftp) |
| 250 |
$(use_with nls gettext "${EPREFIX}/usr") |
| 251 |
$(use_with gmp gmp "${EPREFIX}/usr") |
| 252 |
+ $(use_enable hash hash) |
| 253 |
$(use_with mhash mhash "${EPREFIX}/usr") |
| 254 |
$(use_with iconv iconv \ |
| 255 |
$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr")) |
| 256 |
- $(use_enable intl) |
| 257 |
- $(use_enable ipv6) |
| 258 |
- $(use_enable json) |
| 259 |
- $(use_with kerberos) |
| 260 |
- $(use_with xml libxml) |
| 261 |
+ $(use_enable intl intl) |
| 262 |
+ $(use_enable ipv6 ipv6) |
| 263 |
+ $(use_enable json json) |
| 264 |
+ $(use_with kerberos kerberos "${EPREFIX}/usr") |
| 265 |
+ $(use_enable xml libxml) |
| 266 |
+ $(use_with xml libxml-dir "${EPREFIX}/usr") |
| 267 |
$(use_enable unicode mbstring) |
| 268 |
- $(use_with ssl openssl) |
| 269 |
- $(use_enable pcntl) |
| 270 |
- $(use_enable phar) |
| 271 |
- $(use_enable pdo) |
| 272 |
- $(use_enable opcache) |
| 273 |
+ $(use_with unicode onig "${EPREFIX}/usr") |
| 274 |
+ $(use_with ssl openssl "${EPREFIX}/usr") |
| 275 |
+ $(use_with ssl openssl-dir "${EPREFIX}/usr") |
| 276 |
+ $(use_enable pcntl pcntl) |
| 277 |
+ $(use_enable phar phar) |
| 278 |
+ $(use_enable pdo pdo) |
| 279 |
+ $(use_enable opcache opcache) |
| 280 |
$(use_with postgres pgsql "${EPREFIX}/usr") |
| 281 |
- $(use_enable posix) |
| 282 |
+ $(use_enable posix posix) |
| 283 |
$(use_with spell pspell "${EPREFIX}/usr") |
| 284 |
- $(use_enable simplexml) |
| 285 |
+ $(use_with recode recode "${EPREFIX}/usr") |
| 286 |
+ $(use_enable simplexml simplexml) |
| 287 |
$(use_enable sharedmem shmop) |
| 288 |
$(use_with snmp snmp "${EPREFIX}/usr") |
| 289 |
- $(use_enable soap) |
| 290 |
- $(use_enable sockets) |
| 291 |
- $(use_with sodium) |
| 292 |
- $(use_with sqlite sqlite3) |
| 293 |
+ $(use_enable soap soap) |
| 294 |
+ $(use_enable sockets sockets) |
| 295 |
+ $(use_with sodium sodium "${EPREFIX}/usr") |
| 296 |
+ $(use_with sqlite sqlite3 "${EPREFIX}/usr") |
| 297 |
$(use_enable sysvipc sysvmsg) |
| 298 |
$(use_enable sysvipc sysvsem) |
| 299 |
$(use_enable sysvipc sysvshm) |
| 300 |
$(use_with tidy tidy "${EPREFIX}/usr") |
| 301 |
- $(use_enable tokenizer) |
| 302 |
- $(use_enable xml) |
| 303 |
- $(use_enable xmlreader) |
| 304 |
- $(use_enable xmlwriter) |
| 305 |
- $(use_with xmlrpc) |
| 306 |
- $(use_with xslt xsl) |
| 307 |
- $(use_with zip) |
| 308 |
+ $(use_enable tokenizer tokenizer) |
| 309 |
+ $(use_enable wddx wddx) |
| 310 |
+ $(use_enable xml xml) |
| 311 |
+ $(use_enable xmlreader xmlreader) |
| 312 |
+ $(use_enable xmlwriter xmlwriter) |
| 313 |
+ $(use_with xmlrpc xmlrpc) |
| 314 |
+ $(use_with xslt xsl "${EPREFIX}/usr") |
| 315 |
+ $(use_enable zip zip) |
| 316 |
+ $(use_with zip-encryption libzip "${EPREFIX}/usr") |
| 317 |
$(use_with zlib zlib "${EPREFIX}/usr") |
| 318 |
- $(use_enable debug) |
| 319 |
+ $(use_enable debug debug) |
| 320 |
) |
| 321 |
|
| 322 |
# DBA support |
| 323 |
if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ |
| 324 |
|| use qdbm || use lmdb || use tokyocabinet ; then |
| 325 |
- our_conf+=( "--enable-dba" ) |
| 326 |
+ our_conf+=( "--enable-dba${shared}" ) |
| 327 |
fi |
| 328 |
|
| 329 |
# DBA drivers support |
| 330 |
our_conf+=( |
| 331 |
- $(use_with cdb) |
| 332 |
+ $(use_with cdb cdb) |
| 333 |
$(use_with berkdb db4 "${EPREFIX}/usr") |
| 334 |
- $(use_enable flatfile) |
| 335 |
+ $(use_enable flatfile flatfile) |
| 336 |
$(use_with gdbm gdbm "${EPREFIX}/usr") |
| 337 |
- $(use_enable inifile) |
| 338 |
+ $(use_enable inifile inifile) |
| 339 |
$(use_with qdbm qdbm "${EPREFIX}/usr") |
| 340 |
- $(use_with tokyocabinet tcadb "${EPREFIX}/usr") |
| 341 |
$(use_with lmdb lmdb "${EPREFIX}/usr") |
| 342 |
) |
| 343 |
|
| 344 |
# Support for the GD graphics library |
| 345 |
our_conf+=( |
| 346 |
- $(use_with truetype freetype) |
| 347 |
+ $(use_with truetype freetype-dir "${EPREFIX}/usr") |
| 348 |
$(use_enable cjk gd-jis-conv) |
| 349 |
- $(use_with gd jpeg) |
| 350 |
- $(use_with xpm) |
| 351 |
- $(use_with webp) |
| 352 |
+ $(use_with gd jpeg-dir "${EPREFIX}/usr") |
| 353 |
+ $(use_with gd png-dir "${EPREFIX}/usr") |
| 354 |
+ $(use_with xpm xpm-dir "${EPREFIX}/usr") |
| 355 |
) |
| 356 |
+ if use webp; then |
| 357 |
+ our_conf+=( --with-webp-dir="${EPREFIX}/usr" ) |
| 358 |
+ fi |
| 359 |
# enable gd last, so configure can pick up the previous settings |
| 360 |
- our_conf+=( $(use_enable gd) ) |
| 361 |
+ our_conf+=( $(use_with gd gd) ) |
| 362 |
|
| 363 |
# IMAP support |
| 364 |
if use imap ; then |
| 365 |
@@ -340,11 +355,14 @@ src_configure() { |
| 366 |
) |
| 367 |
fi |
| 368 |
|
| 369 |
+ # Interbase/firebird support |
| 370 |
+ our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") ) |
| 371 |
+ |
| 372 |
# LDAP support |
| 373 |
if use ldap ; then |
| 374 |
our_conf+=( |
| 375 |
$(use_with ldap ldap "${EPREFIX}/usr") |
| 376 |
- $(use_with ldap-sasl) |
| 377 |
+ $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr") |
| 378 |
) |
| 379 |
fi |
| 380 |
|
| 381 |
@@ -360,25 +378,10 @@ src_configure() { |
| 382 |
fi |
| 383 |
|
| 384 |
# ODBC support |
| 385 |
- if use odbc && use iodbc ; then |
| 386 |
- our_conf+=( |
| 387 |
- --without-unixODBC |
| 388 |
- --with-iodbc |
| 389 |
- $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr") |
| 390 |
- ) |
| 391 |
- elif use odbc ; then |
| 392 |
- our_conf+=( |
| 393 |
- --with-unixODBC="${EPREFIX}/usr" |
| 394 |
- --without-iodbc |
| 395 |
- $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr") |
| 396 |
- ) |
| 397 |
- else |
| 398 |
- our_conf+=( |
| 399 |
- --without-unixODBC |
| 400 |
- --without-iodbc |
| 401 |
- --without-pdo-odbc |
| 402 |
- ) |
| 403 |
- fi |
| 404 |
+ our_conf+=( |
| 405 |
+ $(use_with odbc unixODBC "${EPREFIX}/usr") |
| 406 |
+ $(use_with iodbc iodbc "${EPREFIX}/usr") |
| 407 |
+ ) |
| 408 |
|
| 409 |
# Oracle support |
| 410 |
our_conf+=( $(use_with oci8-instant-client oci8) ) |
| 411 |
@@ -389,8 +392,9 @@ src_configure() { |
| 412 |
$(use_with mssql pdo-dblib "${EPREFIX}/usr") |
| 413 |
$(use_with mysql pdo-mysql "${mysqllib}") |
| 414 |
$(use_with postgres pdo-pgsql) |
| 415 |
- $(use_with sqlite pdo-sqlite) |
| 416 |
+ $(use_with sqlite pdo-sqlite "${EPREFIX}/usr") |
| 417 |
$(use_with firebird pdo-firebird "${EPREFIX}/usr") |
| 418 |
+ $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr") |
| 419 |
$(use_with oci8-instant-client pdo-oci) |
| 420 |
) |
| 421 |
fi |
| 422 |
@@ -398,23 +402,27 @@ src_configure() { |
| 423 |
# readline/libedit support |
| 424 |
our_conf+=( |
| 425 |
$(use_with readline readline "${EPREFIX}/usr") |
| 426 |
- $(use_with libedit) |
| 427 |
+ $(use_with libedit libedit "${EPREFIX}/usr") |
| 428 |
) |
| 429 |
|
| 430 |
# Session support |
| 431 |
if use session ; then |
| 432 |
our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") ) |
| 433 |
else |
| 434 |
- our_conf+=( $(use_enable session) ) |
| 435 |
+ our_conf+=( $(use_enable session session) ) |
| 436 |
fi |
| 437 |
|
| 438 |
# Use pic for shared modules such as apache2's mod_php |
| 439 |
our_conf+=( --with-pic ) |
| 440 |
|
| 441 |
# we use the system copy of pcre |
| 442 |
- # --with-external-pcre affects ext/pcre |
| 443 |
+ # --with-pcre-regex affects ext/pcre |
| 444 |
+ # --with-pcre-dir affects ext/filter and ext/zip |
| 445 |
+ # --with-pcre-valgrind cannot be enabled with system pcre |
| 446 |
our_conf+=( |
| 447 |
- --with-external-pcre |
| 448 |
+ --with-pcre-regex="${EPREFIX}/usr" |
| 449 |
+ --with-pcre-dir="${EPREFIX}/usr" |
| 450 |
+ --without-pcre-valgrind |
| 451 |
$(use_with jit pcre-jit) |
| 452 |
) |
| 453 |
|
| 454 |
|
| 455 |
diff --git a/dev-lang/php/php-7.4.20.ebuild b/dev-lang/php/php-7.4.21.ebuild |
| 456 |
similarity index 99% |
| 457 |
rename from dev-lang/php/php-7.4.20.ebuild |
| 458 |
rename to dev-lang/php/php-7.4.21.ebuild |
| 459 |
index 7b09eb440f4..d747f5c16da 100644 |
| 460 |
--- a/dev-lang/php/php-7.4.20.ebuild |
| 461 |
+++ b/dev-lang/php/php-7.4.21.ebuild |
| 462 |
@@ -116,7 +116,7 @@ COMMON_DEPEND=" |
| 463 |
readline? ( sys-libs/readline:0= ) |
| 464 |
session-mm? ( dev-libs/mm ) |
| 465 |
snmp? ( >=net-analyzer/net-snmp-5.2 ) |
| 466 |
- sodium? ( dev-libs/libsodium:= ) |
| 467 |
+ sodium? ( dev-libs/libsodium:=[-minimal] ) |
| 468 |
spell? ( >=app-text/aspell-0.50 ) |
| 469 |
sqlite? ( >=dev-db/sqlite-3.7.6.3 ) |
| 470 |
ssl? ( >=dev-libs/openssl-1.0.1:0= ) |
| 471 |
|
| 472 |
diff --git a/dev-lang/php/php-8.0.7.ebuild b/dev-lang/php/php-8.0.8.ebuild |
| 473 |
similarity index 99% |
| 474 |
rename from dev-lang/php/php-8.0.7.ebuild |
| 475 |
rename to dev-lang/php/php-8.0.8.ebuild |
| 476 |
index bf9240b404a..54e951e5c95 100644 |
| 477 |
--- a/dev-lang/php/php-8.0.7.ebuild |
| 478 |
+++ b/dev-lang/php/php-8.0.8.ebuild |
| 479 |
@@ -115,7 +115,7 @@ COMMON_DEPEND=" |
| 480 |
readline? ( sys-libs/readline:0= ) |
| 481 |
session-mm? ( dev-libs/mm ) |
| 482 |
snmp? ( >=net-analyzer/net-snmp-5.2 ) |
| 483 |
- sodium? ( dev-libs/libsodium:= ) |
| 484 |
+ sodium? ( dev-libs/libsodium:=[-minimal] ) |
| 485 |
spell? ( >=app-text/aspell-0.50 ) |
| 486 |
sqlite? ( >=dev-db/sqlite-3.7.6.3 ) |
| 487 |
ssl? ( >=dev-libs/openssl-1.0.1:0= ) |
Archives