diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-05-04 12:02:00 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-05-04 12:02:00 +0100 |
commit | eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch) | |
tree | ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /dev-lang/php | |
parent | b7ebc951da8800f711142f69d9d958bde67a112d (diff) |
gentoo resync : 04.05.2019
Diffstat (limited to 'dev-lang/php')
-rw-r--r-- | dev-lang/php/Manifest | 16 | ||||
-rw-r--r-- | dev-lang/php/php-5.6.40-r3.ebuild (renamed from dev-lang/php/php-7.3.4.ebuild) | 213 | ||||
-rw-r--r-- | dev-lang/php/php-7.1.29.ebuild (renamed from dev-lang/php/php-7.1.28.ebuild) | 0 | ||||
-rw-r--r-- | dev-lang/php/php-7.2.18.ebuild (renamed from dev-lang/php/php-7.2.17.ebuild) | 0 | ||||
-rw-r--r-- | dev-lang/php/php-7.3.5.ebuild (renamed from dev-lang/php/php-7.3.3.ebuild) | 0 |
5 files changed, 134 insertions, 95 deletions
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 4fb703c9f5d1..1957a8d56ade 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -6,19 +6,19 @@ AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd235506 AUX php-freetype-2.9.1.patch 7667 BLAKE2B efc8f829bbad11b3e7b654d0882213ecb9aae766060d51f93446a6293a2f607339faba484c7b0b2f9318a5c5442da3c09e25aeda20dbc5e3258bf1009f8625b4 SHA512 0a06189f6fb3513cd2dcf9ddb590360475e2dd9a7aa8b13ab66c389c1ed40ce2361681f017cd3c6219f5b40a0a9d4978e57ca3ee4bacb7657db3285136fd2875 DIST php-5.6.40.tar.xz 12472236 BLAKE2B f41147eaec9b15e965540f9e871691cc88848dd619bae6af85e7bba0130b71ce91bad5cdbbadbb537c42df83369f5c731007339a9d9e21e689e913c135201afc SHA512 997b5a952a60cf9166671cc91fcc34c674dd62bfd5cb0a9cdf3fdf2d088b5d19943d94c1cf193f8ab71fc4957d9a9a4c7c2fb8826f937501c1c0a0858f10e329 DIST php-7.1.27.tar.xz 12219868 BLAKE2B 9de4902504e50b53aab28eac2252aa79302541352b1323a17e68cc58e22cd3b6108b3f7d6ba4779a7f87a561442cf3c44c5660418a354d3b48b6df270a761f8b SHA512 a7019788b02f624e19f804cb0c34578443fc2e0a582a32e72d1340f3cd7bb866631497fe61d18f31f92bad5aa7667847e21bd3916fcdd6f04a3b8f88c805f544 -DIST php-7.1.28.tar.xz 12222508 BLAKE2B 1e52632f801a717ea7020665da11536ba7ab21ea0e5d5ccf147003cb9a87878053ebabf5f4cdd0810207de1e2ebdd683d7afefd72aa5be521c5690130a72b349 SHA512 fcf983adb7669b83ff3aee33f9d18328f8f36b304bc51bfd1f13a7493365e98204c63214fe4add157dffa44d5407b257dee7247168a14efa36dcfa70d4909a6e +DIST php-7.1.29.tar.xz 12221984 BLAKE2B a07e7e5ee58f9a74437d865bb7ee9a4458fde52cf3e678128fb4c2d1cc076da0d37dc16c8908011ed542cc37f492d56a6565e06315630d2a213e2a42accdc4f4 SHA512 97575ec588fd3ab51360525fc02058254b95e89e0a36c74a2890ae7619adda1a5489f3675fa83754f8f693af463cdf17232db071351b6ace9f83d4c3c643f682 DIST php-7.2.16.tar.xz 12166372 BLAKE2B c59ac69b717a8ee88f229baa94c43f9ee1d9c7161c767a95c3a9719ee70cdc9b61aaff75504aca09bba10d224d9a717cb7c985060b6912491857a003e6cbc349 SHA512 cd2ea3c68d7ed20317800f4b838b0dd9ae2fde508c79662b296dacdacf6c7e35b6ef30a6564516d7b22e82749a6e9e2ffcfd95b05cd79a9f227fbfaf9e25bc31 -DIST php-7.2.17.tar.xz 12144120 BLAKE2B 5e49af74b9e049962c21b30e77b89db36e376b1fe580118b5bc598fcc42421b8a4ed3b1be3de9ab2a9fc483b3e54acaaf268518b045e808f4a8e4d9c64a2204d SHA512 52451a13bdb480e599a8d0baf3b76303cfec0bc2057166607ae1b0cf423a16361c059bd4df85f7c435715c86d7252399cb1744e435f0adb50bada0e40804c302 -DIST php-7.3.3.tar.xz 11972184 BLAKE2B e6404d8af6d0196f27a8939e995e317307287e2110b3cdc436659eb074087ac545a4253d86c4ee7374dffbe4348004bd257ec0e2b7169e8c125e664c56f9dfe7 SHA512 bad5fa35f5962fa23dbe01fe85f76ce80e431cf2f9719284c082bb1fa32af26407407a97d3bf999165a6158f83a9669e3dd641f6d70028ec644b74a414fb803d -DIST php-7.3.4.tar.xz 11977004 BLAKE2B 7a3a805a55272a7d641b6cf26965ff6fccca607f035c0e40be8d83cf4aa79ee246ec906e0f1352b7c654744a618d1c1a1e60dfea56b6b0be06ef9811efe22126 SHA512 fc45cd6cb273ca7a959a3ab0d2d15febedc60e9e289803f5f4340149b5fe8f52ca23119b128513194d769c842cd0941f8086c338db115d585c2f4e791e83b141 +DIST php-7.2.18.tar.xz 12172696 BLAKE2B c23f4dffe60ad48b53de1c565ecb4f378f5d3daccde98ec8d9bddcfce8bd1a48a75061a72d0094d0db6719a3c0a96cae25ce0ef0fbfadc28fbeff27b332c8107 SHA512 b38034aa13867496009903ba64e4e8bf3216307a9ff1dade60a1477671ecf7bceb5062b349f6997d9af414d58d46ea7bb3f9855e372c230f4a6cff26ad9985d6 +DIST php-7.3.5.tar.xz 11981356 BLAKE2B f0ea69358519458d1e48f598f3af808f560d824f417995ea80fc63c8610fb04144a471cee7941802b29eaf24b233b506baa4fff390e57292335f88c434b8dc46 SHA512 3231947b01333987568ec3304bebf0c089a23cd6bc4a7139683bd36b2490fef13ed494108b645d40d5ab55f65990004445ba04af48393a9a508cfa7379ba81d3 DIST php-patches-20190307-r1.tar.xz 20796 BLAKE2B 251f0d8b222e4a6a339a3b1d4aff39fab8bd7203ec34295b7316a366a7d0015bb9e6665614005949da9decbca53aa9ac0aab63845638a6b4d3d462eabff4ea35 SHA512 d7a412ec1bc6002c458c6bc3cb53faf4e95a852a6cdad337f6a81a978dd56ba72801cccbe866857d6c5b7e95dfe558878133e44a4e9f9b6efd38e679acc82af9 DIST php-patches-7.1.28bp.tar.bz2 27464 BLAKE2B 4babea64a2a24f31299997d6a962b3b7506ec1bb77b8e8b4532cce50c1a9eda73829820c2c7883ea97c1a860bab4220e2c576bdd14d8dd80c8e6a3af808c4c52 SHA512 171a8e52c70283dee12316ff8449dc7c7d3bf37c803724b63c7aa9bb12468a795de286075af317ba69080a5e1c3ed59a2f5b3891b35fb1e5045ede277d48e56a +DIST php-patches-7.1.29bp.tar.bz2 28709 BLAKE2B ad9510e5f550407895371c615db9dc3329c725e9dc61c7a4a2b3bf92ca96040d720cceb333e5c5cc577a9587530da2b0dca5e5466c2acdb0c12f6395927334e1 SHA512 d41fb828cd00473abb9d6d8c8a5f0f2783146874de27c6c7d329437dcd8cc292574f4762e64738d4e7cc584db59d33396908d54a9aef238afda5d445d062065a EBUILD php-5.6.40-r1.ebuild 23648 BLAKE2B 1f8cf8f5f9a1584029aa8bae4f770dba5bf721dbe2b9a0cca943056e4cfa362b9e9d199a9eec18e11776235c0eac847b4bc6ce458a8c3cef7efe233f49596c5c SHA512 ff1bc6fdf20b143dccf95862329291c7d38dc29871ac7715ba2ae79e738ab1e80e08005412b47a98c6a427d0b09cba3449c86f10cbf61420a3eadf7807fe50f5 EBUILD php-5.6.40-r2.ebuild 23035 BLAKE2B 63bae4611a9db68154201cecf202e7182f3c0ac6afe328484c6b345db1d80cfc157fe9f704956767c473b9ae9b52360febf2ffbcb9808fcce690c31730fafdc5 SHA512 6d2683374baaa01cbd03a5504d8fcf561dd0c92b89ed516c3bd7f3c32e039123a0801ee7fa00637361138108d39461721c5077dca56384b262f1dedcd6d534be +EBUILD php-5.6.40-r3.ebuild 23067 BLAKE2B 0e133da9d0d3879235b0208096e5c99f257f0d93686935d1fb0648efbd92fddd71f579ad59c09368844a251b956fade71aff7d88be2211e2c5832eb2f4b713c2 SHA512 c53b2549a14b55dc16b2d3b8f5c7617ef5deeb30db19606b582126cf32dd040b51b86ddefb3472573c3b11c14f8b72bf5064a0edd37e39b5e9139f2dbdd8e798 EBUILD php-7.1.27.ebuild 21986 BLAKE2B fc3e3d38972dd2a7d4ab83cbca37ab8e18c6b6859a93beeab4ba9a1495aa9f8485c7b5d0609626ff7360b6c4d9c10f4050c338ab07d10738063ba76f3f48d43e SHA512 65b84a7e5b1dfd8a1a45833f9277d69cb085a13c8b38fb878c0c44c8865cfd6ea41d850171a6d6bf6924c3d05c634d76341405d08518ab862e4e2290ce87e8e1 -EBUILD php-7.1.28.ebuild 21995 BLAKE2B 6ce17a7b0a7e41922199ceeab72e05a4327105da6b97bc9af0f5a9014fd4a4a872491c810d721e97e6547d3ee5cb6d235ab842eb8293eb47c7c5e6cde1d2dabe SHA512 6801e4ac7755f816311530a3bbaa08bd48477c9c402eeb37b007a689dd946b716be86aa7ed9c7dd53703bfd073287087f88e75099b58c6dab6558563e48f67ef +EBUILD php-7.1.29.ebuild 21995 BLAKE2B 6ce17a7b0a7e41922199ceeab72e05a4327105da6b97bc9af0f5a9014fd4a4a872491c810d721e97e6547d3ee5cb6d235ab842eb8293eb47c7c5e6cde1d2dabe SHA512 6801e4ac7755f816311530a3bbaa08bd48477c9c402eeb37b007a689dd946b716be86aa7ed9c7dd53703bfd073287087f88e75099b58c6dab6558563e48f67ef EBUILD php-7.2.16.ebuild 22517 BLAKE2B 3ee1c7b07bc61f650510639324ef7640f2aba8d60e5cd6f535fdcd4492b0359447baf3a181693fb90a3cfe7dc7af893e010c8faa2d53f7dcaacfc2311ddec75e SHA512 531f59496f45462d1c05c3bf5c9c1f0cbb7d2978d4026636ed6efa4b1b4d64d4e44e7a6d6d2ea5bc5aed0c8534ef254a8c32b4ea188d875d5a4847a2003b8b42 -EBUILD php-7.2.17.ebuild 22526 BLAKE2B e31a0ae6df4fc5b632b06d76e83709fb0c098b6f98a384911ebe7ca2c1873106670221d6506f73a5a163beeb5c43dac7685efa1ba4e3c8746034a7ba779b4483 SHA512 7808dc20a216b8418986464b8bd571c093d1b02fda1dd4d48a4580f6c4632990dc8a0c5542f2786608b0951068ad20fce842b40132c239853a17d41b6970eee8 -EBUILD php-7.3.3.ebuild 22538 BLAKE2B 1fa1a354c598ada995c907fd6aef0e12e806e66fd72275c22729252c1f83b7cbe85869ce60de60034e42fd0c8492a98353c924919743e246e50d93168e2f5ace SHA512 b69f9613f6901fc45a2659d3f972560709ebd9d13ccd75ecc95e130d4e913b7a67c4f0fbb9e93f56cf65fb3103d053b0ede1a6917a791506697fe1d36a477a2a -EBUILD php-7.3.4.ebuild 22538 BLAKE2B 1fa1a354c598ada995c907fd6aef0e12e806e66fd72275c22729252c1f83b7cbe85869ce60de60034e42fd0c8492a98353c924919743e246e50d93168e2f5ace SHA512 b69f9613f6901fc45a2659d3f972560709ebd9d13ccd75ecc95e130d4e913b7a67c4f0fbb9e93f56cf65fb3103d053b0ede1a6917a791506697fe1d36a477a2a +EBUILD php-7.2.18.ebuild 22526 BLAKE2B e31a0ae6df4fc5b632b06d76e83709fb0c098b6f98a384911ebe7ca2c1873106670221d6506f73a5a163beeb5c43dac7685efa1ba4e3c8746034a7ba779b4483 SHA512 7808dc20a216b8418986464b8bd571c093d1b02fda1dd4d48a4580f6c4632990dc8a0c5542f2786608b0951068ad20fce842b40132c239853a17d41b6970eee8 +EBUILD php-7.3.5.ebuild 22538 BLAKE2B 1fa1a354c598ada995c907fd6aef0e12e806e66fd72275c22729252c1f83b7cbe85869ce60de60034e42fd0c8492a98353c924919743e246e50d93168e2f5ace SHA512 b69f9613f6901fc45a2659d3f972560709ebd9d13ccd75ecc95e130d4e913b7a67c4f0fbb9e93f56cf65fb3103d053b0ede1a6917a791506697fe1d36a477a2a MISC metadata.xml 3268 BLAKE2B fcd85522c4dbea03403eee66cd3be945f4f998d5eb483ac9c47bd2be2f5f2f4be8586ecc58d50ced7798fdd63ef2136e56d559fa06e870d242239127a97b7b76 SHA512 c44c7fdf1592ba4c0b2cf6f29a97a4a214d2193cb164dcc90454e4a762860a5f3fa67908217543fe72811d403c2ef3b15d2f80f2657f09c1e078d31ef35c12f4 diff --git a/dev-lang/php/php-7.3.4.ebuild b/dev-lang/php/php-5.6.40-r3.ebuild index 1e66c720846d..224b353c58b0 100644 --- a/dev-lang/php/php-7.3.4.ebuild +++ b/dev-lang/php/php-5.6.40-r3.ebuild @@ -3,12 +3,14 @@ EAPI="7" -inherit flag-o-matic systemd autotools +inherit autotools flag-o-matic systemd + +PATCH_V="7.1.29bp" -MY_PV=${PV/_rc/RC} DESCRIPTION="The PHP language runtime engine" -HOMEPAGE="https://php.net/" -SRC_URI="https://php.net/distributions/${P}.tar.xz" +HOMEPAGE="https://secure.php.net/" +SRC_URI="https://php.net/distributions/${P}.tar.xz + https://gitweb.gentoo.org/proj/php-patches.git/snapshot/php-patches-${PATCH_V}.tar.bz2" LICENSE="PHP-3.01 BSD @@ -21,38 +23,35 @@ LICENSE="PHP-3.01 SLOT="$(ver_cut 1-2)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -S="${WORKDIR}/${PN}-${MY_PV}" - # We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2 phpdbg" +SAPIS="embed cli cgi fpm apache2" # SAPIs and SAPI-specific USE flags (cli SAPI is default on): IUSE="${IUSE} ${SAPIS/cli/+cli} threads" -IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk - coverage +ctype curl debug +IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk + coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb - mhash mssql mysql mysqli nls + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl + mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm - readline recode selinux +session session-mm sharedmem - +simplexml snmp soap sockets sodium spell sqlite ssl - sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp - +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib" + readline recode selinux +session sharedmem + +simplexml snmp soap sockets spell sqlite ssl + sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx + +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" # The supported (that is, autodetected) versions of BDB are listed in # the ./configure script. Other versions *work*, but we need to stick to # the ones that can be detected to avoid a repeat of bug #564824. COMMON_DEPEND=" >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] - >=dev-libs/libpcre2-10.30[unicode] + >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) - argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 @@ -61,11 +60,22 @@ COMMON_DEPEND=" sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + cjk? ( !gd? ( + virtual/jpeg:0 + media-libs/libpng:0= + sys-libs/zlib:0= + ) ) coverage? ( dev-util/lcov ) + crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( <app-text/enchant-2.0:0 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg:0 + media-libs/libpng:0= + sys-libs/zlib:0= + ) ) firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) + gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) @@ -76,8 +86,11 @@ COMMON_DEPEND=" ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) + libmysqlclient? ( + mysql? ( virtual/libmysqlclient:= ) + mysqli? ( virtual/libmysqlclient:= ) + ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) @@ -85,32 +98,39 @@ COMMON_DEPEND=" qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) - session-mm? ( dev-libs/mm ) + sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) - sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( - !libressl? ( >=dev-libs/openssl-1.0.1:0= ) + !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) - tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) - tokyocabinet? ( dev-db/tokyocabinet ) - truetype? ( =media-libs/freetype-2* ) + sybase-ct? ( dev-db/freetds ) + tidy? ( app-text/htmltidy ) + truetype? ( + =media-libs/freetype-2* + >=media-libs/t1lib-5.0.0 + !gd? ( + virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) + ) unicode? ( dev-libs/oniguruma:= ) + vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) - webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( x11-libs/libXpm ) + xpm? ( + x11-libs/libXpm + virtual/jpeg:0 + media-libs/libpng:0= sys-libs/zlib:0= + ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( >=sys-libs/zlib-1.2.0.4:0= ) - zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) - zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) + zip? ( sys-libs/zlib:0= ) + zlib? ( sys-libs/zlib:0= ) " RDEPEND="${COMMON_DEPEND} @@ -119,21 +139,19 @@ RDEPEND="${COMMON_DEPEND} selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )" -# Bison isn't actually needed when building from a release tarball -# However, the configure script will warn if it's absent or if you -# have an incompatible version installed. See bug 593278. DEPEND="${COMMON_DEPEND} app-arch/xz-utils - >=sys-devel/bison-3.0.1" - -BDEPEND="virtual/pkgconfig" + >=sys-devel/bison-3.0.1 + sys-devel/flex + >=sys-devel/m4-1.4.3 + >=sys-devel/libtool-1.5.18" # Without USE=readline or libedit, the interactive "php -a" CLI will hang. REQUIRED_USE=" - || ( cli cgi fpm apache2 embed phpdbg ) + || ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) - webp? ( gd zlib ) + vpx? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) @@ -147,16 +165,17 @@ REQUIRED_USE=" ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) + recode? ( !imap !mysql !mysqli !libmysqlclient ) + libmysqlclient? ( || ( + mysql + mysqli + pdo + ) ) + qdbm? ( !gdbm ) readline? ( !libedit ) - recode? ( !imap !mysqli !mysql ) - session-mm? ( session !threads ) - mysql? ( || ( mysqli pdo ) ) - zip-encryption? ( zip ) + sharedmem? ( !threads ) " -PATCHES=( - "${FILESDIR}/php-freetype-2.9.1.patch" -) PHP_MV="$(ver_cut 1)" @@ -200,11 +219,9 @@ php_install_ini() { # SAPI-specific handling if [[ "${sapi}" == "fpm" ]] ; then - einfo "Installing FPM config files php-fpm.conf and www.conf" + einfo "Installing FPM config file php-fpm.conf" insinto "${PHP_INI_DIR#${EPREFIX}}" doins sapi/fpm/php-fpm.conf - insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d" - doins sapi/fpm/www.conf fi dodoc php.ini-{development,production} @@ -217,22 +234,54 @@ php_set_ini_dir() { } src_prepare() { - default - - # In php-7.x, the FPM pool configuration files have been split off - # of the main config. By default the pool config files go in - # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the - # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later - # we'll install the pool configuration file "www.conf" there. - php_set_ini_dir fpm - sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ - sapi/fpm/php-fpm.conf.in \ - || die 'failed to move the include directory in php-fpm.conf' - - # Bug 669566 - necessary so that build tools are updated for commands like pecl + local patchdir="${WORKDIR}/php-patches-${PATCH_V}" + + eapply "${patchdir}/" + + # Copy test binaries from patches + cp "${patchdir}/bug77540.jpg" \ + "${patchdir}/bug77753.tiff" "${patchdir}/bug77831.tiff" \ + "${patchdir}/bug77950.tiff" \ + "${patchdir}/bug77563.jpg" "ext/exif/tests/" || die + + # Change PHP branding + # Get the alpha/beta/rc version + sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ + -i configure.in || die "Unable to change PHP branding" + + # Patch PHP to show Gentoo as the server platform + sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ + -i configure.in || die "Failed to fix server platform name" + + # Prevent PHP from activating the Apache config, + # as we will do that ourselves + sed -i \ + -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ + -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ + configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \ + || die + + # Patch PHP to support heimdal instead of mit-krb5 + if has_version "app-crypt/heimdal" ; then + sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ + || die "Failed to fix heimdal libname" + sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ + || die "Failed to fix heimdal crypt library reference" + fi + + eapply_user + # Force rebuilding aclocal.m4 rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare" + + mv configure.in configure.ac || die + eautoreconf + + if [[ ${CHOST} == *-darwin* ]] ; then + # http://bugs.php.net/bug.php?id=48795, bug #343481 + sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die + fi } src_configure() { @@ -255,7 +304,6 @@ src_configure() { ) our_conf+=( - $(use_with argon2 password-argon2 "${EPREFIX}/usr") $(use_enable bcmath bcmath) $(use_with bzip2 bz2 "${EPREFIX}/usr") $(use_enable calendar calendar) @@ -281,6 +329,8 @@ src_configure() { $(use_enable xml libxml) $(use_with xml libxml-dir "${EPREFIX}/usr") $(use_enable unicode mbstring) + $(use_with crypt mcrypt "${EPREFIX}/usr") + $(use_with mssql mssql "${EPREFIX}/usr") $(use_with unicode onig "${EPREFIX}/usr") $(use_with ssl openssl "${EPREFIX}/usr") $(use_with ssl openssl-dir "${EPREFIX}/usr") @@ -297,8 +347,8 @@ src_configure() { $(use_with snmp snmp "${EPREFIX}/usr") $(use_enable soap soap) $(use_enable sockets sockets) - $(use_with sodium sodium "${EPREFIX}/usr") $(use_with sqlite sqlite3 "${EPREFIX}/usr") + $(use_with sybase-ct sybase-ct "${EPREFIX}/usr") $(use_enable sysvipc sysvmsg) $(use_enable sysvipc sysvsem) $(use_enable sysvipc sysvshm) @@ -311,14 +361,13 @@ src_configure() { $(use_with xmlrpc xmlrpc) $(use_with xslt xsl "${EPREFIX}/usr") $(use_enable zip zip) - $(use_with zip-encryption libzip "${EPREFIX}/usr") $(use_with zlib zlib "${EPREFIX}/usr") $(use_enable debug debug) ) # DBA support if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm || use lmdb || use tokyocabinet ; then + || use qdbm ; then our_conf+=( "--enable-dba${shared}" ) fi @@ -330,20 +379,18 @@ src_configure() { $(use_with gdbm gdbm "${EPREFIX}/usr") $(use_enable inifile inifile) $(use_with qdbm qdbm "${EPREFIX}/usr") - $(use_with lmdb lmdb "${EPREFIX}/usr") ) # Support for the GD graphics library our_conf+=( $(use_with truetype freetype-dir "${EPREFIX}/usr") + $(use_with truetype t1lib "${EPREFIX}/usr") $(use_enable cjk gd-jis-conv) $(use_with gd jpeg-dir "${EPREFIX}/usr") $(use_with gd png-dir "${EPREFIX}/usr") $(use_with xpm xpm-dir "${EPREFIX}/usr") + $(use_with vpx vpx-dir "${EPREFIX}/usr") ) - if use webp; then - our_conf+=( --with-webp-dir="${EPREFIX}/usr" ) - fi # enable gd last, so configure can pick up the previous settings our_conf+=( $(use_with gd gd) ) @@ -369,7 +416,10 @@ src_configure() { # MySQL support local mysqllib="mysqlnd" local mysqlilib="mysqlnd" + use libmysqlclient && mysqllib="${EPREFIX}/usr" + use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config" + our_conf+=( $(use_with mysql mysql "${mysqllib}") ) our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" @@ -389,7 +439,7 @@ src_configure() { # PDO support if use pdo ; then our_conf+=( - $(use_with mssql pdo-dblib "${EPREFIX}/usr") + $(use_with mssql pdo-dblib) $(use_with mysql pdo-mysql "${mysqllib}") $(use_with postgres pdo-pgsql) $(use_with sqlite pdo-sqlite "${EPREFIX}/usr") @@ -407,7 +457,7 @@ src_configure() { # Session support if use session ; then - our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") ) + our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") ) else our_conf+=( $(use_enable session session) ) fi @@ -418,13 +468,9 @@ src_configure() { # we use the system copy of pcre # --with-pcre-regex affects ext/pcre # --with-pcre-dir affects ext/filter and ext/zip - # --with-pcre-valgrind cannot be enabled with system pcre - # Many arches don't support pcre-jit our_conf+=( --with-pcre-regex="${EPREFIX}/usr" --with-pcre-dir="${EPREFIX}/usr" - --without-pcre-valgrind - --without-pcre-jit ) # Catch CFLAGS problems @@ -460,7 +506,7 @@ src_configure() { for sapi in $SAPIS ; do case "$sapi" in - cli|cgi|embed|fpm|phpdbg) + cli|cgi|embed|fpm) if [[ "${one_sapi}" == "${sapi}" ]] ; then sapi_conf+=( "--enable-${sapi}" ) if [[ "fpm" == "${sapi}" ]] ; then @@ -547,7 +593,7 @@ src_install() { # We're specifically not using emake install-sapi as libtool # may cause unnecessary relink failures (see bug #351266) insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp${PHP_MV}$(get_libname)" \ + newins ".libs/libphp5$(get_libname)" \ "libphp${PHP_MV}$(get_libname)" keepdir "/usr/$(get_libdir)/apache2/modules" else @@ -567,9 +613,6 @@ src_install() { embed) source="libs/libphp${PHP_MV}$(get_libname)" ;; - phpdbg) - source="sapi/phpdbg/phpdbg" - ;; *) die "unhandled sapi in src_install" ;; @@ -632,12 +675,8 @@ src_test() { export TEST_PHP_EXECUTABLE="${PHP_BIN}" fi - if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" - fi - - if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then - export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" + if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then + export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" fi REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ diff --git a/dev-lang/php/php-7.1.28.ebuild b/dev-lang/php/php-7.1.29.ebuild index 21ae6551ee5a..21ae6551ee5a 100644 --- a/dev-lang/php/php-7.1.28.ebuild +++ b/dev-lang/php/php-7.1.29.ebuild diff --git a/dev-lang/php/php-7.2.17.ebuild b/dev-lang/php/php-7.2.18.ebuild index 2d85e9d999ef..2d85e9d999ef 100644 --- a/dev-lang/php/php-7.2.17.ebuild +++ b/dev-lang/php/php-7.2.18.ebuild diff --git a/dev-lang/php/php-7.3.3.ebuild b/dev-lang/php/php-7.3.5.ebuild index 1e66c720846d..1e66c720846d 100644 --- a/dev-lang/php/php-7.3.3.ebuild +++ b/dev-lang/php/php-7.3.5.ebuild |