mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-17 09:56:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-libs/berkdb: Drop unused package

Browse Source
This commit is contained in:
Krzesimir Nowak 2021-12-21 15:49:43 +01:00
parent 9fb7e90be0
commit da18e43918
37 changed files with 0 additions and 3113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1237
sdk_container/src/third_party/coreos-overlay/sys-libs/db/ChangeLog vendored
View File

File diff suppressed because it is too large Load Diff

6
sdk_container/src/third_party/coreos-overlay/sys-libs/db/Manifest vendored
View File

@ -1,6 +0,0 @@
DIST db-4.6.21.tar.gz 11881885 RMD160 ccf9a4b85cc0464b2f3c2f2da29d99328fd4978e SHA1 5be3beb82e42a78ff671a3f5a4c30e5652972119 SHA256 53ea9c9f03746a0aa415e6706e9c6da18ca18148f20ad1465b182411a7985e21
DIST db-4.7.25.tar.gz 13124129 RMD160 9a5d8149d61452906c3f1c36f2859a2033c8bc3b SHA1 957c10358df1211e1dc37ea997aadef42117d6a5 SHA256 f14fd96dd38915a1d63dcb94a63fbb8092334ceba6b5060760427096f631263e
DIST patch.4.6.21.1 2475 RMD160 8c11e9b991ac6559f22ece2d93617b16126049e8 SHA1 c7c155705687e4de03d06c2ea86940f573fdac0b SHA256 d28c0723c465a2cf3ff2ddc5ed3c643b40c955c4e64d56580961f2fd799cbb53
DIST patch.4.6.21.2 892 RMD160 f8abf554552db668037e046dea54700ce3340bf8 SHA1 a694b71088ba99b74042e7568f395fe467bb6590 SHA256 9496a6cad44377ad1fab8c617f17c6f541e3423814663bfa81c3abb4001622d9
DIST patch.4.6.21.3 1517 RMD160 63743d910f8c3832409bdc6e7d74db0fcdd686a5 SHA1 a893f6bcdb6ae1f9395c027431c038168d500c9b SHA256 3f531b18d88ce68ff080761cd62ef621444e675593aa23045d69121cd2c7c638
DIST patch.4.6.21.4 41501 RMD160 f1d18e59c311fb4e1f00a3b6220269fca17df312 SHA1 e2190185c667edb97e800495ce6eb4f95f43eb87 SHA256 98bb4499dc7408c27a8a855330972a69abd3b29d0ff3820d6e1da790593a5bb7

170
sdk_container/src/third_party/coreos-overlay/sys-libs/db/db-4.6.21_p4.ebuild vendored
View File

