OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Nov-2004 15:53:39
Branch: HEAD Handle: 2004111314532810
Modified files:
openpkg-src/db db.patch db.spec
openpkg-src/imapd imapd.patch imapd.spec
openpkg-src/inn inn.patch inn.spec
openpkg-src/openldap openldap.patch openldap.spec
Log:
Upgrade from DB 4.2 to 4.3
Summary:
Revision Changes Path
1.6 +9 -9 openpkg-src/db/db.patch
1.51 +3 -7 openpkg-src/db/db.spec
1.12 +23 -1 openpkg-src/imapd/imapd.patch
1.127 +3 -3 openpkg-src/imapd/imapd.spec
1.6 +27 -0 openpkg-src/inn/inn.patch
1.91 +3 -3 openpkg-src/inn/inn.spec
1.10 +24 -0 openpkg-src/openldap/openldap.patch
1.123 +1 -1 openpkg-src/openldap/openldap.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/db/db.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 db.patch
--- openpkg-src/db/db.patch 29 Apr 2004 09:37:58 -0000 1.5
+++ openpkg-src/db/db.patch 13 Nov 2004 14:53:28 -0000 1.6
@@ -1,7 +1,7 @@
Index: mutex/mut_fcntl.c
---- mutex/mut_fcntl.c.orig 2003-05-05 21:55:03.000000000 +0200
-+++ mutex/mut_fcntl.c 2003-12-05 10:28:14.000000000 +0100
-@@ -100,7 +100,7 @@
+--- mutex/mut_fcntl.c.orig 2004-01-28 04:36:18 +0100
++++ mutex/mut_fcntl.c 2004-11-11 20:04:31 +0100
+@@ -99,7 +99,7 @@
/* Acquire an exclusive kernel lock. */
k_lock.l_type = F_WRLCK;
@@ -10,7 +10,7 @@
return (__os_get_errno());
/* If the resource is still available, it's ours. */
-@@ -111,7 +111,7 @@
+@@ -110,7 +110,7 @@
/* Release the kernel lock. */
k_lock.l_type = F_UNLCK;
@@ -20,11 +20,11 @@
/*
Index: os/os_open.c
---- os/os_open.c.orig 2003-09-10 02:27:29.000000000 +0200
-+++ os/os_open.c 2003-12-05 10:28:14.000000000 +0100
-@@ -141,7 +141,7 @@
- if (LF_ISSET(DB_OSO_TRUNC))
- oflags |= O_TRUNC;
+--- os/os_open.c.orig 2004-09-28 18:46:57 +0200
++++ os/os_open.c 2004-11-11 20:04:31 +0100
+@@ -121,7 +121,7 @@
+ if (LF_ISSET(DB_OSO_EXCL))
+ oflags |= O_EXCL;
-#ifdef HAVE_O_DIRECT
+#if defined(HAVE_O_DIRECT) && defined(__FreeBSD__)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/db/db.spec
============================================================================
$ cvs diff -u -r1.50 -r1.51 db.spec
--- openpkg-src/db/db.spec 18 Oct 2004 11:58:01 -0000 1.50
+++ openpkg-src/db/db.spec 13 Nov 2004 14:53:28 -0000 1.51
@@ -24,8 +24,8 @@
##
# package version
-%define V_version 4.2.52
-%define V_revision 2
+%define V_version 4.3.21
+%define V_revision 0
# package information
Name: db
@@ -38,7 +38,7 @@
Group: Database
License: BSD
Version: %{V_version}.%{V_revision}
-Release: 20041018
+Release: 20041113
# package options
%option with_compat no
@@ -47,8 +47,6 @@
# list of sources
Source0: http://www.sleepycat.com/update/snapshot/db-%{V_version}.tar.gz
Patch0: db.patch
-Patch1:
http://www.sleepycat.com/update/%{V_version}/patch.%{V_version}.1
-Patch2:
http://www.sleepycat.com/update/%{V_version}/patch.%{V_version}.2
# build information
Prefix: %{l_prefix}
@@ -82,8 +80,6 @@
%prep
%setup -q -n db-%{V_version}
%patch -p0
- %patch -p0 -P 1
- %patch -p0 -P 2
%{l_shtool} subst \
-e 's;\($(ar) cr .*\);\1 _udivdi3.o _muldi3.o _clz.o;' \
-e 's;install_utilities install_docs;install_utilities;' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 imapd.patch
--- openpkg-src/imapd/imapd.patch 28 Mar 2004 21:48:01 -0000 1.11
+++ openpkg-src/imapd/imapd.patch 13 Nov 2004 14:53:34 -0000 1.12
@@ -41,7 +41,7 @@
+++ perl/sieve/lib/isieve.c 2004-02-02 20:01:21.000000000 +0100
@@ -41,9 +41,7 @@
- /* $Id: imapd.patch,v 1.11 2004/03/28 21:48:01 thl Exp $ */
+ /* $Id: imapd.patch,v 1.12 2004/11/13 14:53:34 rse Exp $ */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
@@ -92,3 +92,25 @@
namelen = cp - name;
+Index: lib/cyrusdb_berkeley.c
+--- lib/cyrusdb_berkeley.c.orig 2004-03-11 19:36:44 +0100
++++ lib/cyrusdb_berkeley.c 2004-11-13 13:48:28 +0100
+@@ -104,7 +104,7 @@
+ exit(EC_TEMPFAIL);
+ }
+
+-static void db_err(const char *db_prfx, char *buffer)
++static void db_err(const DB_ENV *dbenv, const char *db_prfx, const char
*buffer)
+ {
+ syslog(LOG_WARNING, "DBERROR %s: %s", db_prfx, buffer);
+ }
+@@ -143,9 +143,6 @@
+ dbenv->set_verbose(dbenv, DB_VERB_DEADLOCK, 1);
+ dbenv->set_verbose(dbenv, DB_VERB_WAITSFOR, 1);
+ }
+- if (CONFIG_DB_VERBOSE > 1) {
+- dbenv->set_verbose(dbenv, DB_VERB_CHKPOINT, 1);
+- }
+
+ dbenv->set_errcall(dbenv, db_err);
+ snprintf(errpfx, sizeof(errpfx), "db%d", DB_VERSION_MAJOR);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.126 -r1.127 imapd.spec
--- openpkg-src/imapd/imapd.spec 19 Aug 2004 15:13:53 -0000 1.126
+++ openpkg-src/imapd/imapd.spec 13 Nov 2004 14:53:34 -0000 1.127
@@ -34,7 +34,7 @@
Group: Mail
License: BSD
Version: 2.2.8
-Release: 20040819
+Release: 20041113
# package options
%option with_fsl yes
@@ -56,8 +56,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, perl >= 5.8.3, perl-openpkg >=
5.8.3, make
PreReq: OpenPKG, openpkg >= 20040130, perl >= 5.8.3, MTA
-BuildPreReq: sasl, db >= 4.1.24, openssl
-PreReq: sasl, db >= 4.1.24, openssl
+BuildPreReq: sasl, db >= 4.3, openssl
+PreReq: sasl, db >= 4.3, openssl
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/inn/inn.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 inn.patch
--- openpkg-src/inn/inn.patch 8 Jan 2004 11:16:37 -0000 1.5
+++ openpkg-src/inn/inn.patch 13 Nov 2004 14:53:31 -0000 1.6
@@ -57,3 +57,30 @@
#endif /* USE_BERKELEY_DB */
+Index: frontends/ovdb_stat.c
+--- frontends/ovdb_stat.c.orig 2004-01-07 23:47:19 +0100
++++ frontends/ovdb_stat.c 2004-11-13 13:55:17 +0100
+@@ -586,7 +586,10 @@
+ {
+ DB_BTREE_STAT *sp;
+
+-#if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR >= 3 && DB_VERSION_MINOR >=
3)
++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 3)
++ if(db->stat(db, NULL, &sp, 0))
++ return 1;
++#elif DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR >= 3 && DB_VERSION_MINOR
>= 3)
+ if(db->stat(db, &sp, 0))
+ return 1;
+ #else
+@@ -646,7 +649,10 @@
+ #else
+ DB_HASH_STAT *sp;
+
+-#if DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR <= 2
++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
++ if(db->stat(db, NULL, &sp, 0))
++ return 1;
++#elif DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR <= 2
+ if(db->stat(db, &sp, NULL, 0))
+ return 1;
+ #else
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/inn/inn.spec
============================================================================
$ cvs diff -u -r1.90 -r1.91 inn.spec
--- openpkg-src/inn/inn.spec 4 Jun 2004 12:12:22 -0000 1.90
+++ openpkg-src/inn/inn.spec 13 Nov 2004 14:53:31 -0000 1.91
@@ -34,7 +34,7 @@
Group: News
License: ISC
Version: 2.4.1
-Release: 20040604
+Release: 20041113
# package options
%option with_fsl yes
@@ -50,8 +50,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, gzip, make, perl, bison,
flex
PreReq: OpenPKG, openpkg >= 20040130, gcc, gzip, perl, MTA
-BuildPreReq: db, openssl
-PreReq: db, openssl
+BuildPreReq: db >= 4.3, openssl
+PreReq: db >= 4.3, openssl
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 openldap.patch
--- openpkg-src/openldap/openldap.patch 23 Sep 2004 15:45:26 -0000
1.9
+++ openpkg-src/openldap/openldap.patch 13 Nov 2004 14:53:38 -0000
1.10
@@ -64,3 +64,27 @@
#include "ldap_rq.h"
+Index: servers/slapd/back-bdb/error.c
+--- servers/slapd/back-bdb/error.c.orig 2004-01-01 19:16:36 +0100
++++ servers/slapd/back-bdb/error.c 2004-11-13 14:03:28 +0100
+@@ -22,7 +22,7 @@
+ #include "slap.h"
+ #include "back-bdb.h"
+
+-void bdb_errcall( const char *pfx, char * msg )
++void bdb_errcall( const DB_ENV *dbenv, const char *pfx, const char * msg )
+ {
+ #ifdef HAVE_EBCDIC
+ if ( msg[0] > 0x7f )
+Index: servers/slapd/back-bdb/proto-bdb.h
+--- servers/slapd/back-bdb/proto-bdb.h.orig 2004-07-16 21:51:43 +0200
++++ servers/slapd/back-bdb/proto-bdb.h 2004-11-13 14:03:46 +0100
+@@ -139,7 +139,7 @@
+ */
+ #define bdb_errcall BDB_SYMBOL(errcall)
+
+-void bdb_errcall( const char *pfx, char * msg );
++void bdb_errcall( const DB_ENV *dbenv, const char *pfx, const char * msg );
+
+ #ifdef HAVE_EBCDIC
+ #define ebcdic_dberror
BDB_SYMBOL(ebcdic_dberror)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.122 -r1.123 openldap.spec
--- openpkg-src/openldap/openldap.spec 24 Oct 2004 19:41:37 -0000
1.122
+++ openpkg-src/openldap/openldap.spec 13 Nov 2004 14:53:38 -0000
1.123
@@ -34,7 +34,7 @@
Group: Database
License: GPL
Version: 2.2.18
-Release: 20041024
+Release: 20041113
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
