Revert "python-six: Removal of python2 & 3 addon versions of six"

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

diff --git a/lfs/guardian b/lfs/guardian
index c016f04279ffd0de9d67e265aa6ff18ce6acb928..245249031123785dd8a5c5ac1b75f028fce940a0 100644 (file)
--- a/lfs/guardian
+++ b/lfs/guardian
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0
+VER        = 2.0.2
 
 THISAPP    = guardian-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -33,9 +33,9 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = guardian
-PAK_VER    = 11
+PAK_VER    = 24
 
-DEPS       = "perl-inotify2 perl-Net-IP"
+DEPS       = perl-inotify2 perl-Net-IP
 
 ###############################################################################
 # Top-level Rules
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 15be3b14a70e21502368deca74903f5c
+$(DL_FILE)_MD5 = f83a7ca312cd3cb3ddf79fb33826027d
 
 install : $(TARGET)
 
@@ -79,6 +79,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axvf $(DIR_DL)/$(DL_FILE)
 
+       # Add upstream patches.
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/guardian-2.0.2-http-parser.patch
+
        # Adjust path for firewall binaries.
        cd $(DIR_APP) && sed -i "s|/usr/sbin/|/sbin/|g" modules/IPtables.pm
 
@@ -93,6 +96,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        -mkdir -pv /var/log/guardian
        touch /var/log/guardian/guardian.log
 
+       #install initscripts
+       $(call INSTALL_INITSCRIPT,guardian)
+
        # Create symlinks for runlevel interaction.
        ln -svf /etc/rc.d/init.d/guardian /etc/rc.d/rc3.d/S45guardian
        ln -svf /etc/rc.d/init.d/guardian /etc/rc.d/rc0.d/K76guardian