X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fdma;h=2b89bcc6e30f9a8934ca3b8b32b6c74e5e28990b;hp=4e6150e8a02696b6cc8d7ac5ea82a2cfacd53755;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=701984cab3fb4f892e00215abdff17e757cbe8c0

diff --git a/lfs/dma b/lfs/dma
index 4e6150e8a0..2b89bcc6e3 100644
--- a/lfs/dma
+++ b/lfs/dma
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2011  IPFire Team  <info@ipfire.org>                          #
+# 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,15 +24,13 @@
 
 include Config
 
-VER        = 0.9.1
+VER        = 0.11
 
 THISAPP    = dma-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = dma
-PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 56afaf438ba34d4ff9c8879dc29a16b1
+$(DL_FILE)_MD5 = 4090572921fc33be0977f4010881b501
 
 install : $(TARGET)
 
@@ -74,10 +72,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	mkdir -pv /var/ipfire/dma
+	touch /var/ipfire/dma/mail.conf
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dma-0.10-better-authentication.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dma-0.10-better-tls.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dma-0.11-compile-fixes.patch
 	cd $(DIR_APP) && sed -i '/PREFIX/s/usr\/local/usr/g' Makefile
 	cd $(DIR_APP) && sed -i '/CONFDIR/s/etc\/dma/var\/ipfire\/dma/g' Makefile
 	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install mailq-link install-spool-dirs install-etc
+	install -v -m 755 $(DIR_SRC)/config/dma/dma-cleanup-spool /usr/sbin
 	chown -R nobody.nobody /var/ipfire/dma
 	chown nobody.root /var/ipfire/dma/auth.conf
 	ln -svf dma /usr/sbin/sendmail.dma