OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 29-Sep-2006 08:04:42
Branch: HEAD Handle: 2006092907044101
Modified files:
openpkg-src/inn inn.patch inn.spec
Log:
fix building under DB 4.5
Summary:
Revision Changes Path
1.9 +37 -24 openpkg-src/inn/inn.patch
1.101 +1 -1 openpkg-src/inn/inn.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/inn/inn.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 inn.patch
--- openpkg-src/inn/inn.patch 10 Mar 2006 21:19:43 -0000 1.8
+++ openpkg-src/inn/inn.patch 29 Sep 2006 06:04:41 -0000 1.9
@@ -1,6 +1,27 @@
+Index: frontends/ovdb_stat.c
+--- frontends/ovdb_stat.c.orig 2006-03-20 05:14:57 +0100
++++ frontends/ovdb_stat.c 2006-09-29 07:17:19 +0200
+@@ -266,13 +266,17 @@
+ { INT32, F(st_nobjects), -1, -1, "Current objects" },
+ { INT32, F(st_maxnobjects), -1, -1, "Maximum objects" },
+ #endif
++#if !(DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 4)
+ { INT32, F(st_nconflicts), -1, -1, "Lock conflicts" },
++#endif
+ { INT32, F(st_nrequests), -1, -1, "Lock requests" },
+ { INT32, F(st_nreleases), -1, -1, "Lock releases" },
+ { DIFF32, F(st_nrequests), F(st_nreleases), F(st_ndeadlocks), "Outstanding
locks" },
+ #if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 0)
++#if !(DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 4)
+ { INT32, F(st_nnowaits), -1, -1, "Lock requests that would
have waited" },
+ #endif
++#endif
+ { INT32, F(st_ndeadlocks), -1, -1, "Deadlocks" },
+ #if DB_VERSION_MAJOR >= 4
+ { INT32, F(st_nlocktimeouts), -1, -1, "Lock timeouts" },
Index: scripts/innwatch.in
---- scripts/innwatch.in.orig 2004-12-22 05:21:19 +0100
-+++ scripts/innwatch.in 2004-12-24 11:31:18 +0100
+--- scripts/innwatch.in.orig 2006-03-20 05:14:57 +0100
++++ scripts/innwatch.in 2006-09-29 07:17:19 +0200
@@ -126,7 +126,12 @@
NEXTSLEEP=1
HASEXITED=false
@@ -16,8 +37,8 @@
## If news.daily is running, idle: we don't want to change the
Index: site/Makefile
---- site/Makefile.orig 2004-12-22 05:21:19 +0100
-+++ site/Makefile 2004-12-24 12:01:24 +0100
+--- site/Makefile.orig 2006-03-20 05:14:57 +0100
++++ site/Makefile 2006-09-29 07:17:19 +0200
@@ -137,7 +137,6 @@
chmod $(FILEMODE) $@
$D$(PATH_HISTORY):
@@ -26,24 +47,16 @@
## Remove files that are unchanged from the release version.
clean:
-Index: frontends/ovdb_stat.c
---- frontends/ovdb_stat.c.orig 2004-12-22 05:21:19 +0100
-+++ frontends/ovdb_stat.c 2006-03-10 22:14:12 +0100
-@@ -266,13 +266,17 @@
- { INT32, F(st_nobjects), -1, -1, "Current objects" },
- { INT32, F(st_maxnobjects), -1, -1, "Maximum objects" },
- #endif
-+#if !(DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 4)
- { INT32, F(st_nconflicts), -1, -1, "Lock conflicts" },
-+#endif
- { INT32, F(st_nrequests), -1, -1, "Lock requests" },
- { INT32, F(st_nreleases), -1, -1, "Lock releases" },
- { DIFF32, F(st_nrequests), F(st_nreleases), F(st_ndeadlocks), "Outstanding
locks" },
- #if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 0)
-+#if !(DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 4)
- { INT32, F(st_nnowaits), -1, -1, "Lock requests that would
have waited" },
- #endif
+Index: storage/ovdb/ovdb.c
+--- storage/ovdb/ovdb.c.orig 2006-03-20 05:14:57 +0100
++++ storage/ovdb/ovdb.c 2006-09-29 07:55:00 +0200
+@@ -1526,7 +1526,9 @@
+
+ OVDBenv->set_errcall(OVDBenv, OVDBerror);
+ OVDBenv->set_cachesize(OVDBenv, 0, ovdb_conf.cachesize, 1);
++#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 5)
+ OVDBenv->set_lk_max(OVDBenv, ovdb_conf.maxlocks);
+#endif
- { INT32, F(st_ndeadlocks), -1, -1, "Deadlocks" },
- #if DB_VERSION_MAJOR >= 4
- { INT32, F(st_nlocktimeouts), -1, -1, "Lock timeouts" },
+
+ #if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR >=
2)
+ if(ovdb_conf.txn_nosync)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/inn/inn.spec
============================================================================
$ cvs diff -u -r1.100 -r1.101 inn.spec
--- openpkg-src/inn/inn.spec 25 Aug 2006 19:16:52 -0000 1.100
+++ openpkg-src/inn/inn.spec 29 Sep 2006 06:04:42 -0000 1.101
@@ -33,7 +33,7 @@
Group: News
License: ISC
Version: 2.4.3
-Release: 20060825
+Release: 20060929
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
