Merge remote-tracking branch 'ms/fake-uname'

Conflicts:
	lfs/fake-environ

diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid
index 461a2a2bdb03140a33d9e40bea9601b481a2f13f..2c37c171c49947fe3622a52fecf283baf10863b6 100644 (file)
--- a/config/rootfiles/common/squid
+++ b/config/rootfiles/common/squid
@@ -390,7 +390,7 @@ usr/lib/squid/errors/de/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/el/ERR_URN_RESOLVE
 #usr/lib/squid/errors/el/ERR_WRITE_ERROR
 #usr/lib/squid/errors/el/ERR_ZERO_SIZE_OBJECT
-usr/lib/squid/errors/en
+#usr/lib/squid/errors/en
 #usr/lib/squid/errors/en-au
 #usr/lib/squid/errors/en-bz
 #usr/lib/squid/errors/en-ca
@@ -1134,43 +1134,43 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/oc/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/pl
 #usr/lib/squid/errors/pl-pl
-#usr/lib/squid/errors/pl/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/pl/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/pl/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/pl/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/pl/ERR_DIR_LISTING
-#usr/lib/squid/errors/pl/ERR_DNS_FAIL
-#usr/lib/squid/errors/pl/ERR_ESI
-#usr/lib/squid/errors/pl/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/pl/ERR_FTP_DISABLED
-#usr/lib/squid/errors/pl/ERR_FTP_FAILURE
-#usr/lib/squid/errors/pl/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/pl/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/pl/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/pl/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/pl/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/pl/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/pl/ERR_GATEWAY_FAILURE
-#usr/lib/squid/errors/pl/ERR_ICAP_FAILURE
-#usr/lib/squid/errors/pl/ERR_INVALID_REQ
-#usr/lib/squid/errors/pl/ERR_INVALID_RESP
-#usr/lib/squid/errors/pl/ERR_INVALID_URL
-#usr/lib/squid/errors/pl/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/pl/ERR_NO_RELAY
-#usr/lib/squid/errors/pl/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/pl/ERR_PRECONDITION_FAILED
-#usr/lib/squid/errors/pl/ERR_READ_ERROR
-#usr/lib/squid/errors/pl/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/pl/ERR_SECURE_CONNECT_FAIL
-#usr/lib/squid/errors/pl/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/pl/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/pl/ERR_TOO_BIG
-#usr/lib/squid/errors/pl/ERR_UNSUP_HTTPVERSION
-#usr/lib/squid/errors/pl/ERR_UNSUP_REQ
-#usr/lib/squid/errors/pl/ERR_URN_RESOLVE
-#usr/lib/squid/errors/pl/ERR_WRITE_ERROR
-#usr/lib/squid/errors/pl/ERR_ZERO_SIZE_OBJECT
+usr/lib/squid/errors/pl/ERR_ACCESS_DENIED
+usr/lib/squid/errors/pl/ERR_CACHE_ACCESS_DENIED
+usr/lib/squid/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED
+usr/lib/squid/errors/pl/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/pl/ERR_CONNECT_FAIL
+usr/lib/squid/errors/pl/ERR_DIR_LISTING
+usr/lib/squid/errors/pl/ERR_DNS_FAIL
+usr/lib/squid/errors/pl/ERR_ESI
+usr/lib/squid/errors/pl/ERR_FORWARDING_DENIED
+usr/lib/squid/errors/pl/ERR_FTP_DISABLED
+usr/lib/squid/errors/pl/ERR_FTP_FAILURE
+usr/lib/squid/errors/pl/ERR_FTP_FORBIDDEN
+usr/lib/squid/errors/pl/ERR_FTP_NOT_FOUND
+usr/lib/squid/errors/pl/ERR_FTP_PUT_CREATED
+usr/lib/squid/errors/pl/ERR_FTP_PUT_ERROR
+usr/lib/squid/errors/pl/ERR_FTP_PUT_MODIFIED
+usr/lib/squid/errors/pl/ERR_FTP_UNAVAILABLE
+usr/lib/squid/errors/pl/ERR_GATEWAY_FAILURE
+usr/lib/squid/errors/pl/ERR_ICAP_FAILURE
+usr/lib/squid/errors/pl/ERR_INVALID_REQ
+usr/lib/squid/errors/pl/ERR_INVALID_RESP
+usr/lib/squid/errors/pl/ERR_INVALID_URL
+usr/lib/squid/errors/pl/ERR_LIFETIME_EXP
+usr/lib/squid/errors/pl/ERR_NO_RELAY
+usr/lib/squid/errors/pl/ERR_ONLY_IF_CACHED_MISS
+usr/lib/squid/errors/pl/ERR_PRECONDITION_FAILED
+usr/lib/squid/errors/pl/ERR_READ_ERROR
+usr/lib/squid/errors/pl/ERR_READ_TIMEOUT
+usr/lib/squid/errors/pl/ERR_SECURE_CONNECT_FAIL
+usr/lib/squid/errors/pl/ERR_SHUTTING_DOWN
+usr/lib/squid/errors/pl/ERR_SOCKET_FAILURE
+usr/lib/squid/errors/pl/ERR_TOO_BIG
+usr/lib/squid/errors/pl/ERR_UNSUP_HTTPVERSION
+usr/lib/squid/errors/pl/ERR_UNSUP_REQ
+usr/lib/squid/errors/pl/ERR_URN_RESOLVE
+usr/lib/squid/errors/pl/ERR_WRITE_ERROR
+usr/lib/squid/errors/pl/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/pt
 #usr/lib/squid/errors/pt-br
 #usr/lib/squid/errors/pt-br/ERR_ACCESS_DENIED
