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 7c3fec29d0687950251a7fb9828dc3867631487b (commit) via ef9d89aa4e15ba8df328dd01039509cc81aa3410 (commit) via 332cc5e86466c0ac5248ee20ba721c3b4f4267c1 (commit) via cac9daa61b7d8522c55dff5faefd54aeb1c47c32 (commit) via ad768ac98b8b7445460f9402cc217e4fc7d79fbc (commit) via 71d3bfd4553ca94c6a3e8a25554f66eb899cf4a7 (commit) via e23114f49c2cc5d5af3b811fc0e266434606bc9b (commit) via 45abde762d84f351e801596dbd336461959dd157 (commit) from 977a52e66930c36acc4db3d9eb1675ce1647300f (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 7c3fec29d0687950251a7fb9828dc3867631487b Merge: 977a52e ef9d89a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Dec 27 11:11:25 2011 +0100

Merge branch 'core54'

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

Summary of changes: config/rootfiles/core/54/filelists/GeoIP | 1 + config/rootfiles/core/54/filelists/files | 1 + config/rootfiles/core/54/update.sh | 4 ++++ config/rootfiles/installer/glibc | 2 +- config/rootfiles/installer/util-linux | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 config/rootfiles/core/54/filelists/GeoIP

Difference in files: diff --git a/config/rootfiles/core/54/filelists/GeoIP b/config/rootfiles/core/54/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/core/54/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/54/filelists/files b/config/rootfiles/core/54/filelists/files index ff13db6..01c4951 100644 --- a/config/rootfiles/core/54/filelists/files +++ b/config/rootfiles/core/54/filelists/files @@ -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 diff --git a/config/rootfiles/core/54/update.sh b/config/rootfiles/core/54/update.sh index 59f97cf..61d1011 100644 --- a/config/rootfiles/core/54/update.sh +++ b/config/rootfiles/core/54/update.sh @@ -44,6 +44,10 @@ done rm -rf /usr/share/usb_modeswitch

# +# Flush old snort rules +rm -rf /etc/snort/rules + +# #Extract files extract_files

diff --git a/config/rootfiles/installer/glibc b/config/rootfiles/installer/glibc index 73e445e..4a46726 120000 --- a/config/rootfiles/installer/glibc +++ b/config/rootfiles/installer/glibc @@ -1 +1 @@ -../common/glibc \ No newline at end of file +../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/installer/util-linux b/config/rootfiles/installer/util-linux index c8ab83e..f672071 120000 --- a/config/rootfiles/installer/util-linux +++ b/config/rootfiles/installer/util-linux @@ -1 +1 @@ -../common/util-linux \ No newline at end of file +../common/i586/util-linux \ No newline at end of file

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