packages: php/fix-test-run.patch, php/php-fpm-config.patch, php/php-fpm-sha...

glen glen at pld-linux.org
Sun Jul 25 12:15:56 CEST 2010 

Author: glen                         Date: Sun Jul 25 10:15:56 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.3.3, fpm patch included but broken
- fpm needs -fPIC fixing

---- Files affected:
packages/php:
   fix-test-run.patch (1.7 -> 1.8) , php-fpm-config.patch (1.7 -> 1.8) , php-fpm-shared.patch (1.1 -> 1.2) , php-pdo_mysql-charsetphpini.patch (1.5 -> 1.6) , php-tds.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/php/fix-test-run.patch
diff -u packages/php/fix-test-run.patch:1.7 packages/php/fix-test-run.patch:1.8
--- packages/php/fix-test-run.patch:1.7	Sat Jul 24 18:16:45 2010
+++ packages/php/fix-test-run.patch	Sun Jul 25 12:15:50 2010
@@ -60,32 +60,3 @@
  PHP_TEST_SHARED_EXTENSIONS =  ` \
  	if test "x$(PHP_MODULES)" != "x"; then \
  		for i in $(PHP_MODULES)""; do \
---- php-5.3.2/Makefile.gcov	2010-03-16 16:31:36.972576955 +0200
-+++ php-5.3.2/Makefile.gcov	2010-03-16 16:31:36.972576955 +0200
-@@ -376,11 +376,25 @@
- 	@echo "Running test suite"
- 	@find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f
- 	- at if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
-+		INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
-+		if test "$$INI_FILE"; then \
-+			$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
-+		else \
-+			echo > $(top_builddir)/tmp-php.ini; \
-+		fi; \
-+		INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \
-+		if test "$$INI_SCANNED_PATH"; then \
-+			INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \
-+			$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
-+		fi; \
- 		NO_INTERACTION=1 \
- 		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
- 		TEST_PHP_SRCDIR=$(top_srcdir) \
- 		CC="$(CC)" \
--			$(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \
-+			$(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \
-+			-d extension_dir=$(top_builddir)/modules/ -d 'extension=$(EXTENSION_DIR)/pcre.$(SHLIB_DL_SUFFIX_NAME)' \
-+			$(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \
-+			-d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \
- 	elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
- 		NO_INTERACTION=1 \
- 		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \

================================================================
Index: packages/php/php-fpm-config.patch
diff -u packages/php/php-fpm-config.patch:1.7 packages/php/php-fpm-config.patch:1.8
--- packages/php/php-fpm-config.patch:1.7	Thu Nov 26 23:03:04 2009
+++ packages/php/php-fpm-config.patch	Sun Jul 25 12:15:50 2010
@@ -1,45 +1,11 @@
---- php-5.3.1/sapi/fpm/conf/php-fpm.conf.in	2009-11-26 23:49:50.761930204 +0200
-+++ php-5.3.1/sapi/fpm/conf/php-fpm.conf.in	2009-11-27 00:01:38.545190815 +0200
-@@ -38,7 +38,7 @@
- 
- 			Address to accept fastcgi requests on.
- 			Valid syntax is 'ip.ad.re.ss:port' or just 'port' or '/path/to/unix/socket'
--			<value name="listen_address">127.0.0.1:@php_fpm_port@</value>
-+			<value name="listen_address">/var/run/php/fpm.sock</value>
- 
- 			<value name="listen_options">
- 
-@@ -110,7 +110,7 @@
- 			<value name="request_slowlog_timeout">0s</value>
- 
- 			The log file for slow requests
--			<value name="slowlog">@php_fpm_log_path at .slow</value>
-+			<value name="slowlog">/var/log/fpm-slow.log</value>
- 
- 			Set open file desc rlimit
- 			<value name="rlimit_files">1024</value>
-@@ -129,7 +129,7 @@
- 			Useful to work around memory leaks in 3rd party libraries.
- 			For endless request processing please specify 0
- 			Equivalent to PHP_FCGI_MAX_REQUESTS
--			<value name="max_requests">500</value>
-+			<value name="max_requests">100000</value>
- 
- 			Comma separated list of ipv4 addresses of FastCGI clients that allowed to connect.
- 			Equivalent to FCGI_WEB_SERVER_ADDRS environment in original php.fcgi (5.2.2+)
-@@ -139,14 +139,7 @@
- 			Pass environment variables like LD_LIBRARY_PATH
- 			All $VARIABLEs are taken from current environment
- 			<value name="environment">
--				<value name="HOSTNAME">$HOSTNAME</value>
--				<value name="PATH">/usr/local/bin:/usr/bin:/bin</value>
--				<value name="TMP">/tmp</value>
--				<value name="TMPDIR">/tmp</value>
--				<value name="TEMP">/tmp</value>
--				<value name="OSTYPE">$OSTYPE</value>
--				<value name="MACHTYPE">$MACHTYPE</value>
--				<value name="MALLOC_CHECK_">2</value>
-+				<value name="PATH">$PATH</value>
- 			</value>
- 
- 		</section>
+--- php-5.3.3/sapi/fpm/php-fpm.conf.in~	2010-05-29 13:39:35.000000000 +0300
++++ php-5.3.3/sapi/fpm/php-fpm.conf.in	2010-07-24 22:29:56.752470466 +0300
+@@ -245,7 +245,7 @@
+ ; the current environment.
+ ; Default Value: clean env
+ ;env[HOSTNAME] = $HOSTNAME
+-;env[PATH] = /usr/local/bin:/usr/bin:/bin
++env[PATH] = $PATH
+ ;env[TMP] = /tmp
+ ;env[TMPDIR] = /tmp
+ ;env[TEMP] = /tmp

================================================================
Index: packages/php/php-fpm-shared.patch
diff -u packages/php/php-fpm-shared.patch:1.1 packages/php/php-fpm-shared.patch:1.2
--- packages/php/php-fpm-shared.patch:1.1	Thu Nov 26 21:44:57 2009
+++ packages/php/php-fpm-shared.patch	Sun Jul 25 12:15:50 2010
@@ -1,11 +1,22 @@
---- php-5.3.1/sapi/fpm/ac/fpm_build.m4~	2009-11-26 18:12:06.000000000 +0200
-+++ php-5.3.1/sapi/fpm/ac/fpm_build.m4	2009-11-26 21:57:28.003071130 +0200
-@@ -36,7 +36,7 @@
+--- php-5.3.3/sapi/fpm/config.m4~	2010-06-16 11:58:42.000000000 +0300
++++ php-5.3.3/sapi/fpm/config.m4	2010-07-24 22:32:25.642457281 +0300
+@@ -600,7 +600,7 @@
          BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
        ;;
        *)
 -        BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
 +        BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
        ;;
-     esac
+   esac
  
+--- php-5.3.3/sapi/fpm/Makefile.frag~	2010-05-30 01:00:43.000000000 +0300
++++ php-5.3.3/sapi/fpm/Makefile.frag	2010-07-24 22:33:51.945781258 +0300
+@@ -3,7 +3,7 @@
+ $(builddir)/fpm: 
+ 	@mkdir -p $(builddir)/fpm
+ 
+-$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
++$(SAPI_FPM_PATH): $(builddir)/fpm libphp_common.la $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
+ 	$(BUILD_FPM)
+ 
+ $(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h

================================================================
Index: packages/php/php-pdo_mysql-charsetphpini.patch
diff -u packages/php/php-pdo_mysql-charsetphpini.patch:1.5 packages/php/php-pdo_mysql-charsetphpini.patch:1.6
--- packages/php/php-pdo_mysql-charsetphpini.patch:1.5	Fri Feb 26 18:28:14 2010
+++ packages/php/php-pdo_mysql-charsetphpini.patch	Sun Jul 25 12:15:50 2010
@@ -26,8 +26,8 @@
  	if (mysqlnd_connect(H->server, host, dbh->username, dbh->password, password_len, dbname, dbname_len,
  						port, unix_socket, connect_opts, PDO_MYSQL_G(mysqlnd_thd_zval_cache) TSRMLS_CC) == NULL) {
  #else
---- php-5.3.2RC3/ext/pdo_mysql/pdo_mysql.c~	2010-02-04 11:37:38.000000000 +0200
-+++ php-5.3.2RC3/ext/pdo_mysql/pdo_mysql.c	2010-02-26 19:09:36.784902389 +0200
+--- php-5.3.3/ext/pdo_mysql/pdo_mysql.c~	2010-07-24 19:23:14.000000000 +0300
++++ php-5.3.3/ext/pdo_mysql/pdo_mysql.c	2010-07-24 19:24:48.363581841 +0300
 @@ -56,6 +56,7 @@
  #if PDO_DBG_ENABLED
  	STD_PHP_INI_ENTRY("pdo_mysql.debug",	NULL, PHP_INI_SYSTEM, OnUpdateString, debug, zend_pdo_mysql_globals, pdo_mysql_globals)
@@ -56,47 +56,12 @@
  }
  /* }}} */
  
-@@ -154,10 +151,13 @@
- /* }}} */
- 
- 
-+#endif /* PDO_USE_MYSQLND */
-+
- /* {{{ PHP_GINIT_FUNCTION
-  */
- static PHP_GINIT_FUNCTION(pdo_mysql)
- {
-+#ifdef PDO_USE_MYSQLND
- #ifndef PHP_WIN32
- 	pdo_mysql_globals->default_socket = NULL;
- #endif
-@@ -165,10 +165,10 @@
+@@ -161,6 +161,7 @@
  	pdo_mysql_globals->debug = NULL;	/* The actual string */
  	pdo_mysql_globals->dbg = NULL;	/* The DBG object*/
  #endif
-+#endif /* PDO_USE_MYSQLND */
 +	pdo_mysql_globals->connect_charset = NULL;
  }
- /* }}} */
--#endif
--
- 
- /* {{{ pdo_mysql_functions[] */
- const zend_function_entry pdo_mysql_functions[] = {
-@@ -205,15 +205,11 @@
- #endif
- 	PHP_MINFO(pdo_mysql),
- 	"1.0.2",
--#if PDO_USE_MYSQLND
- 	PHP_MODULE_GLOBALS(pdo_mysql),
- 	PHP_GINIT(pdo_mysql),
- 	NULL,
- 	NULL,
- 	STANDARD_MODULE_PROPERTIES_EX
--#else
--	STANDARD_MODULE_PROPERTIES
--#endif
- };
  /* }}} */
  
 --- php-5.3.2RC3/ext/pdo_mysql/php_pdo_mysql_int.h~	2010-02-04 11:37:38.000000000 +0200

================================================================
Index: packages/php/php-tds.patch
diff -u packages/php/php-tds.patch:1.3 packages/php/php-tds.patch:1.4
--- packages/php/php-tds.patch:1.3	Sat Dec  6 00:09:24 2008
+++ packages/php/php-tds.patch	Sun Jul 25 12:15:50 2010
@@ -1,11 +1,11 @@
---- php/ext/sybase_ct/config.m4~	2007-07-03 19:25:35.000000000 +0200
-+++ php/ext/sybase_ct/config.m4	2008-06-16 10:42:20.463792334 +0200
+--- php-5.3.3/ext/sybase_ct/config.m4~	2010-07-07 13:15:24.000000000 +0300
++++ php-5.3.3/ext/sybase_ct/config.m4	2010-07-24 19:21:13.897144810 +0300
 @@ -31,7 +31,7 @@
    fi
    
    PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
--  if test -f $SYBASE_CT_INCDIR/tds.h; then
-+  if test -f $SYBASE_CT_INCDIR/sybdb.h; then
+-  if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then
++  if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h || test -f $SYBASE_CT_INCDIR/sybdb.h; then
      PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
      SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
-   else
+   elif test -f $SYBASE_CT_INCDIR/libsybct64; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/fix-test-run.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-fpm-config.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-fpm-shared.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-pdo_mysql-charsetphpini.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-tds.patch?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list