- outdated

Changed files:
    php-bug-40073.patch -> 1.5
    php-curl.patch -> 1.2
    php-db4.5.patch -> 1.2

diff --git a/php-bug-40073.patch b/php-bug-40073.patch
deleted file mode 100644 (file)
index 1c35a41..0000000
--- a/php-bug-40073.patch
+++ /dev/null
@@ -1,218 +0,0 @@
---- exif.c     2006/10/10 22:22:43     1.173.2.5.2.4
-+++ exif.c     2007/01/09 17:55:29     1.173.2.5.2.10
-@@ -2,7 +2,7 @@
-    +----------------------------------------------------------------------+
-    | PHP Version 5                                                        |
-    +----------------------------------------------------------------------+
--   | Copyright (c) 1997-2006 The PHP Group                                |
-+   | Copyright (c) 1997-2007 The PHP Group                                |
-    +----------------------------------------------------------------------+
-    | This source file is subject to version 3.01 of the PHP license,      |
-    | that is bundled with this package in the file LICENSE, and is        |
-@@ -17,7 +17,7 @@
-    +----------------------------------------------------------------------+
-  */
- 
--/* $Id$ */
-+/* $Id$ */
- 
- /*  ToDos
-  *
-@@ -139,7 +139,7 @@
- };
- /* }}} */
- 
--#define EXIF_VERSION "1.4 $Id$"
-+#define EXIF_VERSION "1.4 $Id$"
- 
- /* {{{ PHP_MINFO_FUNCTION
-  */
-@@ -1150,6 +1150,80 @@
- }
- /* }}} */
- 
-+#ifdef EXIF_DEBUG
-+char * exif_dump_data(int *dump_free, int format, int components, int length, int motorola_intel, char *value_ptr TSRMLS_DC) /* {{{ */
-+{
-+      char *dump;
-+      int len;
-+
-+      *dump_free = 0;
-+      if (format == TAG_FMT_STRING) {
-+              return value_ptr ? value_ptr : "<no data>";
-+      }
-+      if (format == TAG_FMT_UNDEFINED) {
-+              return "<undefined>\n";
-+      }
-+      if (format == TAG_FMT_IFD) {
-+              return "";
-+      }
-+      if (format == TAG_FMT_SINGLE || format == TAG_FMT_DOUBLE) {
-+              return "<not implemented>";
-+      }
-+      *dump_free = 1;
-+      if (components > 1) {
-+              len = spprintf(&dump, 0, "(%d,%d) {", components, length);
-+      } else {
-+              len = spprintf(&dump, 0, "{");
-+      }
-+      while(components > 0) {
-+              switch(format) {
-+                      case TAG_FMT_BYTE:
-+                      case TAG_FMT_UNDEFINED:
-+                      case TAG_FMT_STRING:
-+                      case TAG_FMT_SBYTE:
-+                              dump = erealloc(dump, len + 4);
-+                              sprintf(dump + len, "0x%02X", *value_ptr);
-+                              len += 4;
-+                              value_ptr++;
-+                              break;
-+                      case TAG_FMT_USHORT:
-+                      case TAG_FMT_SSHORT:
-+                              dump = erealloc(dump, len + 6);
-+                              sprintf(dump + len, "0x%04X", php_ifd_get16s(value_ptr, motorola_intel));
-+                              len += 6;
-+                              value_ptr += 2;
-+                              break;
-+                      case TAG_FMT_ULONG:
-+                      case TAG_FMT_SLONG:
-+                              dump = erealloc(dump, len + 6);
-+                              sprintf(dump + len, "0x%04X", php_ifd_get32s(value_ptr, motorola_intel));
-+                              len += 6;
-+                              value_ptr += 4;
-+                              break;
-+                      case TAG_FMT_URATIONAL:
-+                      case TAG_FMT_SRATIONAL:
-+                              dump = erealloc(dump, len + 13);
-+                              sprintf(dump + len, "0x%04X/0x%04X", php_ifd_get32s(value_ptr, motorola_intel), php_ifd_get32s(value_ptr+4, motorola_intel));
-+                              len += 13;
-+                              value_ptr += 8;
-+                              break;
-+              }
-+              if (components > 0) {
-+                      dump = erealloc(dump, len + 2);
-+                      sprintf(dump + len, ", ");
-+                      len += 2;                       
-+                      components--;
-+              } else{
-+                      break;
-+              }
-+      }
-+      dump = erealloc(dump, len + 2);
-+      sprintf(dump + len, "}");
-+      return dump;
-+}
-+/* }}} */
-+#endif
-+
- /* {{{ exif_convert_any_format
-  * Evaluate number, be it int, rational, or float from directory. */
- static double exif_convert_any_format(void *value, int format, int motorola_intel TSRMLS_DC)
-@@ -1599,6 +1673,7 @@
-       image_info->info_list[section_index].list = list;
- 
-       info_data  = &image_info->info_list[section_index].list[image_info->info_list[section_index].count];
-+      memset(info_data, 0, sizeof(image_info_data));
-       info_data->tag    = tag;
-       info_data->format = format;
-       info_data->length = length;
-@@ -2746,10 +2821,14 @@
-       char *value_ptr, tagname[64], cbuf[32], *outside=NULL;
-       size_t byte_count, offset_val, fpos, fgot;
-       xp_field_type *tmp_xp;
-+#ifdef EXIF_DEBUG
-+      char *dump_data;
-+      int dump_free;
-+#endif /* EXIF_DEBUG */
- 
-       /* Protect against corrupt headers */
-       if (ImageInfo->ifd_nesting_level > MAX_IFD_NESTING_LEVEL) {
--              exif_error_docref("exif_read_data#error_ifd" TSRMLS_CC, ImageInfo, E_WARNING, "corrupt EXIF header: maximum directory nesting level reached");
-+              exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "corrupt EXIF header: maximum directory nesting level reached");
-               return FALSE;
-       }
-       ImageInfo->ifd_nesting_level++;
-@@ -2834,7 +2913,11 @@
- 
-       ImageInfo->sections_found |= FOUND_ANY_TAG;
- #ifdef EXIF_DEBUG
--      exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Process tag(x%04X=%s,@x%04X + x%04X(=%d)): %s%s", tag, exif_get_tagname(tag, tagname, -12, tag_table TSRMLS_CC), offset_val+displacement, byte_count, byte_count, (components>1)&&format!=TAG_FMT_UNDEFINED&&format!=TAG_FMT_STRING?"ARRAY OF ":"", format==TAG_FMT_STRING?(value_ptr?value_ptr:"<no data>"):exif_get_tagformat(format));
-+      dump_data = exif_dump_data(&dump_free, format, components, length, ImageInfo->motorola_intel, value_ptr TSRMLS_CC);
-+      exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Process tag(x%04X=%s,@x%04X + x%04X(=%d)): %s%s %s", tag, exif_get_tagname(tag, tagname, -12, tag_table TSRMLS_CC), offset_val+displacement, byte_count, byte_count, (components>1)&&format!=TAG_FMT_UNDEFINED&&format!=TAG_FMT_STRING?"ARRAY OF ":"", exif_get_tagformat(format), dump_data);
-+      if (dump_free) {
-+              efree(dump_data);
-+      }
- #endif
-       if (section_index==SECTION_THUMBNAIL) {
-               if (!ImageInfo->Thumbnail.data) {
-@@ -3023,7 +3106,9 @@
-                                               exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Illegal IFD Pointer");
-                                               return FALSE;
-                                       }
--                                      exif_process_IFD_in_JPEG(ImageInfo, Subdir_start, offset_base, IFDlength, displacement, sub_section_index TSRMLS_CC);
-+                                      if (!exif_process_IFD_in_JPEG(ImageInfo, Subdir_start, offset_base, IFDlength, displacement, sub_section_index TSRMLS_CC)) {
-+                                              return FALSE;
-+                                      }
- #ifdef EXIF_DEBUG
-                                       exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Subsection %s done", exif_get_sectionname(sub_section_index));
- #endif
-@@ -3590,7 +3675,7 @@
-                                                               exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "%s THUMBNAIL @0x%04X + 0x%04X", ImageInfo->Thumbnail.data ? "Ignore" : "Read", ImageInfo->Thumbnail.offset, ImageInfo->Thumbnail.size);
- #endif
-                                                               if (!ImageInfo->Thumbnail.data) {
--                                                                      ImageInfo->Thumbnail.data = emalloc(ImageInfo->Thumbnail.size);
-+                                                                      ImageInfo->Thumbnail.data = safe_emalloc(ImageInfo->Thumbnail.size, 1, 0);
-                                                                       php_stream_seek(ImageInfo->infile, ImageInfo->Thumbnail.offset, SEEK_SET);
-                                                                       fgot = php_stream_read(ImageInfo->infile, ImageInfo->Thumbnail.data, ImageInfo->Thumbnail.size);
-                                                                       if (fgot < ImageInfo->Thumbnail.size) {
-@@ -3623,7 +3708,7 @@
-                                       exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "%s THUMBNAIL @0x%04X + 0x%04X", ImageInfo->Thumbnail.data ? "Ignore" : "Read", ImageInfo->Thumbnail.offset, ImageInfo->Thumbnail.size);
- #endif
-                                       if (!ImageInfo->Thumbnail.data && ImageInfo->Thumbnail.offset && ImageInfo->Thumbnail.size && ImageInfo->read_thumbnail) {
--                                              ImageInfo->Thumbnail.data = emalloc(ImageInfo->Thumbnail.size);
-+                                              ImageInfo->Thumbnail.data = safe_emalloc(ImageInfo->Thumbnail.size, 1, 0);
-                                               php_stream_seek(ImageInfo->infile, ImageInfo->Thumbnail.offset, SEEK_SET);
-                                               fgot = php_stream_read(ImageInfo->infile, ImageInfo->Thumbnail.data, ImageInfo->Thumbnail.size);
-                                               if (fgot < ImageInfo->Thumbnail.size) {
-@@ -3914,7 +3999,7 @@
-               exif_iif_add_int(&ImageInfo, SECTION_COMPUTED, "ByteOrderMotorola", ImageInfo.motorola_intel TSRMLS_CC);
-       }
-       if (ImageInfo.FocalLength) {
--              exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "FocalLength" TSRMLS_CC, "%4.1fmm", ImageInfo.FocalLength);
-+              exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "FocalLength" TSRMLS_CC, "%4.1Fmm", ImageInfo.FocalLength);
-               if(ImageInfo.CCDWidth) {
-                       exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "35mmFocalLength" TSRMLS_CC, "%dmm", (int)(ImageInfo.FocalLength/ImageInfo.CCDWidth*35+0.5));
-               }
-@@ -3924,19 +4009,19 @@
-       }
-       if(ImageInfo.ExposureTime>0) {
-               if(ImageInfo.ExposureTime <= 0.5) {
--                      exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "ExposureTime" TSRMLS_CC, "%0.3f s (1/%d)", ImageInfo.ExposureTime, (int)(0.5 + 1/ImageInfo.ExposureTime));
-+                      exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "ExposureTime" TSRMLS_CC, "%0.3F s (1/%d)", ImageInfo.ExposureTime, (int)(0.5 + 1/ImageInfo.ExposureTime));
-               } else {
--                      exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "ExposureTime" TSRMLS_CC, "%0.3f s", ImageInfo.ExposureTime);
-+                      exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "ExposureTime" TSRMLS_CC, "%0.3F s", ImageInfo.ExposureTime);
-               }
-       }
-       if(ImageInfo.ApertureFNumber) {
--              exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "ApertureFNumber" TSRMLS_CC, "f/%.1f", ImageInfo.ApertureFNumber);
-+              exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "ApertureFNumber" TSRMLS_CC, "f/%.1F", ImageInfo.ApertureFNumber);
-       }
-       if(ImageInfo.Distance) {
-               if(ImageInfo.Distance<0) {
-                       exif_iif_add_str(&ImageInfo, SECTION_COMPUTED, "FocusDistance", "Infinite" TSRMLS_CC);
-               } else {
--                      exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "FocusDistance" TSRMLS_CC, "%0.2fm", ImageInfo.Distance);
-+                      exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "FocusDistance" TSRMLS_CC, "%0.2Fm", ImageInfo.Distance);
-               }
-       }
-       if (ImageInfo.UserComment) {
-@@ -4005,7 +4090,7 @@
-    Reads the embedded thumbnail */
- PHP_FUNCTION(exif_thumbnail)
- {
--      zval *p_width, *p_height, *p_imagetype;
-+      zval *p_width = 0, *p_height = 0, *p_imagetype = 0;
-       char *p_name;
-       int p_name_len, ret, arg_c = ZEND_NUM_ARGS();
-       image_info_type ImageInfo;

diff --git a/php-curl.patch b/php-curl.patch
deleted file mode 100644 (file)
index 111741d..0000000
--- a/php-curl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- php-5.2.0/ext/curl/interface.c.orig        2006-10-11 01:12:59.000000000 +0200
-+++ php-5.2.0/ext/curl/interface.c     2006-11-21 22:57:41.498291750 +0100
-@@ -369,7 +369,9 @@
-       REGISTER_CURL_CONSTANT(CURLOPT_FTPAPPEND);
-       REGISTER_CURL_CONSTANT(CURLOPT_NETRC);
-       REGISTER_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION);
-+#if CURLOPT_FTPASCII != 0
-       REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII);
-+#endif
-       REGISTER_CURL_CONSTANT(CURLOPT_PUT);
- #if CURLOPT_MUTE != 0
-       REGISTER_CURL_CONSTANT(CURLOPT_MUTE);
-@@ -409,7 +411,9 @@
-       REGISTER_CURL_CONSTANT(CURLOPT_FILETIME);
-       REGISTER_CURL_CONSTANT(CURLOPT_WRITEFUNCTION);
-       REGISTER_CURL_CONSTANT(CURLOPT_READFUNCTION);
-+#if CURLOPT_PASSWDFUNCTION != 0
-       REGISTER_CURL_CONSTANT(CURLOPT_PASSWDFUNCTION);
-+#endif
-       REGISTER_CURL_CONSTANT(CURLOPT_HEADERFUNCTION);
-       REGISTER_CURL_CONSTANT(CURLOPT_MAXREDIRS);
-       REGISTER_CURL_CONSTANT(CURLOPT_MAXCONNECTS);
-@@ -1158,11 +1162,13 @@
-       dupch->handlers->read->fp = ch->handlers->read->fp;
-       dupch->handlers->read->fd = ch->handlers->read->fd;
- 
-+#if CURLOPT_PASSWDDATA != 0
-       if (ch->handlers->passwd) {
-               zval_add_ref(&ch->handlers->passwd);
-               dupch->handlers->passwd = ch->handlers->passwd;
-               curl_easy_setopt(ch->cp, CURLOPT_PASSWDDATA, (void *) dupch);
-       }
-+#endif
-       if (ch->handlers->write->func_name) {
-               zval_add_ref(&ch->handlers->write->func_name);
-               dupch->handlers->write->func_name = ch->handlers->write->func_name;

diff --git a/php-db4.5.patch b/php-db4.5.patch
deleted file mode 100644 (file)
index 455277a..0000000
--- a/php-db4.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- php-5.1.2/ext/dba/config.m4.orig   2005-11-29 19:25:58.000000000 +0100
-+++ php-5.1.2/ext/dba/config.m4        2006-02-19 22:52:01.317248250 +0100
-@@ -262,7 +262,7 @@
-         break
-       fi
-     done
--    PHP_DBA_DB_CHECK(4, db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
-+    PHP_DBA_DB_CHECK(4, db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
-   fi
- ])
- AC_DBA_STD_RESULT(db4,Berkeley DB4)