Merge branch 'next'

[people/pmueller/ipfire-2.x.git] / lfs / calamaris

diff --git a/lfs/calamaris b/lfs/calamaris
index 2022f84f86ec8b1d610e85a9ee4f2fd93bb054fa..32858526a7cf67941990e7ba9ad76c1c550820ed 100644 (file)
--- a/lfs/calamaris
+++ b/lfs/calamaris
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  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        #
@@ -70,6 +70,9 @@ $(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 -i $(DIR_SRC)/src/patches/calamaris/01_calamaris_cant_use_defined_hash.patch
+
        cd $(DIR_APP) && cp -f calamaris $(DIR_SRC)/config/calamaris/mkreport \
                        /var/ipfire/proxy/calamaris/bin/
        chmod 755 /var/ipfire/proxy/calamaris/bin/{calamaris,mkreport}