sys-libs/db: Bump to version 6.1.36
authorLars Wendler <polynomial-c@gentoo.org>
Fri, 25 Jan 2019 14:07:49 +0000 (15:07 +0100)
committerLars Wendler <polynomial-c@gentoo.org>
Fri, 25 Jan 2019 14:10:02 +0000 (15:10 +0100)
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
sys-libs/db/Manifest
sys-libs/db/db-6.1.36.ebuild [new file with mode: 0644]
sys-libs/db/files/db-4.3-listen-to-java-options.patch

index d8fd85ce4afdb2af2d1117360ae1e87576a3fc40..2c9de6d4f745415cd8f71af2f3f24f21cd188296 100644 (file)
@@ -12,6 +12,7 @@ DIST db-5.1.29.tar.gz 32188074 BLAKE2B 6af9e6afc0ebd06a43c0e96fd0b2b3c8e17476507
 DIST db-5.3.28.tar.gz 35090431 BLAKE2B 5b77a4ec0945fa96ce6c2b452fb4b029295e037fa64d5ff8dcb3b5e01ee3501fd75d9a73b8f5fa54d8907717d93546fbb5348ee70119e877fa2f17d301ecf50d SHA512 e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090
 DIST db-6.0.35.tar.gz 36532251 BLAKE2B 22fbe557ccc13e4b936db8ca7d6ba11ce42e477bbf39f7e472067e06fb5910b1147fa58a44ac944c24a51ea839f1c61edda6bd8f3c450acac0c13d7fdba11e89 SHA512 002db1553def44efa715095b04b2bac2de7450cdc7142586d1d8b5d8ce79ee5e98f824b3bd276cd586ca932dc51ed35a9ffbed95b2b9847264f262cfa092479d
 DIST db-6.1.29.tar.gz 37521943 BLAKE2B 3f036647337a36cb5f8cf5cc8774bd49d4cdff2d57750f21488183de67e426ab0863ee97d972751adc10b294f6c23e1e5e3f2c7b3fc02616463f971b10f3b15e SHA512 ced40e357acd1214f8b5800ddcf084c65c0ab77ca045a4504ac1a4c864035bd50aa8993cd1232174ff81071a36806314807330aa53dcb18de548c886c2a99e73
+DIST db-6.1.36.tar.gz 37526795 BLAKE2B 9334dc66501465acf99f2675dc838a979c03a29b526b1d22fc9f811c6e76c5ecab4fafad4aa7efbc658c0bc64218f22ac4189c34bce866b0a4ffa052525607a6 SHA512 5f63eaaf75cad12c2a9b9f960bf39cb4ba6f8636609472f5909e38dccb65322a20104f0a8641b968c195c1b9a3ac5456c8bdaf3253995c9a4ace222a2e0d6811
 DIST db-6.2.23.tar.gz 44305964 BLAKE2B 8d5705e8e4c66f93e52d1bee86a322ef6d2077d1e5c005208bedcb25f6cfd10e0a6d9c9a72a1d2e3568d6fec14ee82e2446a0fa0a0d505cc17f0ef245de826a1 SHA512 0aac380673ff4f97a2a6230f135f8151b8d2896a12710f708cd983b5fb95075b55fc2c67af577365e8ec7a32e43357a4f3118e37713d00b227f05eb11b1d12f5
 DIST db-6.2.32.tar.gz 45342417 BLAKE2B d3254fba1300d6c7dda5d872c5fa349e8704d71be9c4d37ccf3357782adeb879ce30e066cf083bd97554405c2e94071a96cee16090ad9f797a4fa657ff7e8c46 SHA512 83bdbf18a7b9782409cf4563f8d5f11322d5e564a39946c890604a60440a6ea6361e0236bbc30bd4e8e1de1fa9196b8e815fd126baa035f55c5826c2c6aa3401
 DIST db.1.85.tar.gz 270953 BLAKE2B 7862979b6fe21a67eac7eb5e0d05093f33fa71fa92f9717a65bd39b366727e6928109c821b86ede85d6d2a8013199f3927e760bed19001a5cfd2270819a3b904 SHA512 03bf3a2b0947efdca4e38719542e96378b5eeb57da64d5030dd23ab710773c1826f1c867032d0bea658b7fdd8272db253e97bbc490d198b9437025ffdf9e880e