@ -1,170 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.6.21_p4.ebuild,v 1.10 2009/09/20 19:52:44 robbat2 Exp $
inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
#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="${WORKDIR}/${MY_P}/build_unix"
DESCRIPTION="Oracle Berkeley DB"
HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/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="OracleDB"
SLOT="4.6"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="tcl java doc nocxx"
DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
java? ( >=virtual/jdk-1.4 )
>=sys-devel/binutils-2.16.1"
RDEPEND="tcl? ( dev-lang/tcl )
java? ( >=virtual/jre-1.4 )"
src_unpack() {
unpack "${MY_P}".tar.gz
cd "${WORKDIR}"/"${MY_P}"
for (( i=1 ; i<=${PATCHNO} ; i++ ))
do
epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
done
epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
# use the includes from the prefix
epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
epatch "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE
# 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}"/../dist/Makefile.in
cd "${S}"/../dist
rm -f aclocal/libtool.m4
sed -i \
-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
configure.ac
sed -i \
-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
aclocal/programs.m4
AT_M4DIR="aclocal aclocal_java" eautoreconf
# Upstream sucks - they do autoconf and THEN replace the version variables.
. ./RELEASE
sed -i \
-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
-e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
-e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
-e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
-e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
-e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure
}
src_compile() {
# compilation with -O0 fails on amd64, see bug #171231
if use amd64; then
replace-flags -O0 -O2
is-flagq -O[s123] || append-flags -O2
fi
local myconf=""
use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
myconf="${myconf} $(use_enable !nocxx cxx)"
use tcl \
&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
|| myconf="${myconf} --disable-tcl"
myconf="${myconf} $(use_enable java)"
if use java; then
myconf="${myconf} --with-java-prefix=${JAVA_HOME}"
# Can't get this working any other way, since it returns spaces, and
# bash doesn't seem to want to pass correctly in any way i try
local javaconf="-with-javac-flags=$(java-pkg_javac-args)"
fi
[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
# the entire testsuite needs the TCL functionality
if use tcl && use test ; then
myconf="${myconf} --enable-test"
else
myconf="${myconf} --disable-test"
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
cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \
--prefix=/usr \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--datadir=/usr/share \
--sysconfdir=/etc \
--localstatedir=/var/lib \
--libdir=/usr/"$(get_libdir)" \
--enable-compat185 \
--enable-o_direct \
--without-uniquename \
$(use arm && echo --with-mutex=ARM/gcc-assembly) \
--enable-rpc \
--host="${CHOST}" \
${myconf} "${javaconf}" || die "configure failed"
sed -e "s,\(^STRIP *=\).*,\1\"none\"," Makefile > Makefile.cpy \
&& mv Makefile.cpy Makefile
emake || die "make failed"
}
src_install() {
einstall libdir="${D}/usr/$(get_libdir)" STRIP="none" || die
db_src_install_usrbinslot
db_src_install_headerslot
db_src_install_doc
db_src_install_usrlibcleanup
dodir /usr/sbin
# This file is not always built, and no longer exists as of db-4.8
[[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \
mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
if use java; then
java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
rm -f "${D}"/usr/"$(get_libdir)"/*.jar
fi
}
pkg_postinst() {
db_fix_so
}
pkg_postrm() {
db_fix_so
}

167
sdk_container/src/third_party/coreos-overlay/sys-libs/db/db-4.7.25_p4-r4.ebuild vendored
View File

@ -1,167 +0,0 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.7.25_p4.ebuild,v 1.13 2010/01/24 18:29:31 armin76 Exp $
inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool binutils-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="${WORKDIR}/${MY_P}/build_unix"
DESCRIPTION="Oracle Berkeley DB"
HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
LICENSE="OracleDB"
SLOT="4.7"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="doc java nocxx tcl test"
# the entire testsuite needs the TCL functionality
DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
test? ( >=dev-lang/tcl-8.4 )
java? ( >=virtual/jdk-1.5 )
>=sys-devel/binutils-2.16.1"
RDEPEND="tcl? ( dev-lang/tcl )
java? ( >=virtual/jre-1.5 )"
src_unpack() {
unpack "${MY_P}".tar.gz
cd "${WORKDIR}"/"${MY_P}"
for (( i=1 ; i<=${PATCHNO} ; i++ ))
do
epatch "${FILESDIR}"/patch."${MY_PV}"."${i}"
done
epatch "${FILESDIR}"/"${PN}"-4.6-libtool.patch
# use the includes from the prefix
epatch "${FILESDIR}"/"${PN}"-4.6-jni-check-prefix-first.patch
epatch "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE
# 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}"/../dist/Makefile.in
cd "${S}"/../dist
rm -f aclocal/libtool.m4
sed -i \
-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
configure.ac
sed -i \
-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
aclocal/programs.m4
AT_M4DIR="aclocal aclocal_java" eautoreconf
# Upstream sucks - they do autoconf and THEN replace the version variables.
. ./RELEASE
sed -i \
-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
-e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
-e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
-e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
-e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
-e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure
}
src_compile() {
if use arm ; then
append-cflags "-marm"
appennd-cxxflags "-marm"
fi
local myconf=''
# compilation with -O0 fails on amd64, see bug #171231
if use amd64; then
replace-flags -O0 -O2
is-flagq -O[s123] || append-flags -O2
fi
# use `set` here since the java opts will contain whitespace
set --
if use java ; then
set -- "$@" \
--with-java-prefix="${JAVA_HOME}" \
--with-javac-flags="$(java-pkg_javac-args)"
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
# gold doesn't support --default-symver so force GNU ld
tc-export CC CXX LD
LD="$(get_binutils_path_ld)/ld"
CC="${CC} -B$(get_binutils_path_ld)"
CXX="${CXX} -B$(get_binutils_path_ld)"
fi
# Bug #270851: test needs TCL support
if use tcl || use test ; then
myconf="${myconf} --enable-tcl"
myconf="${myconf} --with-tcl=/usr/$(get_libdir)"
else
myconf="${myconf} --disable-tcl"
fi
cd "${S}"
ECONF_SOURCE="${S}"/../dist \
STRIP="true" \
econf \
--enable-compat185 \
--enable-o_direct \
--without-uniquename \
--enable-rpc \
$(use arm && echo --with-mutex=ARM/gcc-assembly) \
$(use amd64 && echo --with-mutex=x86/gcc-assembly) \
$(use_enable !nocxx cxx) \
$(use_enable java) \
${myconf} \
$(use_enable test) \
"$@"
emake || die "make failed"
}
src_install() {
emake install DESTDIR="${D}" || die
db_src_install_usrbinslot
db_src_install_headerslot
db_src_install_doc
db_src_install_usrlibcleanup
dodir /usr/sbin
# This file is not always built, and no longer exists as of db-4.8
[[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \
mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
if use java; then
java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
rm -f "${D}"/usr/"$(get_libdir)"/*.jar
fi
}
pkg_postinst() {
db_fix_so
}
pkg_postrm() {
db_fix_so
}

29
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-1.85-gentoo-paths.patch vendored
View File

@ -1,29 +0,0 @@
--- PORT/linux/Makefile
+++ PORT/linux/Makefile
@@ -1,12 +1,12 @@
# @(#)Makefile 8.9 (Berkeley) 7/14/94
-LIBDB= libdb.a
-LIBDBSO=libdb.so
+LIBDB= libdb1.a
+LIBDBSO=libdb1.so
SOVER=2
SONAME=$(LIBDBSO).$(SOVER)
LIBNDBM=libndbm.a
LIBNDBMSO=libndbm.so
-PROG= db_dump185
+PROG= db1_dump185
OBJ1= hash.o hash_bigkey.o hash_buf.o hash_func.o hash_log2.o hash_page.o \
ndbm.o
OBJ2= bt_close.o bt_conv.o bt_debug.o bt_delete.o bt_get.o bt_open.o \
@@ -27,8 +27,8 @@
DESTDIR =
prefix = /usr
bindir = $(prefix)/bin
-libdir = $(prefix)/lib
-includedir = $(prefix)/include
+libdir = $(prefix)/@GENTOO_LIBDIR@
+includedir = $(prefix)/include/db1
all: $(LIBDB) $(LIBDBSO) $(PROG)

26
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-3.2.9-fix-dep-link.patch vendored
View File

@ -1,26 +0,0 @@
--- db-3.2.9/dist/Makefile.in.orig 2003-02-23 23:41:13.000000000 +0200
+++ db-3.2.9/dist/Makefile.in 2003-02-23 23:42:07.000000000 +0200
@@ -240,19 +240,19 @@
$(libso_target): $(OBJS)
$(SOLINK) $(SOFLAGS) -o $(libso_target) \
- $(OBJS) $(LDFLAGS) $(LIBSO_LIBS)
+ $(OBJS) $(LDFLAGS) $(LIBS) $(LIBSO_LIBS)
$(libxso_target): $(COBJS) $(OBJS)
$(SOLINK) $(SOFLAGS) -o $(libxso_target) \
- $(COBJS) $(OBJS) $(LDFLAGS) $(LIBXSO_LIBS)
+ $(COBJS) $(OBJS) $(LDFLAGS) $(LIBS) $(LIBXSO_LIBS)
$(libjso_target): $(JOBJS) $(OBJS)
$(SOLINK) $(SOFLAGS) -o $(libjso_target) \
- $(JOBJS) $(OBJS) $(LDFLAGS) $(LIBJSO_LIBS)
+ $(JOBJS) $(OBJS) $(LDFLAGS) $(LIBS) $(LIBJSO_LIBS)
$(libtso_target): $(TOBJS) $(OBJS)
$(SOLINK) $(SOFLAGS) -o $(libtso_target) \
- $(TOBJS) $(OBJS) $(LDFLAGS) $(LIBTSO_LIBS)
+ $(TOBJS) $(OBJS) $(LDFLAGS) $(LIBS) $(LIBTSO_LIBS)
##################################################
# Creating individual dependencies and actions for building class

16
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-3.2.9-gcc43.patch vendored
View File

@ -1,16 +0,0 @@
diff -Nuar db-3.2.9.orig/include/db_cxx.h db-3.2.9/include/db_cxx.h
--- db-3.2.9.orig/include/db_cxx.h 2001-01-11 10:28:55.000000000 -0800
+++ db-3.2.9/include/db_cxx.h 2008-08-16 16:10:48.474699646 -0700
@@ -49,7 +49,12 @@
// Forward declarations
//
+#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)
+using namespace std;
+#include <iostream>
+#else
#include <iostream.h>
+#endif
#include <stdarg.h>
#include "db.h"

12
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-3.2.9-jarlocation.patch vendored
View File

@ -1,12 +0,0 @@
diff -ur db-3.2.9.old/dist/Makefile.in db-3.2.9/dist/Makefile.in
--- db-3.2.9.old/dist/Makefile.in 2003-10-18 02:21:18.000000000 -0700
+++ db-3.2.9/dist/Makefile.in 2003-10-18 02:22:14.000000000 -0700
@@ -72,7 +72,7 @@
JAVA_DBDIR= $(JAVA_SRCDIR)/$(JAVA_DBREL)
JAVA_EXDIR= $(JAVA_SRCDIR)/com/sleepycat/examples
-libj_jarfile= db.jar
+libj_jarfile= db-$(SOVERSION).jar
libjso_base= libdb_java
libjso= $(libjso_base)-$(SOVERSION).@SOSUFFIX@
libjso_target= $(libjso_base)-$(SOVERSION).la

15
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-3.2.9-java15.patch vendored
View File

@ -1,15 +0,0 @@
--- db-3.2.9/java/src/com/sleepycat/db/DbEnv.java.orig 2005-03-10 18:30:19.705147736 +0000
+++ db-3.2.9/java/src/com/sleepycat/db/DbEnv.java 2005-03-10 18:03:07.930215232 +0000
@@ -78,9 +78,9 @@
//
/*package*/ void _notify_dbs()
{
- Enumeration enum = dblist_.elements();
- while (enum.hasMoreElements()) {
- Db db = (Db)enum.nextElement();
+ Enumeration en = dblist_.elements();
+ while (en.hasMoreElements()) {
+ Db db = (Db)en.nextElement();
db._notify_dbenv_close();
}
dblist_.removeAllElements();

38
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.0.14-fix-dep-link.patch vendored
View File

@ -1,38 +0,0 @@
--- db-4.0.14/dist/Makefile.in.orig 2003-08-16 06:21:53.763400112 +0200
+++ db-4.0.14/dist/Makefile.in 2003-08-16 06:23:16.036892640 +0200
@@ -58,7 +58,7 @@
LDFLAGS= @LDFLAGS@
LIBS= @LIBS@
-LIBSO_LIBS= @LIBSO_LIBS@
+LIBSO_LIBS= @LIBSO_LIBS@ $(LIBS)
libdb= libdb.a
libso_base= libdb
@@ -77,7 +77,7 @@
CXX= @MAKEFILE_CXX@
CXXLINK= @MAKEFILE_CXXLINK@
XSOLINK= @MAKEFILE_XSOLINK@
-LIBXSO_LIBS= @LIBXSO_LIBS@
+LIBXSO_LIBS= @LIBXSO_LIBS@ $(LIBS)
libcxx= libdb_cxx.a
libxso_base= libdb_cxx
@@ -93,7 +93,7 @@
# Java support is optional and requires shared librarires.
##################################################
CLASSPATH= $(JAVA_CLASSTOP)
-LIBJSO_LIBS= @LIBJSO_LIBS@
+LIBJSO_LIBS= @LIBJSO_LIBS@ $(LIBS)
JAR= @JAR@
JAVAC= env CLASSPATH="$(CLASSPATH)" @JAVAC@
@@ -121,7 +121,7 @@
# Tcl support is optional and requires shared libraries.
##################################################
TCFLAGS= @TCFLAGS@
-LIBTSO_LIBS= @LIBTSO_LIBS@
+LIBTSO_LIBS= @LIBTSO_LIBS@ $(LIBS)
libtso_base= libdb_tcl
libtso= $(libtso_base)-$(SOVERSION).@SOSUFFIX@
libtso_static= $(libtso_base)-$(SOVERSION).a

14
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.0.14-jarlocation.patch vendored
View File

@ -1,14 +0,0 @@
diff -ur db-4.0.14.old/dist/Makefile.in db-4.0.14/dist/Makefile.in
--- db-4.0.14.old/dist/Makefile.in 2003-10-18 02:24:50.000000000 -0700
+++ db-4.0.14/dist/Makefile.in 2003-10-18 02:25:18.000000000 -0700
@@ -105,8 +105,8 @@
JAVA_DBDIR= $(JAVA_SRCDIR)/$(JAVA_DBREL)
JAVA_EXDIR= $(JAVA_SRCDIR)/$(JAVA_EXREL)
-libj_jarfile= db.jar
-libj_exjarfile= dbexamples.jar
+libj_jarfile= db-$(SOVERSION).jar
+libj_exjarfile= dbexamples-$(SOVERSION).jar
libjso_base= libdb_java
libjso= $(libjso_base)-$(SOVERSION).@SOSUFFIX@
libjso_static= $(libjso_base)-$(SOVERSION).a

16
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.2-jarlocation.patch vendored
View File

@ -1,16 +0,0 @@
diff -ur db-4.1.25.old/dist/Makefile.in db-4.1.25/dist/Makefile.in
--- db-4.1.25.old/dist/Makefile.in 2003-10-18 02:15:45.000000000 -0700
+++ db-4.1.25/dist/Makefile.in 2003-10-18 02:13:47.000000000 -0700
@@ -107,9 +107,9 @@
JAVA_EXDIR= $(JAVA_SRCDIR)/$(JAVA_EXREL)
JAVA_RPCDIR= $(srcdir)/rpc_server/java
-libj_jarfile= db.jar
-libj_exjarfile= dbexamples.jar
-rpc_jarfile= dbsvc.jar
+libj_jarfile= db-4.2.jar
+libj_exjarfile= dbexamples-4.2.jar
+rpc_jarfile= dbsvc-4.2.jar
libjso_base= libdb_java
libjso= $(libjso_base)-$(SOVERSION).@JMODSUFFIX@
libjso_static= $(libjso_base)-$(SOVERSION).a

30
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.2-jni-check-prefix-first.patch vendored
View File

@ -1,30 +0,0 @@
--- dist/aclocal_java/ac_jni_include_dirs.ac 2003-10-06 20:41:38.000000000 +0200
+++ dist/aclocal_java/ac_jni_include_dirs.ac 2005-09-23 21:31:26.000000000 +0200
@@ -43,14 +43,19 @@
*) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);;
esac
-_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
-_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
-case "$host_os" in
- darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
- _JINC="$_JTOPDIR/Headers";;
- *) _JINC="$_JTOPDIR/include";;
-esac
-
+# If JAVAPREFIX is defined, look there first
+if test -r "$JAVAPREFIX/include/jni.h"; then
+ _JTOPDIR="$JAVAPREFIX"
+ _JINC="$JAVAPREFIX/include"
+else
+ _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
+ _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
+ case "$host_os" in
+ darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
+ _JINC="$_JTOPDIR/Headers";;
+ *) _JINC="$_JTOPDIR/include";;
+ esac
+fi
# If we find jni.h in /usr/include, then it's not a java-only tree, so
# don't add /usr/include or subdirectories to the list of includes.
# An extra -I/usr/include can foul things up with newer gcc's.

20
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.2-libtool.patch vendored
View File

@ -1,20 +0,0 @@
--- ./dist/configure.orig 2004-09-22 22:58:48.421632944 -0700
+++ ./dist/configure 2004-09-22 23:02:55.068136976 -0700
@@ -5657,7 +5657,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `"$LD" -v 2>&1 </dev/null` in
+case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
;;
@@ -11135,7 +11135,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `"$LD" -v 2>&1 </dev/null` in
+case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
;;

10
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.2-listen-to-java-options.patch vendored
View File

@ -1,10 +0,0 @@
--- dist/configure.ac 2005-09-23 21:01:26.000000000 +0200
+++ dist/configure.ac 2005-09-23 20:59:20.000000000 +0200
@@ -385,6 +385,7 @@
# A classpath that includes . is needed to check for Java
CLASSPATH=".:$CLASSPATH"
export CLASSPATH
+ AC_JAVA_OPTIONS
AC_PROG_JAVAC
AC_PROG_JAR
AC_PROG_JAVA

68
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.2.52_p2-TXN.patch vendored
View File

@ -1,68 +0,0 @@
This patch is intended to be applied to Berkeley DB 4.2.52 and,
if applied, will automatically be used by slapd(8) back-bdb/hdb.
Without this patch the BDB DB_LOG_AUTOREMOVE option will not work,
nor will db_archive allow any transaction log files to be removed
while slapd is running.
The patch can be applied to the BDB source using patch(1) as follows
cd db-4.2.52
patch -p0 < openldap-src/build/BerkeleyDB42.patch
(modify directory paths as necessary), then recompile and reinstall
the BerkeleyDB 4.2 library, and then build and install OpenLDAP
Software.
The patch should not be applied to Berkeley DB 4.3.
Index: dbinc/db.in
===================================================================
RCS file: /var/CVSROOT/bdb42/dbinc/db.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- dbinc/db.in 25 Nov 2003 21:58:02 -0000 1.1.1.1
+++ dbinc/db.in 17 Jul 2004 16:07:23 -0000 1.2
@@ -839,6 +839,7 @@
#define TXN_NOWAIT 0x040 /* Do not wait on locks. */
#define TXN_RESTORED 0x080 /* Transaction has been restored. */
#define TXN_SYNC 0x100 /* Sync on prepare and commit. */
+#define TXN_NOLOG 0x200 /* Do not log this transaction. */
u_int32_t flags;
};
Index: txn/txn.c
===================================================================
RCS file: /var/CVSROOT/bdb42/txn/txn.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- txn/txn.c 17 Dec 2003 21:43:53 -0000 1.1.1.2
+++ txn/txn.c 17 Jul 2004 16:07:27 -0000 1.2
@@ -127,7 +127,7 @@
if ((ret = __db_fchk(dbenv,
"txn_begin", flags,
DB_DIRTY_READ | DB_TXN_NOWAIT |
- DB_TXN_NOSYNC | DB_TXN_SYNC)) != 0)
+ DB_TXN_NOSYNC | DB_TXN_SYNC | DB_TXN_NOT_DURABLE)) != 0)
return (ret);
if ((ret = __db_fcchk(dbenv,
"txn_begin", flags, DB_TXN_NOSYNC, DB_TXN_SYNC)) != 0)
@@ -193,6 +193,8 @@
F_SET(txn, TXN_SYNC);
if (LF_ISSET(DB_TXN_NOWAIT))
F_SET(txn, TXN_NOWAIT);
+ if (LF_ISSET(DB_TXN_NOT_DURABLE))
+ F_SET(txn, TXN_NOLOG);
if ((ret = __txn_begin_int(txn, 0)) != 0)
goto err;
@@ -328,7 +330,7 @@
* We should set this value when we write the first log record, not
* here.
*/
- if (DBENV_LOGGING(dbenv))
+ if (DBENV_LOGGING(dbenv) && !F_ISSET(txn, TXN_NOLOG))
__log_txn_lsn(dbenv, &begin_lsn, NULL, NULL);
else
ZERO_LSN(begin_lsn);

