commit: 78beda8bdbf94b62a586e38d6ac00e32180f3eb8 Author: Lars <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sat Jan 14 18:17:36 2017 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Mon Jul 10 22:22:42 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78beda8b
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 <AT> gentoo.org> sys-libs/db/{db-5.3.28-r2.ebuild => db-5.3.28-r3.ebuild} | 6 ++++-- sys-libs/db/{db-6.0.35.ebuild => db-6.0.35-r1.ebuild} | 6 ++++-- sys-libs/db/{db-6.1.29.ebuild => db-6.1.29-r1.ebuild} | 6 ++++-- sys-libs/db/{db-6.2.23.ebuild => db-6.2.23-r1.ebuild} | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) 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 c9c47add336..e5330769b21 100644 --- 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 feca1dcaa8b..0c5fe167e08 100644 --- 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 75d89109cd9..1055a51317b 100644 --- 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 af25495f83e..2d4ba9b4437 100644 --- 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) \
