X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcyrus-sasl;h=7f5135612ef46498a302cb69affebf34ddb48fcf;hb=HEAD;hp=af2b1488939563cbbe97351c33888524a280437d;hpb=0037264780e516ef1cd85c1a73b178097b3201d6;p=ipfire-2.x.git

diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl
index af2b148893..98fa0a183b 100644
--- a/lfs/cyrus-sasl
+++ b/lfs/cyrus-sasl
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,14 +24,16 @@
 
 include Config
 
-VER        = 2.1.21
+SUMMARY    = Implementation of Cyrus SASL API
+
+VER        = 2.1.28
 
 THISAPP    = cyrus-sasl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PROG       = cyrus-sasl
-PAK_VER    = 1
+PAK_VER    = 2
 
 ifeq "$(PASS)" ""
 	TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -39,7 +41,9 @@ else
 	TARGET     = $(DIR_INFO)/$(THISAPP)-ldap
 endif
 
-DEPS       = ""
+DEPS       =
+
+SERVICES   = cyrus-sasl
 
 ###############################################################################
 # Top-level Rules
@@ -49,7 +53,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = dde02db234dea892bee298390890502e
+$(DL_FILE)_BLAKE2 = 6cca8c26cebb9c2ee5d539c43797d30b6309a476ec4233225789978e1d7315c4ea5d2abbc7f5464be0f3c0de5fd9212706b43fbc92f40b76cd0b1013cc00f823
 
 install : $(TARGET)
 
@@ -57,13 +61,13 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 dist :
 	@$(PAK)
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -72,8 +76,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
 	@$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+	@$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -82,31 +86,25 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-sasl-2.1.22-bad-elif.patch
-	cd $(DIR_APP) && sed -i '/sasl_global/s/^static //' lib/client.c
-	cd $(DIR_APP) && sed -i 's/cat8/man8/' saslauthd/Makefile.am
-	cd $(DIR_APP) && autoconf
 
-ifeq "$(PASS)" ""
+	# Fix build with GCC 14
+	cd $(DIR_APP) && sed '/saslint/a #include <time.h>' -i lib/saslutil.c
+	cd $(DIR_APP) && sed '/plugin_common/a #include <time.h>' -i plugins/cram.c
+	cd $(DIR_APP) && sed '/plugin_common/a #include <time.h>' -i plugins/digestmd5.c
+
 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
 		            --with-dbpath=/var/lib/sasl/sasldb2 \
-		            --with-saslauthd=/var/run/saslauthd
+		            --with-saslauthd=/var/run/saslauthd \
+		            --with-des=no --with-rc4=no \
+		            --disable-otp
 	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
 	install -v -m700 -d /var/lib/sasl
 	-mkdir /var/run/saslauthd
 	cp -vf $(DIR_SRC)/config/cyrus-sasl/smtpd.conf /usr/lib/sasl2/
-else
-	# WITH LDAP SUPPORT AT THIS TIME
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
-		            --with-dbpath=/var/lib/sasl/sasldb2 \
-		            --with-saslauthd=/var/run \
-			     --with-ldap --enable-ldapdb
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make -C include
-	cd $(DIR_APP) && make -C sasldb
-	cd $(DIR_APP) && make -C plugins
-	cd $(DIR_APP) && libtool --mode=install install plugins/libldapdb.la /usr/lib/sasl2
-endif
+
+	#install initscripts
+	$(call INSTALL_INITSCRIPTS,$(SERVICES))
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)