webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-01 07:50:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next' into thirteen

Browse Source 
Conflicts:
	make.sh
This commit is contained in:
Arne Fitzenreiter
2012-11-03 17:04:23 +01:00
parent 1e1cdd5840 eead8d2e01
commit 534fb55f9d
13 changed files with 220 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
config/rootfiles/common/daq
View File

@@ -17,17 +17,19 @@ usr/lib/daq
#usr/lib/daq/daq_nfq.so
#usr/lib/daq/daq_pcap.la
#usr/lib/daq/daq_pcap.so
usr/lib/libdaq.a
usr/lib/libdaq.la
usr/lib/libdaq.so
usr/lib/libdaq.so.0
usr/lib/libdaq.so.0.0.1
usr/lib/libdaq_static.a
usr/lib/libdaq_static.la
usr/lib/libdaq_static_modules.a
usr/lib/libdaq_static_modules.la
usr/lib/libsfbpf.a
usr/lib/libsfbpf.la
usr/lib/libsfbpf.so
usr/lib/libsfbpf.so.0
usr/lib/libsfbpf.so.0.0.1
#usr/lib/libdaq.a
#usr/lib/libdaq.la
#usr/lib/libdaq.so
#usr/lib/libdaq.so.1
#usr/lib/libdaq.so.1.0.0
#usr/lib/libdaq_static.a
#usr/lib/libdaq_static.la
#usr/lib/libdaq_static_modules.a
#usr/lib/libdaq_static_modules.la
#usr/lib/libsfbpf.a
#usr/lib/libsfbpf.la
#usr/lib/libsfbpf.so
#usr/lib/libsfbpf.so.0
#usr/lib/libsfbpf.so.0.0.1
#usr/lib/libdaq.so.0
#usr/lib/libdaq.so.0.0.1

61
config/rootfiles/common/snort
View File

@@ -7,7 +7,26 @@ etc/snort/unicode.map
usr/bin/u2boat
usr/bin/u2spewfoo
#usr/include/snort
#usr/include/snort/dynamic_output
#usr/include/snort/dynamic_output/bitop.h
#usr/include/snort/dynamic_output/ipv6_port.h
#usr/include/snort/dynamic_output/obfuscation.h
#usr/include/snort/dynamic_output/output_api.h
#usr/include/snort/dynamic_output/output_common.h
#usr/include/snort/dynamic_output/output_lib.h
#usr/include/snort/dynamic_output/preprocids.h
#usr/include/snort/dynamic_output/sfPolicy.h
#usr/include/snort/dynamic_output/sf_dynamic_common.h
#usr/include/snort/dynamic_output/sf_ip.h
#usr/include/snort/dynamic_output/sf_protocols.h
#usr/include/snort/dynamic_output/sf_snort_packet.h
#usr/include/snort/dynamic_output/sfrt.h
#usr/include/snort/dynamic_output/sfrt_dir.h
#usr/include/snort/dynamic_output/sfrt_trie.h
#usr/include/snort/dynamic_output/snort_debug.h
#usr/include/snort/dynamic_output/stream_api.h
#usr/include/snort/dynamic_preproc
#usr/include/snort/dynamic_preproc/attribute_table_api.h
#usr/include/snort/dynamic_preproc/bitop.h
#usr/include/snort/dynamic_preproc/cpuclock.h
#usr/include/snort/dynamic_preproc/idle_processing.h
@@ -30,6 +49,7 @@ usr/bin/u2spewfoo
#usr/include/snort/dynamic_preproc/sf_preproc_info.h
#usr/include/snort/dynamic_preproc/sf_protocols.h
#usr/include/snort/dynamic_preproc/sf_sdlist_types.h
#usr/include/snort/dynamic_preproc/sf_seqnums.h
#usr/include/snort/dynamic_preproc/sf_snort_packet.h
#usr/include/snort/dynamic_preproc/sf_snort_plugin_api.h
#usr/include/snort/dynamic_preproc/sfcommon.h
@@ -44,58 +64,89 @@ usr/bin/u2spewfoo
#usr/include/snort/dynamic_preproc/ssl.h
#usr/include/snort/dynamic_preproc/str_search.h
#usr/include/snort/dynamic_preproc/stream_api.h
usr/lib/pkgconfig/snort.pc
usr/lib/pkgconfig/snort_preproc.pc
#usr/lib/pkgconfig/snort.pc
#usr/lib/pkgconfig/snort_output.pc
#usr/lib/pkgconfig/snort_preproc.pc
#usr/lib/snort
usr/lib/snort/dynamic_output
#usr/lib/snort/dynamic_output/libsf_dynamic_output.a
#usr/lib/snort/dynamic_output/libsf_dynamic_output.la
usr/lib/snort/dynamic_preproc
#usr/lib/snort/dynamic_preproc/libsf_dynamic_preproc.a
#usr/lib/snort/dynamic_preproc/libsf_dynamic_preproc.la
usr/lib/snort_dynamicengine
#usr/lib/snort_dynamicengine/libsf_engine.a
#usr/lib/snort_dynamicengine/libsf_engine.la
#usr/lib/snort_dynamicengine/libsf_engine.so
#usr/lib/snort_dynamicengine/libsf_engine.so.0
#usr/lib/snort_dynamicengine/libsf_engine.so.0.0.0
usr/lib/snort_dynamicpreprocessor
#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so.0.0.0
#usr/lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.so.0.0.0
#usr/lib/snort_dynamicpreprocessor/libsf_dns_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_dns_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_dns_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_dns_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_dns_preproc.so.0.0.0
#usr/lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0.0.0
#usr/lib/snort_dynamicpreprocessor/libsf_gtp_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_gtp_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_gtp_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_gtp_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_gtp_preproc.so.0.0.0
#usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.so.0.0.0
#usr/lib/snort_dynamicpreprocessor/libsf_modbus_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_modbus_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_modbus_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_modbus_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_modbus_preproc.so.0.0.0
#usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.so.0.0.0
#usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.so.0.0.0
#usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.so.0.0.0
#usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.so.0.0.0
#usr/lib/snort_dynamicpreprocessor/libsf_smtp_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_smtp_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_smtp_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_smtp_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_smtp_preproc.so.0.0.0
#usr/lib/snort_dynamicpreprocessor/libsf_ssh_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_ssh_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_ssh_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_ssh_preproc.so.0
#usr/lib/snort_dynamicpreprocessor/libsf_ssh_preproc.so.0.0.0
#usr/lib/snort_dynamicpreprocessor/libsf_ssl_preproc.a
#usr/lib/snort_dynamicpreprocessor/libsf_ssl_preproc.la
#usr/lib/snort_dynamicpreprocessor/libsf_ssl_preproc.so
#usr/lib/snort_dynamicpreprocessor/libsf_ssl_preproc.so.0
@@ -109,7 +160,7 @@ usr/sbin/snort
#usr/share/doc/snort/NEWS
#usr/share/doc/snort/PROBLEMS
#usr/share/doc/snort/README
#usr/share/doc/snort/README.ARUBA
#usr/share/doc/snort/README.GTP
#usr/share/doc/snort/README.PLUGINS
#usr/share/doc/snort/README.PerfProfiling
#usr/share/doc/snort/README.SMTP
@@ -121,10 +172,10 @@ usr/sbin/snort
#usr/share/doc/snort/README.counts
#usr/share/doc/snort/README.csv
#usr/share/doc/snort/README.daq
#usr/share/doc/snort/README.database
#usr/share/doc/snort/README.dcerpc2
#usr/share/doc/snort/README.decode
#usr/share/doc/snort/README.decoder_preproc_rules
#usr/share/doc/snort/README.dnp3
#usr/share/doc/snort/README.dns
#usr/share/doc/snort/README.event_queue
#usr/share/doc/snort/README.filters
@@ -136,6 +187,7 @@ usr/sbin/snort
#usr/share/doc/snort/README.imap
#usr/share/doc/snort/README.ipip
#usr/share/doc/snort/README.ipv6
#usr/share/doc/snort/README.modbus
#usr/share/doc/snort/README.multipleconfigs
#usr/share/doc/snort/README.normalize
#usr/share/doc/snort/README.pcap_readmode
@@ -153,6 +205,7 @@ usr/sbin/snort
#usr/share/doc/snort/README.tag
#usr/share/doc/snort/README.thresholding
#usr/share/doc/snort/README.u2boat
#usr/share/doc/snort/README.unified2
#usr/share/doc/snort/README.variables
#usr/share/doc/snort/TODO
#usr/share/doc/snort/USAGE

