diff options
author | Matthias Andree <mandree@FreeBSD.org> | 2014-08-21 22:50:29 +0000 |
---|---|---|
committer | Matthias Andree <mandree@FreeBSD.org> | 2014-08-21 22:50:29 +0000 |
commit | b50a4b0708948c5766fb92a70bfc082efa53857b (patch) | |
tree | 5f9e6219e9207f083ae5e2fff1302ed5967538ef /databases/db44/files/patch-upstream.4.4.20.3 | |
parent | Mark BROKEN on FreeBSD 10 and above. (diff) |
Berkeley DB cleanup, remove versions 4.0 ... 4.7.
- Mk/bsd.database.mk rewrite, new default to db5.
- db6 is eligible by default only if installed on the system.
- Bump PORTREVISION of all ports that directly depend on BerkeleyDB or
where USE_BDB is found in the port's directory
- Patch a few ports such that they will pick up or work with newer
versions.
- Add UPDATING entry
- Drive-by format fix for pks
- Drop BerkeleyDB option from mail/popular for now, requires more work.
- Exp-run logs linked from the PR below.
- Ports that do not build (IGNORE, BROKEN, etc.) have pro-forma changes
for new Berkeley DB, but are untested.
NOTE: please read UPDATING and the Wiki page before proceeding!
Announcement: http://lists.freebsd.org/pipermail/freebsd-ports-announce/2014-August/000090.html
Wiki reference: https://wiki.freebsd.org/Ports/BerkeleyDBCleanup
PR: 192690
Approved by: portmgr (implicit, PORTREVISION bump on unstaged ports)
Diffstat (limited to 'databases/db44/files/patch-upstream.4.4.20.3')
-rw-r--r-- | databases/db44/files/patch-upstream.4.4.20.3 | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/databases/db44/files/patch-upstream.4.4.20.3 b/databases/db44/files/patch-upstream.4.4.20.3 deleted file mode 100644 index d859c42a44c1..000000000000 --- a/databases/db44/files/patch-upstream.4.4.20.3 +++ /dev/null @@ -1,49 +0,0 @@ -*** ../db/db_cam.c.orig 2006-01-11 03:19:21.000000000 +1100 ---- ../db/db_cam.c 2006-03-01 13:59:01.000000000 +1100 -*************** -*** 579,589 **** - flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) { - if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0) - return (ret); -! if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0) - return (ret); - -! switch (ret = -! opd->c_am_get(opd, key, data, flags, NULL)) { - case 0: - goto done; - case DB_NOTFOUND: ---- 579,590 ---- - flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) { - if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0) - return (ret); -! if (F_ISSET(dbc_arg, DBC_TRANSIENT)) -! opd = cp->opd; -! else if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0) - return (ret); - -! switch (ret = opd->c_am_get(opd, key, data, flags, NULL)) { - case 0: - goto done; - case DB_NOTFOUND: -*************** -*** 596,607 **** ---- 597,614 ---- - if ((ret = __db_c_close(opd)) != 0) - goto err; - opd = NULL; -+ if (F_ISSET(dbc_arg, DBC_TRANSIENT)) -+ cp->opd = NULL; - break; - } - goto err; - default: - goto err; - } -+ } else if (cp->opd != NULL && F_ISSET(dbc_arg, DBC_TRANSIENT)) { -+ if ((ret = __db_c_close(cp->opd)) != 0) -+ goto err; -+ cp->opd = NULL; - } - - /* |