@@ -1290,43 +1290,43 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/ro/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/ru
 #usr/lib/squid/errors/ru-ru
-#usr/lib/squid/errors/ru/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/ru/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/ru/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/ru/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/ru/ERR_DIR_LISTING
-#usr/lib/squid/errors/ru/ERR_DNS_FAIL
-#usr/lib/squid/errors/ru/ERR_ESI
-#usr/lib/squid/errors/ru/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/ru/ERR_FTP_DISABLED
-#usr/lib/squid/errors/ru/ERR_FTP_FAILURE
-#usr/lib/squid/errors/ru/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/ru/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/ru/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/ru/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/ru/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/ru/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/ru/ERR_GATEWAY_FAILURE
-#usr/lib/squid/errors/ru/ERR_ICAP_FAILURE
-#usr/lib/squid/errors/ru/ERR_INVALID_REQ
-#usr/lib/squid/errors/ru/ERR_INVALID_RESP
-#usr/lib/squid/errors/ru/ERR_INVALID_URL
-#usr/lib/squid/errors/ru/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/ru/ERR_NO_RELAY
-#usr/lib/squid/errors/ru/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/ru/ERR_PRECONDITION_FAILED
-#usr/lib/squid/errors/ru/ERR_READ_ERROR
-#usr/lib/squid/errors/ru/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/ru/ERR_SECURE_CONNECT_FAIL
-#usr/lib/squid/errors/ru/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/ru/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/ru/ERR_TOO_BIG
-#usr/lib/squid/errors/ru/ERR_UNSUP_HTTPVERSION
-#usr/lib/squid/errors/ru/ERR_UNSUP_REQ
-#usr/lib/squid/errors/ru/ERR_URN_RESOLVE
-#usr/lib/squid/errors/ru/ERR_WRITE_ERROR
-#usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
+usr/lib/squid/errors/ru/ERR_ACCESS_DENIED
+usr/lib/squid/errors/ru/ERR_CACHE_ACCESS_DENIED
+usr/lib/squid/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED
+usr/lib/squid/errors/ru/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/ru/ERR_CONNECT_FAIL
+usr/lib/squid/errors/ru/ERR_DIR_LISTING
+usr/lib/squid/errors/ru/ERR_DNS_FAIL
+usr/lib/squid/errors/ru/ERR_ESI
+usr/lib/squid/errors/ru/ERR_FORWARDING_DENIED
+usr/lib/squid/errors/ru/ERR_FTP_DISABLED
+usr/lib/squid/errors/ru/ERR_FTP_FAILURE
+usr/lib/squid/errors/ru/ERR_FTP_FORBIDDEN
+usr/lib/squid/errors/ru/ERR_FTP_NOT_FOUND
+usr/lib/squid/errors/ru/ERR_FTP_PUT_CREATED
+usr/lib/squid/errors/ru/ERR_FTP_PUT_ERROR
+usr/lib/squid/errors/ru/ERR_FTP_PUT_MODIFIED
+usr/lib/squid/errors/ru/ERR_FTP_UNAVAILABLE
+usr/lib/squid/errors/ru/ERR_GATEWAY_FAILURE
+usr/lib/squid/errors/ru/ERR_ICAP_FAILURE
+usr/lib/squid/errors/ru/ERR_INVALID_REQ
+usr/lib/squid/errors/ru/ERR_INVALID_RESP
+usr/lib/squid/errors/ru/ERR_INVALID_URL
+usr/lib/squid/errors/ru/ERR_LIFETIME_EXP
+usr/lib/squid/errors/ru/ERR_NO_RELAY
+usr/lib/squid/errors/ru/ERR_ONLY_IF_CACHED_MISS
+usr/lib/squid/errors/ru/ERR_PRECONDITION_FAILED
+usr/lib/squid/errors/ru/ERR_READ_ERROR
+usr/lib/squid/errors/ru/ERR_READ_TIMEOUT
+usr/lib/squid/errors/ru/ERR_SECURE_CONNECT_FAIL
+usr/lib/squid/errors/ru/ERR_SHUTTING_DOWN
+usr/lib/squid/errors/ru/ERR_SOCKET_FAILURE
+usr/lib/squid/errors/ru/ERR_TOO_BIG
+usr/lib/squid/errors/ru/ERR_UNSUP_HTTPVERSION
+usr/lib/squid/errors/ru/ERR_UNSUP_REQ
+usr/lib/squid/errors/ru/ERR_URN_RESOLVE
+usr/lib/squid/errors/ru/ERR_WRITE_ERROR
+usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/sk
 #usr/lib/squid/errors/sk-sk
 #usr/lib/squid/errors/sk/ERR_ACCESS_DENIED

