From ff814c108b7b21ef31182aa43276348c69d0c448 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 12 Feb 2023 22:08:00 -0600 Subject: user/dovecot: Remove CLucene FTS support We still have solr FTS support, so that should be enough. Didn't bump pkgrel because it hasn't been built/uploaded anywhere yet. --- user/dovecot/APKBUILD | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/user/dovecot/APKBUILD b/user/dovecot/APKBUILD index 4722afdc8..9b51722d4 100644 --- a/user/dovecot/APKBUILD +++ b/user/dovecot/APKBUILD @@ -18,9 +18,9 @@ arch="all" options="libtool" license="LGPL-2.0+" depends="openssl" -makedepends="autoconf automake libtool bzip2-dev clucene-dev expat-dev krb5-dev - libcap-dev libsodium-dev linux-headers linux-pam-dev mariadb-dev - openldap-dev openssl-dev postgresql-dev sqlite-dev zlib-dev" +makedepends="autoconf automake libtool bzip2-dev expat-dev krb5-dev libcap-dev + libsodium-dev linux-headers linux-pam-dev mariadb-dev openldap-dev + openssl-dev postgresql-dev sqlite-dev zlib-dev" pkgusers="dovecot dovenull" pkggroups="dovecot dovenull" install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade" @@ -30,7 +30,7 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-openrc $pkgname-lmtpd $pkgname-pigeonhole-plugin:_sieve $pkgname-sql $pkgname-pgsql $pkgname-mysql $pkgname-sqlite $pkgname-gssapi $pkgname-ldap $pkgname-fts-solr:_fts_solr - $pkgname-fts-lucene:_fts_lucene" + " source="https://www.dovecot.org/releases/$_pkgvermajor/dovecot-$pkgver.tar.gz https://pigeonhole.dovecot.org/releases/$_pkgvermajor/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholever.tar.gz skip-iconv-check.patch @@ -86,10 +86,10 @@ build() { --with-sqlite \ --with-pgsql \ --with-solr \ - --with-lucene \ --with-ssl=openssl \ --with-ssldir=/etc/ssl/dovecot \ - --with-rundir=/run/dovecot + --with-rundir=/run/dovecot \ + --without-lucene make # Build pigeonhole plugin @@ -248,14 +248,6 @@ _fts_solr() { _submv $(find usr/ -name '*fts*solr*') } -_fts_lucene() { - pkgdesc="FTS-Lucene plugin for dovecot" - depends="$pkgname=$pkgver-r$pkgrel" - - cd "$pkgdir" - _submv $(find usr/ -name '*fts*lucene*') -} - _submv() { while [ $# -gt 0 ]; do _dir=${1%/*} -- cgit v1.2.3-70-g09d2