main/cyrus-sasl: upgrade to 2.1.27 and cleanup

fails to build with ldap (linker issue)
should probably be added/fixed in the future.

make sasldb the default auth for saslauthd (we do not support pam).

1 files changed, 73 insertions, 57 deletions

diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index aaefd7c811..c193314bc3 100644
--- a/main/cyrus-sasl/APKBUILD
+++ b/main/cyrus-sasl/APKBUILD
@@ -1,25 +1,45 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cyrus-sasl
-pkgver=2.1.26
-pkgrel=15
+pkgver=2.1.27
+pkgrel=0
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
 url="https://cyrusimap.org/"
 arch="all"
 license="custom"
 options="!check"  # No test suite.
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-gssapi $pkgname-gs2
-	$pkgname-scram $pkgname-ntlm $pkgname-crammd5 $pkgname-digestmd5
-	libsasl $pkgname-openrc"
-depends=
-makedepends="db-dev openssl-dev heimdal-dev
-	autoconf automake libtool"
-source="ftp://ftp.cyrusimap.org/$pkgname/$pkgname-$pkgver.tar.gz
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-openrc
+	libsasl	
+	$pkgname-gssapiv2:_plugin
+	$pkgname-gs2:_plugin
+	$pkgname-scram:_plugin
+	$pkgname-ntlm:_plugin
+	$pkgname-crammd5:_plugin
+	$pkgname-digestmd5:_plugin
+	$pkgname-plain:_plugin
+	$pkgname-login:_plugin
+	"
+makedepends="
+	db-dev
+	openssl-dev
+	krb5-dev
+	openldap-dev
+	py-sphinx
+
+	automake
+	autoconf
+	libtool
+	"
+source="https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-$pkgver/cyrus-sasl-$pkgver.tar.gz
+	cyrus-sasl-2.1.27-as_needed.patch
+	cyrus-sasl-2.1.27-autotools_fixes.patch
+	cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
+	cyrus-sasl-2.1.27-doc_build_fix.patch
+	cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
 	saslauthd.initd
-	cyrus-sasl-2.1.25-avoid_pic_overwrite.patch
-	cyrus-sasl-2.1.26-size_t.patch
-	CVE-2013-4122.patch
-	openssl-1.1.patch
 	"
 
 # secfixes:
@@ -27,50 +47,48 @@ source="ftp://ftp.cyrusimap.org/$pkgname/$pkgname-$pkgver.tar.gz
 #   - CVE-2013-4122
 
 builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	default_prepare
-
-	# the libtool they ship is broken
-	sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in || return 1
-	rm -rf config/config.guess config/config.sub config/ltconfig \
-		config/ltmain.sh config/libtool.m4 autom4te.cache
-	libtoolize -c && aclocal -I config -I cmulocal \
-		&& automake -a -c && autoheader && autoconf
-}
 
 build() {
-	cd "$builddir"
+	autoreconf -vif
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
+		--mandir=/usr/share/man \
 		--enable-static \
 		--enable-shared \
-		--disable-anon \
+		--disable-java \
+		--with-plugindir=/usr/lib/sasl2 \
+		--with-configdir=/etc/sasl2 \
+		--with-dbpath=/etc/sasl2/sasldb2 \
+		--disable-krb4 \
+		--with-gss_impl=mit \
+		--enable-gssapi \
+		--with-rc4 \
+		--with-dblib=berkeley \
+		--with-saslauthd=/run/saslauthd \
+		--without-pwcheck \
+		--with-devrandom=/dev/urandom \
+		--enable-anon \
 		--enable-cram \
 		--enable-digest \
-		--enable-login \
 		--enable-ntlm \
-		--disable-otp \
 		--enable-plain \
-		--with-gss_impl=heimdal \
-		--with-devrandom=/dev/urandom \
-		--without-ldap \
-		--with-saslauthd=/var/run/saslauthd \
-		--mandir=/usr/share/man
-	# parallell builds is broken
-	make -j1
+		--enable-login \
+		--enable-auth-sasldb \
+		--enable-alwaystrue \
+		--disable-otp 
+	make
 }
 
 package() {
-	cd "$srcdir"/cyrus-sasl-$pkgver
+	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
+	mkdir -p "$pkgdir"/etc/sasl2
 	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-
-	install -Dm755 ../saslauthd.initd "$pkgdir"/etc/init.d/saslauthd
-	install -d "$pkgdir"/var/run/saslauthd
+	install -Dm755 "$srcdir"/saslauthd.initd "$pkgdir"/etc/init.d/saslauthd
 }
 
 static() {
@@ -79,32 +97,30 @@ static() {
 	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
 }
 
-_plugindir=usr/lib/sasl2
 _plugin() {
 	depends=
+	local plugin=${subpkgname/$pkgname-/}
 	replaces="libsasl"
-	pkgdesc="Cyrus SASL plugin for $1"
-	mkdir -p "$subpkgdir"/$_plugindir
-	mv "$pkgdir"/$_plugindir/lib${1}.so* "$subpkgdir"/$_plugindir/
+	pkgdesc="Cyrus SASL plugin for $plugin"
+	mkdir -p "$subpkgdir"/usr/lib/sasl2
+	mv "$pkgdir"/usr/lib/sasl2/lib${plugin}.so* "$subpkgdir"/usr/lib/sasl2/
 }
 
-gssapi() { _plugin gssapiv2; }
-gs2() { _plugin gs2; }
-scram() { _plugin scram; }
-ntlm() { _plugin ntlm; }
-crammd5() { _plugin crammd5; }
-digestmd5() { _plugin digestmd5; }
-
 libsasl() {
 	depends=
 	pkgdesc="Cyrus Simple Authentication and Security Layer (SASL) library"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
+	mkdir -p "$subpkgdir"/usr/lib/sasl2 
+	local lib=
+	for lib in anonymous sasldb; do
+		mv "$pkgdir"/usr/lib/sasl2/*${lib}*.so* "$subpkgdir"/usr/lib/sasl2/
+	done
+	mv "$pkgdir"/usr/lib/libsasl*.so.* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0  cyrus-sasl-2.1.26.tar.gz
-71a00a22f91f0fb6ba2796acede321a0f071b1d7a99616f0e36c354213777f30575c340b6df392dcbfc103ba7640d046144882f6a7b505f59709bb5c429b44d8  saslauthd.initd
-033e3634116e1d3b316052dbe0b671cca0fcfb6063fca1a97d990c422c2ce05109a1e424e84ed9928dc0312a325a7248f2d2e3f9547f84453b36331c01f63be5  cyrus-sasl-2.1.25-avoid_pic_overwrite.patch
-fe4c3e6d5230eb50b9e6885129760a12e7bce316b41a3e58b2c550fa83526b91205cd827f7d1367751313559875d32982b95b024b1a22300ac5b35214e7c2b78  cyrus-sasl-2.1.26-size_t.patch
-08964bc3ad713e137b8f05f9bac345d79676d14784bc37525f195e8e2a3e6740428237b64f7eeeacc0c71ed6cf1664c6e9c2267ac6df327761d92174a1853744  CVE-2013-4122.patch
-75541cf0a1b52f809ac9073b629a224fdb6e70a13ce0cf10c0ad0a12bf94887a725466e8000c2a412f20d88d8c4b8bc5be5a5bf74d752c529bc76cfa58755d8a  openssl-1.1.patch"
+sha512sums="d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b  cyrus-sasl-2.1.27.tar.gz
+9eefa6d45e3dd9157a5672909acdd88f0ae35e76d64c3723890a474bbb05b22499cfadb0c077924d27f34da3710b2b700094dd7d5704050138c08dabcefdde94  cyrus-sasl-2.1.27-as_needed.patch
+0d99ca049e76c11500769079d94f3bdb634bddb4c8d45a83b383e9bb9777edda66b17566800acbd450e1f4842d070ec3fbc236e7f0ef8759c36e6dd5ea8e3c64  cyrus-sasl-2.1.27-autotools_fixes.patch
+4ca601839b023ef790e48dae567ffbbd57c632384c980946639ec7437ad23874961451718569455e6e25afaeff1728ecbc71a8686f6b43246f83465f95a2c904  cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
+6d723e7ec2c431b45c011b887187b6a670dbe646aa4c39d38171047ab23db529c30c433f8d4dd624181917c5ce4e5271f86e35e2644ede1c40dfb09cb67dccde  cyrus-sasl-2.1.27-doc_build_fix.patch
+fca4f2b7e427c7613f71daa4a31772c33c8c0fe9d7f85b57b85da71bc5a88a18fc52f7caea463188b4addd31cd041d5349af689d5face2cc45fb50c700a8afd7  cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
+f76bfb61567172428cdbc1ed900d5e0b6e66afc38118db6ba0e2fd8ba01956ad896e56463b2249bdc46d8725384f1b975a2af3601c0735327d3f8bc26ce1ed75  saslauthd.initd"