Added support for iodbc

Package-Manager: portage-2.0.51.19

4 files changed, 53 insertions, 35 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 83b7b6dc7236..4e248ea72b15 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.233 2005/05/19 20:23:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.234 2005/05/31 21:41:43 stuart Exp $
+
+  31 May 2005; Stuart Herbert <stuart@gentoo.org> +files/with-iodbc.diff:
+  Added patch to support iodbc database library
 
   19 May 2005; Robin H. Johnson <robbat2@gentoo.org>
   mod_php-4.3.9_rc1.ebuild, mod_php-4.3.9.ebuild, mod_php-4.3.10.ebuild,
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 6c9e53063719..753ed3401fae 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,52 +1,53 @@
-MD5 8b7b68cdbf3f1b0166be3c1c3ab17a1a mod_php-5.0.2-r1.ebuild 4166
-MD5 0590fbcb37577564c35284d34693a369 mod_php-5.0.0.ebuild 3991
-MD5 8b5fd333626d3b48284520c2ba23f781 mod_php-4.3.9.ebuild 6066
-MD5 c6a13dc4da001ffebdd02f7d0159cb8e mod_php-4.3.11-r1.ebuild 6420
-MD5 f4349201e2fd2d03677964aca3cd68d9 mod_php-5.0.2.ebuild 4247
-MD5 d9c6c1ccdb4c59e334d094d71d1fcfd5 mod_php-5.0.3-r2.ebuild 2046
-MD5 503480155a6bb0af5f88a53de5bb2016 mod_php-4.3.10-r1.ebuild 6344
-MD5 13aae2688364c0055a0597db453d59e6 mod_php-4.3.11.ebuild 6203
-MD5 3bb00217dc1ac7589ec1d33fc29ddb7a mod_php-5.0.4.ebuild 2095
-MD5 4862fd4457f3657f73b51018c8062c26 mod_php-4.3.8.ebuild 5957
+MD5 ba882cb0792fc39245006caf7e655443 ChangeLog 40866
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 7fa3534b809e0a9ac6164d1af55fe3fb mod_php-5.0.0-r1.ebuild 4169
 MD5 e20f19cf3e363f24b988a6e75a7308b7 mod_php-4.3.9_rc1.ebuild 6064
 MD5 f88cfb59bb6302175e2ebffe5365bf51 mod_php-5.0.1.ebuild 4234
-MD5 95d75a98a9c537d7ed43e02482f19b06 mod_php-4.3.11-r2.ebuild 6420
-MD5 f95d27f25ea999ac96095db4f8870eaa mod_php-5.0.3-r1.ebuild 4285
-MD5 a28680e4d3407fd72ca4508ab74a05f8 ChangeLog 40744
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 8b5fd333626d3b48284520c2ba23f781 mod_php-4.3.9.ebuild 6066
+MD5 f4349201e2fd2d03677964aca3cd68d9 mod_php-5.0.2.ebuild 4247
 MD5 576fa4769ff24b189302174ac2aca578 mod_php-4.3.10.ebuild 6126
 MD5 541613fee6206a59402e87102a5dc853 mod_php-5.0.3.ebuild 4367
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
-MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
-MD5 7304d443039ee9ef328e98a346f3056e files/digest-mod_php-4.3.10 284
-MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-mod_php-4.3.11 284
-MD5 f7a7898637874593f519c336db79fa45 files/mod_php-5.0.3-missing-arches.patch 524
+MD5 503480155a6bb0af5f88a53de5bb2016 mod_php-4.3.10-r1.ebuild 6344
+MD5 0590fbcb37577564c35284d34693a369 mod_php-5.0.0.ebuild 3991
+MD5 4862fd4457f3657f73b51018c8062c26 mod_php-4.3.8.ebuild 5957
+MD5 8b7b68cdbf3f1b0166be3c1c3ab17a1a mod_php-5.0.2-r1.ebuild 4166
+MD5 f95d27f25ea999ac96095db4f8870eaa mod_php-5.0.3-r1.ebuild 4285
+MD5 d9c6c1ccdb4c59e334d094d71d1fcfd5 mod_php-5.0.3-r2.ebuild 2046
+MD5 13aae2688364c0055a0597db453d59e6 mod_php-4.3.11.ebuild 6203
+MD5 c6a13dc4da001ffebdd02f7d0159cb8e mod_php-4.3.11-r1.ebuild 6420
+MD5 95d75a98a9c537d7ed43e02482f19b06 mod_php-4.3.11-r2.ebuild 6420
+MD5 3bb00217dc1ac7589ec1d33fc29ddb7a mod_php-5.0.4.ebuild 2095
+MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484
 MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022
