summaryrefslogtreecommitdiffstats
path: root/development/nvi/patches/nvi.diffs
diff options
context:
space:
mode:
author Don Allen2014-11-13 20:45:57 +0100
committer Willy Sudiarto Raharjo2014-11-13 20:46:13 +0100
commit2057942373464512c839959ac4c9b336a2bb81cc (patch)
treee1b173b22372bf23a2fda4ba84759fb69dc68bc1 /development/nvi/patches/nvi.diffs
parent3642f5db8d4c92f1f2534d0ea6c93cfb30592de3 (diff)
downloadslackbuilds-2057942373464512c839959ac4c9b336a2bb81cc.tar.gz
development/nvi: New maintainer + patch DB.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'development/nvi/patches/nvi.diffs')
-rw-r--r--development/nvi/patches/nvi.diffs28
1 files changed, 28 insertions, 0 deletions
diff --git a/development/nvi/patches/nvi.diffs b/development/nvi/patches/nvi.diffs
new file mode 100644
index 0000000000..98a45861e7
--- /dev/null
+++ b/development/nvi/patches/nvi.diffs
@@ -0,0 +1,28 @@
+diff -up nvi-1.81.6/common/db.h patched-nvi-1.81.6/common/db.h
+--- nvi-1.81.6/common/db.h 2007-11-18 11:41:42.000000000 -0500
++++ patched-nvi-1.81.6/common/db.h 2014-10-04 08:53:11.000000000 -0400
+@@ -16,7 +16,10 @@
+ (env)->remove(env, path, NULL, flags)
+ #endif
+
+-#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
++# if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 4) || DB_VERSION_MAJOR > 4
++#define db_open(db,file,type,flags,mode) \
++ (db)->open(db, NULL, file, NULL, type, flags | DB_CREATE, mode)
++#elif DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
+ #define db_open(db,file,type,flags,mode) \
+ (db)->open(db, NULL, file, NULL, type, flags, mode)
+ #else
+diff -up nvi-1.81.6/common/msg.c patched-nvi-1.81.6/common/msg.c
+--- nvi-1.81.6/common/msg.c 2007-11-18 11:41:42.000000000 -0500
++++ patched-nvi-1.81.6/common/msg.c 2014-10-04 08:55:13.000000000 -0400
+@@ -724,7 +724,8 @@ msg_open(SCR *sp, char *file)
+ p = buf;
+ } else
+ p = file;
+- if ((sp->db_error = db_create(&db, 0, 0)) != 0 ||
++ if (access(p, R_OK) != 0 ||
++ (sp->db_error = db_create(&db, 0, 0)) != 0 ||
+ (sp->db_error = db->set_re_source(db, p)) != 0 ||
+ (sp->db_error = db_open(db, NULL, DB_RECNO, 0, 0)) != 0) {
+ if (first) {