diff --git a/config/rootfiles/core/54/filelists/GeoIP b/config/rootfiles/core/54/filelists/GeoIP
new file mode 100644 (file)
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/armv5tel/intelnet-modules b/config/rootfiles/core/54/filelists/armv5tel/intelnet-modules
new file mode 100644 (file)
index 0000000..83d1e8b
--- /dev/null
+++ b/config/rootfiles/core/54/filelists/armv5tel/intelnet-modules
@@ -0,0 +1,6 @@
+lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/e1000/e1000.ko
+lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/e1000e/e1000e.ko
+lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/igb/igb.ko
+lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/e1000/e1000.ko
+lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/e1000e/e1000e.ko
+lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/igb/igb.ko

diff --git a/config/rootfiles/core/54/filelists/files b/config/rootfiles/core/54/filelists/files
index ff13db675df45c71884228f5cca79a68e72bfd4b..01c4951df56cabfe392ff363cb96b472e5345d89 100644 (file)
--- 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/filelists/intelnet-modules b/config/rootfiles/core/54/filelists/i586/intelnet-modules
similarity index 100%
rename from config/rootfiles/core/54/filelists/intelnet-modules
rename to config/rootfiles/core/54/filelists/i586/intelnet-modules

diff --git a/config/rootfiles/core/54/update.sh b/config/rootfiles/core/54/update.sh
index 59f97cfc8512e48181ec831cc29e608764e24a10..61d10113dfe0882e36dd7042ce0dc82c623d70bc 100644 (file)
--- a/config/rootfiles/core/54/update.sh
+++ b/config/rootfiles/core/54/update.sh
@@ -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

diff --git a/config/rootfiles/installer/glibc b/config/rootfiles/installer/glibc
index 73e445e7a1b37544a37cd26a3d8d341ecef300ea..4a4672680c6dd62ff74e82ef52f2f462638cf3dd 120000 (symlink)
--- 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 c8ab83eac85df7ed67406528b0177891b4af9a2a..f672071b7bc91462143402b9b075c073ca77d950 120000 (symlink)
--- 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

diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index e667c83dacd2e3aeb4f22588f9c2849e24889b24..75e59b18d66be403ae59721690a22257c2ad9b2b 100644 (file)
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2011  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # 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        #
@@ -65,30 +65,35 @@ print <<END
 
 <p><b>Development:</b><br />
 
