sys-libs/db: Security revbumps to disable usage of bundled sqlite.

This fixes Gentoo bug #605688

(cherry picked from commit 953247c8dda0eec48bf7f019583003077d008ba1)
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=605688
Fixes: https://github.com/gentoo/gentoo/pull/3480/
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r3.ebuild
similarity index 97%
rename from sys-libs/db/db-5.3.28-r2.ebuild
rename to sys-libs/db/db-5.3.28-r3.ebuild
index c9c47add3360e3e7ef866f44a9aa4ae5236d4ce4..e5330769b2128fbf2220ad9d0f67ce0d21a66d02 100644 (file)
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r3.ebuild
@@ -143,6 +143,8 @@ multilib_src_configure() {
 
        # sql_compat will cause a collision with sqlite3
        # --enable-sql_compat
+       # Don't --enable-sql* because we don't want to use bundled sqlite.
+       # See Gentoo bug #605688
        ECONF_SOURCE="${S_BASE}"/dist \
        STRIP="true" \
        econf \
@@ -150,8 +152,8 @@ multilib_src_configure() {
                --enable-dbm \
                --enable-o_direct \
                --without-uniquename \
-               --enable-sql \
-               --enable-sql_codegen \
+               --disable-sql \
+               --disable-sql_codegen \
                --disable-sql_compat \
                $([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) \
                $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \

diff --git a/sys-libs/db/db-6.0.35.ebuild b/sys-libs/db/db-6.0.35-r1.ebuild
similarity index 97%
rename from sys-libs/db/db-6.0.35.ebuild
rename to sys-libs/db/db-6.0.35-r1.ebuild
index feca1dcaa8bad14933f474dc6ffe743c967c05e7..0c5fe167e08425f77b3eda1d6cd9aa67f20afebd 100644 (file)
--- a/sys-libs/db/db-6.0.35.ebuild
+++ b/sys-libs/db/db-6.0.35-r1.ebuild
@@ -141,6 +141,8 @@ multilib_src_configure() {
 
        # sql_compat will cause a collision with sqlite3
        # --enable-sql_compat
+       # Don't --enable-sql* because we don't want to use bundled sqlite.
+       # See Gentoo bug #605688
        ECONF_SOURCE="${S_BASE}"/dist \
        STRIP="true" \
        econf \
@@ -148,8 +150,8 @@ multilib_src_configure() {
                --enable-dbm \
                --enable-o_direct \
                --without-uniquename \
-               --enable-sql \
-               --enable-sql_codegen \
+               --disable-sql \
+               --disable-sql_codegen \
                --disable-sql_compat \
                $([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) \
                $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \

diff --git a/sys-libs/db/db-6.1.29.ebuild b/sys-libs/db/db-6.1.29-r1.ebuild
similarity index 97%
rename from sys-libs/db/db-6.1.29.ebuild
rename to sys-libs/db/db-6.1.29-r1.ebuild
index 75d89109cd91189d130a0a24c2af47508ab1992e..1055a51317b6d7d64745513c03ea06405c676563 100644 (file)
--- a/sys-libs/db/db-6.1.29.ebuild
+++ b/sys-libs/db/db-6.1.29-r1.ebuild
@@ -141,6 +141,8 @@ multilib_src_configure() {
 
        # sql_compat will cause a collision with sqlite3
        # --enable-sql_compat
+       # Don't --enable-sql* because we don't want to use bundled sqlite.
+       # See Gentoo bug #605688
        ECONF_SOURCE="${S_BASE}"/dist \
        STRIP="true" \
        econf \
@@ -148,8 +150,8 @@ multilib_src_configure() {
                --enable-dbm \
                --enable-o_direct \
                --without-uniquename \
-               --enable-sql \
-               --enable-sql_codegen \
+               --disable-sql \
+               --disable-sql_codegen \
                --disable-sql_compat \
                $([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) \
                $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \

diff --git a/sys-libs/db/db-6.2.23.ebuild b/sys-libs/db/db-6.2.23-r1.ebuild
similarity index 97%
rename from sys-libs/db/db-6.2.23.ebuild
rename to sys-libs/db/db-6.2.23-r1.ebuild
index af25495f83e36065c85434360377833baaa2870a..2d4ba9b4437319d841f51dafb2f052cd5540d4c4 100644 (file)
--- a/sys-libs/db/db-6.2.23.ebuild
+++ b/sys-libs/db/db-6.2.23-r1.ebuild
@@ -146,6 +146,8 @@ multilib_src_configure() {
 
        # sql_compat will cause a collision with sqlite3
        # --enable-sql_compat
+       # Don't --enable-sql* because we don't want to use bundled sqlite.
+       # See Gentoo bug #605688
        ECONF_SOURCE="${S_BASE}"/dist \
        STRIP="true" \
        econf \
@@ -153,8 +155,8 @@ multilib_src_configure() {
                --enable-dbm \
                --enable-o_direct \
                --without-uniquename \
-               --enable-sql \
-               --enable-sql_codegen \
+               --disable-sql \
+               --disable-sql_codegen \
                --disable-sql_compat \
                $([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) \
                $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \