From fbb2a69a70acf458032a42b889416507e996e7ec Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: Apr 12 2005 08:54:20 +0000
Subject: * Tue Apr 12 2005 Joe Orton <jorton@redhat.com> 5.0.4-4

- bundle from PEAR: HTTP, Mail, XML_Parser, Net_Socket, Net_SMTP
- snmp: disable MSHUTDOWN function to prevent error_log noise (#153988)
- mysqli: add fix for crash on x86_64 (Georg Richter, upstream #32282)

---

diff --git a/.cvsignore b/.cvsignore
index b082532..c1a16b7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,12 @@ php-5.0.4.tar.gz
 *.rpm
 i386
 DB-1.7.5.tgz
+php-4.3.9.tar.gz
+php-4.3.10.tar.gz
+php-4.3.11.tar.gz
+DB-1.7.5.tgz
+Mail-1.1.4.tgz
+HTTP-1.3.5.tgz
+Net_Socket-1.0.6.tgz
+XML_Parser-1.2.6.tgz
+Net_SMTP-1.2.6.tgz
diff --git a/php-4.3.11-shutdown.patch b/php-4.3.11-shutdown.patch
new file mode 100644
index 0000000..a9980ce
--- /dev/null
+++ b/php-4.3.11-shutdown.patch
@@ -0,0 +1,38 @@
+--- php-4.3.11/ext/snmp/php_snmp.h.shutdown
++++ php-4.3.11/ext/snmp/php_snmp.h
+@@ -39,7 +39,6 @@
+ #endif
+ 
+ PHP_MINIT_FUNCTION(snmp);
+-PHP_MSHUTDOWN_FUNCTION(snmp);
+ PHP_MINFO_FUNCTION(snmp);
+ 
+ PHP_FUNCTION(snmpget);
+--- php-4.3.11/ext/snmp/snmp.c.shutdown
++++ php-4.3.11/ext/snmp/snmp.c
+@@ -156,7 +156,7 @@
+ 	"snmp",
+ 	snmp_functions,
+ 	PHP_MINIT(snmp),
+-	PHP_MSHUTDOWN(snmp),
++	NULL,
+ 	NULL,
+ 	NULL,
+ 	PHP_MINFO(snmp),
+@@ -208,16 +208,6 @@
+ }
+ /* }}} */
+ 
+-/* {{{ PHP_MSHUTDOWN_FUNCTION
+- */
+-PHP_MSHUTDOWN_FUNCTION(snmp)
+-{
+-	snmp_shutdown("snmpapp");
+-
+-	return SUCCESS;
+-}
+-/* }}} */
+-
+ /* {{{ PHP_MINFO_FUNCTION
+  */
+ PHP_MINFO_FUNCTION(snmp)
diff --git a/php.spec b/php.spec
index 7e848d7..d8ebd2c 100644
--- a/php.spec
+++ b/php.spec
@@ -7,7 +7,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.0.4
-Release: 3
+Release: 4
 License: The PHP License
 Group: Development/Languages
 URL: http://www.php.net/
@@ -15,6 +15,11 @@ URL: http://www.php.net/
 Source0: http://www.php.net/distributions/php-%{version}.tar.gz
 Source10: pear-RunTest.php
 Source20: http://pear.php.net/get/DB-1.7.5.tgz
+Source21: http://pear.php.net/get/HTTP-1.3.5.tgz
+Source22: http://pear.php.net/get/Mail-1.1.4.tgz
+Source23: http://pear.php.net/get/XML_Parser-1.2.6.tgz
+Source24: http://pear.php.net/get/Net_Socket-1.0.6.tgz
+Source25: http://pear.php.net/get/Net_SMTP-1.2.6.tgz
 Source50: php.conf
 
 Patch2: php-5.0.1-config.patch
@@ -33,6 +38,7 @@ Patch17: php-5.0.3-gcc4.patch
 
 # Fixes for extension modules
 Patch21: php-4.3.1-odbc.patch
+Patch22: php-4.3.11-shutdown.patch
 
 # Functional changes
 Patch30: php-5.0.4-dlopen.patch
@@ -308,6 +314,7 @@ support for using the gd graphics library to PHP.
 %patch17 -p1 -b .gcc4
 
 %patch21 -p1 -b .odbc
+%patch22 -p1 -b .shutdown
 
 %patch30 -p1 -b .dlopen
 %patch31 -p1 -b .easter
@@ -335,12 +342,11 @@ rm -f ext/standard/tests/file/bug22414.phpt \
 # Missing file in 5.0.4 PEAR bundle:
 cp $RPM_SOURCE_DIR/pear-RunTest.php pear/PEAR/RunTest.php
 
-# Unpack PEAR DB package
-pushd pear
- tar xzf %{SOURCE20}
- mv DB-* DB
- sed '/<file /s,name=",name="DB/,' package.xml > package-DB.xml
- rm package.xml
+# Add some standard PEAR packages which are no longer shipped upstream
+pushd pear/packages
+  cp %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} \
+     %{SOURCE24} %{SOURCE25} .
+  gunzip *.tgz
 popd
 
 : Build for oci8=%{with_oci8} mssql=%{with_mssql} mhash=%{with_mhash} ibase=%{with_ibase}
@@ -598,6 +604,11 @@ rm files.*
 %endif
 
 %changelog
+* Tue Apr 12 2005 Joe Orton <jorton@redhat.com> 5.0.4-4
+- bundle from PEAR: HTTP, Mail, XML_Parser, Net_Socket, Net_SMTP
+- snmp: disable MSHUTDOWN function to prevent error_log noise (#153988)
+- mysqli: add fix for crash on x86_64 (Georg Richter, upstream #32282)
+
 * Mon Apr 11 2005 Joe Orton <jorton@redhat.com> 5.0.4-3
 - build shared objects as PIC (#154195)
 
diff --git a/sources b/sources
index 29eccbf..7e9b7b7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,7 @@
 c8f5fa441fd99c1b363bd2a071a0bd97  php-5.0.4.tar.gz
 43954e51f8dcf5c62700268bdc61ac63  DB-1.7.5.tgz
+3e14fef5bd418de87214a3271ffc4549  Mail-1.1.4.tgz
+9c01a682f5859a09e01fe5f305b3c353  HTTP-1.3.5.tgz
+f961deffb093a58eb4c48478de1b27ed  Net_Socket-1.0.6.tgz
+96ebc0fc2f349249f1455389797e72a4  XML_Parser-1.2.6.tgz
+69bcb47d571b72060beed0a7d8d852a5  Net_SMTP-1.2.6.tgz