16
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.3-jarlocation.patch vendored
View File

@ -1,16 +0,0 @@
diff -ur db-4.1.25.old/dist/Makefile.in db-4.1.25/dist/Makefile.in
--- db-4.1.25.old/dist/Makefile.in 2003-10-18 02:15:45.000000000 -0700
+++ db-4.1.25/dist/Makefile.in 2003-10-18 02:13:47.000000000 -0700
@@ -107,9 +107,9 @@
JAVA_EXDIR= $(JAVA_SRCDIR)/$(JAVA_EXREL)
JAVA_RPCDIR= $(srcdir)/rpc_server/java
-libj_jarfile= db.jar
-libj_exjarfile= dbexamples.jar
-rpc_jarfile= dbsvc.jar
+libj_jarfile= db-4.3.jar
+libj_exjarfile= dbexamples-4.3.jar
+rpc_jarfile= dbsvc-4.3.jar
libjso_base= libdb_java
libjso= $(libjso_base)-$(SOVERSION).@JMODSUFFIX@
libjso_static= $(libjso_base)-$(SOVERSION).a

30
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch vendored
View File

@ -1,30 +0,0 @@
--- dist/aclocal_java/ac_jni_include_dirs.ac 2003-10-06 20:41:38.000000000 +0200
+++ dist/aclocal_java/ac_jni_include_dirs.ac 2005-09-23 21:31:26.000000000 +0200
@@ -43,14 +43,19 @@
*) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);;
esac
-_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
-_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
-case "$host_os" in
- darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
- _JINC="$_JTOPDIR/Headers";;
- *) _JINC="$_JTOPDIR/include";;
-esac
-
+# If JAVAPREFIX is defined, look there first
+if test -r "$JAVAPREFIX/include/jni.h"; then
+ _JTOPDIR="$JAVAPREFIX"
+ _JINC="$JAVAPREFIX/include"
+else
+ _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
+ _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
+ case "$host_os" in
+ darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
+ _JINC="$_JTOPDIR/Headers";;
+ *) _JINC="$_JTOPDIR/include";;
+ esac
+fi
# If we find jni.h in /usr/include, then it's not a java-only tree, so
# don't add /usr/include or subdirectories to the list of includes.
# An extra -I/usr/include can foul things up with newer gcc's.

