diff options
author | jlam <jlam@pkgsrc.org> | 2005-10-25 06:26:48 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2005-10-25 06:26:48 +0000 |
commit | 3eaa754521861ecc294488ae02701ff111ee52a6 (patch) | |
tree | e895ff887bd210a8a4a66dfcb643f79c0a7f240d /databases/db4 | |
parent | 9b58cc3868b1bd52d50d2c97021a3681d01f1b89 (diff) | |
download | pkgsrc-3eaa754521861ecc294488ae02701ff111ee52a6.tar.gz |
Update databases/db4 to 4.3.29. This is a point release update over
4.3.28, so there are no API changes, and applications may be upgraded
by relinking against db4-4.3.29. We stop pretending to support a
"java" package option since we never even bothered with handling the
PLIST differences. Changes from version 4.3.28 include:
* The on-disk log format has changed.
* Add support for lightweight, transactionally protected Sequence
Number generation.
* Add support for Degree 2 isolation.
* Add election generation information to replication to support Paxos
compliance.
* A huge number of bug fixes, including eliminating some instances of
application deadlock and memory leak fixes.
* Some minor performance enhancements.
Diffstat (limited to 'databases/db4')
-rw-r--r-- | databases/db4/Makefile | 10 | ||||
-rw-r--r-- | databases/db4/buildlink3.mk | 4 | ||||
-rw-r--r-- | databases/db4/distinfo | 16 | ||||
-rw-r--r-- | databases/db4/options.mk | 13 | ||||
-rw-r--r-- | databases/db4/patches/patch-aa | 48 | ||||
-rw-r--r-- | databases/db4/patches/patch-ab | 44 | ||||
-rw-r--r-- | databases/db4/patches/patch-ac | 30 | ||||
-rw-r--r-- | databases/db4/patches/patch-ad | 6 |
8 files changed, 106 insertions, 65 deletions
diff --git a/databases/db4/Makefile b/databases/db4/Makefile index f4df47af5e2..a30e85d5cf7 100644 --- a/databases/db4/Makefile +++ b/databases/db4/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.38 2005/05/10 16:24:48 drochner Exp $ +# $NetBSD: Makefile,v 1.39 2005/10/25 06:26:48 jlam Exp $ -DISTNAME= db-4.3.28 +DISTNAME= db-4.3.29 PKGNAME= ${DISTNAME:S/db/db4/} CATEGORIES= databases -MASTER_SITES= ftp://ftp.sleepycat.com/releases/ +MASTER_SITES= http://downloads.sleepycat.com/ \ + ftp://ftp.sleepycat.com/releases/ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.sleepycat.com/ @@ -25,9 +26,6 @@ CONFIGURE_ARGS+= --enable-compat185 CONFIGURE_ARGS+= --includedir=${PREFIX}/include/db4 CONFIGURE_ARGS+= --program-transform-name=s,db_,db4_, -.include "../../mk/bsd.prefs.mk" -.include "options.mk" - # NetBSD-sparc64-1.6*'s f77 makes configure failing and as f77 is not # needed for this package the following does no harm on other platform. CONFIGURE_ENV+= F77=${FALSE} diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk index a5890f6953c..45f32339a18 100644 --- a/databases/db4/buildlink3.mk +++ b/databases/db4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.23 2004/11/17 18:47:19 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2005/10/25 06:26:48 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DB4_BUILDLINK3_MK:= ${DB4_BUILDLINK3_MK}+ @@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+= db4 .if !empty(DB4_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.db4+= db4>=4.2.52 -BUILDLINK_RECOMMENDED.db4+= db4>=4.2.52nb7 +BUILDLINK_RECOMMENDED.db4+= db4>=4.3.21 BUILDLINK_PKGSRCDIR.db4?= ../../databases/db4 BUILDLINK_INCDIRS.db4?= include/db4 BUILDLINK_LDADD.db4= -ldb4 diff --git a/databases/db4/distinfo b/databases/db4/distinfo index 2b0b68385db..9bb6bcd0663 100644 --- a/databases/db4/distinfo +++ b/databases/db4/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.17 2005/08/19 19:46:24 reed Exp $ +$NetBSD: distinfo,v 1.18 2005/10/25 06:26:48 jlam Exp $ -SHA1 (db-4.3.28.tar.gz) = a59eece10a907977a0578a58218c75cac7c3bdf7 -RMD160 (db-4.3.28.tar.gz) = c4853e6004787d3d664da7bb5acc17d7d1875c58 -Size (db-4.3.28.tar.gz) = 5995854 bytes -SHA1 (patch-aa) = ea0c124c6d18db88ccd0d92b7c14b7e859213444 -SHA1 (patch-ab) = 9e742365c9d1f812f8f170333abc5b532cbf1348 -SHA1 (patch-ac) = ec623253fdee19b81a8a1cd3a58fc76f1d2e343f -SHA1 (patch-ad) = 6fc146cc50aa8f74830639af95b4e0cd1ddb1949 +SHA1 (db-4.3.29.tar.gz) = 7ddac51fcbd5945aed154be2ee1fe166b3acd628 +RMD160 (db-4.3.29.tar.gz) = fac910828a74087124e9cc3cad99c6a6dc88c14b +Size (db-4.3.29.tar.gz) = 6103264 bytes +SHA1 (patch-aa) = 0ab7730d6eb4e1a93c9ca4dcf15f2b28c794d972 +SHA1 (patch-ab) = 0fe5e630222429b8bf767e2e15aa5ea51a0f2eb5 +SHA1 (patch-ac) = d31cb82810577003de202ac81e91aa15108147c7 +SHA1 (patch-ad) = a0c92d70ef752f02011ef6b5d76d1fb7cabf8895 diff --git a/databases/db4/options.mk b/databases/db4/options.mk deleted file mode 100644 index d0fb3a7a347..00000000000 --- a/databases/db4/options.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: options.mk,v 1.3 2005/10/05 13:29:49 wiz Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.db4 -PKG_SUPPORTED_OPTIONS= java - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mjava) -CONFIGURE_ARGS+= --enable-java -. include "../../mk/java-vm.mk" -.else -CONFIGURE_ARGS+= --disable-java -.endif diff --git a/databases/db4/patches/patch-aa b/databases/db4/patches/patch-aa index 8871efceffc..33e7eb572cd 100644 --- a/databases/db4/patches/patch-aa +++ b/databases/db4/patches/patch-aa @@ -1,28 +1,46 @@ -$NetBSD: patch-aa,v 1.8 2005/01/05 08:06:42 martti Exp $ +$NetBSD: patch-aa,v 1.9 2005/10/25 06:26:48 jlam Exp $ ---- dist/Makefile.in.orig 2004-11-04 19:26:52.000000000 +0200 -+++ dist/Makefile.in 2005-01-05 09:39:34.000000000 +0200 -@@ -13,3 +13,3 @@ +--- dist/Makefile.in.orig 2004-11-04 12:26:52.000000000 -0500 ++++ dist/Makefile.in +@@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@ + bindir= @bindir@ + includedir=@includedir@ libdir= @libdir@ -docdir= $(prefix)/docs +docdir= $(prefix)/share/doc/db4 -@@ -43,3 +43,3 @@ + dmode= 755 + emode= 555 +@@ -41,7 +41,7 @@ INSTALLER= @INSTALLER@ + LIBTOOL= @LIBTOOL@ + POSTLINK= @POSTLINK@ -SOLINK= @MAKEFILE_SOLINK@ +SOLINK= @MAKEFILE_SOLINK@ -version-info @DB_VERSION_MINOR@:@DB_VERSION_PATCH@ SOFLAGS= @SOFLAGS@ -@@ -62,3 +62,3 @@ + LIBMAJOR= @DB_VERSION_MAJOR@ + LIBVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@ +@@ -60,7 +60,7 @@ LIBS= @LIBS@ + TEST_LIBS= @TEST_LIBS@ + LIBSO_LIBS= @LIBSO_LIBS@ -libdb_base= libdb +libdb_base= libdb4 libdb= $(libdb_base).a -@@ -81,3 +81,3 @@ + libdb_version= $(libdb_base)-$(LIBVERSION).a + libso= $(libdb_base)-$(LIBVERSION)@SOSUFFIX@ +@@ -79,7 +79,7 @@ CXXLINK= @MAKEFILE_CXXLINK@ @CXXFLAGS@ + XSOLINK= @MAKEFILE_XSOLINK@ @CXXFLAGS@ + LIBXSO_LIBS= @LIBXSO_LIBS@ -libcxx_base= libdb_cxx +libcxx_base= libdb4_cxx libcxx= $(libcxx_base).a -@@ -111,6 +111,6 @@ + libcxx_version= $(libcxx_base)-$(LIBVERSION).a + libxso= $(libcxx_base)-$(LIBVERSION)@SOSUFFIX@ +@@ -109,10 +109,10 @@ JAVA_EXDIR= $(srcdir)/examples_java/src/ + JAVA_RPCDIR= $(srcdir)/rpc_server/java + JAVA_SLEEPYCAT= $(srcdir)/java/src/com/sleepycat -libj_jarfile= db.jar +libj_jarfile= db4.jar @@ -31,12 +49,20 @@ $NetBSD: patch-aa,v 1.8 2005/01/05 08:06:42 martti Exp $ -libjso_base= libdb_java +libjso_base= libdb4_java libjso= $(libjso_base)-$(LIBVERSION)@JMODSUFFIX@ -@@ -129,3 +129,3 @@ + libjso_static= $(libjso_base)-$(LIBVERSION).a + libjso_target= $(libjso_base)-$(LIBVERSION).la +@@ -127,7 +127,7 @@ libjso_g= $(libjso_base)-$(LIBVERSION)_g + ################################################## + TCFLAGS= @TCFLAGS@ LIBTSO_LIBS= @LIBTSO_LIBS@ -libtso_base= libdb_tcl +libtso_base= libdb4_tcl libtso= $(libtso_base)-$(LIBVERSION)@MODSUFFIX@ -@@ -885,7 +885,6 @@ + libtso_static= $(libtso_base)-$(LIBVERSION).a + libtso_target= $(libtso_base)-$(LIBVERSION).la +@@ -883,11 +883,10 @@ install_utilities: + ($(mkdir) -p $(DESTDIR)$(bindir) && \ + $(chmod) $(dmode) $(DESTDIR)$(bindir)) @for i in $(UTIL_PROGS); do \ - $(rm) -f $(DESTDIR)$(bindir)/$$i $(DESTDIR)$(bindir)/$$i.exe; \ - test -f $$i.exe && i=$$i.exe || true; \ @@ -48,3 +74,5 @@ $NetBSD: patch-aa,v 1.8 2005/01/05 08:06:42 martti Exp $ + test -f $(strip) && $(strip) $${target} || true; \ + $(chmod) $(emode) $${target}; \ done + + uninstall_utilities: diff --git a/databases/db4/patches/patch-ab b/databases/db4/patches/patch-ab index 583a5f1b88f..9600b94597e 100644 --- a/databases/db4/patches/patch-ab +++ b/databases/db4/patches/patch-ab @@ -1,12 +1,16 @@ -$NetBSD: patch-ab,v 1.10 2005/08/19 19:46:24 reed Exp $ +$NetBSD: patch-ab,v 1.11 2005/10/25 06:26:48 jlam Exp $ ---- dist/configure.orig 2004-12-23 04:59:13.000000000 +0200 -+++ dist/configure 2005-01-05 09:40:13.000000000 +0200 -@@ -5419,2 +5419,3 @@ +--- dist/configure.orig 2005-09-06 03:44:24.000000000 -0400 ++++ dist/configure +@@ -5417,6 +5417,7 @@ db_cv_gxx_except=no; + if test "$GXX" = "yes"; then + GXX_VERSION=`${MAKEFILE_CXX} --version` case ${GXX_VERSION} in + egcs*) CXXFLAGS="-fexceptions $CXXFLAGS";; 1.*|2.[01234567].*|*-1.*|*-2.[01234567].*) -@@ -5832,13 +5832,13 @@ darwin* | rhapsody*) + db_cv_gxx_except=yes;; + esac +@@ -5831,13 +5832,13 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; @@ -22,7 +26,7 @@ $NetBSD: patch-ab,v 1.10 2005/08/19 19:46:24 reed Exp $ lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; -@@ -7075,7 +7075,7 @@ else +@@ -7074,7 +7075,7 @@ else lt_cv_sys_max_cmd_len=8192; ;; @@ -31,7 +35,7 @@ $NetBSD: patch-ab,v 1.10 2005/08/19 19:46:24 reed Exp $ # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -@@ -8851,7 +8851,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8850,7 +8851,7 @@ if test -z "$aix_libpath"; then aix_libp ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. @@ -40,7 +44,7 @@ $NetBSD: patch-ab,v 1.10 2005/08/19 19:46:24 reed Exp $ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes -@@ -9430,7 +9430,7 @@ kfreebsd*-gnu) +@@ -9429,7 +9430,7 @@ kfreebsd*-gnu) dynamic_linker='GNU ld.so' ;; @@ -49,7 +53,7 @@ $NetBSD: patch-ab,v 1.10 2005/08/19 19:46:24 reed Exp $ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in -@@ -11785,7 +11785,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -11784,7 +11785,7 @@ if test -z "$aix_libpath"; then aix_libp freebsd-elf*) archive_cmds_need_lc_CXX=no ;; @@ -58,7 +62,7 @@ $NetBSD: patch-ab,v 1.10 2005/08/19 19:46:24 reed Exp $ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes -@@ -13142,7 +13142,7 @@ kfreebsd*-gnu) +@@ -13141,7 +13142,7 @@ kfreebsd*-gnu) dynamic_linker='GNU ld.so' ;; @@ -67,7 +71,7 @@ $NetBSD: patch-ab,v 1.10 2005/08/19 19:46:24 reed Exp $ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in -@@ -15723,7 +15723,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -15722,7 +15723,7 @@ if test -z "$aix_libpath"; then aix_libp ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. @@ -76,7 +80,7 @@ $NetBSD: patch-ab,v 1.10 2005/08/19 19:46:24 reed Exp $ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='-R$libdir' hardcode_direct_F77=yes -@@ -16302,7 +16302,7 @@ kfreebsd*-gnu) +@@ -16301,7 +16302,7 @@ kfreebsd*-gnu) dynamic_linker='GNU ld.so' ;; @@ -85,7 +89,7 @@ $NetBSD: patch-ab,v 1.10 2005/08/19 19:46:24 reed Exp $ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in -@@ -18664,7 +18664,7 @@ kfreebsd*-gnu) +@@ -18663,7 +18664,7 @@ kfreebsd*-gnu) dynamic_linker='GNU ld.so' ;; @@ -94,12 +98,16 @@ $NetBSD: patch-ab,v 1.10 2005/08/19 19:46:24 reed Exp $ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in -@@ -20868,3 +20869,3 @@ +@@ -20866,7 +20867,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6 + INSTALLER="\$(LIBTOOL) --mode=install cp -p" + MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" -MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version" +MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" -@@ -21615,7 +21615,7 @@ if test "$_JTOPDIR" != "/usr"; then + MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" + MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" +@@ -21614,7 +21615,7 @@ if test "$_JTOPDIR" != "/usr"; then case "$host_os" in aix*) _JNI_INC_SUBDIRS="aix";; bsdi*) _JNI_INC_SUBDIRS="bsdos";; @@ -108,8 +116,12 @@ $NetBSD: patch-ab,v 1.10 2005/08/19 19:46:24 reed Exp $ hp*) _JNI_INC_SUBDIRS="hp-ux";; linux*) _JNI_INC_SUBDIRS="linux genunix";; osf*) _JNI_INC_SUBDIRS="alpha";; -@@ -30027,3 +30028,3 @@ +@@ -30025,7 +30026,7 @@ fi + # + # If the user specified we use POSIX pthreads mutexes, and we fail to find the # full interface, try and configure for just intra-process support. -if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then +if test "$ac_cv_lib_pthread_main" = yes -a "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then LIBS="$LIBS -lpthread" + + if test "$cross_compiling" = yes; then diff --git a/databases/db4/patches/patch-ac b/databases/db4/patches/patch-ac index 7e8943a62a9..7cef1ec0b15 100644 --- a/databases/db4/patches/patch-ac +++ b/databases/db4/patches/patch-ac @@ -1,8 +1,10 @@ -$NetBSD: patch-ac,v 1.4 2005/01/05 08:06:42 martti Exp $ +$NetBSD: patch-ac,v 1.5 2005/10/25 06:26:48 jlam Exp $ ---- hmac/sha1.c.orig 2004-01-28 05:36:11.000000000 +0200 -+++ hmac/sha1.c 2005-01-05 09:40:34.000000000 +0200 -@@ -105,2 +105,59 @@ +--- hmac/sha1.c.orig 2004-01-27 22:36:11.000000000 -0500 ++++ hmac/sha1.c +@@ -103,6 +103,63 @@ A million repetitions of "a" + #define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30); + #define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30); +typedef union { + unsigned char c[64]; @@ -62,14 +64,22 @@ $NetBSD: patch-ac,v 1.4 2005/01/05 08:06:42 martti Exp $ +} +#endif -@@ -137,6 +194,2 @@ + #ifdef VERBOSE /* SAK */ + static void __db_SHAPrintContext __P((SHA1_CTX *, char *)); +@@ -135,10 +192,6 @@ __db_SHA1Transform(state, buffer) + unsigned char *buffer; + { u_int32_t a, b, c, d, e; -typedef union { - unsigned char c[64]; - u_int32_t l[16]; -} CHAR64LONG16; CHAR64LONG16* block; -@@ -159,2 +212,9 @@ + static int is_bigendian = -1; + #ifdef SHA1HANDSOFF +@@ -157,6 +210,13 @@ static int is_bigendian = -1; + c = state[2]; + d = state[3]; e = state[4]; + +#ifdef __sparc_v9__ @@ -79,8 +89,14 @@ $NetBSD: patch-ac,v 1.4 2005/01/05 08:06:42 martti Exp $ + do_R4(&a, &b, &c, &d, &e, block, is_bigendian); +#else /* 4 rounds of 20 operations each. Loop unrolled. */ -@@ -180,2 +240,4 @@ + R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3); + R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7); +@@ -178,6 +238,8 @@ static int is_bigendian = -1; + R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71); + R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75); R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79); +#endif + /* Add the working vars back into context.state[] */ + state[0] += a; + state[1] += b; diff --git a/databases/db4/patches/patch-ad b/databases/db4/patches/patch-ad index ed46284e9d5..6a81a63c50b 100644 --- a/databases/db4/patches/patch-ad +++ b/databases/db4/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.1 2005/01/17 05:31:12 jschauma Exp $ +$NetBSD: patch-ad,v 1.2 2005/10/25 06:26:48 jlam Exp $ ---- dbinc/db_185.in.orig 2005-01-16 19:39:27.000000000 -0500 -+++ dbinc/db_185.in 2005-01-16 19:39:47.000000000 -0500 +--- dbinc/db_185.in.orig 2004-01-27 22:36:01.000000000 -0500 ++++ dbinc/db_185.in @@ -72,7 +72,7 @@ * XXX * SGI/IRIX already has a pgno_t. |