[OE-core] [PATCH 1/2] rpm: update patch to support db-6.2.23

[Mark Hatle]

On 6/3/16 6:39 AM, Maxin B. John wrote:
> Refresh the rpm-db60.patch to support db-6.2.23

NAK NAK NAK

Please do NOT merge this set.

6.2.23 does NOT work with the version of RPM.

They (BDB) changed something with the locking semantics.  If you do anything
more then a trivial test you will end up with a corrupted database.

The RPM5 community is working on a newer version of RPM5, that will likely adapt
to the new semantics.  I've not yet seen it released.  When it does, -and- if it
works w/ db 6.2.23, we can consider the upgrade at that time.

--Mark

> Signed-off-by: Maxin B. John <maxin.john at intel.com>
> ---
>  meta/recipes-devtools/rpm/rpm/rpm-db60.patch | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/meta/recipes-devtools/rpm/rpm/rpm-db60.patch b/meta/recipes-devtools/rpm/rpm/rpm-db60.patch
> index b4df8b7..403f3cb 100644
> --- a/meta/recipes-devtools/rpm/rpm/rpm-db60.patch
> +++ b/meta/recipes-devtools/rpm/rpm/rpm-db60.patch
> @@ -13,11 +13,11 @@ Index: rpm/configure.ac
>   [RPM_CHECK_LIB(
>       [Berkeley-DB], [db],
>  -    [db-6.1], [db_create], [db.h],
> -+    [db-6.0], [db_create], [db.h],
> ++    [db-6.2], [db_create], [db.h],
>       [yes,external], [db6],
>       [ DBLIBSRCS="$DBLIBSRCS db3.c"
>  -      DBXY=db61
> -+      DBXY=db60
> ++      DBXY=db62
>         AM_CONDITIONAL(WITH_DB, [ true ])
>         AM_CONDITIONAL(WITH_DB_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" = .internal ])
>         if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
> @@ -26,7 +26,7 @@ Index: rpm/configure.ac
>   ])
>   
>  -if test ".$ac_cv_lib_db_6_1_db_create" != .yes -a ".$ac_cv_lib_db_5_3_db_create" != .yes; then
> -+if test ".$ac_cv_lib_db_6_0_db_create" != .yes -a ".$ac_cv_lib_db_5_3_db_create" != .yes; then
> ++if test ".$ac_cv_lib_db_6_2_db_create" != .yes -a ".$ac_cv_lib_db_5_3_db_create" != .yes; then
>       CPPFLAGS="${CPPFLAGS_save}"
>   fi
>   
> @@ -36,12 +36,12 @@ Index: rpm/configure.ac
>   
>  -dnl # Sqlite 3.8.3.1 from db-6.1.19
>  -if test ".$ac_cv_lib_db_6_1_db_create" = .yes; then
> -+dnl # Sqlite 3.8.3.1 from db-6.0.30
> -+if test ".$ac_cv_lib_db_6_0_db_create" = .yes; then
> ++dnl # Sqlite 3.8.3.1 from db-6.2.23
> ++if test ".$ac_cv_lib_db_6_2_db_create" = .yes; then
>   RPM_CHECK_LIB(
>       [Berkeley-DB (+SQLite3)], [dbsql],
>  -    [db_sql-6.1], [sqlite3_open], [dbsql.h],
> -+    [db_sql-6.0], [sqlite3_open], [dbsql.h],
> ++    [db_sql-6.2], [sqlite3_open], [dbsql.h],
>       [yes,external], [db6/sql],
>       [
>         AM_CONDITIONAL(WITH_DBSQL, [ true ])
>