X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Foinkmaster;h=3403eb83751d291feaf3119964828cc18fc3d83a;hp=d9224a007c4e2a6d97a01b913a79e72a531e4983;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=cd1a2927226c734d96478e12bb768256fb64a06a

diff --git a/lfs/oinkmaster b/lfs/oinkmaster
index d9224a007c..3403eb8375 100644
--- a/lfs/oinkmaster
+++ b/lfs/oinkmaster
@@ -1,28 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: oinkmaster,v 1.1.2.3 2005/09/04 20:13:13 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,11 +24,10 @@
 
 include Config
 
-VER        = 1.2
-
+VER        = 2.0
 THISAPP    = oinkmaster-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_SFNET)/oinkmaster
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +39,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 23dc212f3a5a93ab32253edb379cb724
+$(DL_FILE)_MD5 = fd37d0391ed7b40b84a1b7907cb89508
 
 install : $(TARGET)
 
@@ -77,10 +68,11 @@ $(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) && install -m 0644 $(DIR_SRC)/config/cfgroot/oinkmaster.conf $(CONFIG_ROOT)/snort
-	cd $(DIR_APP) && chown -R nobody:nobody /var/ipfire/snort/oinkmaster.conf
-	cd $(DIR_APP) && install -m 0755 oinkmaster.pl /usr/local/bin
-	cd $(DIR_APP) && chown -R nobody:nobody /usr/local/bin/oinkmaster.pl
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf  $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/oinkmaster-2.0-add_community_rules.patch
+	cd $(DIR_APP) && chown nobody:nobody oinkmaster.pl
+	cd $(DIR_APP) && cp -f oinkmaster.conf /var/ipfire/snort/
+	cd /var/ipfire/snort && patch -Np1 < $(DIR_SRC)/src/patches/oinkmaster-tmp.patch
+	cd $(DIR_APP) && install -m 0755 oinkmaster.pl /usr/local/bin/
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)