Merge branch 'master' into perl_5.12.2

diff --git a/config/cron/crontab b/config/cron/crontab
index 7fa37ea8b138df3c71564d205557e18b9cdca2cc..5cca1facc4601655514392f04f2907c93e535a27 100644 (file)
--- a/config/cron/crontab
+++ b/config/cron/crontab
@@ -3,7 +3,7 @@
 #
 SHELL=/bin/bash
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
-MAILTO=root
+MAILTO=
 HOME=/
 
 # Do all jobs in this directories

diff --git a/config/httpd/ssl-global.conf b/config/httpd/ssl-global.conf
index 458339add4eb734fb72f1be292825e37d994fce3..9cf4f8150bd133a5076c7587983a5ed1ca62f8ce 100644 (file)
--- a/config/httpd/ssl-global.conf
+++ b/config/httpd/ssl-global.conf
@@ -13,10 +13,6 @@
 # what they do.  They're here only as hints or reminders.  If you are unsure
 # consult the online docs. You have been warned.
 
-# This global SSL configuration is ignored if 
-# "SSL" is not defined, or if "NOSSL" is defined.
-<IfDefine SSL>
-<IfDefine !NOSSL>
 <IfModule mod_ssl.c>
 
        #
@@ -61,9 +57,4 @@
        SSLRandomSeed startup builtin
        SSLRandomSeed connect builtin
 
-       SSLLog      /var/log/httpd/ssl_engine_log
-       SSLLogLevel info
-
 </IfModule>
-</IfDefine>
-</IfDefine>

diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index 53462db483d99c747e1325e24d4472f02c7eadb2..1d7dd93aa00b04abe9a27f92c8da065abb6c55f6 100644 (file)
--- a/config/outgoingfw/outgoingfw.pl
+++ b/config/outgoingfw/outgoingfw.pl
@@ -207,6 +207,7 @@ foreach $configentry (sort @configs)
                                }
 
                                if ($configline[17] && $configline[18]) {
+                                       $DAY = "";
                                        if ($configline[10]){$DAY = "Mon,"}
                                        if ($configline[11]){$DAY .= "Tue,"}
                                        if ($configline[12]){$DAY .= "Wed,"}

diff --git a/config/rootfiles/common/fcron b/config/rootfiles/common/fcron
index cf34afc600f83d5d1b143c0ae866301dd2e581b7..b3a1c49606f1817aeffd974604200f0585532518 100644 (file)
--- a/config/rootfiles/common/fcron
+++ b/config/rootfiles/common/fcron
@@ -1,12 +1,18 @@
 etc/fcron.allow
 etc/fcron.conf
-etc/fcron.cyclic
-etc/fcron.daily
+#etc/fcron.cyclic
+etc/fcron.cyclic/info.txt
+#etc/fcron.daily
+etc/fcron.daily/info.txt
 etc/fcron.deny
-etc/fcron.hourly
-etc/fcron.minutely
-etc/fcron.monthly
-etc/fcron.weekly
+#etc/fcron.hourly
+etc/fcron.hourly/info.txt
+#etc/fcron.minutely
+etc/fcron.minutely/info.txt
+#etc/fcron.monthly
+etc/fcron.monthly/info.txt
+#etc/fcron.weekly
+etc/fcron.weekly/info.txt
 usr/bin/fcronsighup
 usr/bin/fcrontab
 usr/sbin/fcron

diff --git a/config/rootfiles/common/linux b/config/rootfiles/common/linux
index 7eeea9a4010829ee2b74ef9691f744894c5f2c7c..32f8cb9d894ffa24fe9764e3009de8a7a67923b7 100644 (file)
--- a/config/rootfiles/common/linux
+++ b/config/rootfiles/common/linux
@@ -280,7 +280,7 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_powersave.ko
 #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_userspace.ko
 #lib/modules/KVER-ipfire/kernel/drivers/crypto
-#lib/modules/KVER-ipfire/kernel/drivers/crypto/geode-aes.ko
+#lib/modules/KVER-ipfire/kernel/drivers/crypto/geode-aes.ko.off
 #lib/modules/KVER-ipfire/kernel/drivers/crypto/hifn_795x.ko
 #lib/modules/KVER-ipfire/kernel/drivers/crypto/padlock-aes.ko
 #lib/modules/KVER-ipfire/kernel/drivers/crypto/padlock-sha.ko

diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid
index 910e12ff7fc6d27d007295c5825608b9c51b8572..dd4122fdd8eff8b1e731067fec6c1c06fd94066b 100644 (file)
--- a/config/rootfiles/common/squid
+++ b/config/rootfiles/common/squid
@@ -47,6 +47,7 @@ usr/lib/squid/diskd
 #usr/lib/squid/errors/af/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/af/ERR_NO_RELAY
 #usr/lib/squid/errors/af/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/af/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/af/ERR_READ_ERROR
 #usr/lib/squid/errors/af/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/af/ERR_SECURE_CONNECT_FAIL
@@ -99,6 +100,7 @@ usr/lib/squid/diskd
 #usr/lib/squid/errors/ar/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/ar/ERR_NO_RELAY
 #usr/lib/squid/errors/ar/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/ar/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/ar/ERR_READ_ERROR
 #usr/lib/squid/errors/ar/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/ar/ERR_SECURE_CONNECT_FAIL
@@ -136,6 +138,7 @@ usr/lib/squid/diskd
 #usr/lib/squid/errors/az/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/az/ERR_NO_RELAY
 #usr/lib/squid/errors/az/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/az/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/az/ERR_READ_ERROR
 #usr/lib/squid/errors/az/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/az/ERR_SECURE_CONNECT_FAIL
@@ -173,6 +176,7 @@ usr/lib/squid/diskd
 #usr/lib/squid/errors/bg/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/bg/ERR_NO_RELAY
 #usr/lib/squid/errors/bg/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/bg/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/bg/ERR_READ_ERROR
 #usr/lib/squid/errors/bg/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/bg/ERR_SECURE_CONNECT_FAIL
@@ -209,6 +213,7 @@ usr/lib/squid/diskd
 #usr/lib/squid/errors/ca/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/ca/ERR_NO_RELAY
 #usr/lib/squid/errors/ca/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/ca/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/ca/ERR_READ_ERROR
 #usr/lib/squid/errors/ca/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/ca/ERR_SECURE_CONNECT_FAIL
@@ -246,6 +251,7 @@ usr/lib/squid/diskd
 #usr/lib/squid/errors/cs/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/cs/ERR_NO_RELAY
 #usr/lib/squid/errors/cs/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/cs/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/cs/ERR_READ_ERROR
 #usr/lib/squid/errors/cs/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/cs/ERR_SECURE_CONNECT_FAIL
@@ -283,6 +289,7 @@ usr/lib/squid/diskd
 #usr/lib/squid/errors/da/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/da/ERR_NO_RELAY
 #usr/lib/squid/errors/da/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/da/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/da/ERR_READ_ERROR
 #usr/lib/squid/errors/da/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/da/ERR_SECURE_CONNECT_FAIL
@@ -324,6 +331,7 @@ usr/lib/squid/errors/de/ERR_INVALID_URL
 usr/lib/squid/errors/de/ERR_LIFETIME_EXP
 usr/lib/squid/errors/de/ERR_NO_RELAY
 usr/lib/squid/errors/de/ERR_ONLY_IF_CACHED_MISS
+usr/lib/squid/errors/de/ERR_PRECONDITION_FAILED
 usr/lib/squid/errors/de/ERR_READ_ERROR
 usr/lib/squid/errors/de/ERR_READ_TIMEOUT
 usr/lib/squid/errors/de/ERR_SECURE_CONNECT_FAIL
@@ -361,6 +369,7 @@ usr/lib/squid/errors/de/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/el/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/el/ERR_NO_RELAY
 #usr/lib/squid/errors/el/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/el/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/el/ERR_READ_ERROR
 #usr/lib/squid/errors/el/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/el/ERR_SECURE_CONNECT_FAIL
@@ -412,6 +421,7 @@ usr/lib/squid/errors/en/ERR_INVALID_URL
 usr/lib/squid/errors/en/ERR_LIFETIME_EXP
 usr/lib/squid/errors/en/ERR_NO_RELAY
 usr/lib/squid/errors/en/ERR_ONLY_IF_CACHED_MISS
+usr/lib/squid/errors/en/ERR_PRECONDITION_FAILED
 usr/lib/squid/errors/en/ERR_READ_ERROR
 usr/lib/squid/errors/en/ERR_READ_TIMEOUT
 usr/lib/squid/errors/en/ERR_SECURE_CONNECT_FAIL
@@ -467,6 +477,7 @@ usr/lib/squid/errors/es/ERR_INVALID_URL
 usr/lib/squid/errors/es/ERR_LIFETIME_EXP
 usr/lib/squid/errors/es/ERR_NO_RELAY
 usr/lib/squid/errors/es/ERR_ONLY_IF_CACHED_MISS
+usr/lib/squid/errors/es/ERR_PRECONDITION_FAILED
 usr/lib/squid/errors/es/ERR_READ_ERROR
 usr/lib/squid/errors/es/ERR_READ_TIMEOUT
 usr/lib/squid/errors/es/ERR_SECURE_CONNECT_FAIL
@@ -504,6 +515,7 @@ usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/et/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/et/ERR_NO_RELAY
 #usr/lib/squid/errors/et/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/et/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/et/ERR_READ_ERROR
 #usr/lib/squid/errors/et/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/et/ERR_SECURE_CONNECT_FAIL
@@ -542,6 +554,7 @@ usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/fa/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/fa/ERR_NO_RELAY
 #usr/lib/squid/errors/fa/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/fa/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/fa/ERR_READ_ERROR
 #usr/lib/squid/errors/fa/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/fa/ERR_SECURE_CONNECT_FAIL
@@ -579,6 +592,7 @@ usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/fi/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/fi/ERR_NO_RELAY
 #usr/lib/squid/errors/fi/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/fi/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/fi/ERR_READ_ERROR
 #usr/lib/squid/errors/fi/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/fi/ERR_SECURE_CONNECT_FAIL
@@ -621,6 +635,7 @@ usr/lib/squid/errors/fr/ERR_INVALID_URL
 usr/lib/squid/errors/fr/ERR_LIFETIME_EXP
 usr/lib/squid/errors/fr/ERR_NO_RELAY
 usr/lib/squid/errors/fr/ERR_ONLY_IF_CACHED_MISS
+usr/lib/squid/errors/fr/ERR_PRECONDITION_FAILED
 usr/lib/squid/errors/fr/ERR_READ_ERROR
 usr/lib/squid/errors/fr/ERR_READ_TIMEOUT
 usr/lib/squid/errors/fr/ERR_SECURE_CONNECT_FAIL
@@ -658,6 +673,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/he/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/he/ERR_NO_RELAY
 #usr/lib/squid/errors/he/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/he/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/he/ERR_READ_ERROR
 #usr/lib/squid/errors/he/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/he/ERR_SECURE_CONNECT_FAIL
@@ -695,6 +711,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/hu/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/hu/ERR_NO_RELAY
 #usr/lib/squid/errors/hu/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/hu/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/hu/ERR_READ_ERROR
 #usr/lib/squid/errors/hu/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/hu/ERR_SECURE_CONNECT_FAIL
@@ -708,6 +725,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/hu/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/hy
 #usr/lib/squid/errors/hy-am
+#usr/lib/squid/errors/hy-armn
 #usr/lib/squid/errors/hy/ERR_ACCESS_DENIED
 #usr/lib/squid/errors/hy/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/hy/ERR_CACHE_MGR_ACCESS_DENIED
@@ -732,6 +750,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/hy/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/hy/ERR_NO_RELAY
 #usr/lib/squid/errors/hy/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/hy/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/hy/ERR_READ_ERROR
 #usr/lib/squid/errors/hy/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/hy/ERR_SECURE_CONNECT_FAIL
@@ -769,6 +788,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/id/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/id/ERR_NO_RELAY
 #usr/lib/squid/errors/id/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/id/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/id/ERR_READ_ERROR
 #usr/lib/squid/errors/id/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/id/ERR_SECURE_CONNECT_FAIL
@@ -807,6 +827,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/it/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/it/ERR_NO_RELAY
 #usr/lib/squid/errors/it/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/it/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/it/ERR_READ_ERROR
 #usr/lib/squid/errors/it/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/it/ERR_SECURE_CONNECT_FAIL
@@ -844,6 +865,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/ja/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/ja/ERR_NO_RELAY
 #usr/lib/squid/errors/ja/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/ja/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/ja/ERR_READ_ERROR
 #usr/lib/squid/errors/ja/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/ja/ERR_SECURE_CONNECT_FAIL
@@ -882,6 +904,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/ko/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/ko/ERR_NO_RELAY
 #usr/lib/squid/errors/ko/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/ko/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/ko/ERR_READ_ERROR
 #usr/lib/squid/errors/ko/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/ko/ERR_SECURE_CONNECT_FAIL
@@ -919,6 +942,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/lt/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/lt/ERR_NO_RELAY
 #usr/lib/squid/errors/lt/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/lt/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/lt/ERR_READ_ERROR
 #usr/lib/squid/errors/lt/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/lt/ERR_SECURE_CONNECT_FAIL
@@ -956,6 +980,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/lv/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/lv/ERR_NO_RELAY
 #usr/lib/squid/errors/lv/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/lv/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/lv/ERR_READ_ERROR
 #usr/lib/squid/errors/lv/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/lv/ERR_SECURE_CONNECT_FAIL
@@ -993,6 +1018,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/ms/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/ms/ERR_NO_RELAY
 #usr/lib/squid/errors/ms/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/ms/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/ms/ERR_READ_ERROR
 #usr/lib/squid/errors/ms/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/ms/ERR_SECURE_CONNECT_FAIL
@@ -1030,6 +1056,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/nl/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/nl/ERR_NO_RELAY
 #usr/lib/squid/errors/nl/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/nl/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/nl/ERR_READ_ERROR
 #usr/lib/squid/errors/nl/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/nl/ERR_SECURE_CONNECT_FAIL
@@ -1041,6 +1068,43 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/nl/ERR_URN_RESOLVE
 #usr/lib/squid/errors/nl/ERR_WRITE_ERROR
 #usr/lib/squid/errors/nl/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/oc
+#usr/lib/squid/errors/oc/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/oc/ERR_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/oc/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/oc/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/oc/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/oc/ERR_DIR_LISTING
+#usr/lib/squid/errors/oc/ERR_DNS_FAIL
+#usr/lib/squid/errors/oc/ERR_ESI
+#usr/lib/squid/errors/oc/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/oc/ERR_FTP_DISABLED
+#usr/lib/squid/errors/oc/ERR_FTP_FAILURE
+#usr/lib/squid/errors/oc/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/oc/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/oc/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/oc/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/oc/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/oc/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/oc/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/oc/ERR_INVALID_REQ
+#usr/lib/squid/errors/oc/ERR_INVALID_RESP
+#usr/lib/squid/errors/oc/ERR_INVALID_URL
+#usr/lib/squid/errors/oc/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/oc/ERR_NO_RELAY
+#usr/lib/squid/errors/oc/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/oc/ERR_PRECONDITION_FAILED
+#usr/lib/squid/errors/oc/ERR_READ_ERROR
+#usr/lib/squid/errors/oc/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/oc/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/oc/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/oc/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/oc/ERR_TOO_BIG
+#usr/lib/squid/errors/oc/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/oc/ERR_UNSUP_REQ
+#usr/lib/squid/errors/oc/ERR_URN_RESOLVE
+#usr/lib/squid/errors/oc/ERR_WRITE_ERROR
+#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
@@ -1067,6 +1131,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #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
@@ -1104,6 +1169,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/pt-br/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/pt-br/ERR_NO_RELAY
 #usr/lib/squid/errors/pt-br/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/pt-br/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/pt-br/ERR_READ_ERROR
 #usr/lib/squid/errors/pt-br/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/pt-br/ERR_SECURE_CONNECT_FAIL
@@ -1140,6 +1206,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/pt/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/pt/ERR_NO_RELAY
 #usr/lib/squid/errors/pt/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/pt/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/pt/ERR_READ_ERROR
 #usr/lib/squid/errors/pt/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/pt/ERR_SECURE_CONNECT_FAIL
@@ -1178,6 +1245,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/ro/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/ro/ERR_NO_RELAY
 #usr/lib/squid/errors/ro/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/ro/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/ro/ERR_READ_ERROR
 #usr/lib/squid/errors/ro/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/ro/ERR_SECURE_CONNECT_FAIL
@@ -1215,6 +1283,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #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
@@ -1252,6 +1321,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/sk/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/sk/ERR_NO_RELAY
 #usr/lib/squid/errors/sk/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/sk/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/sk/ERR_READ_ERROR
 #usr/lib/squid/errors/sk/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/sk/ERR_SECURE_CONNECT_FAIL
@@ -1264,6 +1334,43 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/sk/ERR_WRITE_ERROR
 #usr/lib/squid/errors/sk/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/sr
+#usr/lib/squid/errors/sr-cyrl
+#usr/lib/squid/errors/sr-cyrl/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/sr-cyrl/ERR_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/sr-cyrl/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/sr-cyrl/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/sr-cyrl/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/sr-cyrl/ERR_DIR_LISTING
+#usr/lib/squid/errors/sr-cyrl/ERR_DNS_FAIL
+#usr/lib/squid/errors/sr-cyrl/ERR_ESI
+#usr/lib/squid/errors/sr-cyrl/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/sr-cyrl/ERR_FTP_DISABLED
+#usr/lib/squid/errors/sr-cyrl/ERR_FTP_FAILURE
+#usr/lib/squid/errors/sr-cyrl/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/sr-cyrl/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/sr-cyrl/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/sr-cyrl/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/sr-cyrl/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/sr-cyrl/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/sr-cyrl/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/sr-cyrl/ERR_INVALID_REQ
+#usr/lib/squid/errors/sr-cyrl/ERR_INVALID_RESP
+#usr/lib/squid/errors/sr-cyrl/ERR_INVALID_URL
+#usr/lib/squid/errors/sr-cyrl/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/sr-cyrl/ERR_NO_RELAY
+#usr/lib/squid/errors/sr-cyrl/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/sr-cyrl/ERR_PRECONDITION_FAILED
+#usr/lib/squid/errors/sr-cyrl/ERR_READ_ERROR
+#usr/lib/squid/errors/sr-cyrl/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/sr-cyrl/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/sr-cyrl/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/sr-cyrl/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/sr-cyrl/ERR_TOO_BIG
+#usr/lib/squid/errors/sr-cyrl/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/sr-cyrl/ERR_UNSUP_REQ
+#usr/lib/squid/errors/sr-cyrl/ERR_URN_RESOLVE
+#usr/lib/squid/errors/sr-cyrl/ERR_WRITE_ERROR
+#usr/lib/squid/errors/sr-cyrl/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/sr-latn
 #usr/lib/squid/errors/sr-latn-cs
 #usr/lib/squid/errors/sr-latn/ERR_ACCESS_DENIED
@@ -1290,6 +1397,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/sr-latn/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/sr-latn/ERR_NO_RELAY
 #usr/lib/squid/errors/sr-latn/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/sr-latn/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/sr-latn/ERR_READ_ERROR
 #usr/lib/squid/errors/sr-latn/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/sr-latn/ERR_SECURE_CONNECT_FAIL
@@ -1329,6 +1437,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/sv/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/sv/ERR_NO_RELAY
 #usr/lib/squid/errors/sv/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/sv/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/sv/ERR_READ_ERROR
 #usr/lib/squid/errors/sv/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/sv/ERR_SECURE_CONNECT_FAIL
@@ -1365,6 +1474,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/templates/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/templates/ERR_NO_RELAY
 #usr/lib/squid/errors/templates/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/templates/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/templates/ERR_READ_ERROR
 #usr/lib/squid/errors/templates/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/templates/ERR_SECURE_CONNECT_FAIL
@@ -1402,6 +1512,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/th/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/th/ERR_NO_RELAY
 #usr/lib/squid/errors/th/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/th/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/th/ERR_READ_ERROR
 #usr/lib/squid/errors/th/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/th/ERR_SECURE_CONNECT_FAIL
@@ -1439,6 +1550,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/tr/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/tr/ERR_NO_RELAY
 #usr/lib/squid/errors/tr/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/tr/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/tr/ERR_READ_ERROR
 #usr/lib/squid/errors/tr/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/tr/ERR_SECURE_CONNECT_FAIL
@@ -1476,6 +1588,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/uk/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/uk/ERR_NO_RELAY
 #usr/lib/squid/errors/uk/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/uk/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/uk/ERR_READ_ERROR
 #usr/lib/squid/errors/uk/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/uk/ERR_SECURE_CONNECT_FAIL
@@ -1512,6 +1625,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/uz/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/uz/ERR_NO_RELAY
 #usr/lib/squid/errors/uz/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/uz/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/uz/ERR_READ_ERROR
 #usr/lib/squid/errors/uz/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/uz/ERR_SECURE_CONNECT_FAIL
@@ -1523,6 +1637,44 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/uz/ERR_URN_RESOLVE
 #usr/lib/squid/errors/uz/ERR_WRITE_ERROR
 #usr/lib/squid/errors/uz/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/vi
+#usr/lib/squid/errors/vi-vn
+#usr/lib/squid/errors/vi/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/vi/ERR_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/vi/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/vi/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/vi/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/vi/ERR_DIR_LISTING
+#usr/lib/squid/errors/vi/ERR_DNS_FAIL
+#usr/lib/squid/errors/vi/ERR_ESI
+#usr/lib/squid/errors/vi/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/vi/ERR_FTP_DISABLED
+#usr/lib/squid/errors/vi/ERR_FTP_FAILURE
+#usr/lib/squid/errors/vi/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/vi/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/vi/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/vi/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/vi/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/vi/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/vi/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/vi/ERR_INVALID_REQ
+#usr/lib/squid/errors/vi/ERR_INVALID_RESP
+#usr/lib/squid/errors/vi/ERR_INVALID_URL
+#usr/lib/squid/errors/vi/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/vi/ERR_NO_RELAY
+#usr/lib/squid/errors/vi/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/vi/ERR_PRECONDITION_FAILED
+#usr/lib/squid/errors/vi/ERR_READ_ERROR
+#usr/lib/squid/errors/vi/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/vi/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/vi/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/vi/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/vi/ERR_TOO_BIG
+#usr/lib/squid/errors/vi/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/vi/ERR_UNSUP_REQ
+#usr/lib/squid/errors/vi/ERR_URN_RESOLVE
+#usr/lib/squid/errors/vi/ERR_WRITE_ERROR
+#usr/lib/squid/errors/vi/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/zh-cn
 #usr/lib/squid/errors/zh-cn/ERR_ACCESS_DENIED
 #usr/lib/squid/errors/zh-cn/ERR_CACHE_ACCESS_DENIED
@@ -1548,6 +1700,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/zh-cn/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/zh-cn/ERR_NO_RELAY
 #usr/lib/squid/errors/zh-cn/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/zh-cn/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/zh-cn/ERR_READ_ERROR
 #usr/lib/squid/errors/zh-cn/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/zh-cn/ERR_SECURE_CONNECT_FAIL
@@ -1587,6 +1740,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/zh-tw/ERR_LIFETIME_EXP
 #usr/lib/squid/errors/zh-tw/ERR_NO_RELAY
 #usr/lib/squid/errors/zh-tw/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/zh-tw/ERR_PRECONDITION_FAILED
 #usr/lib/squid/errors/zh-tw/ERR_READ_ERROR
 #usr/lib/squid/errors/zh-tw/ERR_READ_TIMEOUT
 #usr/lib/squid/errors/zh-tw/ERR_SECURE_CONNECT_FAIL

diff --git a/config/rootfiles/core/45/exclude b/config/rootfiles/core/45/exclude
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2cb97983d07245dd1361e37599380aabe3894d33 100644 (file)
--- a/config/rootfiles/core/45/exclude
+++ b/config/rootfiles/core/45/exclude
@@ -0,0 +1 @@
+etc/snort/snort.conf
\ No newline at end of file

diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/core/45/filelists/files
index ae685d5382103ccf73dbc49681953ee1e9228c88..0fba2b213c64e823124d2149f393c13e13c3ed05 100644 (file)
--- a/config/rootfiles/core/45/filelists/files
+++ b/config/rootfiles/core/45/filelists/files
@@ -1,11 +1,19 @@
 etc/system-release
 etc/issue
+etc/httpd/conf/ssl-global.conf
+etc/rc.d/init.d/functions
 srv/web/ipfire/cgi-bin/connections.cgi
+srv/web/ipfire/cgi-bin/fireinfo.cgi
+srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/media.cgi
+srv/web/ipfire/cgi-bin/pakfire.cgi
 srv/web/ipfire/cgi-bin/pppsetup.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/sbin/updxlrator
 var/ipfire/outgoing/bin/outgoingfw.pl
 srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
+usr/local/bin/makegraphs
+usr/local/bin/hddshutdown
 usr/local/bin/vpn-watch

diff --git a/config/rootfiles/core/45/filelists/snort b/config/rootfiles/core/45/filelists/snort
new file mode 120000 (symlink)
index 0000000..9406ce0
--- /dev/null
+++ b/config/rootfiles/core/45/filelists/snort
@@ -0,0 +1 @@
+../../../common/snort
\ No newline at end of file

diff --git a/config/rootfiles/core/45/filelists/squid b/config/rootfiles/core/45/filelists/squid
new file mode 120000 (symlink)
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/45/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file

diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh
index d22779172099f7fd2bce7b6b9278ab76a3e9a4e2..64be6d3e6af5bb8b480143ddab1b41b877fd1308 100644 (file)
--- a/config/rootfiles/core/45/update.sh
+++ b/config/rootfiles/core/45/update.sh
@@ -24,6 +24,9 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 
+#
+# Remove core updates from pakfire cache to save space...
+rm -f /var/cache/pakfire/core-upgrade-*.ipfire
 #
 #Stop services
 echo Stopping Proxy
@@ -35,23 +38,43 @@ killall vpn-watch
 #Extract files
 extract_files
 
+#
+# Remove some addon cronjobs if the addons are not installed
+[ ! -e /opt/pakfire/db/installed/meta-cacti ] && rm -f /etc/fcron.cyclic/cacti.cron
+[ ! -e /opt/pakfire/db/installed/meta-gnump3d ] && rm -f /etc/fcron.daily/gnump3d-index
+[ ! -e /opt/pakfire/db/installed/meta-asterisk ] && rm -f /etc/fcron.minutely/wakeup.sh
+
+# Remove disable cron mails...
+sed "s|MAILTO=root|MAILTO=|g" < /var/spool/cron/root.orig > /var/tmp/root.tmp
+fcrontab /var/tmp/root.tmp
+
 #
 #Start services
 echo Starting Proxy
 /etc/init.d/squid start 2>/dev/null
 echo Rewriting Outgoing FW Rules
 /var/ipfire/outgoing/bin/outgoingfw.pl
-echo Starting vpn-watch
-/usr/local/bin/vpn-watch &
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+       echo Starting vpn-watch
+       /usr/local/bin/vpn-watch &
+fi
 
 #
 #Update Language cache
 #perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
+#Disable geode_aes modul
+mv /lib/modules/2.6.32.28-ipfire/kernel/drivers/crypto/geode-aes.ko \
+   /lib/modules/2.6.32.28-ipfire/kernel/drivers/crypto/geode-aes.ko.off >/dev/null 2>&1
+mv /lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/crypto/geode-aes.ko \
+   /lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/crypto/geode-aes.ko.off >/dev/null 2>&1
+mv /lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/crypto/geode-aes.ko \
+   /lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/crypto/geode-aes.ko.off >/dev/null 2>&1
+
 #Rebuild module dep's
-#depmod 2.6.32.28-ipfire
-#depmod 2.6.32.28-ipfire-pae
-#depmod 2.6.32.28-ipfire-xen
+depmod 2.6.32.28-ipfire     >/dev/null 2>&1
+depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1
+depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1
 
 #
 #Finish

diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae
index 6119966638f1c2d9c836183b4ffd565e4ab16589..c4899a4d2d4011b45679c9fc1e58662821c0cef3 100644 (file)
--- a/config/rootfiles/packages/linux-pae
+++ b/config/rootfiles/packages/linux-pae
@@ -277,7 +277,7 @@ lib/modules/KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_powersave.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/cpufreq/cpufreq_userspace.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/crypto
-#lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/geode-aes.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/geode-aes.ko.off
 #lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/hifn_795x.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/padlock-aes.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/crypto/padlock-sha.ko

diff --git a/config/rootfiles/packages/linux-xen b/config/rootfiles/packages/linux-xen
index fd2bfe6dc246d40d62e27e0b14e296383e27048b..7a3bc21b87b203c4b7dc635e00a1685c2a86fd39 100644 (file)
--- a/config/rootfiles/packages/linux-xen
+++ b/config/rootfiles/packages/linux-xen
@@ -241,7 +241,7 @@ lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/kernel/drivers/connector
 #lib/modules/KVER-ipfire-xen/kernel/drivers/connector/cn.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/crypto
-#lib/modules/KVER-ipfire-xen/kernel/drivers/crypto/geode-aes.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/crypto/geode-aes.ko.off
 #lib/modules/KVER-ipfire-xen/kernel/drivers/crypto/hifn_795x.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/crypto/padlock-aes.ko
 #lib/modules/KVER-ipfire-xen/kernel/drivers/crypto/padlock-sha.ko

diff --git a/config/snort/snort.conf b/config/snort/snort.conf
index bf4640624b45cdb14f502a0cea26d60de829860a..fd4e8ea4fb7b007ecb97892f4f12e3149d32a9ce 100644 (file)
--- a/config/snort/snort.conf
+++ b/config/snort/snort.conf
@@ -74,7 +74,7 @@ var PREPROC_RULE_PATH /etc/snort/preproc_rules
 ###################################################
 
 # Stop generic decode events:
-#config disable_decode_alerts
+config disable_decode_alerts
 
 # Stop Alerts on experimental TCP options
 config disable_tcpopt_experimental_alerts
@@ -86,7 +86,7 @@ config disable_tcpopt_obsolete_alerts
 #config disable_tcpopt_ttcp_alerts
 
 # Stop Alerts on all other TCPOption type events:
-#config disable_tcpopt_alerts
+config disable_tcpopt_alerts
 
 # Stop Alerts on invalid ip options
 #config disable_ipopt_alerts

diff --git a/html/cgi-bin/fireinfo.cgi b/html/cgi-bin/fireinfo.cgi
index 1be0ebe3388a9d260666c154bb6485814408fd4c..11c4637d69eba249a4634669d2af05affe7ac89e 100644 (file)
--- a/html/cgi-bin/fireinfo.cgi
+++ b/html/cgi-bin/fireinfo.cgi
@@ -152,7 +152,7 @@ print <<END;
        </tr>
        <tr>
                <!-- spacer -->
-               <td colspan="2">&nbsp;</td>
+               <td colspan="2"><font color='$Header::colourgreen'>&nbsp;</font></td>
        </tr>
        <tr>
                <td colspan='2'>

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 7567fd06e593bc00e156a51f0ed35e57f226f14d..734e7dc8868d5d81d278dfe0102a2566eaf77675 100644 (file)
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2005-2010  IPFire Team                                        #
+# Copyright (C) 2005-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        #
@@ -97,7 +97,7 @@ if (-e "/etc/snort/snort.conf") {
        close(FILE);
        open(FILE, ">/etc/snort/snort.conf") or die 'Unable to write snort config file.';
 
-    my @rules = `cd /etc/snort/rules/ && ls *.rules`;    # With this loop the rule might be display with correct rulepath set
+    my @rules = `cd /etc/snort/rules/ && ls *.rules 2>/dev/null`;    # With this loop the rule might be display with correct rulepath set
        foreach (@rules) {
        chomp $_;
        my $temp = join(";",@snortconfig);

diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat
index 2c4fb14f03aa04dc72513c2249567d9c0c79ed48..466a3cec7a95bda83f5b4a4fc823d1c6cb374c50 100644 (file)
--- a/html/cgi-bin/logs.cgi/firewalllog.dat
+++ b/html/cgi-bin/logs.cgi/firewalllog.dat
@@ -333,7 +333,7 @@ foreach $_ (@log)
         my $comment = $3; 
         my $packet = $4;
 
-        $packet =~ /IN=(\w+)/;       my $iface=$1; if ( $1 eq "27" || $1 eq "20"){ $iface="";}
+        $packet =~ /IN=(\w+)/;       my $iface=$1; if ( $1 =~ /2./ ){ $iface="";}
         $packet =~ /SRC=([\d\.]+)/;  my $srcaddr=$1;
         $packet =~ /DST=([\d\.]+)/;  my $dstaddr=$1;
         $packet =~ /MAC=([\w+\:]+)/; my $macaddr=$1;

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index da761f085e140592abe86854f9f3513242097909..124f912cf7155c27dff0872875ad1ce75ec689d0 100644 (file)
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  Michael Tremer & Christian Schmidt                 #
 #                                                                             #
 # 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        #
@@ -57,12 +57,6 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' cont
 &Header::openpage($Lang::tr{'pakfire configuration'}, 1);
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
-# check if reboot is necessary
-my $reboot = 0;
-if (`find /var/run/need_reboot 2>/dev/null`) {
-       $reboot = 1;    
-}
-
 if ($pakfiresettings{'ACTION'} eq 'install'){
        $pakfiresettings{'INSPAKS'} =~ s/\|/\ /g;
        if ("$pakfiresettings{'FORCE'}" eq "on") {
@@ -236,7 +230,7 @@ my $packages_update_age = &General::age("/opt/pakfire/db/lists/packages_list.db"
 print <<END;
        <table width='95%' cellpadding='5' >
 END
-if ($reboot == 1) {
+if ( -e "/var/run/need_reboot") {
        print "<tr><td align='center' colspan='2'><font color='red'>$Lang::tr{'needreboot'}!</font></td></tr>";
        print "<tr><td colspan='2'>&nbsp;</font></td></tr>"
 }

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index cd5bda3e87c7eed5826eee5bfc3a6a0107cbf380..0bb42ae312440c33525a169b2ef415f43cf731aa 100644 (file)
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2005-2010  IPTifre Team                                       #
+# Copyright (C) 2005-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        #
@@ -242,7 +242,7 @@ $selected{'TXPOWER'}{$wlanapsettings{'TXPOWER'}} = "selected='selected'";
 $selected{'HW_MODE'}{$wlanapsettings{'HW_MODE'}} = "selected='selected'";
 $selected{'MACMODE'}{$wlanapsettings{'MACMODE'}} = "selected='selected'";
 
-my @channellist_cmd = `iwlist $wlanapsettings{'INTERFACE'} channel`;
+my @channellist_cmd = `iwlist $wlanapsettings{'INTERFACE'} channel 2>/dev/null`;
 # get available channels
 
 my @temp;
@@ -253,7 +253,7 @@ if ( $channel =~ /\d+/ ){push(@temp,$channel);}
 }
 my @channellist = @temp;
 
-my @txpower_cmd = `iwlist $wlanapsettings{'INTERFACE'} txpower`;
+my @txpower_cmd = `iwlist $wlanapsettings{'INTERFACE'} txpower 2>/dev/null`;
 # get available channels
 
 my @temp;

diff --git a/lfs/configroot b/lfs/configroot
index ff1a2062a86f3d0b6a84ffa2e8599467beb346ae..43c2d21558d9fe4140273e123fbf25eebd0647ff 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -139,4 +139,7 @@ $(TARGET) :
        done
        chown root:nobody $(CONFIG_ROOT)/dhcpc
 
+       # Set outgoingfw.pl executable
+       chmod 755 $(CONFIG_ROOT)/outgoing/bin/outgoingfw.pl
+
        @$(POSTBUILD)

diff --git a/lfs/fcron b/lfs/fcron
index 5cf9cc5e525bcf3e3fd9ecc69eda3307b73e35eb..38343d4073ede643bf6504524f300625e9686603 100644 (file)
--- a/lfs/fcron
+++ b/lfs/fcron
@@ -93,6 +93,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chmod u-s /usr/bin/fcrontab /usr/bin/fcronsighup
        mkdir -p /etc/fcron.minutely /etc/fcron.cyclic /etc/fcron.hourly \
                /etc/fcron.daily /etc/fcron.weekly /etc/fcron.monthly
+
+       #Create Placeholder files
+       echo "Place scripts run minutely here ..." > /etc/fcron.minutely/info.txt
+       echo "Place scripts run cyclic here ..." > /etc/fcron.cyclic/info.txt 
+       echo "Place scripts run hourly here ..." > /etc/fcron.hourly/info.txt
+       echo "Place scripts run daily here ..." > /etc/fcron.daily/info.txt
+       echo "Place scripts run weekly here ..." > /etc/fcron.weekly/info.txt
+       echo "Place scripts run monthly here ..." > /etc/fcron.monthly/info.txt
+
        /usr/bin/fcrontab $(DIR_SRC)/config/cron/crontab
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/fireinfo b/lfs/fireinfo
index 0c55e007cd9bdd05f12bd49f5313933830fa8203..6c502e1ff5fe29e26d471d03cc7e89b5613f52d3 100644 (file)
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.3
+VER        = 2.0.4
 
 THISAPP    = fireinfo-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f9ce8b96350dd5af1e5c095806128cd0
+$(DL_FILE)_MD5 = 7433e108cce180980189339886621539
 
 install : $(TARGET)
 

diff --git a/lfs/linux b/lfs/linux
index 1aec51112e32cfe957bcd34f352e783b146068f3..26c7b837b94abeb3eb8314b4af32f9b19124c329 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -208,5 +208,9 @@ endif
        rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
        rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
 
+       # Disable geode_aes modul
+       mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko \
+           /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko.off
+
        @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*
        @$(POSTBUILD)

diff --git a/lfs/memtest b/lfs/memtest
index 5d27047ac33d07410886211c09cea5027306114b..a6179ed362de9b4518e152d7c2a864daf93d424c 100644 (file)
--- a/lfs/memtest
+++ b/lfs/memtest
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.10
+VER        = 4.20
 
 THISAPP    = memtest86+-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2144f21d4489a04149b1891b8d97e8fc
+$(DL_FILE)_MD5 = ef62c2f5be616676c8c62066dedc46b3
 
 install : $(TARGET)
 

diff --git a/lfs/snort b/lfs/snort
index 47b8b5aadef6e2a27b5ec496c75b4297d1e7ce12..7b5d41bc2e2e5b2ef37347f80bc2fb10e47adf1b 100644 (file)
--- a/lfs/snort
+++ b/lfs/snort
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.9.0.2
+VER        = 2.9.0.3
 
 THISAPP    = snort-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5d4dabe98bccbea166bbc86e2439f22a
+$(DL_FILE)_MD5 = 5f0c48b06453696ad32e27b9b3dd6603
 
 install : $(TARGET)
 

diff --git a/lfs/squid b/lfs/squid
index 8b907156f47bf6d334c041dff2ca2b5886cd4a72..9bb8b50b8a0a5af0242bd0b399eafdc77d656ea2 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 3.1.8
+VER        = 3.1.10
 
 THISAPP    = squid-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a8160dfba55ab7c400c622b72d39fc13
+$(DL_FILE)_MD5 = 0a233d8966a563a795065ccb654caa4f
 
 install : $(TARGET)
 
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE)
 
        cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \
           --datadir=/usr/lib/squid \

diff --git a/make.sh b/make.sh
index 13d79e08845fe452cf106f7ef9d2e3edd0127edb..f144ec4f7ad24ee0c7b2cf0b0abe2f5010a58f4c 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.9"                                                  # Version number
-CORE="44"                                                      # Core Level (Filename)
-PAKFIRE_CORE="44"                                              # Core Level (PAKFIRE)
+CORE="45"                                                      # Core Level (Filename)
+PAKFIRE_CORE="45"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir

diff --git a/src/initscripts/init.d/functions b/src/initscripts/init.d/functions
index 00cd6fa2a1a6d239cb751e36facaea7ad550a13c..e2e058d38b9d081aea1519d91e8a3832a4b9b02c 100644 (file)
--- a/src/initscripts/init.d/functions
+++ b/src/initscripts/init.d/functions
@@ -27,7 +27,7 @@ KILLDELAY="10"
 ## Screen Dimensions
 # Find current screen size
 if [ -z "${COLUMNS}" ]; then
-       COLUMNS=$(stty size)
+       COLUMNS=$(stty size 2>/dev/null)
        COLUMNS=${COLUMNS##* }
 fi
 

diff --git a/src/install+setup/install/unattended.c b/src/install+setup/install/unattended.c
index 3e2f3f08865f932782b98b5d69cfcd1c7e51d2e9..77e1eabbdc94f95d564173d14fa2504034992fd1 100644 (file)
--- a/src/install+setup/install/unattended.c
+++ b/src/install+setup/install/unattended.c
@@ -150,7 +150,7 @@ int unattended_setup(struct keyvalue *unattendedkv) {
        if (strlen(restore_file) > 0) {
                fprintf(flog, "unattended: Restoring Backup\n");
            snprintf(commandstring, STRING_SIZE,
-                   "cd /harddisk && /bin/tar -xvzp -f /harddisk/var/ipfire/backup/%s", restore_file);
+                   "/usr/sbin/chroot /harddisk /bin/tar -xvzp -f /var/ipfire/backup/%s -C /", restore_file);
            if (mysystem(commandstring)) {
                errorbox("unattended: ERROR restoring backup");
            }

diff --git a/src/scripts/hddshutdown b/src/scripts/hddshutdown
index 28994998bd812016ad1dfffb7c080c088a9bc29b..bb28f830a7b5afd991c61a820a89ca5aaf375f24 100644 (file)
--- a/src/scripts/hddshutdown
+++ b/src/scripts/hddshutdown
@@ -1,13 +1,26 @@
 #!/usr/bin/perl
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
 #
 # IPFire HDD Shutdown state reader
 #
-# This code is distributed under the terms of the GPL
-#
-# 18.09.2007 Maniacikarus - IPFire.org - maniacikarus@ipfire.org
-# 22.09.2007 Arne_F -  fitzenreiter.de - arne@fitzenreiter.de
-
-# begin
 
 my @devices = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
 my $diskstats = "";
@@ -20,7 +33,7 @@ if ($debug){print "### Searching for available Disks ###\n";}
 foreach (@devices){
     chomp $_;
     my @array = split(/\//,$_);
-    $diskstats = `cat /var/run/hddstats-$array[$#array]`;
+    $diskstats = `cat /var/run/hddstats-$array[$#array] 2>/dev/null`;
     chomp $diskstats;
     $newdiskstats = `iostat -d -t $_ | tail -2 | head -1 | awk '{ print \$5","\$6}'`;
     chomp $newdiskstats;

diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch
index 466aaa62dc1725fb6a8dccdb2b7c08643a2167f0..af646adce8b8f98fa2277a1287cd38571728e8f7 100755 (executable)
--- a/src/scripts/vpn-watch
+++ b/src/scripts/vpn-watch
@@ -1,6 +1,6 @@
 #!/usr/bin/perl 
 ##################################################
-#####     VPN-Watch.pl     Version 0.6       #####
+#####     VPN-Watch.pl     Version 0.6a      #####
 ##################################################
 #                                                #
 #   VPN-Watch is part of the IPFire Firewall     #
@@ -31,8 +31,8 @@ while ( $i == 0){
 
   $round++;
 
-   # Reset roundcounter after 10 min. To do established check.
-  if ($round > 9) { $round=0; }
+   # Reset roundcounter after 60 min. To do established check.
+  if ($round > 59) { $round=0; }
 
   if (open(FILE, "<${General::swroot}/vpn/config")) {    @vpnsettings = <FILE>;
     close(FILE);
@@ -56,8 +56,9 @@ foreach (@vpnsettings){
   if ($remoteip eq ""){next;if ($debug){logger("Unable to resolve $remotehostname.");}}
   my $ipmatch= `echo "$status" | grep '$remoteip' | grep '$settings[2]'`;
   my $established= `echo "$status" | grep '$settings[2]' | grep 'erouted;'`;
-  
-  if ( $round == 0 && $ipmatch eq '' && $status ne ''){
+  my $known= `echo "$status" | grep '$settings[2]'`;
+
+  if ( $ipmatch eq '' && $known ne '' ){
     logger("Remote IP for host $remotehostname($remoteip) has changed, restarting ipsec.");
     system("/usr/local/bin/ipsecctrl S $settings[0]");
     $round=0;