47
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.3-libtool.patch vendored
View File

@ -1,47 +0,0 @@
--- dist/configure.orig 2005-02-02 11:22:49.596096072 +0100
+++ dist/configure 2005-02-02 11:23:46.749407448 +0100
@@ -5684,7 +5684,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
+case `"$LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
;;
@@ -8461,7 +8461,7 @@
tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
archive_cmds="$tmp_archive_cmds"
supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
+ case `"$LD" -v 2>/dev/null` in
*\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -11383,7 +11383,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
+case `"$LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
;;
@@ -15353,7 +15353,7 @@
tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
archive_cmds_F77="$tmp_archive_cmds"
supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
+ case `"$LD" -v 2>/dev/null` in
*\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -17695,7 +17695,7 @@
tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
archive_cmds_GCJ="$tmp_archive_cmds"
supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
+ case `"$LD" -v 2>/dev/null` in
*\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...

10
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.3-listen-to-java-options.patch vendored
View File

@ -1,10 +0,0 @@
--- dist/configure.ac 2005-09-23 21:01:26.000000000 +0200
+++ dist/configure.ac 2005-09-23 20:59:20.000000000 +0200
@@ -385,6 +385,7 @@
# A classpath that includes . is needed to check for Java
CLASSPATH=".:$CLASSPATH"
export CLASSPATH
+ AC_JAVA_OPTIONS
AC_PROG_JAVAC
AC_PROG_JAR
AC_PROG_JAVA

38
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.3.27-fix-dep-link.patch vendored
View File

@ -1,38 +0,0 @@
--- db-4.3.27/dist/Makefile.in.chris 2005-02-01 23:40:34.447945464 +0100
+++ db-4.3.27/dist/Makefile.in 2005-02-01 23:42:21.635650456 +0100
@@ -58,7 +58,7 @@
LDFLAGS= @LDFLAGS@
LIBS= @LIBS@
TEST_LIBS= @TEST_LIBS@
-LIBSO_LIBS= @LIBSO_LIBS@
+LIBSO_LIBS= @LIBSO_LIBS@ $(LIBS)
libdb_base= libdb
libdb= $(libdb_base).a
@@ -77,7 +77,7 @@
CXX= @MAKEFILE_CXX@
CXXLINK= @MAKEFILE_CXXLINK@ @CXXFLAGS@
XSOLINK= @MAKEFILE_XSOLINK@ @CXXFLAGS@
-LIBXSO_LIBS= @LIBXSO_LIBS@
+LIBXSO_LIBS= @LIBXSO_LIBS@ $(LIBS)
libcxx_base= libdb_cxx
libcxx= $(libcxx_base).a
@@ -93,7 +93,7 @@
# Java support is optional and requires shared librarires.
##################################################
CLASSPATH= $(JAVA_CLASSTOP)
-LIBJSO_LIBS= @LIBJSO_LIBS@
+LIBJSO_LIBS= @LIBJSO_LIBS@ $(LIBS)
JAR= @JAR@
JAVAC= env CLASSPATH="$(CLASSPATH)" @JAVAC@
@@ -126,7 +126,7 @@
# Tcl support is optional and requires shared libraries.
##################################################
TCFLAGS= @TCFLAGS@
-LIBTSO_LIBS= @LIBTSO_LIBS@
+LIBTSO_LIBS= @LIBTSO_LIBS@ $(LIBS)
libtso_base= libdb_tcl
libtso= $(libtso_base)-$(LIBVERSION)@MODSUFFIX@
libtso_static= $(libtso_base)-$(LIBVERSION).a

16
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.4-jarlocation.patch vendored
View File

@ -1,16 +0,0 @@
diff -ur db-4.1.25.old/dist/Makefile.in db-4.1.25/dist/Makefile.in
--- db-4.1.25.old/dist/Makefile.in 2003-10-18 02:15:45.000000000 -0700
+++ db-4.1.25/dist/Makefile.in 2003-10-18 02:13:47.000000000 -0700
@@ -107,9 +107,9 @@
JAVA_EXDIR= $(JAVA_SRCDIR)/$(JAVA_EXREL)
JAVA_RPCDIR= $(srcdir)/rpc_server/java
-libj_jarfile= db.jar
-libj_exjarfile= dbexamples.jar
-rpc_jarfile= dbsvc.jar
+libj_jarfile= db-4.5.jar
+libj_exjarfile= dbexamples-4.5.jar
+rpc_jarfile= dbsvc-4.5.jar
libjso_base= libdb_java
libjso= $(libjso_base)-$(SOVERSION).@JMODSUFFIX@
libjso_static= $(libjso_base)-$(SOVERSION).a

47
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.4-libtool.patch vendored
View File

@ -1,47 +0,0 @@
--- dist/configure.orig 2006-01-31 10:23:58.000000000 +0100
+++ dist/configure 2006-01-31 10:26:43.000000000 +0100
@@ -5765,7 +5765,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
+case `"$LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
;;
@@ -8753,7 +8753,7 @@
whole_archive_flag_spec=
fi
supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
+ case `"$LD" -v 2>/dev/null` in
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -11855,7 +11855,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
+case `"$LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
;;
@@ -15842,7 +15842,7 @@
whole_archive_flag_spec_F77=
fi
supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
+ case `"$LD" -v 2>/dev/null` in
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -18300,7 +18300,7 @@
whole_archive_flag_spec_GCJ=
fi
supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
+ case `"$LD" -v 2>/dev/null` in
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...

16
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.5-jarlocation.patch vendored
View File

