This patch originates from the Debian project, see https://www.debian.org/

03db4.dpatch  by  <hesso@pool.math.tu-berlin.de>


libdb4 compatibility adjustments.

In particular, this patch adds extra file permission checking and passes the
DB_CREATE flag to the first invocation of db_open on the file's database
structure, which rids us of the following message:

  BDB0635 DB_CREATE must be specified to create databases.

--- nvi-1.81.6.orig/common/msg.c	2009-02-26 14:26:58.350336128 +0100
+++ nvi-1.81.6/common/msg.c	2009-02-26 14:29:05.235335829 +0100
@@ -724,9 +724,18 @@
 		p = buf;
 	} else
 		p = file;
+	if (access(p, F_OK) != 0) {
+		if (first) {
+			first = 0;
+			return (1);
+		}
+		sp->db_error = ENOENT;
+		msgq_str(sp, M_DBERR, p, "%s");
+		return (1);
+	}
 	if ((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) {
+	    (sp->db_error = db_open(db, NULL, DB_RECNO, DB_CREATE, 0)) != 0) {
 		if (first) {
 			first = 0;
 			return (1);
/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=460e4e42c8a5c2a1a73772916165f3c434ee46c9'>refs</a><a class='active' href='/guix/log/tests/signing-key.sec'>log</a><a href='/guix/tree/tests/signing-key.sec?id=460e4e42c8a5c2a1a73772916165f3c434ee46c9'>tree</a><a href='/guix/commit/tests/signing-key.sec?id=460e4e42c8a5c2a1a73772916165f3c434ee46c9'>commit</a><a href='/guix/diff/tests/signing-key.sec?id=460e4e42c8a5c2a1a73772916165f3c434ee46c9'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/signing-key.sec'>
<input type='hidden' name='id' value='460e4e42c8a5c2a1a73772916165f3c434ee46c9'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=460e4e42c8a5c2a1a73772916165f3c434ee46c9'>root</a>/<a href='/guix/log/tests?id=460e4e42c8a5c2a1a73772916165f3c434ee46c9'>tests</a>/<a href='/guix/log/tests/signing-key.sec?id=460e4e42c8a5c2a1a73772916165f3c434ee46c9'>signing-key.sec</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/signing-key.sec?id=460e4e42c8a5c2a1a73772916165f3c434ee46c9&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2013-12-20 17:17:42 +0100'>2013-12-20</span></td><td><a href='/guix/commit/tests/signing-key.sec?id=526382ff92b20f6c651f03711c160c0c88264b88'>daemon: Implement signed archive import/export.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/scripts/authenticate.scm, nix/scripts/guix-authenticate.in,
  tests/signing-key.pub, tests/signing-key.sec: New files.
* po/POTFILES.in: Add 'guix/scripts/authenticate.scm'.
* guix/store.scm (dump-port): New procedure.
  (process-stderr): Add 'user-port' optional parameter.  Handle
  the %STDERR-WRITE and %STDERR-READ cases as expected.
  (import-paths, export-path, export-paths): New procedures.
* tests/store.scm ("export/import several paths", "import corrupt
  path"): New tests.
* Makefile.am (MODULES): Add 'guix/scripts/authenticate.scm'.
  (EXTRA_DIST): Add 'tests/signing-key.{pub,sec}'.
* daemon.am (libstore_a_CPPFLAGS)[-DNIX_CONF_DIR]: Change 'NIX_CONF_DIR'
  to .../guix.  Change 'OPENSSL_PATH' to 'guix-authenticate'.
* config-daemon.ac: Instantiate 'nix/scripts/guix-authenticate'.
* nix/nix-daemon/guix-daemon.cc (main): Augment $PATH to include
  'settings.nixLibexecDir'.
* test-env.in: Export 'NIX_CONF_DIR' and 'NIX_LIBEXEC_DIR'.  Populate
  $NIX_CONF_DIR.
</span></span></td><td>Ludovic Courtès</td></tr>