diff options
author | Stuart Herbert <stuart@gentoo.org> | 2005-09-04 16:35:16 +0000 |
---|---|---|
committer | Stuart Herbert <stuart@gentoo.org> | 2005-09-04 16:35:16 +0000 |
commit | 8f4c87dfa91f24e13d9644bd32f736b4ea2c15d8 (patch) | |
tree | b75e81d1f47964cd015319fd12157e65ef54556a /dev-php5 | |
parent | Initial import for PHP5 (diff) | |
download | gentoo-2-8f4c87dfa91f24e13d9644bd32f736b4ea2c15d8.tar.gz gentoo-2-8f4c87dfa91f24e13d9644bd32f736b4ea2c15d8.tar.bz2 gentoo-2-8f4c87dfa91f24e13d9644bd32f736b4ea2c15d8.zip |
Initial import for PHP5
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'dev-php5')
22 files changed, 471 insertions, 0 deletions
diff --git a/dev-php5/pecl-memcache/ChangeLog b/dev-php5/pecl-memcache/ChangeLog new file mode 100644 index 000000000000..e53cb5a788cc --- /dev/null +++ b/dev-php5/pecl-memcache/ChangeLog @@ -0,0 +1,7 @@ +# ChangeLog for dev-php5/pecl-memcache +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-memcache/ChangeLog,v 1.1 2005/09/04 16:30:29 stuart Exp $ + + 18 Aug 2005; <stuart@gentoo.org> ChangeLog: + Initial version; replaces older dev-php/* packages + diff --git a/dev-php5/pecl-memcache/Manifest b/dev-php5/pecl-memcache/Manifest new file mode 100644 index 000000000000..7aa2d6abf5ff --- /dev/null +++ b/dev-php5/pecl-memcache/Manifest @@ -0,0 +1,4 @@ +MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157 +MD5 b598c12efda96c4924b981cc5c81765f ChangeLog 223 +MD5 39967b0de474b441c31343cda5d0714c pecl-memcache-1.5.ebuild 503 +MD5 5a0944dace5bba68eeeddcc69a730995 files/digest-pecl-memcache-1.5 60 diff --git a/dev-php5/pecl-memcache/files/digest-pecl-memcache-1.5 b/dev-php5/pecl-memcache/files/digest-pecl-memcache-1.5 new file mode 100644 index 000000000000..dbddac7e0eaa --- /dev/null +++ b/dev-php5/pecl-memcache/files/digest-pecl-memcache-1.5 @@ -0,0 +1 @@ +MD5 f521dd4d3cad4ccb05d9ade4e1cc04d4 memcache-1.5.tgz 14291 diff --git a/dev-php5/pecl-memcache/metadata.xml b/dev-php5/pecl-memcache/metadata.xml new file mode 100644 index 000000000000..fd3dbe39fa64 --- /dev/null +++ b/dev-php5/pecl-memcache/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>php</herd> +</pkgmetadata> diff --git a/dev-php5/pecl-memcache/pecl-memcache-1.5.ebuild b/dev-php5/pecl-memcache/pecl-memcache-1.5.ebuild new file mode 100644 index 000000000000..8c0b7ec652f6 --- /dev/null +++ b/dev-php5/pecl-memcache/pecl-memcache-1.5.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-memcache/pecl-memcache-1.5.ebuild,v 1.1 2005/09/04 16:30:29 stuart Exp $ + +PHP_EXT_ZENDEXT="no" +PHP_EXT_PECL_PKG="memcache" +PHP_EXT_NAME="memcache" +PHP_EXT_INI="yes" + +inherit php-ext-pecl-r1 + +IUSE="" +DESCRIPTION="PHP extension for using memcached." +SLOT="0" +LICENSE="PHP" +KEYWORDS="~ppc ~x86" +DEPEND="${DEPEND} + sys-libs/zlib" + +need_php_by_category + +src_compile() { + has_php + my_conf="--enable-memcache --with-zlib-dir=/usr" + php-ext-pecl-r1_src_compile +} diff --git a/dev-php5/pecl-pdflib/ChangeLog b/dev-php5/pecl-pdflib/ChangeLog new file mode 100644 index 000000000000..a99df8f01476 --- /dev/null +++ b/dev-php5/pecl-pdflib/ChangeLog @@ -0,0 +1,7 @@ +# ChangeLog for dev-php5/pecl-pdflib +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdflib/ChangeLog,v 1.1 2005/09/04 16:31:34 stuart Exp $ + + 18 Aug 2005; <stuart@gentoo.org> ChangeLog: + Initial version; replaces older dev-php/* packages + diff --git a/dev-php5/pecl-pdflib/Manifest b/dev-php5/pecl-pdflib/Manifest new file mode 100644 index 000000000000..31425dae752f --- /dev/null +++ b/dev-php5/pecl-pdflib/Manifest @@ -0,0 +1,5 @@ +MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157 +MD5 1a89bb654f444a3a3a595a50b5509fad ChangeLog 221 +MD5 8907d897162afa8b1719d63dc2a9774d pecl-pdflib-2.0.4-r1.ebuild 528 +MD5 1ffaf58e4d052d47b48b8490ca92efaf files/digest-pecl-pdflib-2.0.4-r1 60 +MD5 f1d1195704d3132b7878446eba109903 files/ifgd-patch.diff 5798 diff --git a/dev-php5/pecl-pdflib/files/digest-pecl-pdflib-2.0.4-r1 b/dev-php5/pecl-pdflib/files/digest-pecl-pdflib-2.0.4-r1 new file mode 100644 index 000000000000..6743f8549605 --- /dev/null +++ b/dev-php5/pecl-pdflib/files/digest-pecl-pdflib-2.0.4-r1 @@ -0,0 +1 @@ +MD5 7fad3af58b98c0b7bea64a6e760e4520 pdflib-2.0.4.tgz 36082 diff --git a/dev-php5/pecl-pdflib/files/ifgd-patch.diff b/dev-php5/pecl-pdflib/files/ifgd-patch.diff new file mode 100644 index 000000000000..824bbd2298d0 --- /dev/null +++ b/dev-php5/pecl-pdflib/files/ifgd-patch.diff @@ -0,0 +1,209 @@ +--- pdf.c 2005-08-02 17:43:36.000000000 +0200 ++++ pdf.c 2005-08-02 17:45:33.000000000 +0200 +@@ -17,12 +17,12 @@ + +----------------------------------------------------------------------+ + */ + +-/* $Id: pdf.c,v 1.143 2004/11/30 11:42:13 rjs Exp $ */ ++/* $Id: pdf.c,v 1.144 2005/03/08 12:02:19 rjs Exp $ */ + + /* {{{ Comments about the module */ + + /* derived from: +- $Id: pdf.c,v 1.143 2004/11/30 11:42:13 rjs Exp $ ++ $Id: pdf.c,v 1.144 2005/03/08 12:02:19 rjs Exp $ + synced with pdflib.h 1.237 */ + + /* PDFlib 2.02 ... 4.0.x is subject to the ALADDIN FREE PUBLIC LICENSE. +@@ -63,8 +63,12 @@ + + /* Bootstrap of PDFlib Feature setup */ + #define PDF_FEATURE_INTERNAL ++#define PDFLIB_PECL_VERSIONSTRING "2.0.4-r1" + +-#define PDFLIB_PECL_VERSIONSTRING "2.0.3" ++/* set this define if you want to include GD support ++ * this adds the (unofficial) function pdf_open_memory_image() ++#define PDFLIB_WITH_GD_SUPPORT ++*/ + + /* }}} */ + +@@ -87,6 +91,7 @@ + # include "Zend/zend_exceptions.h" + #endif /* PHP_MAJOR_VERSION >= 5 */ + ++#if PDFLIB_WITH_GD_SUPPORT + #if HAVE_LIBGD13 + # include "ext/gd/php_gd.h" + # if HAVE_GD_BUNDLED +@@ -96,6 +101,7 @@ + # endif /* HAVE_GD_BUNDLED */ + static int le_gd; + #endif /* HAVE_LIBGD13 */ ++#endif /* PDFLIB_WITH_GD_SUPPORT */ + + #ifdef HAVE_UNISTD_H + # include <unistd.h> +@@ -299,10 +305,12 @@ + + /* End of the official PDFLIB API */ + ++#if PDFLIB_WITH_GD_SUPPORT + #if HAVE_LIBGD13 + /* not supported by PDFlib GmbH */ + PHP_FE(pdf_open_memory_image, NULL) + #endif /* HAVE_LIBGD13 */ ++#endif /* PDFLIB_WITH_GD_SUPPORT */ + + {NULL, NULL, NULL} + }; +@@ -491,10 +499,12 @@ + + /* End of the official PDFLIB API */ + ++#if PDFLIB_WITH_GD_SUPPORT + #if HAVE_LIBGD13 + /* not supported by PDFlib GmbH */ + /* PHP_ME_MAPPING(open_memory_image, pdf_open_memory_image, NULL) */ + #endif /* HAVE_LIBGD13 */ ++#endif /* PDFLIB_WITH_GD_SUPPORT */ + + {NULL, NULL, NULL} + }; +@@ -768,7 +778,7 @@ + php_info_print_table_row(2, "PDF Support", "enabled" ); + php_info_print_table_row(2, "PDFlib GmbH Version", PDFLIB_VERSIONSTRING ); + php_info_print_table_row(2, "PECL Version", PDFLIB_PECL_VERSIONSTRING); +- php_info_print_table_row(2, "Revision", "$Revision: 1.143 $" ); ++ php_info_print_table_row(2, "Revision", "$Revision: 1.144 $" ); + php_info_print_table_end(); + + } +@@ -7197,6 +7207,7 @@ + + + ++#if PDFLIB_WITH_GD_SUPPORT + #if HAVE_LIBGD13 + /* {{{ proto int pdf_open_memory_image(resource p, int image) + Takes an GD image and returns an image for placement in a PDF document */ +@@ -7276,6 +7287,7 @@ + } + /* }}} */ + #endif /* HAVE_LIBGD13 */ ++#endif /* PDFLIB_WITH_GD_SUPPORT */ + + #else /* PDFLIB_MAJORVERSION < 5 */ + /* use the old wrapper for PDFlib 4 and earlier */ +--- pdf4.c 2005-08-02 17:43:43.000000000 +0200 ++++ pdf4.c 2005-08-02 17:47:52.000000000 +0200 +@@ -17,7 +17,7 @@ + +----------------------------------------------------------------------+ + */ + +-/* $Id: pdf4.c,v 1.2 2004/11/30 11:42:13 rjs Exp $ */ ++/* $Id: pdf4.c,v 1.4 2005/07/08 06:22:03 steinm Exp $ */ + + /* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE. + Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */ +@@ -40,6 +40,7 @@ + #include "ext/standard/file.h" + #include "php_streams.h" + ++#if PDFLIB_WITH_GD_SUPPORT + #if HAVE_LIBGD13 + #include "ext/gd/php_gd.h" + #if HAVE_GD_BUNDLED +@@ -49,6 +50,7 @@ + #endif + static int le_gd; + #endif ++#endif / * PDFLIB_WITH_GD_SUPPORT * / + + #ifdef HAVE_UNISTD_H + # include <unistd.h> +@@ -187,9 +189,11 @@ + + /* some more stuff for compatibility */ + PHP_FE(pdf_add_annotation, NULL) ++#if PDFLIB_WITH_GD_SUPPORT + #if HAVE_LIBGD13 + PHP_FE(pdf_open_memory_image, NULL) + #endif ++#endif + /* depreciatet after V4.0 of PDFlib */ + PHP_FE(pdf_setgray_fill, NULL) + PHP_FE(pdf_setgray_stroke, NULL) +@@ -334,7 +338,7 @@ + #else + php_info_print_table_row(2, "PDFlib GmbH Version", tmp ); + #endif +- php_info_print_table_row(2, "Revision", "$Revision: 1.2 $" ); ++ php_info_print_table_row(2, "Revision", "$Revision: 1.4 $" ); + php_info_print_table_end(); + + } +@@ -1949,6 +1953,7 @@ + } + /* }}} */ + ++#if PDFLIB_WITH_GD_SUPPORT + #if HAVE_LIBGD13 + /* {{{ proto int pdf_open_memory_image(int pdf, int image) + Takes an GD image and returns an image for placement in a PDF document */ +@@ -2015,6 +2020,7 @@ + } + /* }}} */ + #endif /* HAVE_LIBGD13 */ ++#endif /* PDFLIB_WITH_GD_SUPPORT */ + + /* {{{ proto void pdf_close_image(int pdf, int pdfimage) + Closes the PDF image */ +--- php_pdf.h 2005-08-02 17:44:20.000000000 +0200 ++++ php_pdf.h 2005-08-02 17:49:15.000000000 +0200 +@@ -16,7 +16,7 @@ + +----------------------------------------------------------------------+ + */ + +-/* $Id: php_pdf.h,v 1.30 2004/11/30 11:42:13 rjs Exp $ */ ++/* $Id: php_pdf.h,v 1.31 2005/03/08 12:02:19 rjs Exp $ */ + /* Derived from: + Id: php_pdf.h,v 1.22 2001/11/30 04:46:35 sniper Exp */ + +@@ -201,10 +201,12 @@ + #endif /* PDFlib >= 6.0.0 */ + + ++#if PDFLIB_WITH_GD_SUPPORT + #if HAVE_LIBGD13 + /* not supported by PDFlib GmbH */ + PHP_FUNCTION(pdf_open_memory_image); + #endif ++#endif /* PDFLIB_WITH_GD_SUPPORT */ + + #ifdef ZTS + #define PDFG(v) TSRMG(pdf_globals_id, php_pdf_globals *, v) +--- php_pdf4.h 2005-08-02 17:44:26.000000000 +0200 ++++ php_pdf4.h 2005-08-02 17:50:39.000000000 +0200 +@@ -16,7 +16,7 @@ + +----------------------------------------------------------------------+ + */ + +-/* $Id: php_pdf4.h,v 1.2 2004/11/30 11:42:13 rjs Exp $ */ ++/* $Id: php_pdf4.h,v 1.3 2005/03/08 12:02:20 rjs Exp $ */ + + #ifndef PHP_PDF_H + #define PHP_PDF_H +@@ -140,9 +140,11 @@ + + /* some more stuff for compatibility */ + PHP_FUNCTION(pdf_add_annotation); ++#if PDFLIB_WITH_GD_SUPPORT + #if HAVE_LIBGD13 + PHP_FUNCTION(pdf_open_memory_image); + #endif ++#endif /* PDFLIB_WITH_GD_SUPPORT */ + + #if (PDFLIB_MAJORVERSION >= 4) + /* support for new functions in PDFlib V4.0 */ diff --git a/dev-php5/pecl-pdflib/metadata.xml b/dev-php5/pecl-pdflib/metadata.xml new file mode 100644 index 000000000000..fd3dbe39fa64 --- /dev/null +++ b/dev-php5/pecl-pdflib/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>php</herd> +</pkgmetadata> diff --git a/dev-php5/pecl-pdflib/pecl-pdflib-2.0.4-r1.ebuild b/dev-php5/pecl-pdflib/pecl-pdflib-2.0.4-r1.ebuild new file mode 100644 index 000000000000..46dfdd482b90 --- /dev/null +++ b/dev-php5/pecl-pdflib/pecl-pdflib-2.0.4-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdflib/pecl-pdflib-2.0.4-r1.ebuild,v 1.1 2005/09/04 16:31:34 stuart Exp $ + +PHP_EXT_ZENDEXT="no" +PHP_EXT_PECL_PKG="pdflib" +PHP_EXT_NAME="pdf" +PHP_EXT_INI="yes" + +inherit php-ext-pecl-r1 + +IUSE="" +DESCRIPTION="PHP extension for creating PDF files." +SLOT="0" +LICENSE="PHP" +KEYWORDS="~ppc ~x86" +DEPEND="${DEPEND} + media-libs/pdflib" + +need_php_by_category + +src_unpack() { + unpack ${A} + + cd ${S} + + # Patch for http://pecl.php.net/bugs/bug.php?id=3554 + epatch ${FILESDIR}/ifgd-patch.diff +} diff --git a/dev-php5/pecl-pdo-dblib/ChangeLog b/dev-php5/pecl-pdo-dblib/ChangeLog new file mode 100644 index 000000000000..0459963fa3a0 --- /dev/null +++ b/dev-php5/pecl-pdo-dblib/ChangeLog @@ -0,0 +1,7 @@ +# ChangeLog for dev-php5/pecl-pdo-dblib +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-dblib/ChangeLog,v 1.1 2005/09/04 16:35:16 stuart Exp $ + + 18 Aug 2005; <stuart@gentoo.org> ChangeLog: + Initial version; replaces older dev-php/* packages + diff --git a/dev-php5/pecl-pdo-dblib/Manifest b/dev-php5/pecl-pdo-dblib/Manifest new file mode 100644 index 000000000000..5f349421864d --- /dev/null +++ b/dev-php5/pecl-pdo-dblib/Manifest @@ -0,0 +1,4 @@ +MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157 +MD5 e9b53675b4e4ef40dda4f108e684b9cf ChangeLog 224 +MD5 c362d67bf50ec272570ebe747a52beef pecl-pdo-dblib-0.9.ebuild 922 +MD5 beff54166dfd24fab05f7b7ad61368d3 files/digest-pecl-pdo-dblib-0.9 60 diff --git a/dev-php5/pecl-pdo-dblib/files/digest-pecl-pdo-dblib-0.9 b/dev-php5/pecl-pdo-dblib/files/digest-pecl-pdo-dblib-0.9 new file mode 100644 index 000000000000..b13c5cbf07c3 --- /dev/null +++ b/dev-php5/pecl-pdo-dblib/files/digest-pecl-pdo-dblib-0.9 @@ -0,0 +1 @@ +MD5 c77b27ff90e7b4c6ab851e9415d46513 PDO_DBLIB-0.9.tgz 7961 diff --git a/dev-php5/pecl-pdo-dblib/metadata.xml b/dev-php5/pecl-pdo-dblib/metadata.xml new file mode 100644 index 000000000000..fd3dbe39fa64 --- /dev/null +++ b/dev-php5/pecl-pdo-dblib/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>php</herd> +</pkgmetadata> diff --git a/dev-php5/pecl-pdo-dblib/pecl-pdo-dblib-0.9.ebuild b/dev-php5/pecl-pdo-dblib/pecl-pdo-dblib-0.9.ebuild new file mode 100644 index 000000000000..df1420786af7 --- /dev/null +++ b/dev-php5/pecl-pdo-dblib/pecl-pdo-dblib-0.9.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-dblib/pecl-pdo-dblib-0.9.ebuild,v 1.1 2005/09/04 16:35:16 stuart Exp $ + +PHP_EXT_ZENDEXT="no" +PHP_EXT_PECL_PKG="PDO_DBLIB" +PHP_EXT_NAME="pdo_dblib" +PHP_EXT_INI="yes" + +inherit php-ext-pecl-r1 + +IUSE="" +DESCRIPTION="PHP Data Objects (PDO) Driver For Sybase/MSSQL Server" +SLOT="0" +LICENSE="PHP" +KEYWORDS="~ppc ~x86" +DEPEND="${DEPEND} + dev-php5/pecl-pdo + dev-db/freetds" + +need_php_by_category + +pkg_setup() { + has_php + + # if the user has compiled in PDO, he can't use this package + if built_with_use =${PHP_PKG} pdo ; then + eerror + eerror "You have built ${PHP_PKG} to use the bundled PDO support." + eerror "If you want to use the PECL PDO packages, you must rebuild" + eerror "your PHP with the 'pdo-external' USE flag instead." + eerror + die "PHP built to use bundled PDO support" + fi +} + +src_compile() { + has_php + my_conf="--with-pdo-dblib" + php-ext-pecl-r1_src_compile +} diff --git a/dev-php5/pecl-pdo/ChangeLog b/dev-php5/pecl-pdo/ChangeLog new file mode 100644 index 000000000000..74ff08ad2def --- /dev/null +++ b/dev-php5/pecl-pdo/ChangeLog @@ -0,0 +1,7 @@ +# ChangeLog for dev-php5/pecl-pdo +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo/ChangeLog,v 1.1 2005/09/04 16:32:39 stuart Exp $ + + 18 Aug 2005; <stuart@gentoo.org> ChangeLog: + Initial version; replaces older dev-php/* packages + diff --git a/dev-php5/pecl-pdo/Manifest b/dev-php5/pecl-pdo/Manifest new file mode 100644 index 000000000000..bfb96bb4710c --- /dev/null +++ b/dev-php5/pecl-pdo/Manifest @@ -0,0 +1,5 @@ +MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157 +MD5 73c4cda1625ca38616ed976dfa5e584f ChangeLog 218 +MD5 b7238b5def2a948fc3ad53a5b5d7ac5c pecl-pdo-0.9.ebuild 1472 +MD5 6279556cf34bf92200701c7a65f81ed9 files/digest-pecl-pdo-0.9 55 +MD5 c52b46703f8061eb524872fa24edc342 files/pdo_stmt.c.diff 915 diff --git a/dev-php5/pecl-pdo/files/digest-pecl-pdo-0.9 b/dev-php5/pecl-pdo/files/digest-pecl-pdo-0.9 new file mode 100644 index 000000000000..c1042eddf580 --- /dev/null +++ b/dev-php5/pecl-pdo/files/digest-pecl-pdo-0.9 @@ -0,0 +1 @@ +MD5 21e8200b0245a2513399a6b7c382b765 PDO-0.9.tgz 46682 diff --git a/dev-php5/pecl-pdo/files/pdo_stmt.c.diff b/dev-php5/pecl-pdo/files/pdo_stmt.c.diff new file mode 100644 index 000000000000..06f433c01e51 --- /dev/null +++ b/dev-php5/pecl-pdo/files/pdo_stmt.c.diff @@ -0,0 +1,34 @@ +--- pdo_stmt.c 2005-07-27 04:06:11.000000000 +0200 ++++ pdo_stmt.c 2005-08-06 20:50:17.000000000 +0200 +@@ -18,7 +18,7 @@ + +----------------------------------------------------------------------+ + */ + +-/* $Id: pdo_stmt.c,v 1.116 2005/07/22 14:31:20 helly Exp $ */ ++/* $Id: pdo_stmt.c,v 1.118 2005/08/03 18:26:16 iliaa Exp $ */ + + /* The PDO Statement Handle Class */ + +@@ -1985,12 +1985,20 @@ + struct pdo_column_data *cols = stmt->columns; + + for (i = 0; i < stmt->column_count; i++) { +- efree(cols[i].name); ++ if (cols[i].name) { ++ efree(cols[i].name); ++ cols[i].name = NULL; ++ } + } + efree(stmt->columns); ++ stmt->columns = NULL; ++ } ++ ++ if (stmt->fetch.into && stmt->default_fetch_type == PDO_FETCH_INTO) { ++ FREE_ZVAL(stmt->fetch.into); ++ stmt->fetch.into = NULL; + } + +- + do_fetch_opt_finish(stmt, 1 TSRMLS_CC); + + zend_objects_store_del_ref(&stmt->database_object_handle TSRMLS_CC); diff --git a/dev-php5/pecl-pdo/metadata.xml b/dev-php5/pecl-pdo/metadata.xml new file mode 100644 index 000000000000..fd3dbe39fa64 --- /dev/null +++ b/dev-php5/pecl-pdo/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>php</herd> +</pkgmetadata> diff --git a/dev-php5/pecl-pdo/pecl-pdo-0.9.ebuild b/dev-php5/pecl-pdo/pecl-pdo-0.9.ebuild new file mode 100644 index 000000000000..97d2a4e7715b --- /dev/null +++ b/dev-php5/pecl-pdo/pecl-pdo-0.9.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo/pecl-pdo-0.9.ebuild,v 1.1 2005/09/04 16:32:39 stuart Exp $ + +PHP_EXT_ZENDEXT="no" +PHP_EXT_PECL_PKG="PDO" +PHP_EXT_NAME="pdo" +PHP_EXT_INI="yes" + +inherit php-ext-pecl-r1 + +IUSE="firebird mssql mysql oci8 odbc postgres sqlite" +DESCRIPTION="Core PHP Data Objects (PDO)" +SLOT="0" +LICENSE="PHP" +KEYWORDS="~ppc ~x86" +DEPEND="${DEPEND}" +PDEPEND="${PDEPEND} + firebird? ( dev-php5/pecl-pdo-firebird ) + mssql? ( dev-php5/pecl-pdo-dblib ) + mysql? ( dev-php5/pecl-pdo-mysql ) + oci8? ( dev-php5/pecl-pdo-oci ) + odbc? ( dev-php5/pecl-pdo-odbc ) + postgres? ( dev-php5/pecl-pdo-pgsql ) + sqlite? ( dev-php5/pecl-pdo-sqlite )" + +need_php_by_category + +pkg_setup() { + has_php + + # if the user has compiled in PDO, he can't use this package + if built_with_use =${PHP_PKG} pdo ; then + eerror + eerror "You have built ${PHP_PKG} to use the bundled PDO support." + eerror "If you want to use the PECL PDO packages, you must rebuild" + eerror "your PHP with the 'pdo-external' USE flag instead." + eerror + die "PHP built to use bundled PDO support" + fi +} + +src_unpack() { + unpack ${A} + + cd ${S} + + # Patches the file to the newest CVS sources + epatch ${FILESDIR}/pdo_stmt.c.diff +} + +src_install() { + php-ext-pecl-r1_src_install + + # install missing header files + destdir=/usr/$(get_libdir)/php5 + dodir ${destdir}/include/php/ext/pdo + insinto ${destdir}/include/php/ext/pdo + doins php_pdo_driver.h + doins php_pdo.h + doins php_pdo_int.h +} |