aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAriadne Conill <ariadne@dereferenced.org>2020-07-14 18:48:10 -0600
committerAriadne Conill <ariadne@dereferenced.org>2020-07-14 18:48:10 -0600
commit06295eb96bcfba81e9cbbb23a309cf45684d0d0c (patch)
tree84a443bd0676408d781639795dec490243591aa1
parent733214445280ab1c9627ef9f6131859fa5f2a399 (diff)
downloadaports-06295eb96bcfba81e9cbbb23a309cf45684d0d0c.tar.gz
aports-06295eb96bcfba81e9cbbb23a309cf45684d0d0c.tar.bz2
aports-06295eb96bcfba81e9cbbb23a309cf45684d0d0c.tar.xz
main/cyrus-sasl: move plain back to libsasl package
The PLAIN auth mechanism is part of core SASL specification, and any conformant client is expected to support this. Splitting out the PLAIN auth mechanism into a subpackage results in software breaking until it is manually installed. In essence, the PLAIN plugin shouldn't have ever been split from libsasl but other plugins are fine to split. Closes: #11739
-rw-r--r--main/cyrus-sasl/APKBUILD7
1 files changed, 4 insertions, 3 deletions
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index 3dfc0afe03..c9c26d0239 100644
--- a/main/cyrus-sasl/APKBUILD
+++ b/main/cyrus-sasl/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cyrus-sasl
pkgver=2.1.27
-pkgrel=6
+pkgrel=7
pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
url="https://www.cyrusimap.org/sasl/"
arch="all"
@@ -19,7 +19,6 @@ subpackages="
$pkgname-ntlm:_plugin
$pkgname-crammd5:_plugin
$pkgname-digestmd5:_plugin
- $pkgname-plain:_plugin
$pkgname-login:_plugin
"
# use heimdal to avoid circular dep: cyrus-sasl -> krb5 -> openldap -> cyrus-sasl
@@ -110,9 +109,11 @@ _plugin() {
libsasl() {
depends=
pkgdesc="Cyrus Simple Authentication and Security Layer (SASL) library"
+ replaces="cyrus-sasl-plain"
+
mkdir -p "$subpkgdir"/usr/lib/sasl2 "$subpkgdir"/etc/sasl2
local lib=
- for lib in anonymous sasldb; do
+ for lib in anonymous sasldb plain; do
mv "$pkgdir"/usr/lib/sasl2/*${lib}*.so* "$subpkgdir"/usr/lib/sasl2/
done
mv "$pkgdir"/usr/lib/libsasl*.so.* "$subpkgdir"/usr/lib/