From: Michael Tremer Date: Thu, 29 Dec 2011 12:50:55 +0000 (+0100) Subject: Merge remote-tracking branch 'ms/fake-uname' X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=da7ab3cf6d7cfea0a9994df7c8cbfd853aa276f5;hp=f13d4e0b09e9aa8f8a47b402438848deaf5a26d1 Merge remote-tracking branch 'ms/fake-uname' Conflicts: lfs/fake-environ --- diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index 461a2a2bd..2c37c171c 100644 --- 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 index 000000000..0258236c0 --- /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 index 000000000..83d1e8b2a --- /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 ff13db675..01c4951df 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/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 59f97cfc8..61d10113d 100644 --- 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 73e445e7a..4a4672680 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 c8ab83eac..f672071b7 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 diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index e667c83da..75e59b18d 100644 --- 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 # +# Copyright (C) 2011 IPFire Team # # # # 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 <Development:
-Project Leader - Michael Tremer -(mitch\@ipfire.org)
-Vice Project Leader - Christian Schmidt -(maniacikarus\@ipfire.org)
-Maintainer IPFire 2.x - Arne Fitzenreiter -(arne\@ipfire.org)
-Developer - Stefan Schantl -(stevee\@ipfire.org)
-Developer - Jan Paul Tücking -(earl\@ipfire.org)
-Developer & Webmaster - Heiner Schmeling -(cm\@ipfire.org)
-Developer (Addons) - Peter Pfeiffer -(peterman\@ipfire.org)
-Supporter, Wiki-Admin & Sponsor - Ronald Wiesinger -(rowie\@ipfire.org)
-Supporter & Wiki-Admin - Silvio Rechenbach -(exciter\@ipfire.org)
-Sponsor - Peter Schaelchli -(scp\@ipfire.org)
-Sponsor - Sven Nierlein -(affect\@versatel.de)
-Sponsor - Rene Zingel -(linuxadmin\@ipfire.org)
+Arne Fitzenreiter +(arne.fitzenreiter\@ipfire.org) - Maintainer IPFire 2.x
+Michael Tremer +(michael.tremer\@ipfire.org) - Project Leader
+Christian Schmidt +(christian.schmidt\@ipfire.org) - Vice Project Leader
+Stefan Schantl +(stefan.schantl\@ipfire.org)
+Jan Paul Tücking +(jan.tuecking\@ipfire.org)
+Heiner Schmeling +(heiner.schmeling\@ipfire.org)
+Ronald Wiesinger +(ronald.wiesinger\@ipfire.org)
+Silvio Rechenbach +(silvio.rechenbach\@ipfire.org)
+Dirk Wagner +(dirk.wagner\@ipfire.org)
+Erik Kapfer +(erik.kapfer\@ipfire.org)
+Alfred Haas +(alfred.haas\@ipfire.org)
+ +

Inactive:
+ +Peter Pfeiffer +(peter.pfeifer\@ipfire.org)
+Peter Schälchli +(peter.schaelchli\@ipfire.org)

Some parts of the distribution are left ajar on third-party software, that is licensed under the GPL, too.
There are: Advanced Proxy with URL-Filter and Update-Accelerator, ZERINA, Connection Scheduler, Hddtemp and Wake-on-LAN.
diff --git a/lfs/squid b/lfs/squid index 6b71f0dae..610154b3b 100644 --- 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)