[Pkg-php-commits] r990 - in php5/trunk/debian: . patches

[Steve Langasek]

tags 463397 pending
thanks

Author: vorlon
Date: 2008-02-01 18:04:12 +0000 (Fri, 01 Feb 2008)
New Revision: 990

Added:
   php5/trunk/debian/patches/libdb_is_-ldb
Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/patches/series
Log:
* debian/patches/libdb_is_-ldb: reorder the search for db4 instances to
  give precedence to -ldb, so that we always get the version that matches
  the installed -dev package instead of whichever most recent version php
  upstream currently knows about.  Closes: #463397.

Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-01-27 23:28:41 UTC (rev 989)
+++ php5/trunk/debian/changelog	2008-02-01 18:04:12 UTC (rev 990)
@@ -1,8 +1,11 @@
 php5 (5.2.5-2) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * debian/patches/libdb_is_-ldb: reorder the search for db4 instances to
+    give precedence to -ldb, so that we always get the version that matches
+    the installed -dev package instead of whichever most recent version php
+    upstream currently knows about.  Closes: #463397.
 
- -- sean finney <seanius at debian.org>  Mon, 28 Jan 2008 00:28:58 +0100
+ -- Steve Langasek <vorlon at debian.org>  Fri, 01 Feb 2008 17:51:44 +0000
 
 php5 (5.2.5-1) unstable; urgency=low
 

Added: php5/trunk/debian/patches/libdb_is_-ldb
===================================================================
--- php5/trunk/debian/patches/libdb_is_-ldb	                        (rev 0)
+++ php5/trunk/debian/patches/libdb_is_-ldb	2008-02-01 18:04:12 UTC (rev 990)
@@ -0,0 +1,13 @@
+Index: php5-5.2.5/ext/dba/config.m4
+===================================================================
+--- php5-5.2.5.orig/ext/dba/config.m4
++++ php5-5.2.5/ext/dba/config.m4
+@@ -301,7 +301,7 @@
+       break
+     fi
+   done
+-  PHP_DBA_DB_CHECK(4, db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
++  PHP_DBA_DB_CHECK(4, db db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+ fi
+ PHP_DBA_STD_RESULT(db4,Berkeley DB4)
+ 

Modified: php5/trunk/debian/patches/series
===================================================================
--- php5/trunk/debian/patches/series	2008-01-27 23:28:41 UTC (rev 989)
+++ php5/trunk/debian/patches/series	2008-02-01 18:04:12 UTC (rev 990)
@@ -25,5 +25,6 @@
 112-proc_open.patch
 113-php.ini_securitynotes.patch
 disable_dl_by_default.patch
+libdb_is_-ldb
 suhosin.patch
 fix_broken_upstream_tests.patch