Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29860
Modified Files:
php5.info php5.patch
Log Message:
* Move apache2 (>= 2.4) from Pre-Depend to Depends (Closes: #711454)
* Install the headers from CGI build to get mysqlnd headers into
php5-dev package (Closes: #690395)
* Use small helper script instead of shell blog to check FPM
configuration (Closes: #718627)
Index: php5.info
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- php5.info 15 Aug 2013 03:31:29 -0000 1.17
+++ php5.info 16 Aug 2013 23:25:10 -0000 1.18
@@ -1,7 +1,7 @@
Info2: <<
Package: php5
Version: 5.5.1
-Revision: 1.1
+Revision: 2.1
Type: sapiver (20121212)
###
BuildDepends: <<
@@ -124,7 +124,7 @@
Source2-MD5: 690d4b78319a0a57d0c224fe976bb536
Source2ExtractDir: php-%v
PatchFile: %n.patch
-PatchFile-MD5: 7af2178ba01c6c88649cfd4db9f2ffa3
+PatchFile-MD5: 8b67afe7604c279ef49b96da926d8892
PatchScript: <<
sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
@@ -581,6 +581,11 @@
# install the apache modules' files
install -d -m755 debian/libapache2-mod-php5
cd apache2-build && make install-headers install-build install-modules
install-programs INSTALL_ROOT=%b/debian/libapache2-mod-php5
+
+# install the headers from cgi-build
+install -d -m755 debian/php5-dev
+cd cgi-build && make install-headers INSTALL_ROOT=%b/debian/php5-dev
+
# remove netware and win32 headers that we don't want
cd debian/libapache2-mod-php5%p/include/php5/ && \
rm -f TSRM/readdir.h \
@@ -665,8 +670,10 @@
sed -nr '/('"'"'|\[)www('"'"'|\])/{h;p;d};x;/www/{x;p}' <
fpm-build/sapi/fpm/php-fpm.conf \
> debian/php5-fpm%p/etc/php5/fpm/pool.d/www.conf
+# install a helper script for checking PHP FPM configuration
+install -m 755 fink/php5-fpm-checkconf debian/php5-fpm%p/lib/php5/
+
# move and install -dev files
-install -d -m755 debian/php5-dev
cp -a debian/libphp5-embed4/* debian/php5-dev/
cp -a debian/libapache2-mod-php5/* debian/php5-dev/
rm -rf debian/libphp5-embed4%p/include/ \
@@ -738,7 +745,7 @@
rm -rf debian/php5-dev%p/lib/apache2
rm -rf debian/php5-dev%p/etc/apache2
rm -rf debian/php5-dev%p/lib/php5/%type_raw[sapiver]
-rm -rf debian/php5-fpm%p/lib
+rm -rf debian/php5-fpm%p/lib/php5/%type_raw[sapiver]
rm -rf debian/php5-cli%p/lib
rm -rf debian/php5-cgi%p/lib/php5
# find debian/php-pear -type d -exec grmdir --ignore-fail-on-non-empty -p '{}'
\; >/dev/null 2>&1
@@ -897,6 +904,7 @@
install -d -m755 debian/php5-fpm%p/etc/php5/fpm/conf.d
install -d -m755 debian/php5-fpm%p/etc/php5/fpm/pool.d
install -d -m755 debian/php5-fpm%p/sbin
+install -d -m755 debian/php5-fpm%p/lib/php5
#php-pear.dirs
install -d -m755 debian/php-pear%p/share/doc/php-pear/PEAR
Index: php5.patch
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- php5.patch 15 Aug 2013 03:31:29 -0000 1.13
+++ php5.patch 16 Aug 2013 23:25:10 -0000 1.14
@@ -6484,10 +6484,23 @@
+ cp -a @FINKPREFIX@/var/lib/php5/module/ @FINKPREFIX@/var/lib/php5/modules/
+ rm -rf @FINKPREFIX@/var/lib/php5/module/
+fi
+diff -ruN php-5.5.1.orig/fink/php5-fpm-checkconf
php-5.5.1/fink/php5-fpm-checkconf
+--- php-5.5.1.orig/fink/php5-fpm-checkconf 1969-12-31 17:00:00.000000000
-0700
++++ php-5.5.1/fink/php5-fpm-checkconf 2013-08-16 16:49:50.000000000 -0600
+@@ -0,0 +1,9 @@
++#!/bin/sh
++set -e
++errors=$(@FINKPREFIX@/sbin/php5-fpm --fpm-config
@FINKPREFIX@/etc/php5/fpm/php-fpm.conf -t 2>&1 | grep "\[ERROR\]" || true);
++if [ -n "${errors}" ]; then
++ echo "Please fix your configuration file..."
++ echo ${errors}
++ exit 1
++fi
++exit 0
diff -ruN php-5.5.1.orig/fink/php5-fpm.init php-5.5.1/fink/php5-fpm.init
--- php-5.5.1.orig/fink/php5-fpm.init 1969-12-31 17:00:00.000000000 -0700
-+++ php-5.5.1/fink/php5-fpm.init 2013-08-08 16:06:12.000000000 -0600
-@@ -0,0 +1,174 @@
++++ php-5.5.1/fink/php5-fpm.init 2013-08-16 16:52:35.000000000 -0600
+@@ -0,0 +1,167 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: php-fpm php5-fpm
@@ -6521,14 +6534,7 @@
+#
+do_check()
+{
-+ [ "$1" != "no" ] && $DAEMON $DAEMON_ARGS -t 2>&1 | grep -v "\[ERROR\]"
-+ FPM_ERROR=$($DAEMON $DAEMON_ARGS -t 2>&1 | grep "\[ERROR\]")
-+
-+ if [ -n "${FPM_ERROR}" ]; then
-+ echo "Please fix your configuration file..."
-+ $DAEMON $DAEMON_ARGS -t 2>&1 | grep "\[ERROR\]"
-+ return 1
-+ fi
++ @FINKPREFIX@/lib/php5/php5-fpm-checkconf || return 1
+ return 0
+}
+
@@ -7731,9 +7737,9 @@
+exit $ret
diff -ruN php-5.5.1.orig/fink/phpapi php-5.5.1/fink/phpapi
--- php-5.5.1.orig/fink/phpapi 1969-12-31 17:00:00.000000000 -0700
-+++ php-5.5.1/fink/phpapi 2013-08-08 09:47:42.000000000 -0600
++++ php-5.5.1/fink/phpapi 2013-08-16 16:52:46.000000000 -0600
@@ -0,0 +1 @@
-+20100525
++20121212
diff -ruN php-5.5.1.orig/fink/sessionclean php-5.5.1/fink/sessionclean
--- php-5.5.1.orig/fink/sessionclean 1969-12-31 17:00:00.000000000 -0700
+++ php-5.5.1/fink/sessionclean 2013-08-08 10:15:17.000000000 -0600
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
