[arch-commits] Commit in php/trunk (4 files)
Date: Saturday, December 8, 2018 @ 12:16:14
Author: pierre
Revision: 341256
upgpkg: php 7.3.0-1
Modified:
php/trunk/PKGBUILD
php/trunk/apache.patch
php/trunk/generate_patches
php/trunk/php.ini.patch
--+
PKGBUILD | 28 ++--
apache.patch |2 +-
generate_patches |2 +-
php.ini.patch|9 +
4 files changed, 21 insertions(+), 20 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-12-08 11:30:32 UTC (rev 341255)
+++ PKGBUILD2018-12-08 12:16:14 UTC (rev 341256)
@@ -20,28 +20,28 @@
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=7.2.13
+pkgver=7.3.0
pkgrel=1
arch=('x86_64')
license=('PHP')
-url='http://www.php.net'
+url='https://secure.php.net/'
makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu'
'libsodium' 'libxslt' 'libzip' 'net-snmp'
- 'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl'
'libtool' 'postfix' 'freetds' 'pcre' 'libnsl')
+ 'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl'
'libtool' 'postfix' 'freetds' 'pcre2' 'libnsl')
checkdepends=('procps-ng')
source=("https://php.net/distributions/${pkgbase}-${pkgver}.tar.xz"{,.asc}
'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles'
'php.ini.patch'
'enchant-2.patch' 'freetype.patch')
-sha512sums=('9df1d43e9cd701db10281811b328721b85cb90c6c8dae1842b0fd848cb5388328918b3040bbad7634b340550d82b93746ea479ed45f4d8a80e8a316e6324115d'
+sha256sums=('7d195cad55af8b288c3919c67023a14ff870a73e3acc2165a6d17a4850a560b5'
'SKIP'
-
'bb9abfc51c41e1de180ef09244691c909ee64feebd9749978e1ecb7f576466a37232d9c6e97c1a01a96b8413a33c4818a91dc79f63078dc1946f56dad516bb05'
-
'eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e'
-
'c9efb3f50770d6ddfa908b7f562355121f07ce528271e72ba188a4f1c788e264fc117c220053aaded42040825c03f3f17131a62a67d96cc91fd9da472e085deb'
-
'824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f'
-
'85000bcb4f5674bfcbac7f32aeb28c523904a23da716e7fd982ac225845843e0acb33c0b8552107c234b1dd106337ad0a6792253f200980b88a6f6239ec982d0'
-
'06b49fb044fe8cdeef5109aa7bb6858906396e3f3643827cdb241264029579c71b0a7661d24b78b16573c54832505491c4b2a1fd77ae7c313cb082731c2efd9e'
-
'97ca469d5234f5cc71af38bb99a60130fdab5f849ad1f49f112101779c7659ca4d6700aef72e0294c85bdcb18e487fc0cdda855cc51084b9e8cacb02ec0fb1eb')
-validpgpkeys=('B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F'
- '1729F83938DA44E27BA0F4D3DBDB397470D12172')
+'62e5ceea3c90a3c6eab1166488f876e766efcfd7d4e973c44060a9e72d51a98a'
+'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce'
+'3de3c76930874c81824c23aa033cb9e66631659fd31f925d7c58f0479aeb18a9'
+'640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
+'ba63ff727d911882726e4e5e513249d29e9ccc842ebee10a07b160b4718ba20d'
+'3992491eebaf5b31f6b00095a7276d11682f9a8aaff473bfb25afbdcfa6eba32'
+'07c4648669dc05afc3c1ad5a4739768079c423b817eabf5296ca3d1ea5ffd163')
+validpgpkeys=('CBAF69F173A0FEA4B537F470D66C9593118BCCB6'
+ 'F38252826ACD957EF380D39F2F7956BC5DA04B5D')
prepare() {
cd ${srcdir}/${pkgbase}-${pkgver}
@@ -181,7 +181,7 @@
package_php() {
pkgdesc='A general-purpose scripting language that is especially suited
to web development'
- depends=('libxml2' 'curl' 'libzip' 'pcre' 'argon2')
+ depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2')
replaces=('php-ldap')
conflicts=('php-ldap')
provides=("php-ldap=${pkgver}")
Modified: apache.patch
===
--- apache.patch2018-12-08 11:30:32 UTC (rev 341255)
+++ apache.patch2018-12-08 12:16:14 UTC (rev 341256)
@@ -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
Modified: generate_patches
===
--- generate_patches2018-12-08 11:30:32 UTC (rev 341255)
+++ generate_patches2018-12-08 12:16:14 UTC (rev 341256)
@@ -32,7 +32,7 @@
-r ":a;N;\$!ba;s/; Notes for Windows environments
:\n.+;?extension=\w+\n/${extensions}/g" \
-i.orig php.ini-production
sed \
- -e 's#^; extension_dir = "\./"$#extension_dir =
"/usr/lib/php/modules/"#g' \
+ -e 's#^;extension_dir = "\./"$#extension_dir =
"/usr/lib/php/modules/"#g' \
-i php.ini-production
diff -u sapi/apache2handler/config.m4.orig sapi/apache2handler/config.m4 |
filterdiff --clean
[arch-commits] Commit in php/trunk (4 files)
Date: Wednesday, May 9, 2018 @ 14:30:54
Author: heftig
Revision: 323625
fix freetype, fix patches touching configure
Added:
php/trunk/freetype.patch
Modified:
php/trunk/PKGBUILD
php/trunk/apache.patch
php/trunk/enchant-2.patch
-+
PKGBUILD| 12
apache.patch| 10 --
enchant-2.patch | 23 ---
freetype.patch | 38 ++
4 files changed, 46 insertions(+), 37 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-05-09 13:01:13 UTC (rev 323624)
+++ PKGBUILD2018-05-09 14:30:54 UTC (rev 323625)
@@ -30,15 +30,17 @@
'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl'
'libtool' 'postfix' 'freetds' 'pcre' 'libnsl')
checkdepends=('procps-ng')
source=("https://php.net/distributions/${pkgbase}-${pkgver}.tar.xz"{,.asc}
-'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles'
'php.ini.patch' enchant-2.patch)
+'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles'
'php.ini.patch'
+'enchant-2.patch' 'freetype.patch')
sha512sums=('1d49fc6e47d2e86d4fd62396e558965502f44cc8f72459bb0d406e157298cac67703b219837952da11122722d9fa8cb4cda8ef66ddf063cb063859db34110f58'
'SKIP'
-
'7b87f785008f4e53e2837ba4009817145b10c46783ec3d19e158881f04bbc03ba0a36396058792bf72ccdc6de603b01ca3f248fae349703d08df74895eeeab46'
+
'bb9abfc51c41e1de180ef09244691c909ee64feebd9749978e1ecb7f576466a37232d9c6e97c1a01a96b8413a33c4818a91dc79f63078dc1946f56dad516bb05'
'eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e'
'c5d57a4d06d33856082a461a6796975ec42b655e81abe14bc896692d44b5c28e9b344111e64d13af486168b3dc927d908705e543095f34052f72198f257b4c34'
'824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f'
'85000bcb4f5674bfcbac7f32aeb28c523904a23da716e7fd982ac225845843e0acb33c0b8552107c234b1dd106337ad0a6792253f200980b88a6f6239ec982d0'
-
'89993be67988f6db09e1102214a41fdb7223274bc6ca71f1defc5fe9548d832485f7133b8ba82860f04da00c7f655d701c7550460c0172a2a2d31ef3f3f96038')
+
'06b49fb044fe8cdeef5109aa7bb6858906396e3f3643827cdb241264029579c71b0a7661d24b78b16573c54832505491c4b2a1fd77ae7c313cb082731c2efd9e'
+
'97ca469d5234f5cc71af38bb99a60130fdab5f849ad1f49f112101779c7659ca4d6700aef72e0294c85bdcb18e487fc0cdda855cc51084b9e8cacb02ec0fb1eb')
validpgpkeys=('B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F'
'1729F83938DA44E27BA0F4D3DBDB397470D12172')
@@ -48,7 +50,9 @@
patch -p0 -i ${srcdir}/apache.patch
patch -p0 -i ${srcdir}/php-fpm.patch
patch -p0 -i ${srcdir}/php.ini.patch
- patch -p1 -i ../enchant-2.patch
+ patch -p1 -i ${srcdir}/enchant-2.patch
+ patch -p1 -i ${srcdir}/freetype.patch
+autoconf
rm tests/output/stream_isatty_*.phpt
}
Modified: apache.patch
===
--- apache.patch2018-05-09 13:01:13 UTC (rev 323624)
+++ apache.patch2018-05-09 14:30:54 UTC (rev 323625)
@@ -8,13 +8,3 @@
if test -n "$APACHE_THREADED_MPM"; then
PHP_BUILD_THREAD_SAFE
fi
configure.orig
-+++ configure
-@@ -7020,7 +7020,6 @@
-
- fi
- else
--APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
- if test -n "$APACHE_THREADED_MPM"; then
-
- enable_maintainer_zts=yes
Modified: enchant-2.patch
===
--- enchant-2.patch 2018-05-09 13:01:13 UTC (rev 323624)
+++ enchant-2.patch 2018-05-09 14:30:54 UTC (rev 323625)
@@ -21,29 +21,6 @@
PHP_ADD_INCLUDE($ENCHANT_INCDIR)
PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param,
[
php-7.1.13/configure.orig 2018-01-21 22:03:51.494656374 +
-+++ php-7.1.13/configure 2018-01-21 22:12:35.932571143 +
-@@ -29838,9 +29838,9 @@
- ENCHANT_SEARCH_DIRS="/usr/local /usr"
- fi
- for i in $ENCHANT_SEARCH_DIRS; do
-- if test -f $i/include/enchant/enchant.h; then
-+ if test -f $i/include/enchant-2/enchant.h; then
- ENCHANT_DIR=$i
-- ENCHANT_INCDIR=$i/include/enchant
-+ ENCHANT_INCDIR=$i/include/enchant-2
- elif test -f $i/include/enchant.h; then
- ENCHANT_DIR=$i
- ENCHANT_INCDIR=$i/include
-@@ -29862,7 +29862,7 @@
-
-
- if test "$ext_shared" = "yes"; then
--ENCHANT_SHARED_LIBADD="-lenchant $ENCHANT_SHARED_LIBADD"
-+ENCHANT_SHARED_LIBADD="-lenchant-2 $ENCHANT_SHARED_LIBADD"
- if test -n "$ENCHANT_LIBDIR"; then
-
- if test "$ENCHANT_LIBDIR" != "/usr/$PHP_LIBDIR"
[arch-commits] Commit in php/trunk (4 files)
Date: Sunday, January 3, 2016 @ 09:04:07 Author: pierre Revision: 257477 Reduce noise in generated patches Modified: php/trunk/apache.patch php/trunk/generate_patches php/trunk/php-fpm.patch php/trunk/php.ini.patch --+ apache.patch |8 generate_patches | 14 +++--- php-fpm.patch| 16 php.ini.patch|4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) Modified: apache.patch === --- apache.patch2016-01-03 07:58:10 UTC (rev 257476) +++ apache.patch2016-01-03 08:04:07 UTC (rev 257477) @@ -1,5 +1,5 @@ sapi/apache2handler/config.m4.orig 2015-12-16 11:41:55.0 +0100 -+++ sapi/apache2handler/config.m4 2016-01-01 18:56:23.530338559 +0100 +--- sapi/apache2handler/config.m4.orig sapi/apache2handler/config.m4 @@ -122,7 +122,6 @@ PHP_BUILD_THREAD_SAFE fi @@ -8,8 +8,8 @@ if test -n "$APACHE_THREADED_MPM"; then PHP_BUILD_THREAD_SAFE fi configure.orig 2015-12-16 11:41:54.0 +0100 -+++ configure 2016-01-01 18:56:23.793665417 +0100 +--- configure.orig configure @@ -6875,7 +6875,6 @@ fi Modified: generate_patches === --- generate_patches2016-01-03 07:58:10 UTC (rev 257476) +++ generate_patches2016-01-03 08:04:07 UTC (rev 257477) @@ -35,14 +35,14 @@ -e 's#^; extension_dir = "\./"$#extension_dir = "/usr/lib/php/modules/"#g' \ -i php.ini-production -diff -u sapi/apache2handler/config.m4.orig sapi/apache2handler/config.m4 > ../../apache.patch -diff -u configure.orig configure >> ../../apache.patch +diff -u sapi/apache2handler/config.m4.orig sapi/apache2handler/config.m4 | filterdiff --clean --remove-timestamps > ../../apache.patch +diff -u configure.orig configure | filterdiff --clean --remove-timestamps >> ../../apache.patch -diff -u sapi/fpm/Makefile.frag.orig sapi/fpm/Makefile.frag > ../../php-fpm.patch -diff -u sapi/fpm/php-fpm.conf.in.orig sapi/fpm/php-fpm.conf.in >> ../../php-fpm.patch -diff -u sapi/fpm/www.conf.in.orig sapi/fpm/www.conf.in >> ../../php-fpm.patch -diff -u sapi/fpm/php-fpm.service.in.orig sapi/fpm/php-fpm.service.in >> ../../php-fpm.patch +diff -u sapi/fpm/Makefile.frag.orig sapi/fpm/Makefile.frag | filterdiff --clean --remove-timestamps > ../../php-fpm.patch +diff -u sapi/fpm/php-fpm.conf.in.orig sapi/fpm/php-fpm.conf.in | filterdiff --clean --remove-timestamps >> ../../php-fpm.patch +diff -u sapi/fpm/www.conf.in.orig sapi/fpm/www.conf.in | filterdiff --clean --remove-timestamps >> ../../php-fpm.patch +diff -u sapi/fpm/php-fpm.service.in.orig sapi/fpm/php-fpm.service.in | filterdiff --clean --remove-timestamps >> ../../php-fpm.patch -diff -u php.ini-production.orig php.ini-production > ../../php.ini.patch +diff -u php.ini-production.orig php.ini-production | filterdiff --clean --remove-timestamps > ../../php.ini.patch popd Modified: php-fpm.patch === --- php-fpm.patch 2016-01-03 07:58:10 UTC (rev 257476) +++ php-fpm.patch 2016-01-03 08:04:07 UTC (rev 257477) @@ -1,5 +1,5 @@ sapi/fpm/Makefile.frag.orig2015-12-16 11:41:54.0 +0100 -+++ sapi/fpm/Makefile.frag 2016-01-01 18:56:23.796998669 +0100 +--- sapi/fpm/Makefile.frag.orig sapi/fpm/Makefile.frag @@ -12,8 +12,8 @@ @echo "Installing PHP FPM config:$(INSTALL_ROOT)$(sysconfdir)/" && \ @@ -11,8 +11,8 @@ @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8 sapi/fpm/php-fpm.conf.in.orig 2015-12-16 11:41:54.0 +0100 -+++ sapi/fpm/php-fpm.conf.in 2016-01-01 18:56:23.800331920 +0100 +--- sapi/fpm/php-fpm.conf.in.orig sapi/fpm/php-fpm.conf.in @@ -14,14 +14,14 @@ ; Pid file ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ @@ -30,8 +30,8 @@ ; syslog_facility is used to specify what type of program is logging the ; message. This lets syslogd specify that messages from different facilities sapi/fpm/www.conf.in.orig 2015-12-16 11:41:54.0 +0100 -+++ sapi/fpm/www.conf.in 2016-01-01 18:56:23.803665171 +0100 +--- sapi/fpm/www.conf.in.orig sapi/fpm/www.conf.in @@ -33,7 +33,7 @@ ;(IPv6 and IPv4-mapped) on a specific port; ; '/path/to/unix/socket' - to listen on a unix socket. @@ -61,8 +61,8 @@ ; Redirect worker stdout and stderr into main error log. If not set, stdout and ; stderr will be redirected to /dev/null according to FastCGI specs. sapi/fpm/php-fpm.service.in.orig 2015-12-16 11:41:54.0 +0100 -+++ sapi/fpm/php-fpm.service.in2016-01-01 18:56:23.803665171 +0100 +--- sapi/fpm/php-fpm.service.in.orig sapi/fpm/php-fpm.service.in @@ -4,7 +4,7 @@
[arch-commits] Commit in php/trunk (4 files)
Date: Thursday, May 1, 2014 @ 08:48:09
Author: pierre
Revision: 211925
upgpkg: php 5.5.12-1
Modified:
php/trunk/PKGBUILD
php/trunk/logrotate.d.php-fpm
php/trunk/php-fpm.conf.in.patch
php/trunk/php.ini.patch
---+
PKGBUILD | 16
logrotate.d.php-fpm |2 +-
php-fpm.conf.in.patch |8
php.ini.patch | 12 ++--
4 files changed, 19 insertions(+), 19 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-05-01 01:24:11 UTC (rev 211924)
+++ PKGBUILD2014-05-01 06:48:09 UTC (rev 211925)
@@ -21,8 +21,8 @@
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=5.5.11
-pkgrel=2
+pkgver=5.5.12
+pkgrel=1
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
@@ -31,15 +31,15 @@
'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2'
'systemd')
source=(http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz;
-http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz.asc;
+#http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz.asc;
'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('9156fcd4b254cbfa9a7535f931da29d5'
- 'SKIP'
- '799cd5f91f5253f4b47ec4fd7fccf4f1'
+md5sums=('b6a6e9c72589c265aafb7b3353a34030'
+# 'SKIP'
+ '510f9092ebfe6e378e12817e197a88b6'
'dec2cbaad64e3abf4f0ec70e1de4e8e9'
- '9f8263996836e27f5be1483e86ac2e33'
- 'e036c721e5ad927cd1613c7475a58b3a'
+ '6bc1fc4ceee039d21ff3b56aa845cc5a'
+ '25bc67ad828e8147a817410b68d8016c'
'cc2940f5312ba42e7aa1ddfab74b84c4'
'c60343df74f8e1afb13b084d5c0e47ed')
Modified: logrotate.d.php-fpm
===
--- logrotate.d.php-fpm 2014-05-01 01:24:11 UTC (rev 211924)
+++ logrotate.d.php-fpm 2014-05-01 06:48:09 UTC (rev 211925)
@@ -3,6 +3,6 @@
notifempty
delaycompress
postrotate
- systemctl reload php-fpm.service || true
+ /bin/kill -SIGUSR1 `cat /run/php-fpm/php-fpm.pid 2/dev/null`
2/dev/null || true
endscript
}
Modified: php-fpm.conf.in.patch
===
--- php-fpm.conf.in.patch 2014-05-01 01:24:11 UTC (rev 211924)
+++ php-fpm.conf.in.patch 2014-05-01 06:48:09 UTC (rev 211925)
@@ -1,5 +1,5 @@
sapi/fpm/php-fpm.conf.in 2013-11-12 15:17:27.0 +0100
-+++ sapi/fpm/php-fpm.conf.in 2013-11-12 17:27:21.283279538 +0100
+--- sapi/fpm/php-fpm.conf.in 2014-04-29 10:04:30.0 +0200
sapi/fpm/php-fpm.conf.in 2014-05-01 07:36:14.762839158 +0200
@@ -12,7 +12,7 @@
; Relative path can also be used. They will be prefixed by:
; - the global prefix if it's been set (-p argument)
@@ -31,10 +31,10 @@
@@ -167,9 +168,9 @@
; BSD-derived systems allow connections regardless of permissions.
; Default Values: user and group are set as the running user
- ; mode is set to 0666
+ ; mode is set to 0660
-;listen.owner = @php_fpm_user@
-;listen.group = @php_fpm_group@
--;listen.mode = 0666
+-;listen.mode = 0660
+listen.owner = @php_fpm_user@
+listen.group = @php_fpm_group@
+listen.mode = 0660
Modified: php.ini.patch
===
--- php.ini.patch 2014-05-01 01:24:11 UTC (rev 211924)
+++ php.ini.patch 2014-05-01 06:48:09 UTC (rev 211925)
@@ -1,6 +1,6 @@
php.ini-production 2013-11-12 15:17:27.0 +0100
-+++ php.ini-production 2013-11-12 17:28:12.715321014 +0100
-@@ -306,7 +306,7 @@
+--- php.ini-production 2014-04-29 10:04:30.0 +0200
php.ini-production 2014-05-01 07:32:06.928871679 +0200
+@@ -296,7 +296,7 @@
; or per-virtualhost web server configuration file. This directive is
; *NOT* affected by whether Safe Mode is turned On or Off.
; http://php.net/open-basedir
@@ -9,7 +9,7 @@
; This directive allows you to disable certain functions for security reasons.
; It receives a comma-delimited list of function names. This directive is
-@@ -703,7 +703,7 @@
+@@ -693,7 +693,7 @@
;
; UNIX: /path1:/path2
@@ -18,7 +18,7 @@
;
; Windows: \path1;\path2
;include_path = .;c:\php\includes
-@@ -726,7 +726,7 @@
+@@ -716,7 +716,7 @@
; Directory in which the loadable extensions (modules) reside.
; http://php.net/extension-dir
@@ -27,7 +27,7 @@
; On windows:
; extension_dir = ext
-@@ -864,50 +864,48 @@
+@@ -854,50 +854,48 @@
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
[arch-commits] Commit in php/trunk (4 files)
Date: Thursday, April 26, 2012 @ 10:01:22
Author: pierre
Revision: 157242
upgpkg: php 5.4.1-2
update to PHP 5.4.1; drop suhosin patch
Modified:
php/trunk/PKGBUILD
php/trunk/php-fpm.conf.in.patch
php/trunk/php.ini.patch
Deleted:
php/trunk/suhosin.patch
---+
PKGBUILD | 63 +---
php-fpm.conf.in.patch |4 +--
php.ini.patch | 16
suhosin.patch | 13 -
4 files changed, 26 insertions(+), 70 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-26 13:40:50 UTC (rev 157241)
+++ PKGBUILD2012-04-26 14:01:22 UTC (rev 157242)
@@ -21,44 +21,35 @@
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=5.3.11
-_suhosinver=5.3.9-0.9.10
-pkgrel=1
+pkgver=5.4.1
+pkgrel=2
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
-makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
+makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
source=(http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2;
-http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz;
-http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig;
'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
-'logrotate.d.php-fpm' 'suhosin.patch')
-md5sums=('94709f6e7c920cbe26e19fa991d9975d'
- 'c099b3d7eac95018ababd41ded7f3066'
- 'c15d18f846be1d69144a5d0056ee6506'
- 'ffc338e8ce2a990f6f2a486355bbab65'
+'logrotate.d.php-fpm')
+md5sums=('5b9529ed89dbc48c498e9693d1af3caf'
+ '0b0bc7a917fc592bdf11dcd3c5c255e9'
'dec2cbaad64e3abf4f0ec70e1de4e8e9'
'b01be5f816988fcee7e78225836e5e27'
- '740ec5fe2ecfd9d7febd4081c90ec65b'
- '07c4e412909ac65a44ec90e7a2c4bade'
- '07ca7da608553b4cb92797e655eb94f1')
+ '59b3a25f9eb3afc02f1adf9ee699808c'
+ '07c4e412909ac65a44ec90e7a2c4bade')
build() {
phpconfig=--srcdir=../${pkgbase}-${pkgver} \
+ --config-cache \
--prefix=/usr \
--sysconfdir=/etc/php \
--localstatedir=/var \
--with-layout=GNU \
--with-config-file-path=/etc/php \
--with-config-file-scan-dir=/etc/php/conf.d \
- --enable-inline-optimization \
- --disable-debug \
--disable-rpath \
- --disable-static \
- --enable-shared \
--mandir=/usr/share/man \
--without-pear \
@@ -70,36 +61,31 @@
--enable-ftp=shared \
--enable-gd-native-ttf \
--enable-intl=shared \
- --enable-json=shared \
- --enable-mbregex \
--enable-mbstring \
- --enable-pdo \
--enable-phar=shared \
--enable-posix=shared \
- --enable-session \
--enable-shmop=shared \
--enable-soap=shared \
--enable-sockets=shared \
- --enable-sqlite-utf8 \
--enable-sysvmsg=shared \
--enable-sysvsem=shared \
--enable-sysvshm=shared \
- --enable-xml \
--enable-zip=shared \
--with-bz2=shared \
--with-curl=shared \
--with-db4=/usr \
--with-enchant=shared,/usr \
- --with-freetype-dir=shared,/usr \
+ --with-freetype-dir=/usr \
--with-gd=shared \
- --with-gdbm=shared \
+ --with-gdbm \
--with-gettext=shared \
--with-gmp=shared \
--with-iconv=shared \
--with-icu-dir=/usr \
- --with-imap-ssl=shared \
+ --with-imap-ssl \
--with-imap=shared \
- --with-jpeg-dir=shared,/usr \
+ --with-jpeg-dir=/usr \
+ --with-vpx-dir=/usr \
--with-ldap=shared \
--with-ldap-sasl \
--with-mcrypt=shared \
@@ -115,19 +101,15 @@
--with-pdo-pgsql=shared \
--with-pdo-sqlite=shared,/usr \
--with-pgsql=shared \
- --with-png-dir=shared,/usr \
+ --with-png-dir=/usr \
--with-pspell=shared \
- --with-regex=php \
--with-snmp=shared \
--with-sqlite3=shared,/usr \
- --with-sqlite=shared \
[arch-commits] Commit in php/trunk (4 files)
Date: Sunday, December 12, 2010 @ 11:31:31
Author: pierre
Revision: 102873
* Make previous suhosin patch work
* Add logrotate for php-fpm
Added:
php/trunk/logrotate.d.php-fpm
php/trunk/suhosin-patch-5.3.3-0.9.10-5.3.4.patch
Modified:
php/trunk/PKGBUILD
php/trunk/rc.d.php-fpm
+
PKGBUILD | 23 +++
logrotate.d.php-fpm|6 ++
rc.d.php-fpm | 14 +-
suhosin-patch-5.3.3-0.9.10-5.3.4.patch | 22 ++
4 files changed, 56 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-12-12 15:52:35 UTC (rev 102872)
+++ PKGBUILD2010-12-12 16:31:31 UTC (rev 102873)
@@ -25,7 +25,7 @@
'php-xsl')
pkgver=5.3.4
pkgrel=1
-#_suhosinver=${pkgver}-0.9.10
+_suhosinver=5.3.3-0.9.10
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
@@ -35,14 +35,18 @@
'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
options=('!makeflags')
source=(http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2;
-#http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz;
-'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch')
+http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz;
+suhosin-patch-${_suhosinver}-${pkgver}.patch
+'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
+'logrotate.d.php-fpm')
md5sums=('2c069d8f690933e3bf6a8741ed818150'
-# 'b66b27c43b1332400ef8982944c3b95b'
+ 'b66b27c43b1332400ef8982944c3b95b'
+ '29cd4241937fee7ec42b08f46c24af72'
'd36c4d1b9d33c1025521e23260f1dc29'
'96ca078be6729b665be8a865535a97bf'
- 'ff8346d57f0bd67c7a383c1561dcd7c1'
- 'd50ff349da08110a7cc8c691ce2d0423')
+ 'b136a184dd055c559a03eb8bac562a3c'
+ 'd50ff349da08110a7cc8c691ce2d0423'
+ '07c4e412909ac65a44ec90e7a2c4bade')
build() {
# ldap-sasl does not compile with --as-needed
@@ -139,8 +143,10 @@
cd ${srcdir}/${pkgbase}-${pkgver}
+ # remove a patch that has been merged into upstream PHP
+ patch -p0 -i ${srcdir}/suhosin-patch-${_suhosinver}-${pkgver}.patch -d
${srcdir}
# apply suhosin patch
- #patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
+ patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
# adjust paths
patch -p0 -i ${srcdir}/php.ini.patch
@@ -252,8 +258,9 @@
install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm
${pkgdir}/usr/sbin/php-fpm
install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8
${pkgdir}/usr/share/man/man8/php-fpm.8
- install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf
${pkgdir}/etc/php/php-fpm.conf
+ install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf
${pkgdir}/etc/php/php-fpm.conf
install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm
+ install -D -m644 ${srcdir}/logrotate.d.php-fpm
${pkgdir}/etc/logrotate.d/php-fpm
install -d -m755 ${pkgdir}/var/run/php-fpm
install -d -m755 ${pkgdir}/etc/php/fpm.d
}
Added: logrotate.d.php-fpm
===
--- logrotate.d.php-fpm (rev 0)
+++ logrotate.d.php-fpm 2010-12-12 16:31:31 UTC (rev 102873)
@@ -0,0 +1,6 @@
+/var/log/php-fpm.log {
+ missingok
+ postrotate
+ /etc/rc.d/php-fpm logrotate /dev/null || true
+ endscript
+}
Modified: rc.d.php-fpm
===
--- rc.d.php-fpm2010-12-12 15:52:35 UTC (rev 102872)
+++ rc.d.php-fpm2010-12-12 16:31:31 UTC (rev 102873)
@@ -116,8 +116,20 @@
stat_done
;;
+ logrotate)
+ stat_busy 'Reopen php-fpm log'
+
+ if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
+ stat_fail
+ exit 1
+ fi
+
+ kill -USR1 `cat /var/run/php-fpm/php-fpm.pid`
+ stat_done
+ ;;
+
*)
- echo usage: $0 {start|stop|force-quit|restart|reload}
+ echo usage: $0
{start|stop|force-quit|restart|reload|logrotate}
exit 1
;;
Added: suhosin-patch-5.3.3-0.9.10-5.3.4.patch
===
--- suhosin-patch-5.3.3-0.9.10-5.3.4.patch (rev 0)
+++ suhosin-patch-5.3.3-0.9.10-5.3.4.patch 2010-12-12 16:31:31 UTC (rev
102873)
@@ -0,0 +1,22 @@
+--- suhosin-patch-5.3.3-0.9.10.patch 2010-12-11 09:10:02.782828086 +0100
suhosin-patch-5.3.3-0.9.10.patch 2010-12-11 09:13:53.871672637 +0100
+@@ -4538,19 +4538,6 @@
+
+ if test -r $abs_srcdir/Zend/zend_objects.c; then
+
[arch-commits] Commit in php/trunk (4 files)
Date: Thursday, November 19, 2009 @ 06:46:52
Author: pierre
Revision: 59023
update to 5.3.1; relocate patches; update mysql socket location
Modified:
php/trunk/PKGBUILD
php/trunk/db-configure.patch
php/trunk/php.ini.patch
Deleted:
php/trunk/gd-info-segfault.patch
+
PKGBUILD | 22 +-
db-configure.patch |6 +++---
gd-info-segfault.patch | 26 --
php.ini.patch | 22 ++
4 files changed, 26 insertions(+), 50 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2009-11-19 11:14:58 UTC (rev 59022)
+++ PKGBUILD2009-11-19 11:46:52 UTC (rev 59023)
@@ -20,9 +20,9 @@
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=5.3.0
-pkgrel=5
-_suhosinver=${pkgver}-0.9.8
+pkgver=5.3.1
+pkgrel=1
+_suhosinver=${pkgver}RC1-0.9.8
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
@@ -33,13 +33,12 @@
options=('!makeflags')
source=(http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2;
http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz;
-'php.ini.patch' 'apache.conf' 'db-configure.patch'
'gd-info-segfault.patch')
-md5sums=('846760cd655c98dfd86d6d97c3d964b0'
- 'a23a3d54e177ac0ad30f78d928ba8177'
- '67c63d2c8a976a333bbd2216cdd60413'
+'php.ini.patch' 'apache.conf' 'db-configure.patch')
+md5sums=('63e97ad450f0f7259e785100b634c797'
+ 'c3ff0cb5fa728420d56f8ed139446647'
+ 'd6f94150f47047882c6716575e12e99b'
'96ca078be6729b665be8a865535a97bf'
- '45ecb6fb0aadfd3462097e3bab951aa5'
- '1c1a50aae7207b12d27bdecd8967e7ce')
+ '45ecb6fb0aadfd3462097e3bab951aa5')
build() {
phpconfig=--prefix=/usr \
@@ -95,7 +94,7 @@
--with-jpeg-dir=shared,/usr \
--with-ldap=shared \
--with-mcrypt=shared \
- --with-mysql-sock=/tmp/mysql.sock \
+ --with-mysql-sock=/var/run/mysqld/mysqld.sock \
--with-mysql=shared,mysqlnd \
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
@@ -136,9 +135,6 @@
# adjust paths
patch -p0 -i ${srcdir}/php.ini.patch || return 1
- # fix gd segfault; http://bugs.php.net/bug.php?id=49193
- patch -p0 -i ${srcdir}/gd-info-segfault.patch || return 1
-
# php
mkdir ${srcdir}/build-php
cd ${srcdir}/build-php
Modified: db-configure.patch
===
--- db-configure.patch 2009-11-19 11:14:58 UTC (rev 59022)
+++ db-configure.patch 2009-11-19 11:46:52 UTC (rev 59023)
@@ -1,6 +1,6 @@
configure.orig 2009-06-29 17:46:18.0 +0200
-+++ configure 2009-08-14 08:34:52.0 +0200
-@@ -29088,43 +29088,15 @@
+--- configure 2009-11-18 21:11:57.0 +0100
configure 2009-11-19 12:42:50.881918639 +0100
+@@ -29292,43 +29292,15 @@
unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
Deleted: gd-info-segfault.patch
===
--- gd-info-segfault.patch 2009-11-19 11:14:58 UTC (rev 59022)
+++ gd-info-segfault.patch 2009-11-19 11:46:52 UTC (rev 59023)
@@ -1,26 +0,0 @@
-Index: ext/gd/libgd/gd_compat.c
-===
ext/gd/libgd/gd_compat.c (Revision 286947)
-+++ ext/gd/libgd/gd_compat.c (Revision 286948)
-@@ -14,7 +14,7 @@
- return JPEG_LIB_VERSION;
- }
-
--int gdJpegGetVersionString()
-+const char * gdJpegGetVersionString()
- {
- switch(JPEG_LIB_VERSION) {
- case 62:
-Index: ext/gd/libgd/gd_compat.h
-===
ext/gd/libgd/gd_compat.h (Revision 286947)
-+++ ext/gd/libgd/gd_compat.h (Revision 286948)
-@@ -8,7 +8,7 @@
- #endif
-
- const char * gdPngGetVersionString();
--int gdJpegGetVersionString();
-+const char * gdJpegGetVersionString();
- int gdJpegGetVersionInt();
- int overflow2(int a, int b);
-
Modified: php.ini.patch
===
--- php.ini.patch 2009-11-19 11:14:58 UTC (rev 59022)
+++ php.ini.patch 2009-11-19 11:46:52 UTC (rev 59023)
@@ -1,5 +1,5 @@
php.ini-production 2009-06-30 01:05:38.0 +0200
-+++ php.ini2009-06-30 01:02:15.0 +0200
+--- php.ini-production 2009-11-12 18:20:01.0 +0100
php.ini2009-11-19 12:39:03.305274757 +0100
@@ -376,7 +376,7 @@
; or per-virtualhost web server configuration file. This directive is
; *NOT* affected by whether Safe Mode is turned On or Off.
@@ -9,7 +9,7 @@
; This directive allows you to disable certain functions for security reasons.
; It receives a comma-delimited list of function names. This directive is
-@@ -785,7 +785,7 @@
