mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 11:43:25 +02:00
Fix merge conflicts during merge of next and the suricata branch
This commit is contained in:
Stefan Schantl
@@ -54,7 +54,7 @@ $(TARGET) :
|
||||
ethernet extrahd/bin fwlogs fwhosts firewall isdn key langs logging mac main \
|
||||
menu.d modem nfs optionsfw \
|
||||
ovpn patches pakfire portfw ppp private proxy/advanced/cre \
|
||||
proxy/calamaris/bin qos/bin red remote sensors snort time \
|
||||
proxy/calamaris/bin qos/bin red remote sensors suricata time \
|
||||
updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \
|
||||
wakeonlan wireless ; do \
|
||||
mkdir -p $(CONFIG_ROOT)/$$i; \
|
||||
@@ -69,7 +69,7 @@ $(TARGET) :
|
||||
isdn/settings mac/settings main/hosts main/routing main/settings optionsfw/settings \
|
||||
ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
|
||||
ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
|
||||
qos/tosconfig snort/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \
|
||||
qos/tosconfig suricata/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \
|
||||
vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \
|
||||
touch $(CONFIG_ROOT)/$$i; \
|
||||
done
|
||||
@@ -80,6 +80,7 @@ $(TARGET) :
|
||||
cp $(DIR_SRC)/config/cfgroot/network-functions.pl $(CONFIG_ROOT)/
|
||||
cp $(DIR_SRC)/config/cfgroot/geoip-functions.pl $(CONFIG_ROOT)/
|
||||
cp $(DIR_SRC)/config/cfgroot/aws-functions.pl $(CONFIG_ROOT)/
|
||||
cp $(DIR_SRC)/config/cfgroot/ids-functions.pl $(CONFIG_ROOT)/
|
||||
cp $(DIR_SRC)/config/cfgroot/lang.pl $(CONFIG_ROOT)/
|
||||
cp $(DIR_SRC)/config/cfgroot/countries.pl $(CONFIG_ROOT)/
|
||||
cp $(DIR_SRC)/config/cfgroot/graphs.pl $(CONFIG_ROOT)/
|
||||
|
||||
53
lfs/ids-ruleset-sources
Normal file
53
lfs/ids-ruleset-sources
Normal file
@@ -0,0 +1,53 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
|
||||
# #
|
||||
# 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 3 of the License, or #
|
||||
# (at your option) any later version. #
|
||||
# #
|
||||
# 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 this program. If not, see <http://www.gnu.org/licenses/>. #
|
||||
# #
|
||||
###############################################################################
|
||||
|
||||
###############################################################################
|
||||
# Definitions
|
||||
###############################################################################
|
||||
|
||||
include Config
|
||||
|
||||
VER = ipfire
|
||||
|
||||
THISAPP = ids-ruleset-sources
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
|
||||
###############################################################################
|
||||
# Top-level Rules
|
||||
###############################################################################
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
check :
|
||||
|
||||
download :
|
||||
|
||||
md5 :
|
||||
|
||||
###############################################################################
|
||||
# Installation Details
|
||||
###############################################################################
|
||||
|
||||
$(TARGET) :
|
||||
@$(PREBUILD)
|
||||
# Simple install the ruleset sources file.
|
||||
install -m 644 $(DIR_SRC)/config/suricata/ruleset-sources \
|
||||
/var/ipfire/suricata/
|
||||
@$(POSTBUILD)
|
||||
@@ -121,8 +121,8 @@ $(TARGET) :
|
||||
ln -sf ../init.d/fcron /etc/rc.d/rc0.d/K08fcron
|
||||
ln -sf ../init.d/fcron /etc/rc.d/rc3.d/S40fcron
|
||||
ln -sf ../init.d/fcron /etc/rc.d/rc6.d/K08fcron
|
||||
ln -sf ../init.d/snort /etc/rc.d/rc0.d/K78snort
|
||||
ln -sf ../init.d/snort /etc/rc.d/rc6.d/K78snort
|
||||
ln -sf ../init.d/suricata /etc/rc.d/rc0.d/K78suricata
|
||||
ln -sf ../init.d/suricata /etc/rc.d/rc6.d/K78suricata
|
||||
ln -sf ../init.d/network /etc/rc.d/rc0.d/K80network
|
||||
ln -sf ../init.d/network /etc/rc.d/rc3.d/S20network
|
||||
ln -sf ../init.d/network /etc/rc.d/rc6.d/K80network
|
||||
@@ -185,8 +185,8 @@ $(TARGET) :
|
||||
ln -sf ../init.d/wlanclient /etc/rc.d/rc3.d/S19wlanclient
|
||||
ln -sf ../init.d/wlanclient /etc/rc.d/rc6.d/K82wlanclient
|
||||
|
||||
ln -sf ../../../../../usr/local/bin/snortctrl \
|
||||
/etc/rc.d/init.d/networking/red.up/23-RS-snort
|
||||
ln -sf ../../../../../usr/local/bin/suricatactrl \
|
||||
/etc/rc.d/init.d/networking/red.up/23-RS-suricata
|
||||
ln -sf ../../../../../usr/local/bin/qosctrl \
|
||||
/etc/rc.d/init.d/networking/red.up/24-RS-qos
|
||||
ln -sf ../../squid /etc/rc.d/init.d/networking/red.up/27-RS-squid
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007-2017 IPFire Team <info@ipfire.org> #
|
||||
# Copyright (C) 2015 Michael Tremer & Christian Schmidt #
|
||||
# #
|
||||
# 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,9 +24,9 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 2.9.11.1
|
||||
VER = 0.5.27
|
||||
|
||||
THISAPP = snort-$(VER)
|
||||
THISAPP = libhtp-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 378e3938b2b5c8e358f942d0ffce18cc
|
||||
$(DL_FILE)_MD5 = 226def386a394911de75ffe9e038554a
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -69,35 +69,12 @@ $(subst %,%_MD5,$(objects)) :
|
||||
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) $(DIR_SRC)/snort* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && ./autogen.sh
|
||||
cd $(DIR_APP) && ./configure \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc/snort \
|
||||
--target=i586 \
|
||||
--enable-linux-smp-stats \
|
||||
--enable-gre --enable-mpls \
|
||||
--enable-targetbased \
|
||||
--enable-ppm \
|
||||
--enable-non-ether-decoders \
|
||||
--enable-perfprofiling \
|
||||
--enable-active-response \
|
||||
--enable-normalizer \
|
||||
--enable-reload \
|
||||
--enable-react \
|
||||
--enable-flexresp3
|
||||
|
||||
cd $(DIR_APP) && make
|
||||
--disable-static
|
||||
cd $(DIR_APP) && make $(MAKETUNING)
|
||||
cd $(DIR_APP) && make install
|
||||
mv /usr/bin/snort /usr/sbin/
|
||||
-mkdir -p /etc/snort/rules
|
||||
|
||||
cd $(DIR_APP) && install -m 0644 \
|
||||
etc/reference.config etc/classification.config /etc/snort/rules
|
||||
cd $(DIR_APP) && install -m 0644 etc/unicode.map /etc/snort
|
||||
install -m 0644 $(DIR_SRC)/config/snort/snort.conf /etc/snort
|
||||
cp /etc/snort/snort.conf /etc/snort/snort.conf.template
|
||||
chown -R nobody:nobody /etc/snort
|
||||
-mkdir -p /var/log/snort
|
||||
chown -R snort:snort /var/log/snort
|
||||
@rm -rf $(DIR_APP) $(DIR_SRC)/snort*
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
@@ -71,8 +71,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@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 0644 $(DIR_SRC)/config/oinkmaster/oinkmaster.conf \
|
||||
/var/ipfire/suricata/
|
||||
cd /var/ipfire/suricata && 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)
|
||||
|
||||
90
lfs/suricata
Normal file
90
lfs/suricata
Normal file
@@ -0,0 +1,90 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2015 Michael Tremer & Christian Schmidt #
|
||||
# #
|
||||
# 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 3 of the License, or #
|
||||
# (at your option) any later version. #
|
||||
# #
|
||||
# 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 this program. If not, see <http://www.gnu.org/licenses/>. #
|
||||
# #
|
||||
###############################################################################
|
||||
|
||||
###############################################################################
|
||||
# Definitions
|
||||
###############################################################################
|
||||
|
||||
include Config
|
||||
|
||||
VER = 4.0.5
|
||||
|
||||
THISAPP = suricata-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
|
||||
###############################################################################
|
||||
# Top-level Rules
|
||||
###############################################################################
|
||||
|
||||
objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = ea0cb823d6a86568152f75ade6de442f
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
|
||||
|
||||
download :$(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
|
||||
md5 : $(subst %,%_MD5,$(objects))
|
||||
|
||||
###############################################################################
|
||||
# Downloading, checking, md5sum
|
||||
###############################################################################
|
||||
|
||||
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
|
||||
@$(CHECK)
|
||||
|
||||
$(patsubst %,$(DIR_DL)/%,$(objects)) :
|
||||
@$(LOAD)
|
||||
|
||||
$(subst %,%_MD5,$(objects)) :
|
||||
@$(MD5)
|
||||
|
||||
###############################################################################
|
||||
# Installation Details
|
||||
###############################################################################
|
||||
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && ./configure \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
--enable-gccprotect \
|
||||
--disable-gccmarch-native \
|
||||
--enable-non-bundled-htp \
|
||||
--enable-nfqueue \
|
||||
--disable-static
|
||||
cd $(DIR_APP) && make $(MAKETUNING)
|
||||
cd $(DIR_APP) && make install
|
||||
cd $(DIR_APP) && make install-conf
|
||||
mv /etc/suricata/suricata.yaml /etc/suricata/suricata-example.yaml
|
||||
install -m 0644 $(DIR_SRC)/config/suricata/suricata.yaml /etc/suricata
|
||||
-mkdir -p /etc/suricata/rules
|
||||
-mkdir -p /var/log/suricata
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
@@ -1,7 +1,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007-2015 IPFire Team <info@ipfire.org> #
|
||||
# Copyright (C) 2015 Michael Tremer & Christian Schmidt #
|
||||
# #
|
||||
# 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,9 +24,9 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 2.0.6
|
||||
VER = 0.2.1
|
||||
|
||||
THISAPP = daq-$(VER)
|
||||
THISAPP = yaml-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 2cd6da422a72c129c685fc4bb848c24c
|
||||
$(DL_FILE)_MD5 = 72724b9736923c517e5a8fc6757ef03d
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -70,8 +70,10 @@ $(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) && ./configure --prefix=/usr
|
||||
cd $(DIR_APP) && make
|
||||
cd $(DIR_APP) && ./configure \
|
||||
--prefix=/usr \
|
||||
--disable-static
|
||||
cd $(DIR_APP) && make $(MAKETUNING)
|
||||
cd $(DIR_APP) && make install
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
Reference in New Issue
Block a user