13
config/rootfiles/core/64/exclude Normal file
View File

@@ -0,0 +1,13 @@
srv/web/ipfire/html/proxy.pac
etc/udev/rules.d/30-persistent-network.rules
etc/ipsec.conf
etc/ipsec.secrets
etc/ipsec.user.conf
etc/ipsec.user.secrets
var/updatecache
etc/localtime
var/ipfire/ovpn
etc/ssh/ssh_config
etc/ssh/sshd_config
etc/ssl/openssl.cnf
var/state/dhcp/dhcpd.leases

1
config/rootfiles/core/64/filelists/daq Symbolic link
View File

@@ -0,0 +1 @@
../../../common/daq

4
config/rootfiles/core/64/filelists/files Normal file
View File

@@ -0,0 +1,4 @@
etc/system-release
etc/issue
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/ids.cgi

1
config/rootfiles/core/64/filelists/snort Symbolic link
View File

@@ -0,0 +1 @@
../../../common/snort

1
config/rootfiles/core/64/meta Normal file
View File

@@ -0,0 +1 @@
DEPS=""

82
config/rootfiles/core/64/update.sh Normal file
View File

@@ -0,0 +1,82 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire 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. #
# #
# IPFire 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 IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2012 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
#
# Remove old core updates from pakfire cache to save space...
core=64
for (( i=1; i<=$core; i++ ))
do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
done
#
#Stop services
/etc/init.d/snort stop
#
#Extract files
extract_files
#
#Start services
/etc/init.d/snort start
#
#Update Language cache
#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
#Rebuild module dep's
#arch=`uname -m`
#if [ ${arch::3} == "arm" ]; then
# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1
# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1
#else
# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
#fi
#Rebuild initrd's because some compat-wireless modules are inside
#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
#fi
#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
#fi
sync
# This update need a reboot...
#touch /var/run/need_reboot
#
#Finish
/etc/init.d/fireinfo start
sendprofile
#Don't report the exitcode last command
exit 0