suricata: Change midstream policy to "pass-flow"

[ipfire-2.x.git] / lfs / cyrus-sasl

diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl
index 84f49d93554194a139d9d4494da584f68e536c07..060b9ad09a811c779996315c8a7f8f7272d9e37f 100644 (file)
--- 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,6 +24,8 @@
 
 include Config
 
+SUMMARY    = Implementation of Cyrus SASL API
+
 VER        = 2.1.26
 
 THISAPP    = cyrus-sasl-$(VER)
@@ -31,7 +33,7 @@ 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 = a7f4e5e559a0e37b3ffc438c9456e425
+$(DL_FILE)_BLAKE2 = 08fe5c1624e7cccb4b5e562f6987fddd047e1221b671cedbbb684d5a2f39e09a438ad14ffcedb5f398c203ca0b6e23574106c87f43a632028d50a69619c54970
 
 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,6 +86,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       $(UPDATE_AUTOMAKE)
        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
@@ -90,12 +95,17 @@ 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
        -mkdir /var/run/saslauthd
        cp -vf $(DIR_SRC)/config/cyrus-sasl/smtpd.conf /usr/lib/sasl2/
+
+       #install initscripts
+       $(call INSTALL_INITSCRIPTS,$(SERVICES))
+
 else
        # WITH LDAP SUPPORT AT THIS TIME
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \