summaryrefslogtreecommitdiff
path: root/databases/db4/patches
diff options
context:
space:
mode:
Diffstat (limited to 'databases/db4/patches')
-rw-r--r--databases/db4/patches/patch-aa24
-rw-r--r--databases/db4/patches/patch-ab27
-rw-r--r--databases/db4/patches/patch-ac12
3 files changed, 23 insertions, 40 deletions
diff --git a/databases/db4/patches/patch-aa b/databases/db4/patches/patch-aa
index f10ae0660c1..8478c1ff34e 100644
--- a/databases/db4/patches/patch-aa
+++ b/databases/db4/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.6 2004/11/10 15:51:23 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2004/12/27 04:27:50 jlam Exp $
---- dist/Makefile.in.orig Fri Nov 28 13:50:06 2003
+--- 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/html/db4
++docdir= $(prefix)/share/doc/db4
dmode= 755
emode= 555
-@@ -42,7 +42,7 @@ INSTALLER= @INSTALLER@
+@@ -41,7 +41,7 @@ INSTALLER= @INSTALLER@
LIBTOOL= @LIBTOOL@
POSTLINK= @POSTLINK@
@@ -20,8 +20,8 @@ $NetBSD: patch-aa,v 1.6 2004/11/10 15:51:23 jlam Exp $
SOFLAGS= @SOFLAGS@
LIBMAJOR= @DB_VERSION_MAJOR@
LIBVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
-@@ -60,7 +60,7 @@ LDFLAGS= @LDFLAGS@
- LIBS= @LIBS@
+@@ -60,7 +60,7 @@ LIBS= @LIBS@
+ TEST_LIBS= @TEST_LIBS@
LIBSO_LIBS= @LIBSO_LIBS@
-libdb_base= libdb
@@ -29,8 +29,8 @@ $NetBSD: patch-aa,v 1.6 2004/11/10 15:51:23 jlam Exp $
libdb= $(libdb_base).a
libdb_version= $(libdb_base)-$(LIBVERSION).a
libso= $(libdb_base)-$(LIBVERSION)@SOSUFFIX@
-@@ -79,7 +79,7 @@ CXXLINK= @MAKEFILE_CXXLINK@
- XSOLINK= @MAKEFILE_XSOLINK@
+@@ -79,7 +79,7 @@ CXXLINK= @MAKEFILE_CXXLINK@ @CXXFLAGS@
+ XSOLINK= @MAKEFILE_XSOLINK@ @CXXFLAGS@
LIBXSO_LIBS= @LIBXSO_LIBS@
-libcxx_base= libdb_cxx
@@ -38,9 +38,9 @@ $NetBSD: patch-aa,v 1.6 2004/11/10 15:51:23 jlam Exp $
libcxx= $(libcxx_base).a
libcxx_version= $(libcxx_base)-$(LIBVERSION).a
libxso= $(libcxx_base)-$(LIBVERSION)@SOSUFFIX@
-@@ -108,10 +108,10 @@ JAVA_RPCREL= com/sleepycat/db/rpcserver
- JAVA_EXDIR= $(srcdir)/examples_java/src/com/sleepycat/examples
+@@ -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
@@ -51,7 +51,7 @@ $NetBSD: patch-aa,v 1.6 2004/11/10 15:51:23 jlam Exp $
libjso= $(libjso_base)-$(LIBVERSION)@JMODSUFFIX@
libjso_static= $(libjso_base)-$(LIBVERSION).a
libjso_target= $(libjso_base)-$(LIBVERSION).la
-@@ -126,7 +126,7 @@ libjso_g= $(libjso_base)-$(LIBVERSION)_g
+@@ -127,7 +127,7 @@ libjso_g= $(libjso_base)-$(LIBVERSION)_g
##################################################
TCFLAGS= @TCFLAGS@
LIBTSO_LIBS= @LIBTSO_LIBS@
@@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.6 2004/11/10 15:51:23 jlam Exp $
libtso= $(libtso_base)-$(LIBVERSION)@MODSUFFIX@
libtso_static= $(libtso_base)-$(LIBVERSION).a
libtso_target= $(libtso_base)-$(LIBVERSION).la
-@@ -833,11 +833,10 @@ install_utilities:
+@@ -883,11 +883,10 @@ install_utilities:
($(mkdir) -p $(DESTDIR)$(bindir) && \
$(chmod) $(dmode) $(DESTDIR)$(bindir))
@for i in $(UTIL_PROGS); do \
diff --git a/databases/db4/patches/patch-ab b/databases/db4/patches/patch-ab
index 41820596fad..852b1d0eae6 100644
--- a/databases/db4/patches/patch-ab
+++ b/databases/db4/patches/patch-ab
@@ -1,16 +1,16 @@
-$NetBSD: patch-ab,v 1.6 2004/11/17 07:10:45 jlam Exp $
+$NetBSD: patch-ab,v 1.7 2004/12/27 04:27:50 jlam Exp $
---- dist/configure.orig 2003-12-03 16:10:02.000000000 -0500
+--- dist/configure.orig 2004-11-08 20:28:06.000000000 -0500
+++ dist/configure
-@@ -5390,6 +5390,7 @@ db_cv_gxx_except=no;
+@@ -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";;
++ egcs*) CXXFLAGS="-fexceptions $CXXFLAGS";;
1.*|2.[01234567].*|*-1.*|*-2.[01234567].*)
db_cv_gxx_except=yes;;
esac
-@@ -20138,7 +20139,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6
+@@ -20866,7 +20867,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6
INSTALLER="\$(LIBTOOL) --mode=install cp -p"
MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
@@ -19,20 +19,3 @@ $NetBSD: patch-ab,v 1.6 2004/11/17 07:10:45 jlam Exp $
MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
-@@ -27047,6 +27048,7 @@ echo "$as_me:$LINENO: result: $ac_cv_lib
- echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6
- if test $ac_cv_lib_pthread_main = yes; then
- LOAD_LIBS="$LOAD_LIBS -lpthread"
-+ LIBSO_LIBS="$LIBSO_LIBS -lpthread"
- fi
- ac_cv_lib_pthread=ac_cv_lib_pthread_main
-
-@@ -28525,7 +28527,7 @@ int
- main ()
- {
-
--#if (defined(i386) || defined(__i386__)) && defined(__GNUC__)
-+#if (defined(i386) || defined(__i386__) || defined(__x86_64__)) && defined(__GNUC__)
- exit(0);
- #else
- FAIL TO COMPILE/LINK
diff --git a/databases/db4/patches/patch-ac b/databases/db4/patches/patch-ac
index 53b6ae17136..be0e7da6956 100644
--- a/databases/db4/patches/patch-ac
+++ b/databases/db4/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2004/11/10 15:51:23 jlam Exp $
+$NetBSD: patch-ac,v 1.3 2004/12/27 04:27:50 jlam Exp $
---- hmac/sha1.c.orig 2002-04-09 13:40:36.000000000 +0000
+--- hmac/sha1.c.orig 2004-01-27 22:36:11.000000000 -0500
+++ hmac/sha1.c
-@@ -102,6 +102,63 @@ A million repetitions of "a"
+@@ -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);
@@ -66,7 +66,7 @@ $NetBSD: patch-ac,v 1.2 2004/11/10 15:51:23 jlam Exp $
#ifdef VERBOSE /* SAK */
static void __db_SHAPrintContext __P((SHA1_CTX *, char *));
-@@ -134,10 +191,6 @@ __db_SHA1Transform(state, buffer)
+@@ -135,10 +192,6 @@ __db_SHA1Transform(state, buffer)
unsigned char *buffer;
{
u_int32_t a, b, c, d, e;
@@ -77,7 +77,7 @@ $NetBSD: patch-ac,v 1.2 2004/11/10 15:51:23 jlam Exp $
CHAR64LONG16* block;
static int is_bigendian = -1;
#ifdef SHA1HANDSOFF
-@@ -156,6 +209,13 @@ static int is_bigendian = -1;
+@@ -157,6 +210,13 @@ static int is_bigendian = -1;
c = state[2];
d = state[3];
e = state[4];
@@ -91,7 +91,7 @@ $NetBSD: patch-ac,v 1.2 2004/11/10 15:51:23 jlam Exp $
/* 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);
-@@ -177,6 +237,8 @@ static int is_bigendian = -1;
+@@ -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);
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-11 11:56:24 +0000