From 0bf77c9821d559f49c392c583afc47ea8a1781b3 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Thu, 26 Oct 2017 22:33:31 +0200 Subject: main/openldap: move rest of backends to subpackages --- main/openldap/APKBUILD | 14 +++++++++++++- main/openldap/openldap.post-upgrade | 10 +++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) (limited to 'main/openldap') diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD index 688a265f72..250e7eec0d 100644 --- a/main/openldap/APKBUILD +++ b/main/openldap/APKBUILD @@ -20,6 +20,7 @@ makedepends="$depends_dev db-dev groff unixodbc-dev libtool mosquitto-dev autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc libldap $pkgname-clients $pkgname-mqtt $pkgname-passwd-pbkdf2:passwd_pbkdf2 + $pkgname-backend-all:_backend_all:noarch $pkgname-overlay-all:_overlay_all:noarch" install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade" source="ftp://ftp.$pkgname.org/pub/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tgz @@ -36,8 +37,12 @@ source="ftp://ftp.$pkgname.org/pub/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tg builddir="$srcdir/$pkgname-$pkgver" # SLAPD backends -for _name in bdb hdb ldap mdb meta monitor sql; do +_backends="" +for _name in bdb dnssrv hdb ldap mdb meta monitor null passwd \ + relay shell sql sock +do subpackages="$subpackages $pkgname-back-$_name:_backend" + _backends="$_backends $pkgname-back-$_name" done # SLAPD overlays @@ -169,6 +174,13 @@ passwd_pbkdf2() { _submv "usr/lib/openldap/pw-pbkdf2.*" } +_backend_all() { + pkgdesc="Virtual package that installs all OpenLDAP backends" + depends="$_backends" + + mkdir -p "$subpkgdir" +} + _overlay_all() { pkgdesc="Virtual package that installs all OpenLDAP overlays" depends="$_overlays" diff --git a/main/openldap/openldap.post-upgrade b/main/openldap/openldap.post-upgrade index 28919c7d36..7be8906a9a 100644 --- a/main/openldap/openldap.post-upgrade +++ b/main/openldap/openldap.post-upgrade @@ -6,10 +6,14 @@ old_ver="$2" if [ "$(apk version -t "$old_ver" "2.4.45-r2")" = "<" ]; then cat >&2 <<-EOF * - * If you use some overlays, you have to install them separately: + * All SLAPD backends and overlays have been moved to subpackages. + * You can install specific backend or overlay with apk: + * + * apk add openldap-back- * apk add openldap-overlay- - * or install them all: - * apk add openldap-overlay-all + * + * Or you can install all of them using metapackages openldap-back-all + * and openldap-overlay-all. EOF if [ -e /var/lib/openldap/openldap-data/data.mdb ]; then cat >&2 <<-EOF -- cgit v1.2.3