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

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/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/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/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)