@ -1,16 +0,0 @@
diff -ur db-4.1.25.old/dist/Makefile.in db-4.1.25/dist/Makefile.in
--- db-4.1.25.old/dist/Makefile.in 2003-10-18 02:15:45.000000000 -0700
+++ db-4.1.25/dist/Makefile.in 2003-10-18 02:13:47.000000000 -0700
@@ -107,9 +107,9 @@
JAVA_EXDIR= $(JAVA_SRCDIR)/$(JAVA_EXREL)
JAVA_RPCDIR= $(srcdir)/rpc_server/java
-libj_jarfile= db.jar
-libj_exjarfile= dbexamples.jar
-rpc_jarfile= dbsvc.jar
+libj_jarfile= db-4.4.jar
+libj_exjarfile= dbexamples-4.4.jar
+rpc_jarfile= dbsvc-4.4.jar
libjso_base= libdb_java
libjso= $(libjso_base)-$(SOVERSION).@JMODSUFFIX@
libjso_static= $(libjso_base)-$(SOVERSION).a

47
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.5-libtool.patch vendored
View File

@ -1,47 +0,0 @@
--- dist/configure.orig 2006-01-31 10:23:58.000000000 +0100
+++ dist/configure 2006-01-31 10:26:43.000000000 +0100
@@ -5765,7 +5765,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
+case `"$LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
;;
@@ -8753,7 +8753,7 @@
whole_archive_flag_spec=
fi
supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
+ case `"$LD" -v 2>/dev/null` in
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -11855,7 +11855,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
+case `"$LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
;;
@@ -15842,7 +15842,7 @@
whole_archive_flag_spec_F77=
fi
supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
+ case `"$LD" -v 2>/dev/null` in
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -18300,7 +18300,7 @@
whole_archive_flag_spec_GCJ=
fi
supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
+ case `"$LD" -v 2>/dev/null` in
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...

16
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.6-jarlocation.patch vendored
View File

@ -1,16 +0,0 @@
diff -ur db-4.1.25.old/dist/Makefile.in db-4.1.25/dist/Makefile.in
--- db-4.1.25.old/dist/Makefile.in 2003-10-18 02:15:45.000000000 -0700
+++ db-4.1.25/dist/Makefile.in 2003-10-18 02:13:47.000000000 -0700
@@ -107,9 +107,9 @@
JAVA_EXDIR= $(JAVA_SRCDIR)/$(JAVA_EXREL)
JAVA_RPCDIR= $(srcdir)/rpc_server/java
-libj_jarfile= db.jar
-libj_exjarfile= dbexamples.jar
-rpc_jarfile= dbsvc.jar
+libj_jarfile= db-4.4.jar
+libj_exjarfile= dbexamples-4.4.jar
+rpc_jarfile= dbsvc-4.4.jar
libjso_base= libdb_java
libjso= $(libjso_base)-$(SOVERSION).@JMODSUFFIX@
libjso_static= $(libjso_base)-$(SOVERSION).a

30
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch vendored
View File

@ -1,30 +0,0 @@
--- dist/aclocal_java/ac_jni_include_dirs.m4 2003-10-06 20:41:38.000000000 +0200
+++ dist/aclocal_java/ac_jni_include_dirs.m4 2005-09-23 21:31:26.000000000 +0200
@@ -43,14 +43,19 @@
*) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);;
esac
-_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
-_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
-case "$host_os" in
- darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
- _JINC="$_JTOPDIR/Headers";;
- *) _JINC="$_JTOPDIR/include";;
-esac
-
+# If JAVAPREFIX is defined, look there first
+if test -r "$JAVAPREFIX/include/jni.h"; then
+ _JTOPDIR="$JAVAPREFIX"
+ _JINC="$JAVAPREFIX/include"
+else
+ _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
+ _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
+ case "$host_os" in
+ darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
+ _JINC="$_JTOPDIR/Headers";;
+ *) _JINC="$_JTOPDIR/include";;
+ esac
+fi
# If we find jni.h in /usr/include, then it's not a java-only tree, so
# don't add /usr/include or subdirectories to the list of includes.
# An extra -I/usr/include can foul things up with newer gcc's.

47
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.6-libtool.patch vendored
View File

@ -1,47 +0,0 @@
--- dist/configure.orig 2006-01-31 10:23:58.000000000 +0100
+++ dist/configure 2006-01-31 10:26:43.000000000 +0100
@@ -5765,7 +5765,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
+case `"$LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
;;
@@ -8753,7 +8753,7 @@
whole_archive_flag_spec=
fi
supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
+ case `"$LD" -v 2>/dev/null` in
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -11855,7 +11855,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
+case `"$LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
;;
@@ -15842,7 +15842,7 @@
whole_archive_flag_spec_F77=
fi
supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
+ case `"$LD" -v 2>/dev/null` in
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -18300,7 +18300,7 @@
whole_archive_flag_spec_GCJ=
fi
supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
+ case `"$LD" -v 2>/dev/null` in
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...

65
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.8-libtool.patch vendored
View File

@ -1,65 +0,0 @@
--- dist/configure
+++ dist/configure
@@ -6691,7 +6691,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
+case `"$LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
;;
@@ -7348,7 +7348,7 @@
;;
irix5* | irix6* | nonstopux*)
- case $LD in
+ case "$LD" in
*-32|*"-32 ") libmagic=32-bit;;
*-n32|*"-n32 ") libmagic=N32;;
*-64|*"-64 ") libmagic=64-bit;;
@@ -10664,7 +10664,7 @@
whole_archive_flag_spec=
fi
supports_anon_versioning=no
- case `$LD -v 2>&1` in
+ case `"$LD" -v 2>&1` in
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -10858,7 +10858,7 @@
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
- case `$LD -v 2>&1` in
+ case `"$LD" -v 2>&1` in
*\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
ld_shlibs=no
cat <<_LT_EOF 1>&2
@@ -12206,7 +12206,7 @@
libsuff= shlibsuff=
;;
*)
- case $LD in # libtool.m4 will add one of these switches to LD
+ case "$LD" in # libtool.m4 will add one of these switches to LD
*-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
libsuff= shlibsuff= libmagic=32-bit;;
*-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
@@ -13423,7 +13423,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
+case `"$LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
;;
@@ -15672,7 +15672,7 @@
libsuff= shlibsuff=
;;
*)
- case $LD in # libtool.m4 will add one of these switches to LD
+ case "$LD" in # libtool.m4 will add one of these switches to LD
*-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
libsuff= shlibsuff= libmagic=32-bit;;
*-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")

12
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/db-4.8.24-java-manifest-location.patch vendored
View File

@ -1,12 +0,0 @@
diff -Nuar db-4.8.24.orig/dist/Makefile.in db-4.8.24/dist/Makefile.in
--- db-4.8.24.orig/dist/Makefile.in 2009-09-19 23:39:45.286001896 +0000
+++ db-4.8.24/dist/Makefile.in 2009-09-19 23:41:13.079326882 +0000
@@ -830,7 +830,7 @@
$(JAVA) -classpath $(JAVA_CLASSTOP) \
com.sleepycat.persist.model.ClassEnhancer $(JAVA_CLASSTOP)
cd $(JAVA_CLASSTOP) && \
- $(JAR) cfm ../$(libj_jarfile) ../$(JAVA_MANIFEST) ./com/sleepycat
+ $(JAR) cfm ../$(libj_jarfile) $(JAVA_MANIFEST) ./com/sleepycat
$(libj_exjarfile): $(libj_jarfile) $(JAVA_EXSRCS)
@test -d $(JAVA_EXCLASSTOP) || \

104
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/patch.3.2.9.1 vendored
View File

