- drop old patches

Changed files:
    php-dextension.patch -> 1.3
    php-ini-charsetphpini.patch -> 1.2
    php-xml-force-expat.patch -> 1.2
    zend.gif -> 1.2

diff --git a/php-dextension.patch b/php-dextension.patch
deleted file mode 100644 (file)
index 97ef3d3..0000000
--- a/php-dextension.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-backported loading dl extension with -dexetnsion=extension.so from php5.1-200512091130
-
---- php-5.0.5/sapi/cli/php_cli.c       2005-03-22 17:09:20.000000000 +0200
-+++ php5.1-200512091130/sapi/cli/php_cli.c     2005-12-10 01:11:54.000000000 +0200
-@@ -397,7 +397,7 @@
- }
- /* }}} */
- 
--static void define_command_line_ini_entry(char *arg)
-+static void define_command_line_ini_entry(char *arg TSRMLS_DC)
- {
-       char *name, *value;
- 
-@@ -409,7 +409,14 @@
-       } else {
-               value = "1";
-       }
--      zend_alter_ini_entry(name, strlen(name)+1, value, strlen(value), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
-+
-+      if (!strcasecmp(name, "extension")) { /* load function module */
-+              zval extension, zval;
-+              ZVAL_STRING(&extension, value, 0);
-+              php_dl(&extension, MODULE_PERSISTENT, &zval TSRMLS_CC);
-+      } else {
-+              zend_alter_ini_entry(name, strlen(name)+1, value, strlen(value), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
-+      }
- }
- 
- 
-@@ -656,7 +663,7 @@
-                       switch (c) {
- 
-                       case 'd': /* define ini entries on command line */
--                              define_command_line_ini_entry(php_optarg);
-+                              define_command_line_ini_entry(php_optarg TSRMLS_CC);
-                               break;
- 
-                       case 'h': /* help & quit */

diff --git a/php-ini-charsetphpini.patch b/php-ini-charsetphpini.patch
deleted file mode 100644 (file)
index 77536fc..0000000
--- a/php-ini-charsetphpini.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- php-5.2.4/php.ini~ 2008-09-23 14:06:04.000000000 +0300
-+++ php-5.2.4/php.ini  2008-10-08 01:34:12.575347747 +0300
-@@ -749,6 +749,9 @@
- ; Maximum time (in seconds) for connect timeout. -1 means no limit
- mysql.connect_timeout = 60
- 
-+; The name of the character set to use as the default character set.
-+;mysql.connect_charset=utf8
-+
- ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
- ; SQL-Errors will be displayed.
- mysql.trace_mode = Off
-@@ -768,6 +771,9 @@
- ; MySQL defaults.
- mysqli.default_socket =
- 
-+; The name of the character set to use as the default character set.
-+;mysqli.connect_charset=utf8
-+
- ; Default host for mysql_connect() (doesn't apply in safe mode).
- mysqli.default_host =
- 
-@@ -784,6 +790,10 @@
- ; Allow or prevent reconnect
- mysqli.reconnect = Off
- 
-+[pdo_mysql]
-+; The name of the character set to use as the default character set.
-+;pdo_mysql.connect_charset=utf8
-+
- [mSQL]
- ; Allow or prevent persistent links.
- msql.allow_persistent = On

diff --git a/php-xml-force-expat.patch b/php-xml-force-expat.patch
deleted file mode 100644 (file)
index 4980f24..0000000
--- a/php-xml-force-expat.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- php-5.2.7/ext/xml.org/config.m4    2005-12-22 09:57:38.000000000 +0100
-+++ php-5.2.7/ext/xml/config.m4        2008-12-06 12:13:57.781991558 +0100
-@@ -5,11 +5,6 @@
- PHP_ARG_ENABLE(xml,whether to enable XML support,
- [  --disable-xml           Disable XML support], yes)
- 
--if test -z "$PHP_LIBXML_DIR"; then
--  PHP_ARG_WITH(libxml-dir, libxml2 install dir,
--  [  --with-libxml-dir=DIR     XML: libxml2 install prefix], no, no)
--fi
--
- PHP_ARG_WITH(libexpat-dir, libexpat install dir,
- [  --with-libexpat-dir=DIR   XML: libexpat install prefix (deprecated)], no, no)
- 
-@@ -19,17 +14,7 @@
-   dnl Default to libxml2 if --with-libexpat-dir is not used.
-   dnl
-   if test "$PHP_LIBEXPAT_DIR" = "no"; then
--
--    if test "$PHP_LIBXML" = "no"; then
--      AC_MSG_ERROR([XML extension requires LIBXML extension, add --enable-libxml])
--    fi
--
--    PHP_SETUP_LIBXML(XML_SHARED_LIBADD, [
--      xml_extra_sources="compat.c"
--      PHP_ADD_EXTENSION_DEP(xml, libxml)
--    ], [
--      AC_MSG_ERROR([xml2-config not found. Use --with-libxml-dir=<DIR>])
--    ])
-+      AC_MSG_ERROR([XML extension requires EXPAT extension, add --enable-expat])
-   fi
-   
-   dnl

diff --git a/zend.gif b/zend.gif
deleted file mode 100644 (file)
index a2b4379..0000000
Binary files a/zend.gif and /dev/null differ