diff options
author | martti <martti@pkgsrc.org> | 2005-01-05 08:06:42 +0000 |
---|---|---|
committer | martti <martti@pkgsrc.org> | 2005-01-05 08:06:42 +0000 |
commit | fd15a8d857b1384db22a50948113566c4f01cbc8 (patch) | |
tree | af291a9d4d2ec2b4ec46247a9a61454bddedd5e4 | |
parent | eb236c9fee7ff94223c58ccf2fa0ed7863f47d62 (diff) | |
download | pkgsrc-fd15a8d857b1384db22a50948113566c4f01cbc8.tar.gz |
Updated db4 to 4.3.27
* bug fixes
-rw-r--r-- | databases/db4/Makefile | 8 | ||||
-rw-r--r-- | databases/db4/distinfo | 12 | ||||
-rw-r--r-- | databases/db4/patches/patch-aa | 48 | ||||
-rw-r--r-- | databases/db4/patches/patch-ab | 24 | ||||
-rw-r--r-- | databases/db4/patches/patch-ac | 30 |
5 files changed, 33 insertions, 89 deletions
diff --git a/databases/db4/Makefile b/databases/db4/Makefile index eddc57b0502..d1082d5b9c0 100644 --- a/databases/db4/Makefile +++ b/databases/db4/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.32 2004/12/30 21:51:30 minskim Exp $ +# $NetBSD: Makefile,v 1.33 2005/01/05 08:06:42 martti Exp $ -DISTNAME= db-4.3.21 +DISTNAME= db-4.3.27 PKGNAME= ${DISTNAME:S/db/db4/} -PKGREVISION= 1 +#PKGREVISION= 1 CATEGORIES= databases -MASTER_SITES= http://www.sleepycat.com/update/snapshot/ +MASTER_SITES= ftp://ftp.sleepycat.com/releases/ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.sleepycat.com/ diff --git a/databases/db4/distinfo b/databases/db4/distinfo index 9719492bc7f..78b218e69d2 100644 --- a/databases/db4/distinfo +++ b/databases/db4/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.12 2004/12/30 21:51:30 minskim Exp $ +$NetBSD: distinfo,v 1.13 2005/01/05 08:06:42 martti Exp $ -SHA1 (db-4.3.21.tar.gz) = 3b4e295c2ea61ba258da2b9a945f6d8d1b587fd9 -Size (db-4.3.21.tar.gz) = 5916550 bytes -SHA1 (patch-aa) = 0ab7730d6eb4e1a93c9ca4dcf15f2b28c794d972 -SHA1 (patch-ab) = 28b408c783225583e3d387ab2dae381752d2a923 -SHA1 (patch-ac) = d31cb82810577003de202ac81e91aa15108147c7 +SHA1 (db-4.3.27.tar.gz) = 8fddfe98d5ff7fcdb3fe9e23bb361d8f20a35941 +Size (db-4.3.27.tar.gz) = 5921872 bytes +SHA1 (patch-aa) = ea0c124c6d18db88ccd0d92b7c14b7e859213444 +SHA1 (patch-ab) = ab6b8c819cf21407dfe136bb75cd4e2f82be9afc +SHA1 (patch-ac) = ec623253fdee19b81a8a1cd3a58fc76f1d2e343f diff --git a/databases/db4/patches/patch-aa b/databases/db4/patches/patch-aa index 8478c1ff34e..8871efceffc 100644 --- a/databases/db4/patches/patch-aa +++ b/databases/db4/patches/patch-aa @@ -1,46 +1,28 @@ -$NetBSD: patch-aa,v 1.7 2004/12/27 04:27:50 jlam Exp $ +$NetBSD: patch-aa,v 1.8 2005/01/05 08:06:42 martti Exp $ ---- 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@ +--- 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 @@ libdir= @libdir@ -docdir= $(prefix)/docs +docdir= $(prefix)/share/doc/db4 - dmode= 755 - emode= 555 -@@ -41,7 +41,7 @@ INSTALLER= @INSTALLER@ - LIBTOOL= @LIBTOOL@ - +@@ -43,3 +43,3 @@ POSTLINK= @POSTLINK@ -SOLINK= @MAKEFILE_SOLINK@ +SOLINK= @MAKEFILE_SOLINK@ -version-info @DB_VERSION_MINOR@:@DB_VERSION_PATCH@ SOFLAGS= @SOFLAGS@ - 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@ +@@ -62,3 +62,3 @@ -libdb_base= libdb +libdb_base= libdb4 libdb= $(libdb_base).a - 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@ +@@ -81,3 +81,3 @@ -libcxx_base= libdb_cxx +libcxx_base= libdb4_cxx libcxx= $(libcxx_base).a - 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 +@@ -111,6 +111,6 @@ -libj_jarfile= db.jar +libj_jarfile= db4.jar @@ -49,20 +31,12 @@ $NetBSD: patch-aa,v 1.7 2004/12/27 04:27:50 jlam Exp $ -libjso_base= libdb_java +libjso_base= libdb4_java libjso= $(libjso_base)-$(LIBVERSION)@JMODSUFFIX@ - libjso_static= $(libjso_base)-$(LIBVERSION).a - libjso_target= $(libjso_base)-$(LIBVERSION).la -@@ -127,7 +127,7 @@ libjso_g= $(libjso_base)-$(LIBVERSION)_g - ################################################## - TCFLAGS= @TCFLAGS@ +@@ -129,3 +129,3 @@ LIBTSO_LIBS= @LIBTSO_LIBS@ -libtso_base= libdb_tcl +libtso_base= libdb4_tcl libtso= $(libtso_base)-$(LIBVERSION)@MODSUFFIX@ - 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)) +@@ -885,7 +885,6 @@ @for i in $(UTIL_PROGS); do \ - $(rm) -f $(DESTDIR)$(bindir)/$$i $(DESTDIR)$(bindir)/$$i.exe; \ - test -f $$i.exe && i=$$i.exe || true; \ @@ -74,5 +48,3 @@ $NetBSD: patch-aa,v 1.7 2004/12/27 04:27:50 jlam 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 bc16e5a496a..93d8803abe5 100644 --- a/databases/db4/patches/patch-ab +++ b/databases/db4/patches/patch-ab @@ -1,30 +1,18 @@ -$NetBSD: patch-ab,v 1.8 2004/12/30 21:51:30 minskim Exp $ +$NetBSD: patch-ab,v 1.9 2005/01/05 08:06:42 martti Exp $ ---- dist/configure.orig 2004-11-08 19:28:06.000000000 -0600 -+++ dist/configure -@@ -5417,6 +5417,7 @@ db_cv_gxx_except=no; - if test "$GXX" = "yes"; then - GXX_VERSION=`${MAKEFILE_CXX} --version` +--- 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 @@ case ${GXX_VERSION} in + egcs*) CXXFLAGS="-fexceptions $CXXFLAGS";; 1.*|2.[01234567].*|*-1.*|*-2.[01234567].*) - db_cv_gxx_except=yes;; - esac -@@ -20866,7 +20867,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6 - INSTALLER="\$(LIBTOOL) --mode=install cp -p" - +@@ -20868,3 +20869,3 @@ 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}" - MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" - MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" -@@ -30024,7 +30025,7 @@ fi - # - # If the user specified we use POSIX pthreads mutexes, and we fail to find the +@@ -30027,3 +30028,3 @@ # 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 be0e7da6956..7e8943a62a9 100644 --- a/databases/db4/patches/patch-ac +++ b/databases/db4/patches/patch-ac @@ -1,10 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2004/12/27 04:27:50 jlam Exp $ +$NetBSD: patch-ac,v 1.4 2005/01/05 08:06:42 martti Exp $ ---- 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); +--- 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 @@ +typedef union { + unsigned char c[64]; @@ -64,22 +62,14 @@ $NetBSD: patch-ac,v 1.3 2004/12/27 04:27:50 jlam Exp $ +} +#endif - #ifdef VERBOSE /* SAK */ - static void __db_SHAPrintContext __P((SHA1_CTX *, char *)); -@@ -135,10 +192,6 @@ __db_SHA1Transform(state, buffer) - unsigned char *buffer; - { +@@ -137,6 +194,2 @@ u_int32_t a, b, c, d, e; -typedef union { - unsigned char c[64]; - u_int32_t l[16]; -} CHAR64LONG16; CHAR64LONG16* block; - static int is_bigendian = -1; - #ifdef SHA1HANDSOFF -@@ -157,6 +210,13 @@ static int is_bigendian = -1; - c = state[2]; - d = state[3]; +@@ -159,2 +212,9 @@ e = state[4]; + +#ifdef __sparc_v9__ @@ -89,14 +79,8 @@ $NetBSD: patch-ac,v 1.3 2004/12/27 04:27:50 jlam Exp $ + do_R4(&a, &b, &c, &d, &e, block, is_bigendian); +#else /* 4 rounds of 20 operations each. Loop unrolled. */ - 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); +@@ -180,2 +240,4 @@ 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; |