Update before moving to PECL

diff --git a/ext/db/CREDITS b/ext/db/CREDITS
index 9efbe3fe52bd5d6103258d8ea6bdea1fa2b8600f..d1c3dc80d15c1e41e02ea1d409180c3fd9848702 100644 (file)
--- a/ext/db/CREDITS
+++ b/ext/db/CREDITS
@@ -1,2 +1,2 @@
 DBM
-Rasmus Lerdorf, Jim Winstead
+Rasmus Lerdorf, Jim Winstead, Marcus Boerger

diff --git a/ext/db/db.c b/ext/db/db.c
index 50c14f1c0c6c3d981a369f1e59a56d67d39fd7e1..530f2994e0e80937325095d0c1f1d7d58d1ced29 100644 (file)
--- a/ext/db/db.c
+++ b/ext/db/db.c
@@ -4,16 +4,17 @@
    +----------------------------------------------------------------------+
    | Copyright (c) 1997-2003 The PHP Group                                |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license,       |
+   | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_0.txt.                                  |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
    | If you did not receive a copy of the PHP license and are unable to   |
    | obtain it through the world-wide-web, please send a note to          |
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
    | Authors: Rasmus Lerdorf <rasmus@php.net>                             |
    |          Jim Winstead <jimw@php.net>                                 |
+   |          Marcus Boerger <helly@php.net>                              |
    +----------------------------------------------------------------------+
  */
 
@@ -185,8 +186,6 @@ dbm_info *php_find_dbm(pval *id TSRMLS_DC)
 
 /* {{{ proto array db_id_list(void)
    Return an associative array id->filename */ 
-#if HELLY_0
-/* New function not needed yet */
 PHP_FUNCTION(db_id_list)
 {
        ulong numitems, i;
@@ -212,7 +211,6 @@ PHP_FUNCTION(db_id_list)
        }
 }
 /* }}} */
-#endif
 
 /* {{{ php_get_info_db
  */
@@ -1096,7 +1094,7 @@ datum flatfile_firstkey(FILE *dbf) {
 }
 /* }}} */
 
-/* {{{ latfile_nextkey
+/* {{{ flatfile_nextkey
  */
 datum flatfile_nextkey(FILE *dbf) {
        datum buf;
@@ -1170,9 +1168,7 @@ function_entry dbm_functions[] = {
        PHP_FE(dbmdelete,                                                               NULL)
        PHP_FE(dbmfirstkey,                                                             NULL)
        PHP_FE(dbmnextkey,                                                              NULL)
-#if HELLY_0
        PHP_FE(db_id_list,                              NULL)
-#endif
        {NULL, NULL, NULL}
 };
 /* }}} */

diff --git a/ext/db/package.xml b/ext/db/package.xml
new file mode 100755 (executable)
index 0000000..6917a67
--- /dev/null
+++ b/ext/db/package.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE package SYSTEM "../../../php4/pear/package.dtd">
+<package>
+  <name>DBM</name>
+  <summary>DBM database bindings</summary>
+  <maintainers>
+    <maintainer>
+      <user>rasmus</user>
+      <name>Rasmus Lerdorf</name>
+      <email>rasmus@php.net</email>
+      <role>lead</role>
+    </maintainer>
+    <maintainer>
+      <user>jimw</user>
+      <name>Jim Winstead</name>
+      <email>jimw@php.net</email>
+      <role>lead</role>
+    </maintainer>
+    <maintainer>
+      <user>helly</user>
+      <name>Marcus B&ouml;rger</name>
+      <email>helly@php.net</email>
+      <role>developer</role>
+    </maintainer>
+  </maintainers>
+  <description>
+       This deprecated package is replaced by the standard extenstion dba.
+  </description>
+  <license>PHP</license>
+  <release>
+    <state>deprecated</state>
+    <version>1.0</version>
+    <date>2003-06-14</date>
+       <notes>
+    </notes>
+    <filelist>
+      <file role="src" name="config.m4"/>
+      <file role="src" name="db.c"/>
+      <file role="src" name="db.dsp"/>
+      <file role="src" name="php_db.h"/>
+      <file role="doc" name="CREDITS"/>
+      <file role="doc" name="README"/>
+      <dir name="test">
+             <file role="test" name="001.phpt"/>
+             <file role="test" name="002.phpt"/>
+             <file role="test" name="003.phpt"/>
+             <file role="test" name="004.phpt"/>
+             <file role="test" name="005.phpt"/>
+             <file role="test" name="006.phpt"/>
+             <file role="test" name="test.inc"/>
+         </dir>
+    </filelist>
+  </release>
+</package>

diff --git a/ext/db/php_db.h b/ext/db/php_db.h
index f2ee63b5969cc1f30196018fdebe56d901fc3c11..9f020acf5e5aaf27ed24c11dc75cea9695cc520a 100644 (file)
--- a/ext/db/php_db.h
+++ b/ext/db/php_db.h
@@ -14,6 +14,7 @@
    +----------------------------------------------------------------------+
    | Authors: Rasmus Lerdorf <rasmus@php.net>                             |
    |          Jim Winstead <jimw@php.net>                                 |
+   |          Marcus Boerger <helly@php.net>                              |
    +----------------------------------------------------------------------+
 */
 
@@ -76,5 +77,6 @@ PHP_FUNCTION(dbmexists);
 PHP_FUNCTION(dbmdelete);
 PHP_FUNCTION(dbmfirstkey);
 PHP_FUNCTION(dbmnextkey);
+PHP_FUNCTION(db_id_list);
 
 #endif /* PHP_DB_H */