From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 27 Nov 2017 12:47:13 +0000 (+0000)
Subject: cyrus-sasl: Disable OTP to build against OpenSSL 1.1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8ee1cfcfcc5a2fd520a40c66a5747480debb51a;p=people%2Fms%2Fipfire-2.x.git

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 7934c1cf98..411c68d7a2 100644
--- 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 757f7426b2..35fb8ddcc8 100644
--- 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