From 6eacc73de2ac75910a69b95801484135518e1a9e Mon Sep 17 00:00:00 2001 From: Leo Date: Mon, 14 Sep 2020 08:54:17 -0300 Subject: [PATCH] main/heimdal: disable berkeleydb support --- main/heimdal/APKBUILD | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD index 6bc6581393..2311736d92 100644 --- a/main/heimdal/APKBUILD +++ b/main/heimdal/APKBUILD @@ -3,15 +3,15 @@ pkgname=heimdal pkgver=7.7.0 _ver=${pkgver/_rc/rc} -pkgrel=1 -pkgdesc="An implementation of Kerberos 5" +pkgrel=2 +pkgdesc="Iplementation of Kerberos 5" arch="all" url="https://github.com/heimdal/" license="BSD-3-Clause" depends="krb5-conf" -depends_dev="openssl-dev e2fsprogs-dev db-dev" +depends_dev="openssl-dev e2fsprogs-dev" makedepends="$depends_dev autoconf automake bash gawk libtool - ncurses-dev perl readline-dev sqlite-dev texinfo perl-json" + ncurses-dev perl readline-dev sqlite-dev texinfo perl-json gdbm-dev" options="suid !check" #FIXME: FAIL: snprintf-test subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc" source="https://github.com/heimdal/heimdal/releases/download/heimdal-$pkgver/heimdal-$pkgver.tar.gz @@ -23,7 +23,6 @@ source="https://github.com/heimdal/heimdal/releases/download/heimdal-$pkgver/hei heimdal_missing-include.patch CVE-2018-16860.patch " -builddir="$srcdir/$pkgname-$_ver" # secfixes: # 7.5.3-r4: @@ -42,8 +41,7 @@ prepare() { } build() { - export LDFLAGS="${LDFLAGS} -Wl,--as-needed" - export LIBS="-ldb" + export LDFLAGS="$LDFLAGS -Wl,--as-needed" ./configure \ --build=$CBUILD \ @@ -51,11 +49,12 @@ build() { --prefix=/usr \ --enable-shared=yes \ --without-x \ - --with-berkeley-db \ + --without-berkeley-db \ --with-readline-lib=/usr/lib \ --with-readline-include=/usr/include/readline \ --with-sqlite3=/usr \ - --without-openssl + --without-openssl \ + --with-db-type-preference= # make sure we use system version rm -r lib/sqlite lib/com_err -- GitLab