cyrus-sasl: Disable OTP to build against OpenSSL 1.1

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/cyrus-sasl b/config/rootfiles/common/cyrus-sasl
index 7934c1cf9827c20263ccd74a1d234d39935ca639..411c68d7a230366609ecef7674f63d20f028db3b 100644 (file)
--- a/config/rootfiles/common/cyrus-sasl
+++ b/config/rootfiles/common/cyrus-sasl
@@ -1,3 +1,4 @@
+etc/rc.d/init.d/cyrus-sasl
 #usr/include/sasl
 #usr/include/sasl/hmac-md5.h
 #usr/include/sasl/md5.h
@@ -24,10 +25,6 @@ usr/lib/sasl2/libcrammd5.so.3.0.0
 usr/lib/sasl2/libdigestmd5.so
 usr/lib/sasl2/libdigestmd5.so.3
 usr/lib/sasl2/libdigestmd5.so.3.0.0
-#usr/lib/sasl2/libotp.la
-usr/lib/sasl2/libotp.so
-usr/lib/sasl2/libotp.so.3
-usr/lib/sasl2/libotp.so.3.0.0
 #usr/lib/sasl2/libplain.la
 usr/lib/sasl2/libplain.so
 usr/lib/sasl2/libplain.so.3
@@ -94,4 +91,3 @@ usr/sbin/testsaslauthd
 #usr/share/man/man8/sasldblistusers2.8
 #usr/share/man/man8/saslpasswd2.8
 var/lib/sasl
-etc/rc.d/init.d/cyrus-sasl

diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl
index 757f7426b20927c05f1391a4547f385b25ce18bd..35fb8ddcc8a791448eb01a59ac09ca3e18f439b5 100644 (file)
--- a/lfs/cyrus-sasl
+++ b/lfs/cyrus-sasl
@@ -90,7 +90,8 @@ ifeq "$(PASS)" ""
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
                            --with-dbpath=/var/lib/sasl/sasldb2 \
                            --with-saslauthd=/var/run/saslauthd \
-                           --with-des=no --with-rc4=no
+                           --with-des=no --with-rc4=no \
+                           --disable-otp
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        install -v -m700 -d /var/lib/sasl