diff options
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | apache.patch | 10 | ||||
| -rw-r--r-- | cmb@php.net.gpg.key | 71 | ||||
| -rw-r--r-- | php.ini.patch | 12 |
4 files changed, 83 insertions, 19 deletions
@@ -35,14 +35,15 @@ source=("https://php.net/distributions/${_pkgbase}-${pkgver}.tar.xz"{,.asc} 'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch') sha512sums=('d991101eb833d3a47833aa930341e75c56f26c4cb0249896728ebe209c6c02af1704fccc3052128d8f9fdffc60dcef0ece38a532697131141946898d8b1abcda' 'SKIP' - '9909867cf8c11e6e150c1f10a7ea2257873d55482efaab9ee68f76be3fea13c0d5438a9f47a68d605ec470a5d56b38a776d4f538a8858d9142e42fe3d60b7a37' + 'f3b7de6c18798ee8f1eb323de2da2553c0ee734a0beaac7ccb15d0f8e464a7c0e0b4da8a7da9b0b52d263fcd2e7bf8b067b00b9febb940f3252f0d930ede6604' 'eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e' 'c9efb3f50770d6ddfa908b7f562355121f07ce528271e72ba188a4f1c788e264fc117c220053aaded42040825c03f3f17131a62a67d96cc91fd9da472e085deb' '824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f' - '85000bcb4f5674bfcbac7f32aeb28c523904a23da716e7fd982ac225845843e0acb33c0b8552107c234b1dd106337ad0a6792253f200980b88a6f6239ec982d0') + 'b3bc5defd4877016663c9051518bb67acc8ebcf32206b93df824de1ee0c4b724e6151fce4c6dd11b917361a3aa96c426d542b025e124b6b6cb625ddcc590ad78') validpgpkeys=('B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F' - '1729F83938DA44E27BA0F4D3DBDB397470D12172', - 'CBAF69F173A0FEA4B537F470D66C9593118BCCB6') + '1729F83938DA44E27BA0F4D3DBDB397470D12172' + 'CBAF69F173A0FEA4B537F470D66C9593118BCCB6' + ) prepare() { cd ${srcdir}/${_pkgbase}-${pkgver} diff --git a/apache.patch b/apache.patch index 9c4584983133..3eb43d6918e8 100644 --- a/apache.patch +++ b/apache.patch @@ -1,6 +1,6 @@ --- sapi/apache2handler/config.m4.orig +++ sapi/apache2handler/config.m4 -@@ -122,7 +122,6 @@ +@@ -113,7 +113,6 @@ PHP_BUILD_THREAD_SAFE fi else @@ -10,7 +10,7 @@ fi --- configure.orig +++ configure -@@ -7019,7 +7019,6 @@ +@@ -6877,7 +6877,6 @@ fi else @@ -18,7 +18,7 @@ if test -n "$APACHE_THREADED_MPM"; then enable_maintainer_zts=yes -@@ -30232,6 +30231,9 @@ +@@ -30550,6 +30549,9 @@ if test -f $i/include/enchant/enchant.h; then ENCHANT_DIR=$i ENCHANT_INCDIR=$i/include/enchant @@ -28,7 +28,7 @@ elif test -f $i/include/enchant.h; then ENCHANT_DIR=$i ENCHANT_INCDIR=$i/include -@@ -34362,15 +34364,16 @@ +@@ -34679,15 +34681,16 @@ if test "$PHP_FREETYPE_DIR" != "no"; then for i in $PHP_FREETYPE_DIR /usr/local /usr; do @@ -49,7 +49,7 @@ fi FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` -@@ -36033,15 +36036,16 @@ +@@ -36350,15 +36353,16 @@ if test "$PHP_FREETYPE_DIR" != "no"; then for i in $PHP_FREETYPE_DIR /usr/local /usr; do diff --git a/cmb@php.net.gpg.key b/cmb@php.net.gpg.key new file mode 100644 index 000000000000..62fcce8b0e91 --- /dev/null +++ b/cmb@php.net.gpg.key @@ -0,0 +1,71 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=PZs3 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/php.ini.patch b/php.ini.patch index 2c84444a6ed2..5d4273d43264 100644 --- a/php.ini.patch +++ b/php.ini.patch @@ -1,15 +1,6 @@ --- php.ini-production.orig +++ php.ini-production -@@ -734,7 +734,7 @@ - - ; Directory in which the loadable extensions (modules) reside. - ; http://php.net/extension-dir --; extension_dir = "./" -+extension_dir = "/usr/lib/php/modules/" - ; On windows: - ; extension_dir = "ext" - -@@ -883,47 +883,44 @@ +@@ -900,48 +900,44 @@ ; deprecated in a future PHP major version. So, when it is possible, please ; move to the new ('extension=<ext>) syntax. ; @@ -64,6 +55,7 @@ - ;extension=soap ;extension=sockets +-;extension=sodium ;extension=sqlite3 +;extension=sysvmsg +;extension=sysvsem |