diff --git a/sys-libs/db/db-6.1.36.ebuild b/sys-libs/db/db-6.1.36.ebuild
new file mode 100644 (file)
index 0000000..4f1b84e
--- /dev/null
@@ -0,0 +1,242 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs
+
+#Number of official patches
+#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+PATCHNO=${PV/*.*.*_p}
+if [[ ${PATCHNO} == "${PV}" ]] ; then
+       MY_PV=${PV}
+       MY_P=${P}
+       PATCHNO=0
+else
+       MY_PV=${PV/_p${PATCHNO}}
+       MY_P=${PN}-${MY_PV}
+fi
+
+S_BASE="${WORKDIR}/${MY_P}"
+S="${S_BASE}/build_unix"
+DESCRIPTION="Oracle Berkeley DB"
+HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
+SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
+for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
+       export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
+done
+
+LICENSE="AGPL-3"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc java cxx tcl test"
+
+REQUIRED_USE="test? ( tcl )"
+
+# the entire testsuite needs the TCL functionality
+DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
+       test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
+       java? ( >=virtual/jdk-1.5 )
+       >=sys-devel/binutils-2.16.1"
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
+       java? ( >=virtual/jre-1.5 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+       /usr/include/db$(ver_cut 1-2)/db.h
+)
+
+PATCHES=(
+       # bug #510506
+       "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
+
+       # use the includes from the prefix
+       "${FILESDIR}"/${PN}-6.2-jni-check-prefix-first.patch
+       "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
+
+       # sqlite configure call has an extra leading ..
+       # upstreamed:5.2.36, missing in 5.3.x/6.x
+       # still needs to be patched in 6.0.20
+       "${FILESDIR}"/${PN}-6.1.19-sqlite-configure-path.patch
+
+       # The upstream testsuite copies .lib and the binaries for each parallel test
+       # core, ~300MB each. This patch uses links instead, saves a lot of space.
+       "${FILESDIR}"/${PN}-6.0.20-test-link.patch
+)
+
+src_prepare() {
+       cd "${WORKDIR}"/"${MY_P}"
+       for (( i=1 ; i<=${PATCHNO} ; i++ ))
+       do
+               eapply "${DISTDIR}"/patch."${MY_PV}"."${i}"
+       done
+
+       default
+
+       # Upstream release script grabs the dates when the script was run, so lets
+       # end-run them to keep the date the same.
+       export REAL_DB_RELEASE_DATE="$(awk \
+               '/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
+               "${S_BASE}"/dist/configure)"
+       sed -r -i \
+               -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
+               "${S_BASE}"/dist/RELEASE || die
+
+       # Include the SLOT for Java JAR files
+       # This supersedes the unused jarlocation patches.
+       sed -r -i \
+               -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
+               "${S_BASE}"/dist/Makefile.in || die
+
+       cd "${S_BASE}"/dist || die
+       rm -f aclocal/libtool.m4
+       sed -i \
+               -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+               configure.ac || die
+       sed -i \
+               -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
+               aclocal/programs.m4 || die
+       AT_M4DIR="aclocal aclocal_java" eautoreconf
+       # Upstream sucks - they do autoconf and THEN replace the version variables.
+       . ./RELEASE
+       for v in \
+               DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
+               DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
+               DB_VERSION \
+               DB_RELEASE_DATE ; do
+               local ev="__EDIT_${v}__"
+               sed -i -e "s/${ev}/${!v}/g" configure || die
+       done
+
+       # This is a false positive skip in the tests as the test-reviewer code
+       # looks for 'Skipping\s'
+       sed -i \
+               -e '/db_repsite/s,Skipping:,Skipping,g' \
+               "${S_BASE}"/test/tcl/reputils.tcl || die
+}
+
+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
+       local myeconfargs=(
+               --enable-compat185
+               --enable-dbm
+               --enable-o_direct
+               --without-uniquename
+               --disable-sql
+               --disable-sql_codegen
+               --disable-sql_compat
+               $([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly)
+               $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
+               $(use_enable cxx)
+               $(use_enable cxx stl)
+               $(multilib_native_use_enable java)
+               $(use_enable test)
+       )
+
+       tc-ld-disable-gold #470634
+
+       # compilation with -O0 fails on amd64, see bug #171231
+       if [[ ${ABI} == amd64 ]]; then
+               local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+               replace-flags -O0 -O2
+               is-flagq -O[s123] || append-flags -O2
+       fi
+
+       # Add linker versions to the symbols. Easier to do, and safer than header file
+       # mumbo jumbo.
+       if use userland_GNU ; then
+               append-ldflags -Wl,--default-symver
+       fi
+
+       # use `set` here since the java opts will contain whitespace
+       if multilib_is_native_abi && use java ; then
+               myeconfargs+=(
+                       --with-java-prefix="${JAVA_HOME}"
+                       --with-javac-flags="$(java-pkg_javac-args)"
+               )
+       fi
+
+       # Bug #270851: test needs TCL support
+       if use tcl || use test ; then
+               myeconfargs+=(
+                       --enable-tcl
+                       --with-tcl="${EPREFIX}/usr/$(get_libdir)"
+               )
+       else
+               myeconfargs+=(--disable-tcl )
+       fi
+
+       ECONF_SOURCE="${S_BASE}"/dist \
+       STRIP="true" \
+       econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+       emake install DESTDIR="${D}"
+
+       db_src_install_headerslot
+
+       db_src_install_usrlibcleanup
+
+       if multilib_is_native_abi && use java; then
+               java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so
+               java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar
+               rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar
+       fi
+}
+
+multilib_src_install_all() {
+       db_src_install_usrbinslot
+
+       db_src_install_doc
+
+       dodir /usr/sbin
+       # This file is not always built, and no longer exists as of db-4.8
+       if [[ -f "${ED%/}"/usr/bin/berkeley_db_svc ]] ; then
+               mv "${ED%/}"/usr/bin/berkeley_db_svc \
+                       "${ED%/}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
+       fi
+}
+
+pkg_postinst() {
+       multilib_foreach_abi db_fix_so
+}
+
+pkg_postrm() {
+       multilib_foreach_abi db_fix_so
+}
+
+src_test() {
+       # db_repsite is impossible to build, as upstream strips those sources.
+       # db_repsite is used directly in the setup_site_prog,
+       # setup_site_prog is called from open_site_prog
+       # which is called only from tests in the multi_repmgr group.
+       #sed -ri \
+       #       -e '/set subs/s,multi_repmgr,,g' \
+       #       "${S_BASE}/test/testparams.tcl"
+       sed -ri \
+               -e '/multi_repmgr/d' \
+               "${S_BASE}/test/tcl/test.tcl" || die
+
+       # This is the only failure in 5.2.28 so far, and looks like a false positive.
+       # Repmgr018 (btree): Test of repmgr stats.
+       #     Repmgr018.a: Start a master.
+       #     Repmgr018.b: Start a client.
+       #     Repmgr018.c: Run some transactions at master.
+       #         Rep_test: btree 20 key/data pairs starting at 0
+       #         Rep_test.a: put/get loop
+       # FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1
+       sed -ri \
+               -e '/set parms.*repmgr018/d' \
+               -e 's/repmgr018//g' \
+               "${S_BASE}/test/tcl/test.tcl" || die
+
+       multilib-minimal_src_test
+}
+
+multilib_src_test() {
+       multilib_is_native_abi || return
+
+       S=${BUILD_DIR} db_src_test
+}
index 8ddb46b70261fd502f8cd96cf0a5c0820bb649f1..f1f701de12612e1ae362913172c9428aa589b976 100644 (file)
@@ -1,5 +1,5 @@
---- dist/configure.ac  2005-09-23 21:01:26.000000000 +0200
-+++ dist/configure.ac  2005-09-23 20:59:20.000000000 +0200
+--- a/dist/configure.ac
++++ b/dist/configure.ac
 @@ -385,6 +385,7 @@
          # A classpath that includes . is needed to check for Java
        CLASSPATH=".:$CLASSPATH"