@ -1,104 +0,0 @@
*** include/log.h.orig 2001/01/25 18:22:51 11.20
--- include/log.h 2001/02/06 05:02:28 11.21
***************
*** 198,203 ****
--- 198,204 ----
*/
typedef enum {
DB_LV_INCOMPLETE,
+ DB_LV_NONEXISTENT,
DB_LV_NORMAL,
DB_LV_OLD_READABLE,
DB_LV_OLD_UNREADABLE
*** log/log.c.orig 2001/01/25 18:22:55 11.43
--- log/log.c 2001/02/06 05:02:28 11.44
***************
*** 309,321 ****
int find_first, *valp;
logfile_validity *statusp;
{
! logfile_validity clv_status, status;
u_int32_t clv, logval;
int cnt, fcnt, ret;
const char *dir;
char **names, *p, *q, savech;
! clv_status = status = DB_LV_NORMAL;
/* Return a value of 0 as the log file number on failure. */
*valp = 0;
--- 309,321 ----
int find_first, *valp;
logfile_validity *statusp;
{
! logfile_validity logval_status, status;
u_int32_t clv, logval;
int cnt, fcnt, ret;
const char *dir;
char **names, *p, *q, savech;
! logval_status = status = DB_LV_NONEXISTENT;
/* Return a value of 0 as the log file number on failure. */
*valp = 0;
***************
*** 385,394 ****
* as a valid log file.
*/
break;
case DB_LV_NORMAL:
case DB_LV_OLD_READABLE:
logval = clv;
! clv_status = status;
break;
case DB_LV_OLD_UNREADABLE:
/*
--- 385,398 ----
* as a valid log file.
*/
break;
+ case DB_LV_NONEXISTENT:
+ /* Should never happen. */
+ DB_ASSERT(0);
+ break;
case DB_LV_NORMAL:
case DB_LV_OLD_READABLE:
logval = clv;
! logval_status = status;
break;
case DB_LV_OLD_UNREADABLE:
/*
***************
*** 410,416 ****
*/
if (!find_first) {
logval = clv;
! clv_status = status;
}
break;
}
--- 414,420 ----
*/
if (!find_first) {
logval = clv;
! logval_status = status;
}
break;
}
***************
*** 420,426 ****
err: __os_dirfree(names, fcnt);
__os_freestr(p);
! *statusp = clv_status;
return (ret);
}
--- 424,430 ----
err: __os_dirfree(names, fcnt);
__os_freestr(p);
! *statusp = logval_status;
return (ret);
}

21
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/patch.3.2.9.2 vendored
View File

@ -1,21 +0,0 @@
*** log/log_rec.c.orig 2001/01/25 18:22:56 11.49
--- log/log_rec.c 2001/02/07 22:17:46
***************
*** 404,410 ****
TAILQ_INIT(&logp->dbentry[i].dblist);
else
TAILQ_REINSERT_HEAD(
! &logp->dbentry[i].dblist, dbp, links);
}
/* Initialize the new entries. */
--- 404,410 ----
TAILQ_INIT(&logp->dbentry[i].dblist);
else
TAILQ_REINSERT_HEAD(
! &logp->dbentry[i].dblist, dbtmp, links);
}
/* Initialize the new entries. */

75
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/patch.4.7.25.1 vendored
View File

