Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8746
Modified Files:
php5.info php5.patch
Log Message:
* Few more tweaks to scripts and config files
Index: php5.info
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- php5.info 13 Aug 2013 22:10:46 -0000 1.16
+++ php5.info 15 Aug 2013 03:31:29 -0000 1.17
@@ -124,7 +124,7 @@
Source2-MD5: 690d4b78319a0a57d0c224fe976bb536
Source2ExtractDir: php-%v
PatchFile: %n.patch
-PatchFile-MD5: 392277d7a5a8d2fdd76a678cf2f2f595
+PatchFile-MD5: 7af2178ba01c6c88649cfd4db9f2ffa3
PatchScript: <<
sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
@@ -510,9 +510,9 @@
TestScript: <<
#!/bin/sh -ex
-MYSQL_PORT=`for i in $(seq 1025 3600 | sort); do nc -z localhost $i || { echo
$i; exit; } ; done`;
+MYSQL_PORT=`for i in $(seq 1025 3600 | sort); do nc -z localhost ${i} || {
echo ${i}; exit; } ; done`;
MYSQL_DATA_DIR=`greadlink -f mysql_db`;
-if [ $MYSQL_PORT == '' ]; then
+if [ ${MYSQL_PORT} == '' ]; then
echo "Could not find available port for mysql server";
exit 1;
fi
@@ -520,8 +520,8 @@
TESTFILE=test-results.txt
-if [ -f test-results.txt ]; then \
- rm test-results.txt; \
+if [ -f ${TESTFILE} ]; then \
+ rm ${TESTFILE}; \
fi
mkdir -p temp_session_store;
@@ -529,29 +529,29 @@
sh -x fink/setup-mysql.sh ${MYSQL_PORT} ${MYSQL_DATA_DIR};
extensions=""; \
for f in apache2-build/modules/*.so; do \
- ext=`basename "$f"`; \
- test -d "ext/${ext%%.so}/tests" || continue; \
- test "$ext" != "imap.so" || continue; \
- test "$ext" != "interbase.so" || continue; \
- test "$ext" != "ldap.so" || continue; \
- test "$ext" != "odbc.so" || continue; \
- test "$ext" != "pgsql.so" || continue; \
- test "$ext" != "pdo_dblib.so" || continue; \
- test "$ext" != "pdo_firebird.so" || continue; \
- test "$ext" != "pdo_odbc.so" || continue; \
- test "$ext" != "pdo_pgsql.so" || continue; \
- test "$ext" != "snmp.so" || continue; \
- test "$ext" != "opcache.so" || continue; \
- extensions="$extensions -d extension=$ext"; \
+ ext=`basename "${f}"`; \
+ test -d "ext/${ext%%%%.so}/tests" || continue; \
+ test "${ext}" != "imap.so" || continue; \
+ test "${ext}" != "interbase.so" || continue; \
+ test "${ext}" != "ldap.so" || continue; \
+ test "${ext}" != "odbc.so" || continue; \
+ test "${ext}" != "pgsql.so" || continue; \
+ test "${ext}" != "pdo_dblib.so" || continue; \
+ test "${ext}" != "pdo_firebird.so" || continue; \
+ test "${ext}" != "pdo_odbc.so" || continue; \
+ test "${ext}" != "pdo_pgsql.so" || continue; \
+ test "${ext}" != "snmp.so" || continue; \
+ test "${ext}" != "opcache.so" || continue; \
+ extensions="${extensions} -d extension=${ext}"; \
done; \
-[ "$extensions" ] || { echo "extensions list is empty"; exit 1; }; \
+[ "${extensions}" ] || { echo "extensions list is empty"; exit 1; }; \
env MYSQL_TEST_HOST=127.0.0.1 MYSQL_TEST_PORT=${MYSQL_PORT}
MYSQL_TEST_SOCKET=${MYSQL_SOCKET} PDO_MYSQL_TEST_HOST=127.0.0.1
PDO_MYSQL_TEST_PORT=${MYSQL_PORT} PDO_MYSQL_TEST_SOCKET=${MYSQL_SOCKET}
NO_INTERACTION=1 TEST_PHP_CGI_EXECUTABLE=cgi-build/sapi/cgi/cgi-bin.php5
TEST_PHP_EXECUTABLE=cli-build/sapi/cli/php \
-cli-build/sapi/cli/php run-tests.php -n -d mysql.default_host=127.0.0.1 -d
mysql.default_socket=${MYSQL_SOCKET} -d mysqli.default_socket=${MYSQL_SOCKET}
-d extension_dir=apache2-build/modules/ $extensions| tee ${TESTFILE}
+cli-build/sapi/cli/php run-tests.php -n -d mysql.default_host=127.0.0.1 -d
mysql.default_socket=${MYSQL_SOCKET} -d mysqli.default_socket=${MYSQL_SOCKET}
-d extension_dir=apache2-build/modules/ ${extensions} | tee ${TESTFILE}
rm -rf temp_session_store
for test in `find . -name '*.log' -a '!' -name 'config.log' -a '!' -name
'bootstrap.log' -a '!' -name 'run.log'`; do \
/bin/echo; \
/bin/echo -n "${test#./}:"; \
- cat $test; \
+ cat ${test}; \
echo; \
done | tee -a ${TESTFILE}
sh -x fink/setup-mysql.sh ${MYSQL_PORT} ${MYSQL_DATA_DIR} stop
@@ -565,10 +565,10 @@
install -d -m755 debian/php5-common%p/share/php5
# sanitize php.ini file
-PCNTL_FUNCTIONS=$(cat ext/pcntl/php_pcntl.h | sed -ne "/^PHP_FUNCTION/
s/PHP_FUNCTION(\(.*\));/\1/;t end;d;:end p" | tr '\n' ',');
-cat php.ini-production | tr "\t" " " | sed -e"/session.gc_probability =/
s/1/0/g;/disable_functions =/ s/$$/ ${PCNTL_FUNCTIONS}/g;" >
debian/php5-common%p/share/php5/php.ini-production
-cat php.ini-production | tr "\t" " " | sed -e'/memory_limit =/
s/128M/-1/g;/session.gc_probability =/ s/1/0/g' >
debian/php5-common%p/share/php5/php.ini-production.cli
-cat php.ini-development | tr "\t" " " | sed -e"/session.gc_probability =/
s/1/0/g;/disable_functions =/ s/$$/ ${PCNTL_FUNCTIONS}/g;" >
debian/php5-common%p/share/php5/php.ini-development
+PCNTL_FUNCTIONS=$(cat ext/pcntl/php_pcntl.h | sed -ne "/^PHP_FUNCTION/
s/PHP_FUNCTION(\(.*\));/\1/;t end;d;:end p" | tr '\n' ','); \
+cat php.ini-production | tr "\t" " " | sed -e "/session.gc_probability =/
s/1/0/g;/disable_functions =/ s/$/ ${PCNTL_FUNCTIONS}/g;" >
debian/php5-common%p/share/php5/php.ini-production; \
+cat php.ini-production | tr "\t" " " | sed -e '/memory_limit =/
s/128M/-1/g;/session.gc_probability =/ s/1/0/g' >
debian/php5-common%p/share/php5/php.ini-production.cli; \
+cat php.ini-development | tr "\t" " " | sed -e "/session.gc_probability =/
s/1/0/g;/disable_functions =/ s/$/ ${PCNTL_FUNCTIONS}/g;" >
debian/php5-common%p/share/php5/php.ini-development
# Install helper shell fragment
install -m644 fink/php5-helper debian/php5-common%p/share/php5/
@@ -672,9 +672,8 @@
rm -rf debian/libphp5-embed4%p/include/ \
debian/libphp5-embed4%p/bin/ \
debian/libphp5-embed4%p/lib/php5/build/ \
- debian/libphp5-embed4%p/lib/php5/%type_raw[sapiver]/ \
- debian/libphp5-embed4%p/lib/php5/libphp5.dylib \
- debian/libphp5-embed4%p/lib/php5/libphp5.4.dylib \
+ debian/libphp5-embed4%p/lib/php5/%type_raw[sapiver] \
+ debian/libphp5-embed4%p/lib/libphp5.dylib \
debian/libphp5-embed4%p/share/man/
rm -rf debian/libapache2-mod-php5%p/lib/php5/build/ \
debian/libapache2-mod-php5%p/include/ \
@@ -685,8 +684,7 @@
debian/libapache2-mod-php5filter%p/include/ \
debian/libapache2-mod-php5filter%p/bin/ \
debian/libapache2-mod-php5filter%p/lib/php5/
-mv debian/php5-dev%p/lib/php5/*.dylib debian/php5-dev%p/lib/
-rm -rf debian/php5-dev%p/lib/libphp5.4.*.dylib
+rm -rf debian/php5-dev%p/lib/libphp5.*.dylib
install -d -m755 debian/php5-dev%p/lib/php5/build
for i in Makefile.global acinclude.m4 mkdep.awk phpize.m4
scan_makefile_in.awk; do \
chmod 644 debian/php5-dev%p/lib/php5/build/$i; \
@@ -731,8 +729,7 @@
install -m755 fink/php5query debian/php5-common%p/sbin/php5query
# remove libtool files
-rm -f debian/libphp5-embed4%p/lib/php5/libphp5.la
-mv debian/libphp5-embed4%p/lib/php5/* debian/libphp5-embed4%p/lib/
+rm -f debian/libphp5-embed4%p/lib/libphp5.la
rm -rf debian/libphp5-embed4%p/lib/php5
# directories cleanup:
@@ -982,11 +979,11 @@
cp -a debian/%n/DEBIAN/* %i/../DEBIAN/
<<
Shlibs: <<
- %p/lib/php5/libphp5.4.dylib 6.0.0 libphp5-embed4 (>= 5.5.1-1)
+ %p/lib/libphp5.4.dylib 6.0.0 libphp5-embed4 (>= 5.5.1-1)
<<
Description: HTML-embedded scripting language (Embedded SAPI library)
DescDetail: <<
-This package provides the library %p/lib/libphp5.dylib which can be used by
+This package provides the libphp5 dylib which can be used by
application developers to embed4 PHP scripting functionality.
.
PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used open
@@ -1925,6 +1922,8 @@
<<
<<
###
+Docfiles: LICENSE
+###
Description: Server-side, HTML-embedded scripting language
DescDetail: <<
This package is a metapackage that, when installed, guarantees that you have at
Index: php5.patch
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/php5.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- php5.patch 13 Aug 2013 23:04:16 -0000 1.12
+++ php5.patch 15 Aug 2013 03:31:29 -0000 1.13
@@ -4815,7 +4815,7 @@
+ DBSETOPT(H->link, DBTEXTSIZE, "2147483647");
diff -ruN php-5.5.1.orig/fink/patches/php-5.2.4-embed-darwin.patch
php-5.5.1/fink/patches/php-5.2.4-embed-darwin.patch
--- php-5.5.1.orig/fink/patches/php-5.2.4-embed-darwin.patch 1969-12-31
17:00:00.000000000 -0700
-+++ php-5.5.1/fink/patches/php-5.2.4-embed-darwin.patch 2013-08-08
10:37:50.000000000 -0600
++++ php-5.5.1/fink/patches/php-5.2.4-embed-darwin.patch 2013-08-14
10:51:30.000000000 -0600
@@ -0,0 +1,33 @@
+--- a/sapi/embed/config.m4
++++ b/sapi/embed/config.m4
@@ -4825,7 +4825,7 @@
+ PHP_EMBED_TYPE=shared
+- INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib;
\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib"
++ EXTRA_LDFLAGS_DARWIN="-dynamiclib -version-info
\$(PHP_MAJOR_VERSION):\$(PHP_MINOR_VERSION):\$(PHP_RELEASE_VERSION)
-L@FINKPREFIX@/lib"
-++ INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(LIBTOOL)
--mode=install \$(INSTALL) -m 0755 \$(OVERALL_TARGET)
\$(INSTALL_ROOT)\$(libdir)"
+++ INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib;
\$(LIBTOOL) --mode=install \$(INSTALL) -m 0755 \$(OVERALL_TARGET)
\$(INSTALL_ROOT)\$(prefix)/lib"
+ ;;
+ static)
+ PHP_EMBED_TYPE=static
@@ -4836,7 +4836,7 @@
+
+ libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath
$(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS)
$(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
-++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(libdir)
$(EXTRA_LDFLAGS_DARWIN) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS)
$(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath
$(prefix)/lib $(EXTRA_LDFLAGS_DARWIN) $(LDFLAGS) $(PHP_RPATHS)
$(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+ -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null
2>&1
+
+ libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
@@ -7747,7 +7747,7 @@
+find "${1}" -depth -mindepth 1 -maxdepth 1 -type f -ignore_readdir_race -cmin
+${2} -delete
diff -ruN php-5.5.1.orig/fink/setup-mysql.sh php-5.5.1/fink/setup-mysql.sh
--- php-5.5.1.orig/fink/setup-mysql.sh 1969-12-31 17:00:00.000000000 -0700
-+++ php-5.5.1/fink/setup-mysql.sh 2013-08-12 22:08:23.000000000 -0600
++++ php-5.5.1/fink/setup-mysql.sh 2013-08-13 21:06:13.000000000 -0600
@@ -0,0 +1,78 @@
+#!/bin/sh
+
@@ -7773,7 +7773,7 @@
+socket=$datadir/mysql.sock
+# Commands:
+mysqladmin="mysqladmin --no-defaults --user root --port $port --host
127.0.0.1 --socket=$socket --no-beep"
-+mysqld="%p/sbin/mysqld --no-defaults --user=$user --bind-address=127.0.0.1
--port=$port --socket=$socket --datadir=$datadir"
++mysqld="@FINKPREFIX@/sbin/mysqld --no-defaults --user=$user
--bind-address=127.0.0.1 --port=$port --socket=$socket --datadir=$datadir"
+
+# Main code #
+
------------------------------------------------------------------------------
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
