This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 9404f4c577a960fcbc40fc926333a25558a6b3a5 (commit) via 38c73dc0442cf2b65bd3dc90f764cef50d6364ac (commit) from bb09267f55f5404153cac90b73ebd318af8643d8 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 9404f4c577a960fcbc40fc926333a25558a6b3a5 Merge: 38c73dc bb09267 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Dec 7 16:53:06 2010 +0100

Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

commit 38c73dc0442cf2b65bd3dc90f764cef50d6364ac Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Dec 7 16:52:03 2010 +0100

Add snort to core44 updated and fix the rootfiles.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/{daq-0.4 => daq} | 0 config/rootfiles/common/{libdnet-1.11 => libdnet} | 0 config/rootfiles/common/snort | 24 +++++--------------- config/rootfiles/core/44/filelists/daq | 1 + config/rootfiles/core/44/filelists/files | 1 + config/rootfiles/core/44/filelists/libdnet | 1 + .../{oldcore/28 => core/44}/filelists/snort | 0 7 files changed, 9 insertions(+), 18 deletions(-) rename config/rootfiles/common/{daq-0.4 => daq} (100%) rename config/rootfiles/common/{libdnet-1.11 => libdnet} (100%) create mode 120000 config/rootfiles/core/44/filelists/daq create mode 120000 config/rootfiles/core/44/filelists/libdnet copy config/rootfiles/{oldcore/28 => core/44}/filelists/snort (100%)

