pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases/db4 Use the distribution patches (patch.4.2....
details: https://anonhg.NetBSD.org/pkgsrc/rev/0a1f941a1e3b
branches: trunk
changeset: 483307:0a1f941a1e3b
user: jlam <jlam%pkgsrc.org@localhost>
date: Wed Nov 10 15:51:23 2004 +0000
description:
Use the distribution patches (patch.4.2.52.{1,2}) directly from
Sleepycat instead of patch-ba and patch-bb. Since patch-ba was actually
an incomplete version of patch.4.2.52.1, we bump the PKGREVISION.
diffstat:
databases/db4/Makefile | 12 +++++++-----
databases/db4/buildlink3.mk | 4 ++--
databases/db4/distinfo | 14 ++++++++------
databases/db4/patches/patch-aa | 6 +++---
databases/db4/patches/patch-ab | 6 +++---
databases/db4/patches/patch-ac | 6 +++---
databases/db4/patches/patch-ba | 12 ------------
databases/db4/patches/patch-bb | 26 --------------------------
8 files changed, 26 insertions(+), 60 deletions(-)
diffs (163 lines):
diff -r 9db04e6e6880 -r 0a1f941a1e3b databases/db4/Makefile
--- a/databases/db4/Makefile Wed Nov 10 15:47:06 2004 +0000
+++ b/databases/db4/Makefile Wed Nov 10 15:51:23 2004 +0000
@@ -1,25 +1,27 @@
-# $NetBSD: Makefile,v 1.24 2004/11/05 09:24:39 grant Exp $
+# $NetBSD: Makefile,v 1.25 2004/11/10 15:51:23 jlam Exp $
DISTNAME= db-4.2.52
PKGNAME= ${DISTNAME:S/db/db4/}
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= databases
MASTER_SITES= http://www.sleepycat.com/update/snapshot/
+PATCHFILES= patch.4.2.52.1 patch.4.2.52.2
+PATCH_SITES= http://www.sleepycat.com/update/4.2.52/
+
MAINTAINER= tech-pkg%NetBSD.org@localhost
HOMEPAGE= http://www.sleepycat.com/
COMMENT= Berkeley DB version 4 from Sleepycat Software
PKG_INSTALLATION_TYPES= overwrite pkgviews
-WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
USE_BUILDLINK3= yes
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
+CONFIGURE_DIRS= ${WRKSRC}/build_unix
+BUILD_DIRS= ${CONFIGURE_DIRS}
CONFIGURE_SCRIPT= ../dist/configure
-CONFIG_SUB_OVERRIDE= ${WRKDIR}/${DISTNAME}/dist/config.sub
-CONFIG_GUESS_OVERRIDE= ${WRKDIR}/${DISTNAME}/dist/config.guess
CONFIGURE_ARGS+= --enable-cxx
CONFIGURE_ARGS+= --enable-rpc
diff -r 9db04e6e6880 -r 0a1f941a1e3b databases/db4/buildlink3.mk
--- a/databases/db4/buildlink3.mk Wed Nov 10 15:47:06 2004 +0000
+++ b/databases/db4/buildlink3.mk Wed Nov 10 15:51:23 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2004/10/03 00:13:18 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2004/11/10 15:51:23 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DB4_BUILDLINK3_MK:= ${DB4_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@
.if !empty(DB4_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.db4+= db4>=4.2.52
-BUILDLINK_RECOMMENDED.db4+= db4>=4.2.52nb5
+BUILDLINK_RECOMMENDED.db4+= db4>=4.2.52nb6
BUILDLINK_PKGSRCDIR.db4?= ../../databases/db4
BUILDLINK_INCDIRS.db4?= include/db4
BUILDLINK_LIBDIRS.db4?= lib
diff -r 9db04e6e6880 -r 0a1f941a1e3b databases/db4/distinfo
--- a/databases/db4/distinfo Wed Nov 10 15:47:06 2004 +0000
+++ b/databases/db4/distinfo Wed Nov 10 15:51:23 2004 +0000
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.8 2004/07/01 15:17:21 recht Exp $
+$NetBSD: distinfo,v 1.9 2004/11/10 15:51:23 jlam Exp $
SHA1 (db-4.2.52.tar.gz) = 12d21a58efd7b5fd35b56815a8fb1ac2cbab2e5c
Size (db-4.2.52.tar.gz) = 4073147 bytes
-SHA1 (patch-aa) = 8fcee1c1e8b53b43ac7969cb0234d203f656dfb9
-SHA1 (patch-ab) = 4204cd6171426de613741a9a16e8b32de37c42b2
-SHA1 (patch-ac) = b9b52d5604afd12409261294a71b3db20b899476
-SHA1 (patch-ba) = eca5ea4dda5d773f06d6969dfa587463905cf8db
-SHA1 (patch-bb) = af3364aec87ebd4393383730141ce3a8e2286868
+SHA1 (patch.4.2.52.1) = fdbe677eb4314309e855c35359a493284ddc1936
+Size (patch.4.2.52.1) = 988 bytes
+SHA1 (patch.4.2.52.2) = ef55711f1bf643024d9d90f9b3885299f6c7b09a
+Size (patch.4.2.52.2) = 1433 bytes
+SHA1 (patch-aa) = 2a3db19cb2b18926531b1b7fc342d0caef78f67c
+SHA1 (patch-ab) = 4b4831ddb27a07c74d6e7a49ce0fad2b3ac2e740
+SHA1 (patch-ac) = b22889222bfd358226bba9af3479350ec053259c
diff -r 9db04e6e6880 -r 0a1f941a1e3b databases/db4/patches/patch-aa
--- a/databases/db4/patches/patch-aa Wed Nov 10 15:47:06 2004 +0000
+++ b/databases/db4/patches/patch-aa Wed Nov 10 15:51:23 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 2004/06/28 22:11:38 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2004/11/10 15:51:23 jlam Exp $
---- ../dist/Makefile.in.orig Fri Nov 28 13:50:06 2003
-+++ ../dist/Makefile.in
+--- dist/Makefile.in.orig Fri Nov 28 13:50:06 2003
++++ dist/Makefile.in
@@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@
bindir= @bindir@
includedir=@includedir@
diff -r 9db04e6e6880 -r 0a1f941a1e3b databases/db4/patches/patch-ab
--- a/databases/db4/patches/patch-ab Wed Nov 10 15:47:06 2004 +0000
+++ b/databases/db4/patches/patch-ab Wed Nov 10 15:51:23 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2004/04/07 15:12:40 jmmv Exp $
+$NetBSD: patch-ab,v 1.5 2004/11/10 15:51:23 jlam Exp $
---- ../dist/configure.orig 2003-12-03 22:10:02.000000000 +0100
-+++ ../dist/configure 2004-04-07 17:00:04.000000000 +0200
+--- dist/configure.orig 2003-12-03 22:10:02.000000000 +0100
++++ dist/configure 2004-04-07 17:00:04.000000000 +0200
@@ -5390,6 +5390,7 @@
if test "$GXX" = "yes"; then
GXX_VERSION=`${MAKEFILE_CXX} --version`
diff -r 9db04e6e6880 -r 0a1f941a1e3b databases/db4/patches/patch-ac
--- a/databases/db4/patches/patch-ac Wed Nov 10 15:47:06 2004 +0000
+++ b/databases/db4/patches/patch-ac Wed Nov 10 15:51:23 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2003/12/08 23:15:05 seb Exp $
+$NetBSD: patch-ac,v 1.2 2004/11/10 15:51:23 jlam Exp $
---- ../hmac/sha1.c.orig 2002-04-09 13:40:36.000000000 +0000
-+++ ../hmac/sha1.c
+--- hmac/sha1.c.orig 2002-04-09 13:40:36.000000000 +0000
++++ hmac/sha1.c
@@ -102,6 +102,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);
diff -r 9db04e6e6880 -r 0a1f941a1e3b databases/db4/patches/patch-ba
--- a/databases/db4/patches/patch-ba Wed Nov 10 15:47:06 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2004/07/01 15:17:21 recht Exp $
-
---- ../mp/mp_fput.c.orig 2003-09-30 19:42:07.000000000 +0200
-+++ ../mp/mp_fput.c 2004-07-01 15:32:08.000000000 +0200
-@@ -285,6 +285,7 @@
- bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh))
- if (bhp->priority != UINT32_T_MAX &&
- bhp->priority > MPOOL_BASE_DECREMENT)
-+ bhp->priority -= MPOOL_BASE_DECREMENT;
- MUTEX_UNLOCK(dbenv, &hp->hash_mutex);
- }
- }
diff -r 9db04e6e6880 -r 0a1f941a1e3b databases/db4/patches/patch-bb
--- a/databases/db4/patches/patch-bb Wed Nov 10 15:47:06 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2004/07/01 15:17:21 recht Exp $
-
---- ../lock/lock.c.orig 2003-11-21 03:40:10.000000000 +0100
-+++ ../lock/lock.c 2004-07-01 15:32:08.000000000 +0200
-@@ -2217,9 +2217,10 @@
- sizeof(db_pgno_t); \
- } while (0)
- #define COPY_OBJ(dp, obj) do { \
-- memcpy(dp, obj->data, obj->size); \
-+ memcpy(dp, \
-+ (obj)->data, (obj)->size); \
- dp = (u_int8_t *)dp + \
-- ALIGN(obj->size, \
-+ ALIGN((obj)->size, \
- sizeof(u_int32_t)); \
- } while (0)
-
-@@ -2339,7 +2340,7 @@
- for (i = 0; i < nlocks; i = j) {
- PUT_PCOUNT(dp, obj[i].ulen);
- PUT_SIZE(dp, obj[i].size);
-- COPY_OBJ(dp, obj);
-+ COPY_OBJ(dp, &obj[i]);
- lock = (DB_LOCK_ILOCK *)obj[i].data;
- for (j = i + 1; j <= i + obj[i].ulen; j++) {
- lock = (DB_LOCK_ILOCK *)obj[j].data;
Home |
Main Index |
Thread Index |
Old Index