-MD5 058042718bc876bf27ab902673919ca9 files/php5-prefork.patch 850
 MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0-r1 63
-MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-mod_php-5.0.2-r1 63
-MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3-r1 63
-MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3-r2 63
 MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
-MD5 390a659097a43447e44ab5bdd59378b5 files/digest-mod_php-4.3.8 282
-MD5 24b9b19a4420d27906e4aface78ed963 files/digest-mod_php-4.3.9 282
-MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0 63
+MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-mod_php-4.3.9_rc1 208
 MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-mod_php-5.0.1 63
+MD5 24b9b19a4420d27906e4aface78ed963 files/digest-mod_php-4.3.9 282
 MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-mod_php-5.0.2 63
+MD5 7304d443039ee9ef328e98a346f3056e files/digest-mod_php-4.3.10 284
+MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
 MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3 63
-MD5 31708f113837cfa71a1be2265e1d851d files/digest-mod_php-5.0.4 63
-MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
 MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
+MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
+MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
+MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0 63
+MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
+MD5 390a659097a43447e44ab5bdd59378b5 files/digest-mod_php-4.3.8 282
 MD5 7304d443039ee9ef328e98a346f3056e files/digest-mod_php-4.3.10-r1 284
+MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-mod_php-5.0.2-r1 63
+MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3-r1 63
+MD5 f7a7898637874593f519c336db79fa45 files/mod_php-5.0.3-missing-arches.patch 524
+MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3-r2 63
+MD5 058042718bc876bf27ab902673919ca9 files/php5-prefork.patch 850
+MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-mod_php-4.3.11 284
 MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-mod_php-4.3.11-r1 284
 MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-mod_php-4.3.11-r2 284
-MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-mod_php-4.3.9_rc1 208
-MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
-MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484
-MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
+MD5 457955f18cb41f31bab803aac779573c files/digest-mod_php-5.0.4 140
+MD5 07529a6c32d73282c53d2936ed8ea9bd files/with-iodbc.diff 444
 MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
-MD5 60cfe0c621237790195bafe595ddcbee files/5.0.4/70_mod_php5.conf 536
-MD5 80c45eef4f54629e893249f869cff5c6 files/5.0.2-r1/70_mod_php5.conf 484
+MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
 MD5 158cb07377a3e2a0028947b0aeb505cb files/4.3.10-r1/70_mod_php.conf 1017
+MD5 80c45eef4f54629e893249f869cff5c6 files/5.0.2-r1/70_mod_php5.conf 484
 MD5 2dfe55aa49dbca0c3316e859f8bebcb1 files/4.3.11-r2/70_mod_php.conf 1125
+MD5 60cfe0c621237790195bafe595ddcbee files/5.0.4/70_mod_php5.conf 536
diff --git a/dev-php/mod_php/files/digest-mod_php-5.0.4 b/dev-php/mod_php/files/digest-mod_php-5.0.4
index db1060f4c4fc..7ffa29e520c6 100644
--- a/dev-php/mod_php/files/digest-mod_php-5.0.4
+++ b/dev-php/mod_php/files/digest-mod_php-5.0.4
@@ -1 +1,2 @@
 MD5 fb1aac107870f897d26563a9cc5053c0 php-5.0.4.tar.bz2 4731383
+MD5 60b3a09d4ea271961a0abe480a5368a2 hardened-php-5.0.4-0.2.7.patch.gz 20011
diff --git a/dev-php/mod_php/files/with-iodbc.diff b/dev-php/mod_php/files/with-iodbc.diff
new file mode 100644
index 000000000000..5bf1fc3131e2
--- /dev/null
+++ b/dev-php/mod_php/files/with-iodbc.diff
@@ -0,0 +1,13 @@
+--- ext/odbc/php_odbc_includes.h~	2005-02-22 17:55:18.000000000 +0000
++++ ext/odbc/php_odbc_includes.h	2005-02-22 17:55:26.000000000 +0000
+@@ -91,8 +91,8 @@
+ #elif defined(HAVE_IODBC) /* iODBC library */
+ 
+ #define ODBC_TYPE "iODBC"
+-#include <isql.h>
+-#include <isqlext.h>
++#include <iodbc/isql.h>
++#include <iodbc/isqlext.h>
+ #define HAVE_SQL_EXTENDED_FETCH 1
+ #define SQL_FD_FETCH_ABSOLUTE   0x00000010L
+ #define SQL_CURSOR_DYNAMIC      2UL