Difference in files: diff --git a/config/rootfiles/common/daq b/config/rootfiles/common/daq new file mode 100644 index 0000000..0391a4b --- /dev/null +++ b/config/rootfiles/common/daq @@ -0,0 +1,33 @@ +usr/bin/daq-modules-config +#usr/include/daq.h +#usr/include/daq_api.h +#usr/include/daq_common.h +#usr/include/sfbpf.h +#usr/include/sfbpf_dlt.h +usr/lib/daq +#usr/lib/daq/daq_afpacket.la +#usr/lib/daq/daq_afpacket.so +#usr/lib/daq/daq_dump.la +#usr/lib/daq/daq_dump.so +#usr/lib/daq/daq_ipfw.la +#usr/lib/daq/daq_ipfw.so +#usr/lib/daq/daq_ipq.la +#usr/lib/daq/daq_ipq.so +#usr/lib/daq/daq_nfq.la +#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 diff --git a/config/rootfiles/common/daq-0.4 b/config/rootfiles/common/daq-0.4 deleted file mode 100644 index 0391a4b..0000000 --- a/config/rootfiles/common/daq-0.4 +++ /dev/null @@ -1,33 +0,0 @@ -usr/bin/daq-modules-config -#usr/include/daq.h -#usr/include/daq_api.h -#usr/include/daq_common.h -#usr/include/sfbpf.h -#usr/include/sfbpf_dlt.h -usr/lib/daq -#usr/lib/daq/daq_afpacket.la -#usr/lib/daq/daq_afpacket.so -#usr/lib/daq/daq_dump.la -#usr/lib/daq/daq_dump.so -#usr/lib/daq/daq_ipfw.la -#usr/lib/daq/daq_ipfw.so -#usr/lib/daq/daq_ipq.la -#usr/lib/daq/daq_ipq.so -#usr/lib/daq/daq_nfq.la -#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 diff --git a/config/rootfiles/common/libdnet b/config/rootfiles/common/libdnet new file mode 100644 index 0000000..07917ed --- /dev/null +++ b/config/rootfiles/common/libdnet @@ -0,0 +1,26 @@ +usr/bin/dnet-config +#usr/include/dnet +#usr/include/dnet.h +#usr/include/dnet/addr.h +#usr/include/dnet/arp.h +#usr/include/dnet/blob.h +#usr/include/dnet/eth.h +#usr/include/dnet/fw.h +#usr/include/dnet/icmp.h +#usr/include/dnet/intf.h +#usr/include/dnet/ip.h +#usr/include/dnet/ip6.h +#usr/include/dnet/os.h +#usr/include/dnet/rand.h +#usr/include/dnet/route.h +#usr/include/dnet/tcp.h +#usr/include/dnet/tun.h +#usr/include/dnet/udp.h +usr/lib/libdnet +usr/lib/libdnet.1 +usr/lib/libdnet.1.0.1 +usr/lib/libdnet.a +usr/lib/libdnet.la +#usr/man/man3/dnet.3 +#usr/man/man8/dnet.8 +usr/sbin/dnet diff --git a/config/rootfiles/common/libdnet-1.11 b/config/rootfiles/common/libdnet-1.11 deleted file mode 100644 index 07917ed..0000000 --- a/config/rootfiles/common/libdnet-1.11 +++ /dev/null @@ -1,26 +0,0 @@ -usr/bin/dnet-config -#usr/include/dnet -#usr/include/dnet.h -#usr/include/dnet/addr.h -#usr/include/dnet/arp.h -#usr/include/dnet/blob.h -#usr/include/dnet/eth.h -#usr/include/dnet/fw.h -#usr/include/dnet/icmp.h -#usr/include/dnet/intf.h -#usr/include/dnet/ip.h -#usr/include/dnet/ip6.h -#usr/include/dnet/os.h -#usr/include/dnet/rand.h -#usr/include/dnet/route.h -#usr/include/dnet/tcp.h -#usr/include/dnet/tun.h -#usr/include/dnet/udp.h -usr/lib/libdnet -usr/lib/libdnet.1 -usr/lib/libdnet.1.0.1 -usr/lib/libdnet.a -usr/lib/libdnet.la -#usr/man/man3/dnet.3 -#usr/man/man8/dnet.8 -usr/sbin/dnet diff --git a/config/rootfiles/common/snort b/config/rootfiles/common/snort index 2357b4d..9c23e0b 100644 --- a/config/rootfiles/common/snort +++ b/config/rootfiles/common/snort @@ -4,50 +4,39 @@ etc/snort/rules #etc/snort/rules/reference.config etc/snort/snort.conf etc/snort/unicode.map +usr/bin/u2boat +usr/bin/u2spewfoo usr/lib/pkgconfig/snort.pc 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_dcerpc_preproc.a -#usr/lib/snort_dynamicpreprocessor/libsf_dcerpc_preproc.la -#usr/lib/snort_dynamicpreprocessor/libsf_dcerpc_preproc.so -#usr/lib/snort_dynamicpreprocessor/libsf_dcerpc_preproc.so.0 -#usr/lib/snort_dynamicpreprocessor/libsf_dcerpc_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_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_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 @@ -62,19 +51,17 @@ usr/sbin/snort #usr/share/doc/snort/PROBLEMS #usr/share/doc/snort/README #usr/share/doc/snort/README.ARUBA -#usr/share/doc/snort/README.FLEXRESP -#usr/share/doc/snort/README.FLEXRESP2 -#usr/share/doc/snort/README.INLINE #usr/share/doc/snort/README.PLUGINS #usr/share/doc/snort/README.PerfProfiling #usr/share/doc/snort/README.SMTP #usr/share/doc/snort/README.UNSOCK #usr/share/doc/snort/README.WIN32 +#usr/share/doc/snort/README.active #usr/share/doc/snort/README.alert_order #usr/share/doc/snort/README.asn1 #usr/share/doc/snort/README.csv +#usr/share/doc/snort/README.daq #usr/share/doc/snort/README.database -#usr/share/doc/snort/README.dcerpc #usr/share/doc/snort/README.dcerpc2 #usr/share/doc/snort/README.decode #usr/share/doc/snort/README.decoder_preproc_rules @@ -89,6 +76,7 @@ usr/sbin/snort #usr/share/doc/snort/README.ipip #usr/share/doc/snort/README.ipv6 #usr/share/doc/snort/README.multipleconfigs +#usr/share/doc/snort/README.normalize #usr/share/doc/snort/README.pcap_readmode #usr/share/doc/snort/README.ppm #usr/share/doc/snort/README.reload @@ -99,8 +87,8 @@ usr/sbin/snort #usr/share/doc/snort/README.stream5 #usr/share/doc/snort/README.tag #usr/share/doc/snort/README.thresholding +#usr/share/doc/snort/README.u2boat #usr/share/doc/snort/README.variables -#usr/share/doc/snort/README.wireless #usr/share/doc/snort/TODO #usr/share/doc/snort/USAGE #usr/share/doc/snort/WISHLIST diff --git a/config/rootfiles/core/44/filelists/daq b/config/rootfiles/core/44/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/core/44/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/44/filelists/files b/config/rootfiles/core/44/filelists/files index 6470a5d..68c86ba 100644 --- a/config/rootfiles/core/44/filelists/files +++ b/config/rootfiles/core/44/filelists/files @@ -10,6 +10,7 @@ srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/speed.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/html/images/urlfilter/copy.gif var/ipfire/general-functions.pl var/ipfire/extrahd/bin/extrahd.pl diff --git a/config/rootfiles/core/44/filelists/libdnet b/config/rootfiles/core/44/filelists/libdnet new file mode 120000 index 0000000..5fe2abb --- /dev/null +++ b/config/rootfiles/core/44/filelists/libdnet @@ -0,0 +1 @@ +../../../common/libdnet \ No newline at end of file diff --git a/config/rootfiles/core/44/filelists/snort b/config/rootfiles/core/44/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/core/44/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file

hooks/post-receive -- IPFire 2.x development tree