OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 08-Jan-2004 12:16:37
Branch: HEAD Handle: 2004010811163502
Modified files:
openpkg-re/vcheck vc.inn
openpkg-src/inn inn.patch inn.spec
openpkg-web news.txt
Log:
SA-2004.001-inn; fix broken DB4 support
Summary:
Revision Changes Path
1.9 +1 -1 openpkg-re/vcheck/vc.inn
1.5 +42 -0 openpkg-src/inn/inn.patch
1.86 +2 -2 openpkg-src/inn/inn.spec
1.8008 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.inn
============================================================================
$ cvs diff -u -r1.8 -r1.9 vc.inn
--- openpkg-re/vcheck/vc.inn 11 May 2003 08:49:06 -0000 1.8
+++ openpkg-re/vcheck/vc.inn 8 Jan 2004 11:16:35 -0000 1.9
@@ -2,7 +2,7 @@
}
prog inn = {
- version = 2.4.0
+ version = 2.4.1
url = ftp://ftp.isc.org/isc/inn/
regex = inn-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/inn/inn.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 inn.patch
--- openpkg-src/inn/inn.patch 21 Aug 2003 09:10:32 -0000 1.4
+++ openpkg-src/inn/inn.patch 8 Jan 2004 11:16:37 -0000 1.5
@@ -15,3 +15,45 @@
## If news.daily is running, idle: we don't want to change the
+--- storage/ovdb/ovdb-private.h.orig 2004-01-07 23:47:19.000000000 +0100
++++ storage/ovdb/ovdb-private.h 2004-01-08 12:07:08.000000000 +0100
+@@ -188,8 +188,7 @@
+
+ #define TRYAGAIN EAGAIN
+
+-#else
+-/* version 3 */
++#elif DB_VERSION_MAJOR == 3
+
+ #define TXN_START(label, tid) \
+ label: { \
+@@ -209,6 +208,28 @@
+
+ #define TRYAGAIN DB_LOCK_DEADLOCK
+
++#elif DB_VERSION_MAJOR == 4
++
++#define TXN_START(label, tid) \
++label: { \
++ int txn_ret; \
++ txn_ret = OVDBenv->txn_begin(OVDBenv, NULL, &tid, 0); \
++ if (txn_ret != 0) { \
++ syslog(L_ERROR, "OVDB: " #label " txn_begin: %s", db_strerror(ret)); \
++ tid = NULL; \
++ } \
++}
++
++#define TXN_RETRY(label, tid) \
++{ tid->abort(tid); goto label; }
++
++#define TXN_ABORT(label, tid) tid->abort(tid)
++#define TXN_COMMIT(label, tid) tid->commit(tid, 0)
++
++#define TRYAGAIN DB_LOCK_DEADLOCK
++
++#else
++#error "unknown DB_VERSION_MAJOR"
+ #endif /* DB_VERSION_MAJOR == 2 */
+
+ #endif /* USE_BERKELEY_DB */
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/inn/inn.spec
============================================================================
$ cvs diff -u -r1.85 -r1.86 inn.spec
--- openpkg-src/inn/inn.spec 11 Nov 2003 20:22:01 -0000 1.85
+++ openpkg-src/inn/inn.spec 8 Jan 2004 11:16:37 -0000 1.86
@@ -32,8 +32,8 @@
Distribution: OpenPKG [BASE]
Group: News
License: ISC
-Version: 2.4.0
-Release: 20031111
+Version: 2.4.1
+Release: 20040108
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8007 -r1.8008 news.txt
--- openpkg-web/news.txt 8 Jan 2004 09:29:43 -0000 1.8007
+++ openpkg-web/news.txt 8 Jan 2004 11:16:35 -0000 1.8008
@@ -1,3 +1,4 @@
+08-Jan-2004: Upgraded package: P<inn-2.4.1-20040108>
08-Jan-2004: Upgraded package: P<xterm-1.84-20040108>
08-Jan-2004: Upgraded package: P<uvscan-4.24+4313-20040108>
08-Jan-2004: Upgraded package: P<ncftp-3.1.7-20040108>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
