Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/man-db/, sys-apps/man-db/files/
Date: Mon, 10 Sep 2018 10:24:30
Message-Id: 1536575044.ed234fb21a833b47f3541c3385000bc045fa27d3.whissi@gentoo
1 commit: ed234fb21a833b47f3541c3385000bc045fa27d3
2 Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
3 AuthorDate: Mon Sep 10 10:24:03 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 10 10:24:04 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed234fb2
7
8 sys-apps/man-db: fix build with berkdb
9
10 Closes: https://github.com/gentoo/gentoo/pull/9546
11 Closes: https://bugs.gentoo.org/662588
12 Package-Manager: Portage-2.3.45, Repoman-2.3.10
13
14 .../files/man-db-2.8.4-berkdb_build_fix.patch | 27 ++++++++++++++++++++++
15 sys-apps/man-db/man-db-2.8.4.ebuild | 2 ++
16 2 files changed, 29 insertions(+)
17
18 diff --git a/sys-apps/man-db/files/man-db-2.8.4-berkdb_build_fix.patch b/sys-apps/man-db/files/man-db-2.8.4-berkdb_build_fix.patch
19 new file mode 100644
20 index 00000000000..30052f26815
21 --- /dev/null
22 +++ b/sys-apps/man-db/files/man-db-2.8.4-berkdb_build_fix.patch
23 @@ -0,0 +1,27 @@
24 +From dd0f554b5c1d563f9ee625c19c8745d8982e00e3 Mon Sep 17 00:00:00 2001
25 +From: Colin Watson <cjwatson@××××××.org>
26 +Date: Thu, 2 Aug 2018 10:34:00 +0100
27 +Subject: Fix build with Berkeley DB
28 +
29 +Fixes Savannah bug #54425.
30 +
31 +* libdb/db_btree.c: Include <stdlib.h> for free.
32 +---
33 + libdb/db_btree.c | 1 +
34 + 1 file changed, 1 insertion(+)
35 +
36 +diff --git a/libdb/db_btree.c b/libdb/db_btree.c
37 +index fdd9b15..4469bf6 100644
38 +--- a/libdb/db_btree.c
39 ++++ b/libdb/db_btree.c
40 +@@ -28,6 +28,7 @@
41 + /* below this line are routines only useful for the BTREE interface */
42 + #ifdef BTREE
43 +
44 ++#include <stdlib.h>
45 + #include <stdio.h>
46 + #include <errno.h>
47 + #include <string.h>
48 +--
49 +cgit v1.0-41-gc330
50 +
51
52 diff --git a/sys-apps/man-db/man-db-2.8.4.ebuild b/sys-apps/man-db/man-db-2.8.4.ebuild
53 index 670cbc0de53..42bdf6a7f67 100644
54 --- a/sys-apps/man-db/man-db-2.8.4.ebuild
55 +++ b/sys-apps/man-db/man-db-2.8.4.ebuild
56 @@ -44,6 +44,8 @@ RDEPEND="
57 "
58 PDEPEND="manpager? ( app-text/manpager )"
59
60 +PATCHES=( "${FILESDIR}"/${P}-berkdb_build_fix.patch )
61 +
62 pkg_setup() {
63 # Create user now as Makefile in src_install does setuid/chown
64 enewgroup man 15