@ -1,75 +0,0 @@
*** sequence/sequence.c.orig 2008-05-05 13:25:09.000000000 -0700
--- sequence/sequence.c 2008-08-15 09:58:46.000000000 -0700
***************
*** 187,193 ****
if ((ret = __db_get_flags(dbp, &tflags)) != 0)
goto err;
! if (DB_IS_READONLY(dbp)) {
ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open");
goto err;
}
--- 187,197 ----
if ((ret = __db_get_flags(dbp, &tflags)) != 0)
goto err;
! /*
! * We can let replication clients open sequences, but must
! * check later that they do not update them.
! */
! if (F_ISSET(dbp, DB_AM_RDONLY)) {
ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open");
goto err;
}
***************
*** 244,249 ****
--- 248,258 ----
if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) ||
!LF_ISSET(DB_CREATE))
goto err;
+ if (IS_REP_CLIENT(env) &&
+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) {
+ ret = __db_rdonly(env, "DB_SEQUENCE->open");
+ goto err;
+ }
ret = 0;
rp = &seq->seq_record;
***************
*** 296,302 ****
*/
rp = seq->seq_data.data;
if (rp->seq_version == DB_SEQUENCE_OLDVER) {
! oldver: rp->seq_version = DB_SEQUENCE_VERSION;
if (!F_ISSET(env, ENV_LITTLEENDIAN)) {
if (IS_DB_AUTO_COMMIT(dbp, txn)) {
if ((ret =
--- 305,316 ----
*/
rp = seq->seq_data.data;
if (rp->seq_version == DB_SEQUENCE_OLDVER) {
! oldver: if (IS_REP_CLIENT(env) &&
! !F_ISSET(dbp, DB_AM_NOT_DURABLE)) {
! ret = __db_rdonly(env, "DB_SEQUENCE->open");
! goto err;
! }
! rp->seq_version = DB_SEQUENCE_VERSION;
if (!F_ISSET(env, ENV_LITTLEENDIAN)) {
if (IS_DB_AUTO_COMMIT(dbp, txn)) {
if ((ret =
***************
*** 707,712 ****
--- 721,733 ----
MUTEX_LOCK(env, seq->mtx_seq);
+ if (handle_check && IS_REP_CLIENT(env) &&
+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) {
+ ret = __db_rdonly(env, "DB_SEQUENCE->get");
+ goto err;
+ }
+
+
if (rp->seq_min + delta > rp->seq_max) {
__db_errx(env, "Sequence overflow");
ret = EINVAL;

71
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/patch.4.7.25.2 vendored
View File

@ -1,71 +0,0 @@
Index: lock/lock.c
===================================================================
RCS file: /a/CVSROOT/db/lock/lock.c,v
retrieving revision 12.61
diff -c -r12.61 lock.c
*** lock/lock.c 22 Jul 2008 12:08:53 -0000 12.61
--- lock/lock.c 19 Aug 2008 17:28:24 -0000
***************
*** 1278,1287 ****
SH_TAILQ_REMOVE(
&lt->obj_tab[obj_ndx], sh_obj, links, __db_lockobj);
if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) {
! LOCK_REGION_LOCK(env);
__env_alloc_free(&lt->reginfo,
SH_DBT_PTR(&sh_obj->lockobj));
! LOCK_REGION_UNLOCK(env);
}
SH_TAILQ_INSERT_HEAD(
&FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj);
--- 1278,1289 ----
SH_TAILQ_REMOVE(
&lt->obj_tab[obj_ndx], sh_obj, links, __db_lockobj);
if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) {
! if (region->part_t_size != 1)
! LOCK_REGION_LOCK(env);
__env_alloc_free(&lt->reginfo,
SH_DBT_PTR(&sh_obj->lockobj));
! if (region->part_t_size != 1)
! LOCK_REGION_UNLOCK(env);
}
SH_TAILQ_INSERT_HEAD(
&FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj);
***************
*** 1470,1484 ****
if (obj->size <= sizeof(sh_obj->objdata))
p = sh_obj->objdata;
else {
! LOCK_REGION_LOCK(env);
if ((ret =
__env_alloc(&lt->reginfo, obj->size, &p)) != 0) {
__db_errx(env,
"No space for lock object storage");
! LOCK_REGION_UNLOCK(env);
goto err;
}
! LOCK_REGION_UNLOCK(env);
}
memcpy(p, obj->data, obj->size);
--- 1472,1492 ----
if (obj->size <= sizeof(sh_obj->objdata))
p = sh_obj->objdata;
else {
! /*
! * If we have only one partition, the region is locked.
! */
! if (region->part_t_size != 1)
! LOCK_REGION_LOCK(env);
if ((ret =
__env_alloc(&lt->reginfo, obj->size, &p)) != 0) {
__db_errx(env,
"No space for lock object storage");
! if (region->part_t_size != 1)
! LOCK_REGION_UNLOCK(env);
goto err;
}
! if (region->part_t_size != 1)
! LOCK_REGION_UNLOCK(env);
}
memcpy(p, obj->data, obj->size);

314
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/patch.4.7.25.3 vendored
View File

@ -1,314 +0,0 @@
*** lock/lock_deadlock.c 2008-03-11 00:31:33.000000000 +1100
--- lock/lock_deadlock.c 2008-12-16 21:54:18.000000000 +1100
***************
*** 121,127 ****
DB_LOCKTAB *lt;
db_timespec now;
locker_info *idmap;
! u_int32_t *bitmap, *copymap, **deadp, **free_me, *tmpmap;
u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers;
u_int32_t lock_max, txn_max;
int ret, status;
--- 121,127 ----
DB_LOCKTAB *lt;
db_timespec now;
locker_info *idmap;
! u_int32_t *bitmap, *copymap, **deadp, **deadlist, *tmpmap;
u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers;
u_int32_t lock_max, txn_max;
int ret, status;
***************
*** 133,139 ****
if (IS_REP_CLIENT(env))
atype = DB_LOCK_MINWRITE;
! free_me = NULL;
lt = env->lk_handle;
if (rejectp != NULL)
--- 133,140 ----
if (IS_REP_CLIENT(env))
atype = DB_LOCK_MINWRITE;
! copymap = tmpmap = NULL;
! deadlist = NULL;
lt = env->lk_handle;
if (rejectp != NULL)
***************
*** 179,189 ****
memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc);
if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0)
! goto err1;
/* Find a deadlock. */
if ((ret =
! __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadp)) != 0)
return (ret);
/*
--- 180,190 ----
memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc);
if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0)
! goto err;
/* Find a deadlock. */
if ((ret =
! __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadlist)) != 0)
return (ret);
/*
***************
*** 204,211 ****
txn_max = TXN_MAXIMUM;
killid = BAD_KILLID;
! free_me = deadp;
! for (; *deadp != NULL; deadp++) {
if (rejectp != NULL)
++*rejectp;
killid = (u_int32_t)(*deadp - bitmap) / nalloc;
--- 205,211 ----
txn_max = TXN_MAXIMUM;
killid = BAD_KILLID;
! for (deadp = deadlist; *deadp != NULL; deadp++) {
if (rejectp != NULL)
++*rejectp;
killid = (u_int32_t)(*deadp - bitmap) / nalloc;
***************
*** 342,352 ****
__db_msg(env,
"Aborting locker %lx", (u_long)idmap[killid].id);
}
! __os_free(env, tmpmap);
! err1: __os_free(env, copymap);
!
! err: if (free_me != NULL)
! __os_free(env, free_me);
__os_free(env, bitmap);
__os_free(env, idmap);
--- 342,353 ----
__db_msg(env,
"Aborting locker %lx", (u_long)idmap[killid].id);
}
! err: if(copymap != NULL)
! __os_free(env, copymap);
! if (deadlist != NULL)
! __os_free(env, deadlist);
! if(tmpmap != NULL)
! __os_free(env, tmpmap);
__os_free(env, bitmap);
__os_free(env, idmap);
***************
*** 360,365 ****
--- 361,377 ----
#define DD_INVALID_ID ((u_int32_t) -1)
+ /*
+ * __dd_build --
+ * Build the lock dependency bit maps.
+ * Notes on syncronization:
+ * LOCK_SYSTEM_LOCK is used to hold objects locked when we have
+ * a single partition.
+ * LOCK_LOCKERS is held while we are walking the lockers list and
+ * to single thread the use of lockerp->dd_id.
+ * LOCK_DD protects the DD list of objects.
+ */
+
static int
__dd_build(env, atype, bmp, nlockers, allocp, idmap, rejectp)
ENV *env;
***************
*** 393,398 ****
--- 405,411 ----
* In particular we do not build the conflict array and our caller
* needs to expect this.
*/
+ LOCK_SYSTEM_LOCK(lt, region);
if (atype == DB_LOCK_EXPIRE) {
skip: LOCK_DD(env, region);
op = SH_TAILQ_FIRST(&region->dd_objs, __db_lockobj);
***************
*** 430,446 ****
OBJECT_UNLOCK(lt, region, indx);
}
UNLOCK_DD(env, region);
goto done;
}
/*
! * We'll check how many lockers there are, add a few more in for
! * good measure and then allocate all the structures. Then we'll
! * verify that we have enough room when we go back in and get the
! * mutex the second time.
*/
! retry: count = region->stat.st_nlockers;
if (count == 0) {
*nlockers = 0;
return (0);
}
--- 443,460 ----
OBJECT_UNLOCK(lt, region, indx);
}
UNLOCK_DD(env, region);
+ LOCK_SYSTEM_UNLOCK(lt, region);
goto done;
}
/*
! * Allocate after locking the region
! * to make sure the structures are large enough.
*/
! LOCK_LOCKERS(env, region);
! count = region->stat.st_nlockers;
if (count == 0) {
+ UNLOCK_LOCKERS(env, region);
*nlockers = 0;
return (0);
}
***************
*** 448,497 ****
if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK))
__db_msg(env, "%lu lockers", (u_long)count);
- count += 20;
nentries = (u_int32_t)DB_ALIGN(count, 32) / 32;
! /*
! * Allocate enough space for a count by count bitmap matrix.
! *
! * XXX
! * We can probably save the malloc's between iterations just
! * reallocing if necessary because count grew by too much.
! */
if ((ret = __os_calloc(env, (size_t)count,
! sizeof(u_int32_t) * nentries, &bitmap)) != 0)
return (ret);
if ((ret = __os_calloc(env,
sizeof(u_int32_t), nentries, &tmpmap)) != 0) {
__os_free(env, bitmap);
return (ret);
}
if ((ret = __os_calloc(env,
(size_t)count, sizeof(locker_info), &id_array)) != 0) {
__os_free(env, bitmap);
__os_free(env, tmpmap);
return (ret);
}
/*
- * Now go back in and actually fill in the matrix.
- */
- if (region->stat.st_nlockers > count) {
- __os_free(env, bitmap);
- __os_free(env, tmpmap);
- __os_free(env, id_array);
- goto retry;
- }
-
- /*
* First we go through and assign each locker a deadlock detector id.
*/
id = 0;
- LOCK_LOCKERS(env, region);
SH_TAILQ_FOREACH(lip, &region->lockers, ulinks, __db_locker) {
if (lip->master_locker == INVALID_ROFF) {
lip->dd_id = id++;
id_array[lip->dd_id].id = lip->id;
switch (atype) {
--- 462,498 ----
if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK))
__db_msg(env, "%lu lockers", (u_long)count);
nentries = (u_int32_t)DB_ALIGN(count, 32) / 32;
! /* Allocate enough space for a count by count bitmap matrix. */
if ((ret = __os_calloc(env, (size_t)count,
! sizeof(u_int32_t) * nentries, &bitmap)) != 0) {
! UNLOCK_LOCKERS(env, region);
return (ret);
+ }
if ((ret = __os_calloc(env,
sizeof(u_int32_t), nentries, &tmpmap)) != 0) {
+ UNLOCK_LOCKERS(env, region);
__os_free(env, bitmap);
return (ret);
}
if ((ret = __os_calloc(env,
(size_t)count, sizeof(locker_info), &id_array)) != 0) {
+ UNLOCK_LOCKERS(env, region);
__os_free(env, bitmap);
__os_free(env, tmpmap);
return (ret);
}
/*
* First we go through and assign each locker a deadlock detector id.
*/
id = 0;
SH_TAILQ_FOREACH(lip, &region->lockers, ulinks, __db_locker) {
if (lip->master_locker == INVALID_ROFF) {
+ DB_ASSERT(env, id < count);
lip->dd_id = id++;
id_array[lip->dd_id].id = lip->id;
switch (atype) {
***************
*** 510,516 ****
lip->dd_id = DD_INVALID_ID;
}
- UNLOCK_LOCKERS(env, region);
/*
* We only need consider objects that have waiters, so we use
--- 511,516 ----
***************
*** 669,675 ****
* status after building the bit maps so that we will not detect
* a blocked transaction without noting that it is already aborting.
*/
- LOCK_LOCKERS(env, region);
for (id = 0; id < count; id++) {
if (!id_array[id].valid)
continue;
--- 669,674 ----
***************
*** 738,743 ****
--- 737,743 ----
id_array[id].in_abort = 1;
}
UNLOCK_LOCKERS(env, region);
+ LOCK_SYSTEM_UNLOCK(lt, region);
/*
* Now we can release everything except the bitmap matrix that we
***************
*** 839,844 ****
--- 839,845 ----
ret = 0;
/* We must lock so this locker cannot go away while we abort it. */
+ LOCK_SYSTEM_LOCK(lt, region);
LOCK_LOCKERS(env, region);
/*
***************
*** 895,900 ****
--- 896,902 ----
done: OBJECT_UNLOCK(lt, region, info->last_ndx);
err:
out: UNLOCK_LOCKERS(env, region);
+ LOCK_SYSTEM_UNLOCK(lt, region);
return (ret);
}

183
sdk_container/src/third_party/coreos-overlay/sys-libs/db/files/patch.4.7.25.4 vendored
View File

@ -1,183 +0,0 @@
*** dbinc/repmgr.h.orig 2009-05-04 10:33:55.000000000 -0400
--- dbinc/repmgr.h 2009-05-04 10:27:26.000000000 -0400
***************
*** 374,379 ****
--- 374,380 ----
#define SITE_FROM_EID(eid) (&db_rep->sites[eid])
#define EID_FROM_SITE(s) ((int)((s) - (&db_rep->sites[0])))
#define IS_VALID_EID(e) ((e) >= 0)
+ #define IS_KNOWN_REMOTE_SITE(e) ((e) >= 0 && ((u_int)(e)) < db_rep->site_cnt)
#define SELF_EID INT_MAX
#define IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_ALL_PEERS || \
*** rep/rep_elect.c.orig 2009-05-04 10:35:50.000000000 -0400
--- rep/rep_elect.c 2009-05-04 10:31:24.000000000 -0400
***************
*** 33,39 ****
static int __rep_fire_elected __P((ENV *, REP *, u_int32_t));
static void __rep_elect_master __P((ENV *, REP *));
static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t));
! static int __rep_wait __P((ENV *, db_timeout_t *, int *, int, u_int32_t));
/*
* __rep_elect --
--- 33,39 ----
static int __rep_fire_elected __P((ENV *, REP *, u_int32_t));
static void __rep_elect_master __P((ENV *, REP *));
static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t));
! static int __rep_wait __P((ENV *, db_timeout_t *, int, u_int32_t));
/*
* __rep_elect --
***************
*** 55,61 ****
ENV *env;
LOG *lp;
REP *rep;
! int done, eid, elected, full_elect, locked, in_progress, need_req;
int ret, send_vote, t_ret;
u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri;
u_int32_t tiebreaker;
--- 55,61 ----
ENV *env;
LOG *lp;
REP *rep;
! int done, elected, full_elect, locked, in_progress, need_req;
int ret, send_vote, t_ret;
u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri;
u_int32_t tiebreaker;
***************
*** 181,188 ****
REP_SYSTEM_UNLOCK(env);
(void)__rep_send_message(env, DB_EID_BROADCAST,
REP_MASTER_REQ, NULL, NULL, 0, 0);
! ret = __rep_wait(env, &to, &eid,
! 0, REP_F_EPHASE0);
REP_SYSTEM_LOCK(env);
F_CLR(rep, REP_F_EPHASE0);
switch (ret) {
--- 181,187 ----
REP_SYSTEM_UNLOCK(env);
(void)__rep_send_message(env, DB_EID_BROADCAST,
REP_MASTER_REQ, NULL, NULL, 0, 0);
! ret = __rep_wait(env, &to, 0, REP_F_EPHASE0);
REP_SYSTEM_LOCK(env);
F_CLR(rep, REP_F_EPHASE0);
switch (ret) {
***************
*** 286,296 ****
REP_SYSTEM_LOCK(env);
goto vote;
}
! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE1);
switch (ret) {
case 0:
/* Check if election complete or phase complete. */
! if (eid != DB_EID_INVALID && !IN_ELECTION(rep)) {
RPRINT(env, DB_VERB_REP_ELECT,
(env, "Ended election phase 1"));
goto edone;
--- 285,295 ----
REP_SYSTEM_LOCK(env);
goto vote;
}
! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE1);
switch (ret) {
case 0:
/* Check if election complete or phase complete. */
! if (!IN_ELECTION(rep)) {
RPRINT(env, DB_VERB_REP_ELECT,
(env, "Ended election phase 1"));
goto edone;
***************
*** 398,412 ****
REP_SYSTEM_LOCK(env);
goto i_won;
}
! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE2);
RPRINT(env, DB_VERB_REP_ELECT,
(env, "Ended election phase 2 %d", ret));
switch (ret) {
case 0:
! if (eid != DB_EID_INVALID)
! goto edone;
! ret = DB_REP_UNAVAIL;
! break;
case DB_REP_EGENCHG:
if (to > timeout)
to = timeout;
--- 397,408 ----
REP_SYSTEM_LOCK(env);
goto i_won;
}
! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE2);
RPRINT(env, DB_VERB_REP_ELECT,
(env, "Ended election phase 2 %d", ret));
switch (ret) {
case 0:
! goto edone;
case DB_REP_EGENCHG:
if (to > timeout)
to = timeout;
***************
*** 1050,1062 ****
ENV *env;
REP *rep;
{
- /*
- * We often come through here twice, sometimes even more. We mustn't
- * let the redundant calls affect stats counting. But rep_elect relies
- * on this first part for setting eidp.
- */
- rep->master_id = rep->eid;
-
if (F_ISSET(rep, REP_F_MASTERELECT | REP_F_MASTER)) {
/* We've been through here already; avoid double counting. */
return;
--- 1046,1051 ----
***************
*** 1093,1102 ****
(timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1);
static int
! __rep_wait(env, timeoutp, eidp, full_elect, flags)
ENV *env;
db_timeout_t *timeoutp;
! int *eidp, full_elect;
u_int32_t flags;
{
DB_REP *db_rep;
--- 1082,1091 ----
(timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1);
static int
! __rep_wait(env, timeoutp, full_elect, flags)
ENV *env;
db_timeout_t *timeoutp;
! int full_elect;
u_int32_t flags;
{
DB_REP *db_rep;
***************
*** 1174,1180 ****
F_CLR(rep, REP_F_EGENUPDATE);
ret = DB_REP_EGENCHG;
} else if (phase_over) {
- *eidp = rep->master_id;
done = 1;
ret = 0;
}
--- 1163,1168 ----
*** repmgr/repmgr_net.c.orig 2009-05-04 10:34:46.000000000 -0400
--- repmgr/repmgr_net.c 2009-05-04 10:27:26.000000000 -0400
***************
*** 100,105 ****
--- 100,107 ----
control, rec, &nsites_sent, &npeers_sent)) != 0)
goto out;
} else {
+ DB_ASSERT(env, IS_KNOWN_REMOTE_SITE(eid));
+
/*
* If this is a request that can be sent anywhere, then see if
* we can send it to our peer (to save load on the master), but

34
sdk_container/src/third_party/coreos-overlay/sys-libs/db/metadata.xml vendored
View File

@ -1,34 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>base-system</herd>
<maintainer restrict="&gt;=sys-libs/db-3.2.9-r5">
<!-- I'm currently working on making db 4 work with gentoo, but am not
maintaining general db -->
<email>pauldv@gentoo.org</email>
<name>Paul de Vrieze</name>
<description>Making db4 work with gentoo</description>
</maintainer>
<maintainer restrict="&gt;=sys-libs/db-3.2.9-r5">
<!-- Helping to maintain db 4, especially the newer versions -->
<email>caleb@gentoo.org</email>
<name>Caleb Tennis</name>
</maintainer>
<longdescription>The Berkeley Database (Berkeley DB) is a programmatic toolkit
that provides embedded database support for both traditional and client/server
applications. Berkeley DB includes b+tree, queue, extended linear hashing,
fixed, and variable-length record access methods, transactions, locking,
logging, shared memory caching and database recovery. DB supports C, C++, Java,
and Perl APIs. DB is available for a wide variety of UNIX platforms as well as
Windows NT and Windows '95 (MSVC 4, 5 and 6).</longdescription>
<longdescription lang="nl">De Berkeley Database is een programmatische toolkit
die embedded database support verzorg voor en traditionele en client/server
applicaties. Berkeley DB bevat b+tree, rij, uitgebreide lineaire hashing, vaste
en variabele lengte record toegangsmethoden, transacties, locking, logging,
gedeeld geheugen caching en database herstel. DB ondersteund C, C++, Java en
Perl API's. DB is beschikbaar voor veel UNIX platformen en
Windows.</longdescription>
</pkgmetadata>