-Project Leader - Michael Tremer
-(<a href='mailto:mitch\@ipfire.org'>mitch\@ipfire.org</a>)<br />
-Vice Project Leader - Christian Schmidt
-(<a href='mailto:maniacikarus\@ipfire.org'>maniacikarus\@ipfire.org</a>)<br />
-Maintainer IPFire 2.x - Arne Fitzenreiter
-(<a href='mailto:arne\@ipfire.org'>arne\@ipfire.org</a>)<br />
-Developer - Stefan Schantl
-(<a href='mailto:Stevee\@ipfire.org'>stevee\@ipfire.org</a>)<br />
-Developer - Jan Paul T&uuml;cking
-(<a href='mailto:earl\@ipfire.org'>earl\@ipfire.org</a>)<br />
-Developer & Webmaster - Heiner Schmeling
-(<a href='mailto:cm\@ipfire.org'>cm\@ipfire.org</a>)<br />
-Developer (Addons) - Peter Pfeiffer
-(<a href='mailto:peterman\@ipfire.org'>peterman\@ipfire.org</a>)<br />
-Supporter, Wiki-Admin & Sponsor - Ronald Wiesinger
-(<a href='mailto:rowie\@ipfire.org'>rowie\@ipfire.org</a>)<br />
-Supporter & Wiki-Admin - Silvio Rechenbach
-(<a href='mailto:exciter\@ipfire.org'>exciter\@ipfire.org</a>)<br />
-Sponsor - Peter Schaelchli
-(<a href='mailto:scp\@ipfire.org'>scp\@ipfire.org</a>)<br />
-Sponsor - Sven Nierlein
-(<a href='mailto:affect\@ipfire.org'>affect\@versatel.de</a>)<br />
-Sponsor  - Rene Zingel
-(<a href='mailto:linuxadmin\@ipfire.org'>linuxadmin\@ipfire.org</a>)<br />
+Arne Fitzenreiter
+(<a href='mailto:arne.fitzenreiter\@ipfire.org'>arne.fitzenreiter\@ipfire.org</a>)  - Maintainer IPFire 2.x <br />
+Michael Tremer
+(<a href='mailto:michael.tremer\@ipfire.org'>michael.tremer\@ipfire.org</a>) - Project Leader <br />
+Christian Schmidt
+(<a href='mailto:christian.schmidt\@ipfire.org'>christian.schmidt\@ipfire.org</a>) - Vice Project Leader <br />
+Stefan Schantl
+(<a href='mailto:stefan.schantl\@ipfire.org'>stefan.schantl\@ipfire.org</a>)<br />
+Jan Paul T&uuml;cking
+(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\@ipfire.org</a>)<br />
+Heiner Schmeling
+(<a href='mailto:heiner.schmeling\@ipfire.org'>heiner.schmeling\@ipfire.org</a>)<br />
+Ronald Wiesinger
+(<a href='mailto:ronald.wiesinger\@ipfire.org'>ronald.wiesinger\@ipfire.org</a>)<br />
+Silvio Rechenbach
+(<a href='mailto:silvio.rechenbach\@ipfire.org'>silvio.rechenbach\@ipfire.org</a>)<br />
+Dirk Wagner
+(<a href='mailto:dirk.wagner\@ipfire.org'>dirk.wagner\@ipfire.org</a>)<br />
+Erik Kapfer
+(<a href='mailto:erik.kapfer\@ipfire.org'>erik.kapfer\@ipfire.org</a>)<br />
+Alfred Haas
+(<a href='mailto:alfred.haas\@ipfire.org'>alfred.haas\@ipfire.org</a>)<br />
+
+<p><b>Inactive:</b><br />
+
+Peter Pfeiffer
+(<a href='mailto:peter.pfeifer\@ipfire.org'>peter.pfeifer\@ipfire.org</a>)<br />
+Peter Sch&auml;lchli
+(<a href='mailto:peter.schaelchli\@ipfire.org'>peter.schaelchli\@ipfire.org</a>)<br />
 </p>
 <p>Some parts of the distribution are left ajar on third-party software, that is licensed under the GPL, too.<br />
 There are: Advanced Proxy with URL-Filter and Update-Accelerator, ZERINA, Connection Scheduler, Hddtemp and Wake-on-LAN.<br />

diff --git a/lfs/squid b/lfs/squid
index 6b71f0dae05ec994a61345860515e0c659477bb6..610154b3bc4a7e2eadd848e336100727c6f93666 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.16
+VER        = 3.1.18
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 675aef4411d41f5b55b15a29ad6e5261
+$(DL_FILE)_MD5 = b53f8fb6e22551c2a7376292df5b6ec7
 
 install : $(TARGET)