summaryrefslogtreecommitdiff
path: root/databases/db4/patches
diff options
context:
space:
mode:
Diffstat (limited to 'databases/db4/patches')
-rw-r--r--databases/db4/patches/patch-aa53
-rw-r--r--databases/db4/patches/patch-ab18
-rw-r--r--databases/db4/patches/patch-ac12
3 files changed, 41 insertions, 42 deletions
diff --git a/databases/db4/patches/patch-aa b/databases/db4/patches/patch-aa
index 1a543b29bf0..a27eaf5bb3f 100644
--- a/databases/db4/patches/patch-aa
+++ b/databases/db4/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.11 2006/11/05 17:43:59 joerg Exp $
+$NetBSD: patch-aa,v 1.12 2007/06/08 12:23:51 wiz Exp $
---- dist/Makefile.in.orig 2005-11-08 12:47:22.000000000 +0000
+--- dist/Makefile.in.orig 2006-09-13 16:22:38.000000000 +0000
+++ dist/Makefile.in
@@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@
bindir= @bindir@
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.11 2006/11/05 17:43:59 joerg Exp $
SOFLAGS= @SOFLAGS@
LIBMAJOR= @DB_VERSION_MAJOR@
LIBVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
-@@ -60,7 +60,7 @@ LIBS= @LIBS@
+@@ -60,7 +60,7 @@ LIBS= @LIBSO_LIBS@
TEST_LIBS= @TEST_LIBS@
LIBCSO_LIBS= @LIBCSO_LIBS@ @LIBSO_LIBS@
@@ -38,20 +38,19 @@ $NetBSD: patch-aa,v 1.11 2006/11/05 17:43:59 joerg Exp $
libcxx= $(libcxx_base).a
libcxx_version= $(libcxx_base)-$(LIBVERSION).a
libxso= $(libcxx_base)-$(LIBVERSION)@SOSUFFIX@
-@@ -107,10 +107,10 @@ JAVA_EXDIR= $(srcdir)/examples_java/src
- JAVA_RPCDIR= $(srcdir)/rpc_server/java
+@@ -105,9 +105,9 @@ JAVA_SRCDIR= $(srcdir)/java/src
+ JAVA_EXDIR= $(srcdir)/examples_java/src
JAVA_SLEEPYCAT= $(srcdir)/java/src/com/sleepycat
-libj_jarfile= db.jar
+libj_jarfile= db4.jar
libj_exjarfile= dbexamples.jar
- rpc_jarfile= dbsvc.jar
-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
-@@ -125,7 +125,7 @@ libjso_g= $(libjso_base)-$(LIBVERSION)_g
+@@ -122,7 +122,7 @@ libjso_g= $(libjso_base)-$(LIBVERSION)_g
##################################################
TCL_INCLUDE_SPEC= @TCL_INCLUDE_SPEC@
LIBTSO_LIBS= @LIBTSO_LIBS@ @LIBSO_LIBS@
@@ -60,34 +59,34 @@ $NetBSD: patch-aa,v 1.11 2006/11/05 17:43:59 joerg Exp $
libtso= $(libtso_base)-$(LIBVERSION)@MODSUFFIX@
libtso_static= $(libtso_base)-$(LIBVERSION).a
libtso_target= $(libtso_base)-$(LIBVERSION).la
-@@ -867,8 +867,7 @@ install_include:
- ($(mkdir) -p $(DESTDIR)$(includedir) && \
- $(chmod) $(dmode) $(DESTDIR)$(includedir))
- @cd $(DESTDIR)$(includedir) && $(rm) -f $(INCDOT)
-- @$(cp) -p $(INCDOT) $(DESTDIR)$(includedir)
-- @cd $(DESTDIR)$(includedir) && $(chmod) $(fmode) $(INCDOT)
+@@ -723,8 +723,7 @@ install_include:
+ ($(MKDIR) -p $(DESTDIR)$(includedir) && \
+ $(CHMOD) $(dmode) $(DESTDIR)$(includedir))
+ @cd $(DESTDIR)$(includedir) && $(RM) -f $(INCDOT)
+- @$(CP) -p $(INCDOT) $(DESTDIR)$(includedir)
+- @cd $(DESTDIR)$(includedir) && $(CHMOD) $(fmode) $(INCDOT)
+ ${BSD_INSTALL_DATA} $(INCDOT) $(DESTDIR)$(includedir)
uninstall_include:
- @cd $(DESTDIR)$(includedir) && $(rm) -f $(INCDOT)
-@@ -879,7 +878,7 @@ install_lib:
- ($(mkdir) -p $(DESTDIR)$(libdir) && \
- $(chmod) $(dmode) $(DESTDIR)$(libdir))
- @cd $(DESTDIR)$(libdir) && $(rm) -f $(LIB_INSTALL_FILE_LIST)
+ @cd $(DESTDIR)$(includedir) && $(RM) -f $(INCDOT)
+@@ -735,7 +734,7 @@ install_lib:
+ ($(MKDIR) -p $(DESTDIR)$(libdir) && \
+ $(CHMOD) $(dmode) $(DESTDIR)$(libdir))
+ @cd $(DESTDIR)$(libdir) && $(RM) -f $(LIB_INSTALL_FILE_LIST)
- @$(INSTALLER) @INSTALL_LIBS@ $(DESTDIR)$(libdir)
+ @libtool --mode=install ${BSD_INSTALL_LIB} @INSTALL_LIBS@ $(DESTDIR)$(libdir)
@(cd $(DESTDIR)$(libdir) && \
- test -f $(libso) && $(ln) -s $(libso) $(libso_default); \
- test -f $(libso) && $(ln) -s $(libso) $(libso_major); \
-@@ -903,11 +902,8 @@ install_utilities:
- ($(mkdir) -p $(DESTDIR)$(bindir) && \
- $(chmod) $(dmode) $(DESTDIR)$(bindir))
+ test -f $(libso) && $(LN) -s $(libso) $(libso_default); \
+ test -f $(libso) && $(LN) -s $(libso) $(libso_major); \
+@@ -759,11 +758,8 @@ 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; \
+- test -f $$i.exe && i=$$i.exe || i=$$i; \
+- $(RM) -f $(DESTDIR)$(bindir)/$$i; \
- $(INSTALLER) $$i $(DESTDIR)$(bindir)/$$i; \
-- test -f $(strip) && $(strip) $(DESTDIR)$(bindir)/$$i || true; \
-- $(chmod) $(emode) $(DESTDIR)$(bindir)/$$i; \
+- test "$(STRIP)" = "none" || $(STRIP) $(DESTDIR)$(bindir)/$$i; \
+- $(CHMOD) $(emode) $(DESTDIR)$(bindir)/$$i; \
+ target="${DESTDIR}${bindir}/`echo $$i | sed '${transform}'`"; \
+ libtool --mode=install ${BSD_INSTALL_PROGRAM} $$i $$target; \
done
diff --git a/databases/db4/patches/patch-ab b/databases/db4/patches/patch-ab
index 609a42f1cf0..75399c98cd9 100644
--- a/databases/db4/patches/patch-ab
+++ b/databases/db4/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.15 2006/10/05 01:24:32 rillig Exp $
+$NetBSD: patch-ab,v 1.16 2007/06/08 12:23:51 wiz Exp $
---- dist/configure.orig 2006-01-10 17:19:32.000000000 +0100
-+++ dist/configure 2006-10-05 03:21:44.000000000 +0200
-@@ -5498,6 +5498,7 @@ db_cv_gxx_except=no;
+--- dist/configure.orig 2006-09-20 20:07:20.000000000 +0000
++++ dist/configure
+@@ -6288,6 +6288,7 @@ db_cv_gxx_except=no;
if test "$GXX" = "yes"; then
GXX_VERSION=`${MAKEFILE_CXX} --version`
case ${GXX_VERSION} in
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.15 2006/10/05 01:24:32 rillig Exp $
1.*|2.[01234567].*|*-1.*|*-2.[01234567].*)
db_cv_gxx_except=yes;;
esac
-@@ -5514,7 +5515,7 @@ fi
+@@ -6304,7 +6305,7 @@ fi
# we're using.
case "$host_os" in
sysv5UnixWare*|sysv5OpenUNIX8*)
@@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.15 2006/10/05 01:24:32 rillig Exp $
CPPFLAGS="$CPPFLAGS -pthread"
LDFLAGS="$LDFLAGS -pthread"
else
-@@ -21564,7 +21565,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+@@ -21832,7 +21833,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
SOFLAGS="-rpath \$(libdir)"
@@ -27,7 +27,7 @@ $NetBSD: patch-ab,v 1.15 2006/10/05 01:24:32 rillig Exp $
# Set SOSUFFIX and friends
-@@ -21656,7 +21656,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6
+@@ -21924,7 +21924,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6; }
INSTALLER="\$(LIBTOOL) --mode=install cp -p"
MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
@@ -36,7 +36,7 @@ $NetBSD: patch-ab,v 1.15 2006/10/05 01:24:32 rillig Exp $
MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
-@@ -22412,7 +22412,7 @@ if test "$_JTOPDIR" != "/usr"; then
+@@ -22691,7 +22691,7 @@ if test "$_JTOPDIR" != "/usr"; then
case "$host_os" in
aix*) _JNI_INC_SUBDIRS="aix";;
bsdi*) _JNI_INC_SUBDIRS="bsdos";;
@@ -45,7 +45,7 @@ $NetBSD: patch-ab,v 1.15 2006/10/05 01:24:32 rillig Exp $
hp*) _JNI_INC_SUBDIRS="hp-ux";;
linux*) _JNI_INC_SUBDIRS="linux genunix";;
osf*) _JNI_INC_SUBDIRS="alpha";;
-@@ -30835,7 +30835,7 @@ fi
+@@ -31972,7 +31972,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.
diff --git a/databases/db4/patches/patch-ac b/databases/db4/patches/patch-ac
index 86b7ba9f166..65e84657034 100644
--- a/databases/db4/patches/patch-ac
+++ b/databases/db4/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2006/01/06 15:08:47 wiz Exp $
+$NetBSD: patch-ac,v 1.7 2007/06/08 12:23:51 wiz Exp $
---- hmac/sha1.c.orig 2004-11-17 04:43:56.000000000 +0100
+--- hmac/sha1.c.orig 2006-09-09 00:45:39.000000000 +0000
+++ hmac/sha1.c
-@@ -103,6 +103,63 @@ A million repetitions of "a"
+@@ -99,6 +99,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.6 2006/01/06 15:08:47 wiz Exp $
#ifdef VERBOSE /* SAK */
static void __db_SHAPrintContext __P((SHA1_CTX *, char *));
-@@ -135,10 +192,6 @@ __db_SHA1Transform(state, buffer)
+@@ -131,10 +188,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.6 2006/01/06 15:08:47 wiz Exp $
CHAR64LONG16* block;
static int is_bigendian = -1;
#ifdef SHA1HANDSOFF
-@@ -157,6 +210,13 @@ static int is_bigendian = -1;
+@@ -153,6 +206,13 @@ static int is_bigendian = -1;
c = state[2];
d = state[3];
e = state[4];
@@ -91,7 +91,7 @@ $NetBSD: patch-ac,v 1.6 2006/01/06 15:08:47 wiz 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);
-@@ -178,6 +238,8 @@ static int is_bigendian = -1;
+@@ -174,6 +234,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-01-14 08:08:32 +0000