[Pkg-php-commits] [php/debian-experimental] Fix segmentation fault in php-gd (Closes: #543496)

[Ondrej Sury]

---
 debian/changelog                         |    7 +++++++
 debian/patches/114-php_gd_segfault.patch |   26 ++++++++++++++++++++++++++
 debian/patches/series                    |    1 +
 3 files changed, 34 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/114-php_gd_segfault.patch

diff --git a/debian/changelog b/debian/changelog
index 620ed05..ea9edfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+php5 (5.3.0-3) unstable; urgency=low
+
+  * Upload to unstable
+  * Fix segmentation fault in php-gd (Closes: #543496)
+
+ -- Ondřej Surý <ondrej at debian.org>  Tue, 25 Aug 2009 14:46:40 +0200
+
 php5 (5.3.0-2) experimental; urgency=low
 
   * update configuration file names to new upstream naming convention
diff --git a/debian/patches/114-php_gd_segfault.patch b/debian/patches/114-php_gd_segfault.patch
new file mode 100644
index 0000000..bf2b95e
--- /dev/null
+++ b/debian/patches/114-php_gd_segfault.patch
@@ -0,0 +1,26 @@
+diff --git a/ext/gd/libgd/gd_compat.c b/ext/gd/libgd/gd_compat.c
+index bba6234..473ea20 100644
+--- a/ext/gd/libgd/gd_compat.c
++++ b/ext/gd/libgd/gd_compat.c
+@@ -14,7 +14,7 @@ int gdJpegGetVersionInt()
+ 	return JPEG_LIB_VERSION;
+ }
+ 
+-int gdJpegGetVersionString()
++const char * gdJpegGetVersionString()
+ {
+ 	switch(JPEG_LIB_VERSION) {
+ 		case 62:
+diff --git a/ext/gd/libgd/gd_compat.h b/ext/gd/libgd/gd_compat.h
+index 022d0a8..c084a00 100644
+--- a/ext/gd/libgd/gd_compat.h
++++ b/ext/gd/libgd/gd_compat.h
+@@ -8,7 +8,7 @@
+ #endif
+ 
+ const char * gdPngGetVersionString();
+-int gdJpegGetVersionString();
++const char * gdJpegGetVersionString();
+ int gdJpegGetVersionInt();
+ int overflow2(int a, int b);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index efbb5af..3a779f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,6 +22,7 @@ libtool2.2.patch
 108-64_bit_datetime.patch
 112-proc_open.patch
 113-php.ini_securitynotes.patch
+114-php_gd_segfault.patch
 libdb_is_-ldb
 fix_broken_upstream_tests.patch
 use_embedded_timezonedb.patch
-- 
1.5.6.5