Merge branch 'core54'

This commit is contained in:
Arne Fitzenreiter
2011-12-27 11:11:25 +01:00
5 changed files with 8 additions and 2 deletions

View File

@@ -0,0 +1 @@
usr/local/share/GeoIP/GeoIP.dat

View File

@@ -12,6 +12,7 @@ etc/rc.d/init.d/snort
usr/local/bin/hddshutdown
usr/local/bin/makegraphs
usr/local/bin/scanhd
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/media.cgi

View File

@@ -43,6 +43,10 @@ done
# Flush old usb-modeswitch data
rm -rf /usr/share/usb_modeswitch
#
# Flush old snort rules
rm -rf /etc/snort/rules
#
#Extract files
extract_files

View File

@@ -1 +1 @@
../common/glibc
../common/i586/glibc

View File

@@ -1 +1 @@
../common/util-linux
../common/i586/util-linux