From 0449b50f896009ad68431e2bd7b3091f5570269d Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 26 Feb 2011 19:13:37 +0100 Subject: [PATCH 01/59] Fix core updater 45-48 to remove only old core updates from cache. Conflicts: config/rootfiles/core/48/update.sh --- config/rootfiles/core/45/update.sh | 9 +++++++-- config/rootfiles/core/46/update.sh | 9 +++++++-- config/rootfiles/core/47/update.sh | 9 +++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh index 228ada4e4..6a76bf845 100644 --- a/config/rootfiles/core/45/update.sh +++ b/config/rootfiles/core/45/update.sh @@ -25,8 +25,13 @@ /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 +# Remove old core updates from pakfire cache to save space... +core=45 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-$i.ipfire +done + # #Stop services echo Stopping Proxy diff --git a/config/rootfiles/core/46/update.sh b/config/rootfiles/core/46/update.sh index 6d2a75dc4..ccf6719ce 100644 --- a/config/rootfiles/core/46/update.sh +++ b/config/rootfiles/core/46/update.sh @@ -25,8 +25,13 @@ /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 +# Remove old core updates from pakfire cache to save space... +core=46 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-$i.ipfire +done + # #Stop services diff --git a/config/rootfiles/core/47/update.sh b/config/rootfiles/core/47/update.sh index ef10f558b..02c315c81 100644 --- a/config/rootfiles/core/47/update.sh +++ b/config/rootfiles/core/47/update.sh @@ -25,8 +25,13 @@ /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 +# Remove old core updates from pakfire cache to save space... +core=47 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-$i.ipfire +done + # #Stop services From 0b1f331c5081e10d98ae9b9174bda2fc3442265d Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 27 Feb 2011 16:31:52 +0100 Subject: [PATCH 02/59] Fix name generation of old core updates. Conflicts: config/rootfiles/core/48/update.sh --- config/rootfiles/core/45/update.sh | 2 +- config/rootfiles/core/46/update.sh | 2 +- config/rootfiles/core/47/update.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh index 6a76bf845..646a5532a 100644 --- a/config/rootfiles/core/45/update.sh +++ b/config/rootfiles/core/45/update.sh @@ -29,7 +29,7 @@ core=45 for (( i=1; i<=$core; i++ )) do - rm -f /var/cache/pakfire/core-upgrade-$i.ipfire + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done # diff --git a/config/rootfiles/core/46/update.sh b/config/rootfiles/core/46/update.sh index ccf6719ce..7769a85a6 100644 --- a/config/rootfiles/core/46/update.sh +++ b/config/rootfiles/core/46/update.sh @@ -29,7 +29,7 @@ core=46 for (( i=1; i<=$core; i++ )) do - rm -f /var/cache/pakfire/core-upgrade-$i.ipfire + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done # diff --git a/config/rootfiles/core/47/update.sh b/config/rootfiles/core/47/update.sh index 02c315c81..3adc61658 100644 --- a/config/rootfiles/core/47/update.sh +++ b/config/rootfiles/core/47/update.sh @@ -29,7 +29,7 @@ core=47 for (( i=1; i<=$core; i++ )) do - rm -f /var/cache/pakfire/core-upgrade-$i.ipfire + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done # From 1432ca2e26cffcff0535e4e0ce5938057f003022 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 4 Mar 2011 13:32:28 +0100 Subject: [PATCH 03/59] Updated squid (3.1.11). Set some cfg switches like in IPFire 3.x (enabled radius, aio ...) --- config/rootfiles/common/squid | 50 +++++++++++++++++++++++++++++++++++ lfs/squid | 34 ++++++++++++++++++------ 2 files changed, 76 insertions(+), 8 deletions(-) diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index dd4122fdd..461a2a2bd 100644 --- a/config/rootfiles/common/squid +++ b/config/rootfiles/common/squid @@ -40,6 +40,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/af/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/af/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/af/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/af/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/af/ERR_ICAP_FAILURE #usr/lib/squid/errors/af/ERR_INVALID_REQ #usr/lib/squid/errors/af/ERR_INVALID_RESP @@ -93,6 +94,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/ar/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/ar/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/ar/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/ar/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/ar/ERR_ICAP_FAILURE #usr/lib/squid/errors/ar/ERR_INVALID_REQ #usr/lib/squid/errors/ar/ERR_INVALID_RESP @@ -131,6 +133,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/az/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/az/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/az/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/az/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/az/ERR_ICAP_FAILURE #usr/lib/squid/errors/az/ERR_INVALID_REQ #usr/lib/squid/errors/az/ERR_INVALID_RESP @@ -169,6 +172,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/bg/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/bg/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/bg/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/bg/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/bg/ERR_ICAP_FAILURE #usr/lib/squid/errors/bg/ERR_INVALID_REQ #usr/lib/squid/errors/bg/ERR_INVALID_RESP @@ -206,6 +210,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/ca/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/ca/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/ca/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/ca/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/ca/ERR_ICAP_FAILURE #usr/lib/squid/errors/ca/ERR_INVALID_REQ #usr/lib/squid/errors/ca/ERR_INVALID_RESP @@ -244,6 +249,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/cs/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/cs/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/cs/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/cs/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/cs/ERR_ICAP_FAILURE #usr/lib/squid/errors/cs/ERR_INVALID_REQ #usr/lib/squid/errors/cs/ERR_INVALID_RESP @@ -282,6 +288,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/da/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/da/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/da/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/da/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/da/ERR_ICAP_FAILURE #usr/lib/squid/errors/da/ERR_INVALID_REQ #usr/lib/squid/errors/da/ERR_INVALID_RESP @@ -324,6 +331,7 @@ usr/lib/squid/errors/de/ERR_FTP_PUT_CREATED usr/lib/squid/errors/de/ERR_FTP_PUT_ERROR usr/lib/squid/errors/de/ERR_FTP_PUT_MODIFIED usr/lib/squid/errors/de/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors/de/ERR_GATEWAY_FAILURE usr/lib/squid/errors/de/ERR_ICAP_FAILURE usr/lib/squid/errors/de/ERR_INVALID_REQ usr/lib/squid/errors/de/ERR_INVALID_RESP @@ -362,6 +370,7 @@ usr/lib/squid/errors/de/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/el/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/el/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/el/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/el/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/el/ERR_ICAP_FAILURE #usr/lib/squid/errors/el/ERR_INVALID_REQ #usr/lib/squid/errors/el/ERR_INVALID_RESP @@ -414,6 +423,7 @@ usr/lib/squid/errors/en/ERR_FTP_PUT_CREATED usr/lib/squid/errors/en/ERR_FTP_PUT_ERROR usr/lib/squid/errors/en/ERR_FTP_PUT_MODIFIED usr/lib/squid/errors/en/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors/en/ERR_GATEWAY_FAILURE usr/lib/squid/errors/en/ERR_ICAP_FAILURE usr/lib/squid/errors/en/ERR_INVALID_REQ usr/lib/squid/errors/en/ERR_INVALID_RESP @@ -470,6 +480,7 @@ usr/lib/squid/errors/es/ERR_FTP_PUT_CREATED usr/lib/squid/errors/es/ERR_FTP_PUT_ERROR usr/lib/squid/errors/es/ERR_FTP_PUT_MODIFIED usr/lib/squid/errors/es/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors/es/ERR_GATEWAY_FAILURE usr/lib/squid/errors/es/ERR_ICAP_FAILURE usr/lib/squid/errors/es/ERR_INVALID_REQ usr/lib/squid/errors/es/ERR_INVALID_RESP @@ -508,6 +519,7 @@ usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/et/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/et/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/et/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/et/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/et/ERR_ICAP_FAILURE #usr/lib/squid/errors/et/ERR_INVALID_REQ #usr/lib/squid/errors/et/ERR_INVALID_RESP @@ -547,6 +559,7 @@ usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/fa/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/fa/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/fa/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/fa/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/fa/ERR_ICAP_FAILURE #usr/lib/squid/errors/fa/ERR_INVALID_REQ #usr/lib/squid/errors/fa/ERR_INVALID_RESP @@ -585,6 +598,7 @@ usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/fi/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/fi/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/fi/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/fi/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/fi/ERR_ICAP_FAILURE #usr/lib/squid/errors/fi/ERR_INVALID_REQ #usr/lib/squid/errors/fi/ERR_INVALID_RESP @@ -628,6 +642,7 @@ usr/lib/squid/errors/fr/ERR_FTP_PUT_CREATED usr/lib/squid/errors/fr/ERR_FTP_PUT_ERROR usr/lib/squid/errors/fr/ERR_FTP_PUT_MODIFIED usr/lib/squid/errors/fr/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors/fr/ERR_GATEWAY_FAILURE usr/lib/squid/errors/fr/ERR_ICAP_FAILURE usr/lib/squid/errors/fr/ERR_INVALID_REQ usr/lib/squid/errors/fr/ERR_INVALID_RESP @@ -666,6 +681,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/he/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/he/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/he/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/he/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/he/ERR_ICAP_FAILURE #usr/lib/squid/errors/he/ERR_INVALID_REQ #usr/lib/squid/errors/he/ERR_INVALID_RESP @@ -704,6 +720,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/hu/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/hu/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/hu/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/hu/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/hu/ERR_ICAP_FAILURE #usr/lib/squid/errors/hu/ERR_INVALID_REQ #usr/lib/squid/errors/hu/ERR_INVALID_RESP @@ -743,6 +760,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/hy/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/hy/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/hy/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/hy/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/hy/ERR_ICAP_FAILURE #usr/lib/squid/errors/hy/ERR_INVALID_REQ #usr/lib/squid/errors/hy/ERR_INVALID_RESP @@ -781,6 +799,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/id/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/id/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/id/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/id/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/id/ERR_ICAP_FAILURE #usr/lib/squid/errors/id/ERR_INVALID_REQ #usr/lib/squid/errors/id/ERR_INVALID_RESP @@ -820,6 +839,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/it/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/it/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/it/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/it/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/it/ERR_ICAP_FAILURE #usr/lib/squid/errors/it/ERR_INVALID_REQ #usr/lib/squid/errors/it/ERR_INVALID_RESP @@ -858,6 +878,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ja/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/ja/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/ja/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/ja/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/ja/ERR_ICAP_FAILURE #usr/lib/squid/errors/ja/ERR_INVALID_REQ #usr/lib/squid/errors/ja/ERR_INVALID_RESP @@ -897,6 +918,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ko/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/ko/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/ko/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/ko/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/ko/ERR_ICAP_FAILURE #usr/lib/squid/errors/ko/ERR_INVALID_REQ #usr/lib/squid/errors/ko/ERR_INVALID_RESP @@ -935,6 +957,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/lt/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/lt/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/lt/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/lt/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/lt/ERR_ICAP_FAILURE #usr/lib/squid/errors/lt/ERR_INVALID_REQ #usr/lib/squid/errors/lt/ERR_INVALID_RESP @@ -973,6 +996,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/lv/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/lv/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/lv/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/lv/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/lv/ERR_ICAP_FAILURE #usr/lib/squid/errors/lv/ERR_INVALID_REQ #usr/lib/squid/errors/lv/ERR_INVALID_RESP @@ -1011,6 +1035,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ms/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/ms/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/ms/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/ms/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/ms/ERR_ICAP_FAILURE #usr/lib/squid/errors/ms/ERR_INVALID_REQ #usr/lib/squid/errors/ms/ERR_INVALID_RESP @@ -1049,6 +1074,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/nl/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/nl/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/nl/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/nl/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/nl/ERR_ICAP_FAILURE #usr/lib/squid/errors/nl/ERR_INVALID_REQ #usr/lib/squid/errors/nl/ERR_INVALID_RESP @@ -1086,6 +1112,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #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_GATEWAY_FAILURE #usr/lib/squid/errors/oc/ERR_ICAP_FAILURE #usr/lib/squid/errors/oc/ERR_INVALID_REQ #usr/lib/squid/errors/oc/ERR_INVALID_RESP @@ -1124,6 +1151,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #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 @@ -1162,6 +1190,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/pt-br/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/pt-br/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/pt-br/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/pt-br/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/pt-br/ERR_ICAP_FAILURE #usr/lib/squid/errors/pt-br/ERR_INVALID_REQ #usr/lib/squid/errors/pt-br/ERR_INVALID_RESP @@ -1199,6 +1228,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/pt/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/pt/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/pt/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/pt/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/pt/ERR_ICAP_FAILURE #usr/lib/squid/errors/pt/ERR_INVALID_REQ #usr/lib/squid/errors/pt/ERR_INVALID_RESP @@ -1238,6 +1268,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ro/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/ro/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/ro/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/ro/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/ro/ERR_ICAP_FAILURE #usr/lib/squid/errors/ro/ERR_INVALID_REQ #usr/lib/squid/errors/ro/ERR_INVALID_RESP @@ -1276,6 +1307,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #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 @@ -1314,6 +1346,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/sk/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/sk/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/sk/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/sk/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/sk/ERR_ICAP_FAILURE #usr/lib/squid/errors/sk/ERR_INVALID_REQ #usr/lib/squid/errors/sk/ERR_INVALID_RESP @@ -1352,6 +1385,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #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_GATEWAY_FAILURE #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 @@ -1390,6 +1424,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/sr-latn/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/sr-latn/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/sr-latn/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/sr-latn/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/sr-latn/ERR_ICAP_FAILURE #usr/lib/squid/errors/sr-latn/ERR_INVALID_REQ #usr/lib/squid/errors/sr-latn/ERR_INVALID_RESP @@ -1430,6 +1465,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/sv/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/sv/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/sv/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/sv/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/sv/ERR_ICAP_FAILURE #usr/lib/squid/errors/sv/ERR_INVALID_REQ #usr/lib/squid/errors/sv/ERR_INVALID_RESP @@ -1467,6 +1503,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/templates/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/templates/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/templates/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/templates/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/templates/ERR_ICAP_FAILURE #usr/lib/squid/errors/templates/ERR_INVALID_REQ #usr/lib/squid/errors/templates/ERR_INVALID_RESP @@ -1505,6 +1542,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/th/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/th/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/th/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/th/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/th/ERR_ICAP_FAILURE #usr/lib/squid/errors/th/ERR_INVALID_REQ #usr/lib/squid/errors/th/ERR_INVALID_RESP @@ -1543,6 +1581,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/tr/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/tr/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/tr/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/tr/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/tr/ERR_ICAP_FAILURE #usr/lib/squid/errors/tr/ERR_INVALID_REQ #usr/lib/squid/errors/tr/ERR_INVALID_RESP @@ -1581,6 +1620,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/uk/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/uk/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/uk/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/uk/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/uk/ERR_ICAP_FAILURE #usr/lib/squid/errors/uk/ERR_INVALID_REQ #usr/lib/squid/errors/uk/ERR_INVALID_RESP @@ -1618,6 +1658,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/uz/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/uz/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/uz/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/uz/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/uz/ERR_ICAP_FAILURE #usr/lib/squid/errors/uz/ERR_INVALID_REQ #usr/lib/squid/errors/uz/ERR_INVALID_RESP @@ -1656,6 +1697,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #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_GATEWAY_FAILURE #usr/lib/squid/errors/vi/ERR_ICAP_FAILURE #usr/lib/squid/errors/vi/ERR_INVALID_REQ #usr/lib/squid/errors/vi/ERR_INVALID_RESP @@ -1693,6 +1735,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/zh-cn/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/zh-cn/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/zh-cn/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/zh-cn/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/zh-cn/ERR_ICAP_FAILURE #usr/lib/squid/errors/zh-cn/ERR_INVALID_REQ #usr/lib/squid/errors/zh-cn/ERR_INVALID_RESP @@ -1733,6 +1776,7 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/zh-tw/ERR_FTP_PUT_ERROR #usr/lib/squid/errors/zh-tw/ERR_FTP_PUT_MODIFIED #usr/lib/squid/errors/zh-tw/ERR_FTP_UNAVAILABLE +#usr/lib/squid/errors/zh-tw/ERR_GATEWAY_FAILURE #usr/lib/squid/errors/zh-tw/ERR_ICAP_FAILURE #usr/lib/squid/errors/zh-tw/ERR_INVALID_REQ #usr/lib/squid/errors/zh-tw/ERR_INVALID_RESP @@ -1787,22 +1831,28 @@ usr/lib/squid/msnt_auth usr/lib/squid/ncsa_auth usr/lib/squid/no_check.pl usr/lib/squid/ntlm_smb_lm_auth +usr/lib/squid/pam_auth +usr/lib/squid/pinger usr/lib/squid/smb_auth usr/lib/squid/smb_auth.pl usr/lib/squid/smb_auth.sh usr/lib/squid/squid_ldap_auth usr/lib/squid/squid_ldap_group +usr/lib/squid/squid_radius_auth usr/lib/squid/squid_session usr/lib/squid/squid_unix_group usr/lib/squid/unlinkd +usr/lib/squid/wbinfo_group.pl usr/sbin/squid usr/sbin/updxlrator #usr/share/man/man1/squidclient.1 #usr/share/man/man8/cachemgr.cgi.8 #usr/share/man/man8/ncsa_auth.8 +#usr/share/man/man8/pam_auth.8 #usr/share/man/man8/squid.8 #usr/share/man/man8/squid_ldap_auth.8 #usr/share/man/man8/squid_ldap_group.8 +#usr/share/man/man8/squid_radius_auth.8 #usr/share/man/man8/squid_session.8 #usr/share/man/man8/squid_unix_group.8 var/ipfire/proxy/errorpage-ipfire.css diff --git a/lfs/squid b/lfs/squid index 16df62101..b1942612f 100644 --- a/lfs/squid +++ b/lfs/squid @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2007-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 # @@ -24,10 +24,10 @@ include Config -VER = 3.1.10 +VER = 3.1.11 THISAPP = squid-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 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 = 0a233d8966a563a795065ccb654caa4f +$(DL_FILE)_MD5 = 4b071d2bf4959f2d081344f2f69dd2f1 install : $(TARGET) @@ -69,26 +69,44 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \ --datadir=/usr/lib/squid \ --mandir=/usr/share/man --libexecdir=/usr/lib/squid \ --localstatedir=/var --sysconfdir=/etc/squid \ - --disable-poll --disable-icmp --disable-wccp \ + --enable-poll --enable-icmp --disable-wccp \ --enable-ident-lookups \ --enable-storeio="aufs,diskd,ufs" --enable-ssl \ --enable-underscores --enable-ntlm-fail-open --enable-arp-acl \ --enable-http-violations --enable-auth=basic,ntlm \ --enable-removal-policies="heap,lru" \ --enable-delay-pools --enable-linux-netfilter \ - --enable-basic-auth-helpers="NCSA,SMB,MSNT,LDAP,multi-domain-NTLM" \ + --enable-basic-auth-helpers="NCSA,SMB,MSNT,LDAP,multi-domain-NTLM,PAM,squid_radius_auth" \ --enable-useragent-log \ --enable-referer-log \ --enable-snmp \ --with-pthreads --with-dl \ --with-maxfd="16384" \ - --with-large-files + --with-filedescriptors=16384 \ + --with-large-files \ + --with-aio \ + --enable-async-io \ + --enable-unlinkd \ + --enable-ntln-fail-open \ + --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \ + --enable-internal-dns \ + --enable-epoll \ + --disable-kqueue \ + --enable-select \ + --disable-cache-digests \ + --enable-forw-via-db \ + --enable-htcp \ + --enable-ipf-transparent \ + --enable-kill-parent-hack \ + --disable-wccpv2 \ + --disable-icap-client \ + --disable-esi cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install From 05d4672c780eb90a44cbdf77dc37b09189290f90 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Mon, 14 Mar 2011 18:48:40 +0100 Subject: [PATCH 04/59] Update htop to latest stable release. --- lfs/htop | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/htop b/lfs/htop index c88995bbe..0f65426fe 100644 --- a/lfs/htop +++ b/lfs/htop @@ -24,7 +24,7 @@ include Config -VER = 0.8.3 +VER = 0.9 THISAPP = htop-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = htop -PAK_VER = 3 +PAK_VER = 4 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5c9f093f9eaddf6e77aa6d54c2116d0c +$(DL_FILE)_MD5 = 7c5507f35f363f3f40183a2ba3c561f8 install : $(TARGET) From 1b22e11a6dbe0ecf702cf6b5f5cc86201bf20786 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Mon, 14 Mar 2011 18:49:20 +0100 Subject: [PATCH 05/59] Updated iperf to latest stable. --- lfs/iperf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/iperf b/lfs/iperf index 8b58e198c..38de994c6 100644 --- a/lfs/iperf +++ b/lfs/iperf @@ -24,7 +24,7 @@ include Config -VER = 2.0.4 +VER = 2.0.5 THISAPP = iperf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = iperf -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8c5bc14cc2ea55f18f22afe3c23e3dcb +$(DL_FILE)_MD5 = 44b5536b67719f4250faed632a3cd016 install : $(TARGET) From c07e938edbb6071fd01872622cc30f333045326c Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Mon, 14 Mar 2011 18:52:11 +0100 Subject: [PATCH 06/59] Updated snort to current stable, This is a large changeset. Updated snort and daq. Snort detection engine is changed and some preprocessors have been updated. --- config/rootfiles/common/snort | 1 + config/snort/snort.conf | 232 ++++++++++++++++++++++------------ html/cgi-bin/ids.cgi | 4 +- lfs/daq | 4 +- lfs/snort | 4 +- 5 files changed, 159 insertions(+), 86 deletions(-) diff --git a/config/rootfiles/common/snort b/config/rootfiles/common/snort index 9c23e0ba9..090a950a5 100644 --- a/config/rootfiles/common/snort +++ b/config/rootfiles/common/snort @@ -80,6 +80,7 @@ usr/sbin/snort #usr/share/doc/snort/README.pcap_readmode #usr/share/doc/snort/README.ppm #usr/share/doc/snort/README.reload +#usr/share/doc/snort/README.rzb_saac #usr/share/doc/snort/README.sensitive_data #usr/share/doc/snort/README.sfportscan #usr/share/doc/snort/README.ssh diff --git a/config/snort/snort.conf b/config/snort/snort.conf index fd4e8ea4f..4de1a4488 100644 --- a/config/snort/snort.conf +++ b/config/snort/snort.conf @@ -15,6 +15,8 @@ # 5) Configure preprocessors # 6) Configure output plugins # 7) Customize your rule set +# 8) Customize preprocessor and decoder rule set +# 9) Customize shared object rule set ################################################### ################################################### @@ -46,18 +48,19 @@ var SQL_SERVERS $HOME_NET # List of telnet servers on your network var TELNET_SERVERS $HOME_NET -# List of ports you run web servers on -portvar HTTP_PORTS [80,2301,3128,7777,7779,8000,8008,8028,8080,8180,8888,9999] +# List of ssh servers on your network +var SSH_SERVERS $HOME_NET -# List of ssh ports -portvar SSH_PORTS [22,222] +# List of ports you run web servers on +portvar HTTP_PORTS [80,311,591,593,901,1220,1414,1830,2301,2381,2809,3128,3702,5250,7001,7777,7779,8000,8008,8028,8080,8088,8118,8123,8180,8243,8280,8888,9090,9091,9443,9999,11371] # List of ports you want to look for SHELLCODE on. portvar SHELLCODE_PORTS !80 # List of ports you might see oracle attacks on -portvar ORACLE_PORTS 1521 - +portvar ORACLE_PORTS 1024: +# List of ssh ports +portvar SSH_PORTS [22,222] # other variables, these should not be modified var AIM_SERVERS [64.12.24.0/23,64.12.28.0/23,64.12.161.0/24,64.12.163.0/24,64.12.200.0/24,205.188.3.0/24,205.188.5.0/24,205.188.7.0/24,205.188.9.0/24,205.188.153.0/24,205.188.179.0/24,205.188.248.0/24] @@ -68,7 +71,6 @@ var RULE_PATH /etc/snort/rules var SO_RULE_PATH /etc/snort/so_rules var PREPROC_RULE_PATH /etc/snort/preproc_rules - ################################################### # Step #2: Configure the decoder. For more information, see README.decode ################################################### @@ -107,25 +109,46 @@ config checksum_mode: all # config ignore_ports: tcp 21 6667:6671 1356 # config ignore_ports: udp 1:17 53 - +# Configure active response for non inline operation. For more information, see REAMDE.active +# config response: eth0 attempts 2 ################################################### # Step #3: Configure the base detection engine. For more information, see README.decode ################################################### # Configure PCRE match limitations -config pcre_match_limit: 1500 +config pcre_match_limit: 3500 config pcre_match_limit_recursion: 1500 # Configure the detection engine See the Snort Manual, Configuring Snort - Includes - Config -config detection: search-method ac-bnfa max_queue_events 5 +config detection: search-method ac-split search-optimize max-pattern-len 20 # Configure the event queue. For more information, see README.event_queue config event_queue: max_queue 8 log 3 order_events content_length -# Configure Inline Resets. See README.INLINE -# config layer2resets: 00:06:76:DD:5F:E3 +################################################### +# Per packet and rule latency enforcement +# For more information see README.ppm +################################################### +# Per Packet latency configuration +#config ppm: max-pkt-time 250, \ +# fastpath-expensive-packets, \ +# pkt-log +# Per Rule latency configuration +#config ppm: max-rule-time 200, \ +# threshold 3, \ +# suspend-expensive-rules, \ +# suspend-timeout 20, \ +# rule-log alert + +################################################### +# Configure Perf Profiling for debugging +# For more information see README.PerfProfiling +################################################### + +#config profile_rules: print all, sort avg_ticks +#config profile_preprocs: print all, sort avg_ticks ################################################### # Step #4: Configure dynamic loaded libraries. # For more information, see Snort Manual, Configuring Snort - Dynamic Modules @@ -137,15 +160,6 @@ dynamicpreprocessor directory /usr/lib/snort_dynamicpreprocessor/ # path to base preprocessor engine dynamicengine /usr/lib/snort_dynamicengine/libsf_engine.so - - - - - - - - - # path to dynamic rules libraries # dynamicdetection directory /usr/lib/snort_dynamicrules @@ -154,39 +168,65 @@ dynamicengine /usr/lib/snort_dynamicengine/libsf_engine.so # For more information, see the Snort Manual, Configuring Snort - Preprocessors ################################################### +# Inline packet normalization. For more information, see README.normalize +# Does nothing in IDS mode +preprocessor normalize_ip4 +preprocessor normalize_tcp: ips ecn stream +preprocessor normalize_icmp4 +preprocessor normalize_ip6 +preprocessor normalize_icmp6 + # Target-based IP defragmentation. For more inforation, see README.frag3 preprocessor frag3_global: max_frags 65536 -preprocessor frag3_engine: policy windows timeout 180 +preprocessor frag3_engine: policy windows detect_anomalies overlap_limit 10 min_fragment_length 100 timeout 180 # Target-Based stateful inspection/stream reassembly. For more inforation, see README.stream5 -preprocessor stream5_global: max_tcp 8192, track_tcp yes, track_udp no -preprocessor stream5_tcp: policy windows, use_static_footprint_sizes, ports client 21 22 23 25 42 53 79 80 109 110 111 113 119 135 136 137 139 143 110 111 161 445 513 514 691 1433 1521 2100 2301 3128 3306 6665 6666 6667 6668 6669 7000 8000 8080 8180 8888 32770 32771 32772 32773 32774 32775 32776 32777 32778 32779, ports both 443 465 563 636 989 992 993 994 995 7801 7702 7900 7901 7902 7903 7904 7905 7906 6907 7908 7909 7910 7911 7912 7913 7914 7915 7916 7917 7918 7919 7920 -# preprocessor stream5_udp: ignore_any_rules +preprocessor stream5_global: max_tcp 8192, track_tcp yes, track_udp yes, track_icmp no max_active_responses 2 min_response_seconds 5 + +preprocessor stream5_tcp: policy windows, detect_anomalies, require_3whs 180, \ + overlap_limit 10, small_segments 3 bytes 150, timeout 180, \ + ports client 21 22 23 25 42 53 79 109 110 111 113 119 135 136 137 139 143 \ + 161 445 513 514 587 593 691 1433 1521 2100 3306 6070 6665 6666 6667 6668 6669 \ + 7000 32770 32771 32772 32773 32774 32775 32776 32777 32778 32779, \ + ports both 80 311 443 465 563 591 593 636 901 989 992 993 994 995 1220 1414 1830 2301 2381 2809 3128 3702 5250 6907 7001 7702 7777 7779 \ + 7801 7900 7901 7902 7903 7904 7905 7906 7908 7909 7910 7911 7912 7913 7914 7915 7916 \ + 7917 7918 7919 7920 8000 8008 8028 8080 8088 8118 8123 8180 8243 8280 8888 9090 9091 9443 9999 11371 +preprocessor stream5_udp: timeout 180 # performance statistics. For more information, see the Snort Manual, Configuring Snort - Preprocessors - Performance Monitor # preprocessor perfmonitor: time 300 file /var/snort/snort.stats pktcnt 10000 # HTTP normalization and anomaly detection. For more information, see README.http_inspect -preprocessor http_inspect: global iis_unicode_map unicode.map 1252 +preprocessor http_inspect: global iis_unicode_map unicode.map 1252 compress_depth 20480 decompress_depth 20480 preprocessor http_inspect_server: server default \ + chunk_length 500000 \ + server_flow_depth 0 \ + client_flow_depth 0 \ + post_depth 65495 \ + oversize_dir_length 500 \ + max_header_length 750 \ + max_headers 100 \ + ports { 80 311 591 593 901 1220 1414 1830 2301 2381 2809 3128 3702 5250 7001 7777 7779 8000 8008 8028 8080 8088 8118 8123 8180 8243 8280 8888 9090 9091 9443 9999 11371 } \ + non_rfc_char { 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 } \ + enable_cookie \ + extended_response_inspection \ + inspect_gzip \ + normalize_utf \ + unlimited_decompress \ apache_whitespace no \ ascii no \ - bare_byte no \ - chunk_length 500000 \ - flow_depth 1460 \ - directory no \ - double_decode no \ - iis_backslash no \ - iis_delimiter no \ - iis_unicode no \ - multi_slash no \ - non_strict \ - oversize_dir_length 500 \ - ports { 80 2301 3128 7777 7779 8000 8008 8028 8080 8180 8888 9999 } \ - u_encode yes \ - non_rfc_char { 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 } \ - webroot no + bare_byte no \ + base36 no \ + directory no \ + double_decode no \ + iis_backslash no \ + iis_delimiter no \ + iis_unicode no \ + multi_slash no \ + utf_8 no \ + u_encode yes \ + webroot no # ONC-RPC normalization and anomaly detection. For more information, see the Snort Manual, Configuring Snort - Preprocessors - RPC Decode preprocessor rpc_decode: 111 32770 32771 32772 32773 32774 32775 32776 32777 32778 32779 no_alert_multiple_requests no_alert_large_fragments no_alert_incomplete @@ -195,55 +235,80 @@ preprocessor rpc_decode: 111 32770 32771 32772 32773 32774 32775 32776 32777 327 preprocessor bo # FTP / Telnet normalization and anomaly detection. For more information, see README.ftptelnet -preprocessor ftp_telnet: global encrypted_traffic yes check_encrypted inspection_type stateful +preprocessor ftp_telnet: global inspection_type stateful encrypted_traffic no + preprocessor ftp_telnet_protocol: telnet \ ayt_attack_thresh 20 \ normalize ports { 23 } \ detect_anomalies + preprocessor ftp_telnet_protocol: ftp server default \ def_max_param_len 100 \ - ports { 21 2100 } \ - ftp_cmds { USER PASS ACCT CWD SDUP SMNT QUIT REIN PORT PASV TYPE STRU MODE } \ - ftp_cmds { RETR STOR STOU APPE ALLO REST RNFR RNTO ABOR DELE RMD MKD PWD } \ - ftp_cmds { LIST NLST SITE SYST STAT HELP NOOP } \ - ftp_cmds { AUTH ADAT PROT PBSZ CONF ENC } \ - ftp_cmds { FEAT OPTS CEL CMD MACB } \ - ftp_cmds { MDTM REST SIZE MLST MLSD } \ - ftp_cmds { XPWD XCWD XCUP XMKD XRMD TEST CLNT } \ - alt_max_param_len 0 { CDUP QUIT REIN PASV STOU ABOR PWD SYST NOOP } \ - alt_max_param_len 100 { MDTM CEL XCWD SITE USER PASS REST DELE RMD SYST TEST STAT MACB EPSV CLNT LPRT } \ - alt_max_param_len 200 { XMKD NLST ALLO STOU APPE RETR STOR CMD RNFR HELP } \ - alt_max_param_len 256 { RNTO CWD } \ + ports { 21 2100 3535 } \ + telnet_cmds yes \ + ignore_telnet_erase_cmds yes \ + ftp_cmds { ABOR ACCT ADAT ALLO APPE AUTH CCC CDUP } \ + ftp_cmds { CEL CLNT CMD CONF CWD DELE ENC EPRT } \ + ftp_cmds { EPSV ESTA ESTP FEAT HELP LANG LIST LPRT } \ + ftp_cmds { LPSV MACB MAIL MDTM MIC MKD MLSD MLST } \ + ftp_cmds { MODE NLST NOOP OPTS PASS PASV PBSZ PORT } \ + ftp_cmds { PROT PWD QUIT REIN REST RETR RMD RNFR } \ + ftp_cmds { RNTO SDUP SITE SIZE SMNT STAT STOR STOU } \ + ftp_cmds { STRU SYST TEST TYPE USER XCUP XCRC XCWD } \ + ftp_cmds { XMAS XMD5 XMKD XPWD XRCP XRMD XRSQ XSEM } \ + ftp_cmds { XSEN XSHA1 XSHA256 } \ + alt_max_param_len 0 { ABOR CCC CDUP ESTA FEAT LPSV NOOP PASV PWD QUIT REIN STOU SYST XCUP XPWD } \ + alt_max_param_len 200 { ALLO APPE CMD HELP NLST RETR RNFR STOR STOU XMKD } \ + alt_max_param_len 256 { CWD RNTO } \ alt_max_param_len 400 { PORT } \ alt_max_param_len 512 { SIZE } \ - chk_str_fmt { USER PASS ACCT CWD SDUP SMNT PORT TYPE STRU MODE } \ - chk_str_fmt { RETR STOR STOU APPE ALLO REST RNFR RNTO DELE RMD MKD } \ - chk_str_fmt { LIST NLST SITE SYST STAT HELP } \ - chk_str_fmt { AUTH ADAT PROT PBSZ CONF ENC } \ - chk_str_fmt { FEAT OPTS CEL CMD } \ - chk_str_fmt { MDTM REST SIZE MLST MLSD } \ - chk_str_fmt { XPWD XCWD XCUP XMKD XRMD TEST CLNT } \ - cmd_validity MODE < char ASBCZ > \ - cmd_validity STRU < char FRP > \ - cmd_validity ALLO < int [ char R int ] > \ - cmd_validity TYPE < { char AE [ char NTC ] | char I | char L [ number ] } > \ + chk_str_fmt { ACCT ADAT ALLO APPE AUTH CEL CLNT CMD } \ + chk_str_fmt { CONF CWD DELE ENC EPRT EPSV ESTP HELP } \ + chk_str_fmt { LANG LIST LPRT MACB MAIL MDTM MIC MKD } \ + chk_str_fmt { MLSD MLST MODE NLST OPTS PASS PBSZ PORT } \ + chk_str_fmt { PROT REST RETR RMD RNFR RNTO SDUP SITE } \ + chk_str_fmt { SIZE SMNT STAT STOR STRU TEST TYPE USER } \ + chk_str_fmt { XCRC XCWD XMAS XMD5 XMKD XRCP XRMD XRSQ } \ + chk_str_fmt { XSEM XSEN XSHA1 XSHA256 } \ + cmd_validity ALLO < int [ char R int ] > \ + cmd_validity EPSV < [ { char 12 | char A char L char L } ] > \ + cmd_validity MACB < string > \ cmd_validity MDTM < [ date nnnnnnnnnnnnnn[.n[n[n]]] ] string > \ - cmd_validity PORT < host_port > + cmd_validity MODE < char ASBCZ > \ + cmd_validity PORT < host_port > \ + cmd_validity PROT < char CSEP > \ + cmd_validity STRU < char FRPO [ string ] > \ + cmd_validity TYPE < { char AE [ char NTC ] | char I | char L [ number ] } > + preprocessor ftp_telnet_protocol: ftp client default \ max_resp_len 256 \ bounce yes \ - telnet_cmds no - + ignore_telnet_erase_cmds yes \ + telnet_cmds yes # SMTP normalization and anomaly detection. For more information, see README.SMTP -preprocessor smtp: ports { 25 587 691 } \ - inspection_type stateful \ - normalize cmds \ - normalize_cmds { EXPN VRFY RCPT } \ - alt_max_command_line_len 260 { MAIL } \ - alt_max_command_line_len 300 { RCPT } \ - alt_max_command_line_len 500 { HELP HELO ETRN } \ - alt_max_command_line_len 255 { EXPN VRFY } +reprocessor smtp: ports { 25 465 587 691 } \ + inspection_type stateful \ + enable_mime_decoding \ + max_mime_depth 20480 \ + normalize cmds \ + normalize_cmds { ATRN AUTH BDAT CHUNKING DATA DEBUG EHLO EMAL ESAM ESND ESOM ETRN EVFY } \ + normalize_cmds { EXPN HELO HELP IDENT MAIL NOOP ONEX QUEU QUIT RCPT RSET SAML SEND SOML } \ + normalize_cmds { STARTTLS TICK TIME TURN TURNME VERB VRFY X-ADAT X-DRCP X-ERCP X-EXCH50 } \ + normalize_cmds { X-EXPS X-LINK2STATE XADR XAUTH XCIR XEXCH50 XGEN XLICENSE XQUE XSTA XTRN XUSR } \ + max_command_line_len 512 \ + max_header_line_len 1000 \ + max_response_line_len 512 \ + alt_max_command_line_len 260 { MAIL } \ + alt_max_command_line_len 300 { RCPT } \ + alt_max_command_line_len 500 { HELP HELO ETRN EHLO } \ + alt_max_command_line_len 255 { EXPN VRFY ATRN SIZE BDAT DEBUG EMAL ESAM ESND ESOM EVFY IDENT NOOP RSET } \ + alt_max_command_line_len 246 { SEND SAML SOML AUTH TURN ETRN DATA RSET QUIT ONEX QUEU STARTTLS TICK TIME TURNME VERB X-EXPS X-LINK2STATE XADR XAUTH XCIR XEXCH50 XGEN XLICENSE XQUE XSTA XTRN XUSR } \ + valid_cmds { ATRN AUTH BDAT CHUNKING DATA DEBUG EHLO EMAL ESAM ESND ESOM ETRN EVFY } \ + valid_cmds { EXPN HELO HELP IDENT MAIL NOOP ONEX QUEU QUIT RCPT RSET SAML SEND SOML } \ + valid_cmds { STARTTLS TICK TIME TURN TURNME VERB VRFY X-ADAT X-DRCP X-ERCP X-EXCH50 } \ + valid_cmds { X-EXPS X-LINK2STATE XADR XAUTH XCIR XEXCH50 XGEN XLICENSE XQUE XSTA XTRN XUSR } \ + xlink2state { enabled } # Portscan detection. For more information, see README.sfportscan preprocessor sfportscan: proto { all } memcap { 10000000 } sense_level { medium } @@ -254,8 +319,10 @@ preprocessor smtp: ports { 25 587 691 } \ # SSH anomaly detection. For more information, see README.ssh preprocessor ssh: server_ports { 22 222 } \ + autodetect \ max_client_bytes 19600 \ max_encrypted_packets 20 \ + max_server_version_len 100 \ enable_respoverflow enable_ssh1crc32 \ enable_srvoverflow enable_protomismatch @@ -272,12 +339,21 @@ preprocessor dns: ports { 53 } enable_rdata_overflow # SSL anomaly detection and traffic bypass. For more information, see README.ssl preprocessor ssl: ports { 443 444 465 563 636 989 992 993 994 995 7801 7702 7900 7901 7902 7903 7904 7905 7906 6907 7908 7909 7910 7911 7912 7913 7914 7915 7916 7917 7918 7919 7920 }, trustservers, noinspect_encrypted +# SDF sensitive data preprocessor. For more information see README.sensitive_data +preprocessor sensitive_data: alert_threshold 25 ################################################### # Step #6: Configure output plugins # For more information, see Snort Manual, Configuring Snort - Output Modules ################################################### +# unified2 +# Recommended for most installs +# output unified2: filename merged.log, limit 128, nostamp, mpls_event_types, vlan_event_types + +# Additional configuration for specific types of installs +# output alert_unified2: filename snort.alert, limit 128, nostamp +# output log_unified2: filename snort.log, limit 128, nostamp # syslog # output alert_syslog: LOG_AUTH LOG_ALERT @@ -288,10 +364,6 @@ preprocessor ssl: ports { 443 444 465 563 636 989 992 993 994 995 7801 7702 7900 # output database: alert, , user= password= test dbname= host= # output database: log, , user= password= test dbname= host= -# unified -# output alert_unified: filename snort.alert, limit 128 -# output log_unified: filename snort.log, limit 128 - # prelude # output alert_prelude diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 7da270c97..220bad0e7 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -264,11 +264,11 @@ if (-e "/etc/snort/snort.conf") { if ($snortsettings{'RULES'} eq 'subscripted') { #$url="http://dl.snort.org/sub-rules/snortrules-snapshot-2.8_s.tar.gz?oink_code=$snortsettings{'OINKCODE'}"; - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2903_s.tar.gz/$snortsettings{'OINKCODE'}"; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2904_s.tar.gz/$snortsettings{'OINKCODE'}"; #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8_s.tar.gz"; } elsif ($snortsettings{'RULES'} eq 'registered') { #$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2.8.tar.gz?oink_code=$snortsettings{'OINKCODE'}"; - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2903.tar.gz/$snortsettings{'OINKCODE'}"; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2904.tar.gz/$snortsettings{'OINKCODE'}"; #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8.tar.gz"; } else { $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz"; diff --git a/lfs/daq b/lfs/daq index 106a38008..47e404cc8 100644 --- a/lfs/daq +++ b/lfs/daq @@ -24,7 +24,7 @@ include Config -VER = 0.4 +VER = 0.5 THISAPP = daq-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = eb48e99247f75951e1af1fcc6b2cbaa7 +$(DL_FILE)_MD5 = ea9d8147f39c44ce00dd2d7eb19ce0ea install : $(TARGET) diff --git a/lfs/snort b/lfs/snort index 7b5d41bc2..fea3f92f6 100644 --- a/lfs/snort +++ b/lfs/snort @@ -24,7 +24,7 @@ include Config -VER = 2.9.0.3 +VER = 2.9.0.4 THISAPP = snort-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5f0c48b06453696ad32e27b9b3dd6603 +$(DL_FILE)_MD5 = 09b2a2d47d3de8106d0b625f7d8070c5 install : $(TARGET) From 14820894ad62c06b0d7e64b67a2757ba76f4d9e2 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Mon, 14 Mar 2011 20:04:16 +0100 Subject: [PATCH 07/59] Fixed snort compile options and ipv6 config options --- config/snort/snort.conf | 6 ++---- lfs/snort | 8 ++++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/config/snort/snort.conf b/config/snort/snort.conf index 4de1a4488..3afa6f1d6 100644 --- a/config/snort/snort.conf +++ b/config/snort/snort.conf @@ -173,8 +173,6 @@ dynamicengine /usr/lib/snort_dynamicengine/libsf_engine.so preprocessor normalize_ip4 preprocessor normalize_tcp: ips ecn stream preprocessor normalize_icmp4 -preprocessor normalize_ip6 -preprocessor normalize_icmp6 # Target-based IP defragmentation. For more inforation, see README.frag3 preprocessor frag3_global: max_frags 65536 @@ -287,7 +285,7 @@ preprocessor ftp_telnet_protocol: ftp client default \ telnet_cmds yes # SMTP normalization and anomaly detection. For more information, see README.SMTP -reprocessor smtp: ports { 25 465 587 691 } \ +preprocessor smtp: ports { 25 465 587 691 } \ inspection_type stateful \ enable_mime_decoding \ max_mime_depth 20480 \ @@ -311,7 +309,7 @@ reprocessor smtp: ports { 25 465 587 691 } \ xlink2state { enabled } # Portscan detection. For more information, see README.sfportscan - preprocessor sfportscan: proto { all } memcap { 10000000 } sense_level { medium } +preprocessor sfportscan: proto { all } memcap { 10000000 } sense_level { medium } # ARP spoof detection. For more information, see the Snort Manual - Configuring Snort - Preprocessors - ARP Spoof Preprocessor # preprocessor arpspoof diff --git a/lfs/snort b/lfs/snort index fea3f92f6..ebffada8c 100644 --- a/lfs/snort +++ b/lfs/snort @@ -71,8 +71,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) $(DIR_SRC)/snort* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \ - --sysconfdir=/etc/snort --target=i586 \ - --enable-linux-smp-stats --enable-smb-alerts + --sysconfdir=/etc/snort --target=i586 \ + --enable-linux-smp-stats --enable-smb-alerts \ + --enable-gre --enable-mpls --enable-targetbased \ + --enable-decoder-preprocessor-rules --enable-ppm \ + --enable-perfprofiling --enable-zlib --enable-active-response \ + --enable-normalizer --enable-reload --enable-react --enable-flexresp3 cd $(DIR_APP) && make cd $(DIR_APP) && make install mv /usr/bin/snort /usr/sbin/ From 800c1607ae050be3e4334c5bdd5f29f76e005390 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 15 Mar 2011 09:02:32 +0100 Subject: [PATCH 08/59] squid: set --enable-async-io=8 --- lfs/squid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/squid b/lfs/squid index b1942612f..bdc164620 100644 --- a/lfs/squid +++ b/lfs/squid @@ -91,7 +91,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-filedescriptors=16384 \ --with-large-files \ --with-aio \ - --enable-async-io \ + --enable-async-io=8 \ --enable-unlinkd \ --enable-ntln-fail-open \ --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \ From fc5592af4d8ccc026591535e4090f187a4d96a98 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 15 Mar 2011 09:12:34 +0100 Subject: [PATCH 09/59] core: add squid to core48. --- config/rootfiles/core/48/exclude | 1 + config/rootfiles/core/48/filelists/squid | 1 + 2 files changed, 2 insertions(+) create mode 120000 config/rootfiles/core/48/filelists/squid diff --git a/config/rootfiles/core/48/exclude b/config/rootfiles/core/48/exclude index e69de29bb..6fe46b4c8 100644 --- a/config/rootfiles/core/48/exclude +++ b/config/rootfiles/core/48/exclude @@ -0,0 +1 @@ +/srv/web/ipfire/html/proxy.pac diff --git a/config/rootfiles/core/48/filelists/squid b/config/rootfiles/core/48/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/48/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file From d0cf29f084d7c47d61a0141e60c12e6cce78d8a8 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 15 Mar 2011 09:14:41 +0100 Subject: [PATCH 10/59] core: add snort update to core. --- config/rootfiles/core/48/filelists/snort | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/48/filelists/snort diff --git a/config/rootfiles/core/48/filelists/snort b/config/rootfiles/core/48/filelists/snort new file mode 120000 index 000000000..9406ce01c --- /dev/null +++ b/config/rootfiles/core/48/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file From cb13f50d50b2d87e4e368d8f18ea945656cafa33 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Tue, 15 Mar 2011 18:28:07 +0100 Subject: [PATCH 11/59] Fixed backup not taking user files into account. --- config/backup/backup.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/backup/backup.pl b/config/backup/backup.pl index 103807fa6..d2d6816b0 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -46,7 +46,7 @@ if (($ARGV[0] eq 'include') || ($ARGV[0] eq 'iso')) { print DATEI @include; print "/var/log/messages"; close(DATEI); - system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude'"); + system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude' --files-from='/var/ipfire/backup/include.user' --exclude-from='/var/ipfire/backup/exclude.user'"); system("rm /tmp/include"); if ($ARGV[0] eq 'iso') { system("/usr/local/bin/backupiso $Jahr$Monat$Monatstag-$Stunden$Minuten &"); @@ -57,7 +57,7 @@ elsif ($ARGV[0] eq 'exclude') { open(DATEI, ">/tmp/include") || die "Could not save temp include file"; print DATEI @include; close(DATEI); - system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude'"); + system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude' --files-from='/var/ipfire/backup/include.user' --exclude-from='/var/ipfire/backup/exclude.user'"); system("rm /tmp/include"); } elsif ($ARGV[0] eq 'restore') { From aa9664561353c352d2783a8054bb32e804a5268c Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Tue, 15 Mar 2011 18:31:37 +0100 Subject: [PATCH 12/59] Added backup.pl and missing daq update to core update. --- config/rootfiles/core/48/filelists/daq | 1 + config/rootfiles/core/48/filelists/files | 1 + 2 files changed, 2 insertions(+) create mode 120000 config/rootfiles/core/48/filelists/daq diff --git a/config/rootfiles/core/48/filelists/daq b/config/rootfiles/core/48/filelists/daq new file mode 120000 index 000000000..d0e0956f2 --- /dev/null +++ b/config/rootfiles/core/48/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/48/filelists/files b/config/rootfiles/core/48/filelists/files index 0037af183..8c4ede36f 100644 --- a/config/rootfiles/core/48/filelists/files +++ b/config/rootfiles/core/48/filelists/files @@ -1 +1,2 @@ etc/system-release +var/ipfire/backup/bin/backup.pl From 11c96d4a74cf1af60c377b8a0a83c53141777d15 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 17 Mar 2011 22:43:55 +0100 Subject: [PATCH 13/59] pppsetup.cgi: add vdsl vlan setting also if igmpproxy is not present. --- config/rootfiles/core/48/filelists/files | 1 + html/cgi-bin/pppsetup.cgi | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/config/rootfiles/core/48/filelists/files b/config/rootfiles/core/48/filelists/files index 8c4ede36f..4bff4f557 100644 --- a/config/rootfiles/core/48/filelists/files +++ b/config/rootfiles/core/48/filelists/files @@ -1,2 +1,3 @@ etc/system-release var/ipfire/backup/bin/backup.pl +srv/web/ipfire/cgi-bin/pppsetup.cgi diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 4c7bb8c77..6205d2fbe 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -777,6 +777,15 @@ END ; } else { + if ($pppsettings{'TYPE'} eq 'vdsl') { +print < + INET_VLAN + + +END +; + } print "No IPTV possible install addon igmpproxy"; } } From 969bf25a6dd741ea388ebccea4b103554d2f57ac Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 18 Mar 2011 09:19:19 +0100 Subject: [PATCH 14/59] pppsetup.cgi: change headline from IPTV to IPTV/VLAN. --- html/cgi-bin/pppsetup.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 6205d2fbe..f6b29e199 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -748,7 +748,7 @@ END if ($pppsettings{'TYPE'} =~ /^(pppoe|vdsl|pppoeatm)$/) { print < - IPTV: + IPTV/VLAN: END ; @@ -777,6 +777,7 @@ END ; } else { + print "No IPTV possible install addon igmpproxy"; if ($pppsettings{'TYPE'} eq 'vdsl') { print < @@ -786,7 +787,6 @@ print <No IPTV possible install addon igmpproxy"; } } From 765123255d98db6f03aa5bf5a91875df360012ed Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 18 Mar 2011 09:24:31 +0100 Subject: [PATCH 15/59] Finish core48. --- make.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make.sh b/make.sh index 55bdf9aa4..a05cfbcc2 100755 --- a/make.sh +++ b/make.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007 IPFire-Team . # +# Copyright (C) 2007-2011 IPFire-Team . # # # ############################################################################ # @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number CORE="48" # Core Level (Filename) -PAKFIRE_CORE="47" # Core Level (PAKFIRE) +PAKFIRE_CORE="48" # 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 From aedfdf8397bcc11032cd54a93d67c729d4a7c81e Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 18 Mar 2011 08:35:35 +0100 Subject: [PATCH 16/59] core48: add missing ids.cgi to core48. --- config/rootfiles/core/48/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/48/filelists/files b/config/rootfiles/core/48/filelists/files index 4bff4f557..6bc22d450 100644 --- a/config/rootfiles/core/48/filelists/files +++ b/config/rootfiles/core/48/filelists/files @@ -1,3 +1,4 @@ etc/system-release var/ipfire/backup/bin/backup.pl +srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi From 25224e2adcaaa2044e4ddab2a163050d56ee13de Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 18 Mar 2011 20:57:00 +0100 Subject: [PATCH 17/59] core48: add missing Net_SSLeay perl files. --- .../rootfiles/core/48/filelists/perl-modules | 83 +++++++++++++++++-- 1 file changed, 75 insertions(+), 8 deletions(-) diff --git a/config/rootfiles/core/48/filelists/perl-modules b/config/rootfiles/core/48/filelists/perl-modules index d2fd65ffe..1d14c69c1 100644 --- a/config/rootfiles/core/48/filelists/perl-modules +++ b/config/rootfiles/core/48/filelists/perl-modules @@ -238,13 +238,81 @@ usr/lib/perl5/site_perl/5.12.3/Net/Server/Single.pm usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Net/SSLeay.pm usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Net/SSLeay/Handle.pm usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/SSLeay.so -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/GD.pm -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/GD/Image.pm -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/GD/Polygon.pm -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/GD/Polyline.pm -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/GD/Simple.pm -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/GD/GD.so -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/qd.pl +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/autosplit.ix +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/debug_read.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_https.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_https2.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_https3.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_https4.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_httpx2.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_httpx3.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_httpx4.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/dump_peer_certificate.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_http.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_http3.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_http4.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_https.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_https3.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_https4.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_httpx.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_httpx3.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_httpx4.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_http.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_http3.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_http4.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_https.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_https3.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_https4.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_httpx.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_httpx3.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_httpx4.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/http_cat.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/https_cat.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/httpx_cat.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/make_form.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/make_headers.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/new_x_ctx.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/open_proxy_tcp_connection.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/open_tcp_connection.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_http.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_http3.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_http4.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_https.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_https3.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_https4.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_httpx.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_httpx3.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_httpx4.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_http.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_http3.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_http4.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_https.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_https3.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_https4.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_httpx.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_httpx3.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_httpx4.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/randomize.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/set_cert_and_key.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/set_proxy.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/set_server_cert_and_key.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/ssl_read_CRLF.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/ssl_read_all.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/ssl_read_until.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/ssl_write_CRLF.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/ssl_write_all.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/sslcat.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcp_read_CRLF.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcp_read_all.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcp_read_until.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcp_write_CRLF.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcp_write_all.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcpcat.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcpxcat.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/want_X509_lookup.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/want_nothing.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/want_read.al +usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/want_write.al usr/lib/perl5/site_perl/5.12.3/RRDp.pm usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/RRDs.pm usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/RRDs/RRDs.so @@ -310,4 +378,3 @@ usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/XML/Parser/Style/Stream.p usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/XML/Parser/Style/Subs.pm usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/XML/Parser/Style/Tree.pm usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/XML/Parser/Expat/Expat.so -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/autosplit.ix From 95d5f3df86e69ce88f60eaa16fc80f68e99523df Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Sun, 20 Mar 2011 20:37:28 +0100 Subject: [PATCH 18/59] Updated vsftpd to 2.3.4 --- lfs/vsftpd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/vsftpd b/lfs/vsftpd index d5e809399..f3e74a00e 100644 --- a/lfs/vsftpd +++ b/lfs/vsftpd @@ -24,7 +24,7 @@ include Config -VER = 2.2.2 +VER = 2.3.4 THISAPP = vsftpd-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vsftpd -PAK_VER = 6 +PAK_VER = 7 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6d6bc136af14c23f8fef6f1a51f55418 +$(DL_FILE)_MD5 = 2ea5d19978710527bb7444d93b67767a install : $(TARGET) From 56e3ad68eccb448b8282776426fe0a2dc9a901c1 Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Sun, 20 Mar 2011 20:38:35 +0100 Subject: [PATCH 19/59] Updated nano to 2.2.9 --- lfs/nano | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/nano b/lfs/nano index 1bd26a320..b0346770f 100644 --- a/lfs/nano +++ b/lfs/nano @@ -24,7 +24,7 @@ include Config -VER = 2.0.9 +VER = 2.2.6 THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 2 +PAK_VER = 3 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2be94dc43fb60fff4626a2401a977220 +$(DL_FILE)_MD5 = 03233ae480689a008eb98feb1b599807 install : $(TARGET) From 7fb4ff755e5bf009e9e6925c5b010e5d71c89566 Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Sun, 20 Mar 2011 20:39:16 +0100 Subject: [PATCH 20/59] Updated nmap to 5.51 --- lfs/nmap | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/nmap b/lfs/nmap index f746b21c5..5ff3221ab 100644 --- a/lfs/nmap +++ b/lfs/nmap @@ -24,7 +24,7 @@ include Config -VER = 5.50 +VER = 5.51 THISAPP = nmap-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nmap -PAK_VER = 4 +PAK_VER = 5 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a4df96e52cb52a1bbe76caace5f21388 +$(DL_FILE)_MD5 = 0b80d2cb92ace5ebba8095a4c2850275 install : $(TARGET) From 25942c277cb9c7485cb9aa6e2b20662031a127b5 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 21 Mar 2011 09:29:53 +0100 Subject: [PATCH 21/59] gnump3d: fix perl version in plugin path. run gnump3d-index after installation. --- config/gnump3d/gnump3d.conf | 2 +- lfs/gnump3d | 2 +- src/paks/gnump3d/install.sh | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/gnump3d/gnump3d.conf b/config/gnump3d/gnump3d.conf index 079874e04..e6a6e445f 100644 --- a/config/gnump3d/gnump3d.conf +++ b/config/gnump3d/gnump3d.conf @@ -731,7 +731,7 @@ sort_order = $TRACK # the installation script - if this doesn't happen report this as # a bug. # -plugin_directory = /usr/lib/perl5/5.8.8/gnump3d/plugins +plugin_directory = /usr/lib/perl5/5.12.3/gnump3d/plugins # diff --git a/lfs/gnump3d b/lfs/gnump3d index e59753b98..ca14c27e9 100644 --- a/lfs/gnump3d +++ b/lfs/gnump3d @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = gnump3d -PAK_VER = 4 +PAK_VER = 5 DEPS = "" diff --git a/src/paks/gnump3d/install.sh b/src/paks/gnump3d/install.sh index 745dfb7e2..13c7e8a85 100644 --- a/src/paks/gnump3d/install.sh +++ b/src/paks/gnump3d/install.sh @@ -24,6 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files [ -d /var/mp3 ] || ( mkdir /var/mp3 && chown nobody.nobody /var/mp3 ) +gnump3d-index & start_service ${NAME} ln -svf ../init.d/gnump3d /etc/rc.d/rc0.d/K00gnump3d ln -svf ../init.d/gnump3d /etc/rc.d/rc3.d/S99gnump3d From 3bcaa8bbdf45ae2ff2ac9084ef2ccdd38a55d912 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 21 Mar 2011 12:24:37 +0100 Subject: [PATCH 22/59] nano: rootfile update. --- config/rootfiles/packages/nano | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/config/rootfiles/packages/nano b/config/rootfiles/packages/nano index 8a2f61624..815c3fac7 100644 --- a/config/rootfiles/packages/nano +++ b/config/rootfiles/packages/nano @@ -9,17 +9,34 @@ usr/bin/rnano #usr/share/man/man5/nanorc.5 #usr/share/nano usr/share/nano/asm.nanorc +usr/share/nano/awk.nanorc usr/share/nano/c.nanorc +usr/share/nano/cmake.nanorc +usr/share/nano/css.nanorc +usr/share/nano/debian.nanorc +usr/share/nano/fortran.nanorc +usr/share/nano/gentoo.nanorc usr/share/nano/groff.nanorc usr/share/nano/html.nanorc usr/share/nano/java.nanorc +usr/share/nano/makefile.nanorc +#usr/share/nano/man-html +#usr/share/nano/man-html/nano.1.html +#usr/share/nano/man-html/nanorc.5.html +#usr/share/nano/man-html/rnano.1.html usr/share/nano/man.nanorc +usr/share/nano/mgp.nanorc usr/share/nano/mutt.nanorc usr/share/nano/nanorc.nanorc +usr/share/nano/objc.nanorc +usr/share/nano/ocaml.nanorc usr/share/nano/patch.nanorc usr/share/nano/perl.nanorc +usr/share/nano/php.nanorc usr/share/nano/pov.nanorc usr/share/nano/python.nanorc usr/share/nano/ruby.nanorc usr/share/nano/sh.nanorc +usr/share/nano/tcl.nanorc usr/share/nano/tex.nanorc +usr/share/nano/xml.nanorc From ed10297e1bf16da05f429e1c6f1fc21926d96474 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 26 Mar 2011 14:22:51 +0100 Subject: [PATCH 23/59] ipfireseeder: update to seed core48. --- config/rootfiles/packages/ipfireseeder | 2 +- lfs/ipfireseeder | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder index 4e21567ef..866d173c6 100644 --- a/config/rootfiles/packages/ipfireseeder +++ b/config/rootfiles/packages/ipfireseeder @@ -1,5 +1,5 @@ etc/rc.d/init.d/ipfireseeder #var/ipfire/seeder -var/ipfire/seeder/ipfire-2.9.i586-full-core47.iso.torrent +var/ipfire/seeder/ipfire-2.9.i586-full-core48.iso.torrent #var/log/seeder var/log/seeder/info diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index 4bdbc481f..2292c3ee2 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -27,13 +27,13 @@ include Config VER = 1.00 THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.9.i586-full-core47.iso.torrent +DL_FILE = ipfire-2.9.i586-full-core48.iso.torrent DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 23 +PAK_VER = 24 DEPS = "rtorrent" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 388d32a2f741df4afa76578948804ae3 +$(DL_FILE)_MD5 = 37dd855f48af4efae045eb9b1f971a6e install : $(TARGET) From 1151f4d08bf00dee56487968f321a09e0bb36bfe Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 26 Mar 2011 14:30:49 +0100 Subject: [PATCH 24/59] gnump3d: add full path to gnumpd3d-index at gnump3d install. --- src/paks/gnump3d/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/paks/gnump3d/install.sh b/src/paks/gnump3d/install.sh index 13c7e8a85..1e0f3cb65 100644 --- a/src/paks/gnump3d/install.sh +++ b/src/paks/gnump3d/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files [ -d /var/mp3 ] || ( mkdir /var/mp3 && chown nobody.nobody /var/mp3 ) -gnump3d-index & +/usr/bin/gnump3d-index & start_service ${NAME} ln -svf ../init.d/gnump3d /etc/rc.d/rc0.d/K00gnump3d ln -svf ../init.d/gnump3d /etc/rc.d/rc3.d/S99gnump3d From 7a524f82b94fa35dab7c1abfbe11865ece156ef5 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 29 Mar 2011 16:19:22 +0200 Subject: [PATCH 25/59] core48: add missing perl-GD modules. --- config/rootfiles/core/48/filelists/perl-GD | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/48/filelists/perl-GD diff --git a/config/rootfiles/core/48/filelists/perl-GD b/config/rootfiles/core/48/filelists/perl-GD new file mode 120000 index 000000000..962d937da --- /dev/null +++ b/config/rootfiles/core/48/filelists/perl-GD @@ -0,0 +1 @@ +../../../common/perl-GD \ No newline at end of file From efaf7bd8df72e27be32f7d937e3e4e2039fcff0d Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 29 Mar 2011 17:23:26 +0200 Subject: [PATCH 26/59] Started core upgrade 49. --- config/rootfiles/core/49/exclude | 0 config/rootfiles/core/49/filelists/files | 1 + config/rootfiles/core/49/filelists/perl-GD | 1 + config/rootfiles/core/49/meta | 1 + config/rootfiles/core/49/update.sh | 59 ++++++++++++++++++++++ make.sh | 2 +- 6 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 config/rootfiles/core/49/exclude create mode 100644 config/rootfiles/core/49/filelists/files create mode 120000 config/rootfiles/core/49/filelists/perl-GD create mode 100644 config/rootfiles/core/49/meta create mode 100644 config/rootfiles/core/49/update.sh diff --git a/config/rootfiles/core/49/exclude b/config/rootfiles/core/49/exclude new file mode 100644 index 000000000..e69de29bb diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files new file mode 100644 index 000000000..0037af183 --- /dev/null +++ b/config/rootfiles/core/49/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/49/filelists/perl-GD b/config/rootfiles/core/49/filelists/perl-GD new file mode 120000 index 000000000..962d937da --- /dev/null +++ b/config/rootfiles/core/49/filelists/perl-GD @@ -0,0 +1 @@ +../../../common/perl-GD \ No newline at end of file diff --git a/config/rootfiles/core/49/meta b/config/rootfiles/core/49/meta new file mode 100644 index 000000000..d547fa86f --- /dev/null +++ b/config/rootfiles/core/49/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/49/update.sh b/config/rootfiles/core/49/update.sh new file mode 100644 index 000000000..7c2a8bfcd --- /dev/null +++ b/config/rootfiles/core/49/update.sh @@ -0,0 +1,59 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2011 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=49 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#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 +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index a05cfbcc2..f572b9304 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number -CORE="48" # Core Level (Filename) +CORE="49" # Core Level (Filename) PAKFIRE_CORE="48" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan From 59d6383286979b33f0d63f8afac6a6209fbd1c0d Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Fri, 1 Apr 2011 11:09:59 +0200 Subject: [PATCH 27/59] Updated ntfs-3g to latest stable. --- config/rootfiles/common/ntfs-3g | 17 +++++++++++++++-- lfs/ntfs-3g | 4 ++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/ntfs-3g b/config/rootfiles/common/ntfs-3g index 662213c65..2762b8fd7 100644 --- a/config/rootfiles/common/ntfs-3g +++ b/config/rootfiles/common/ntfs-3g @@ -1,14 +1,19 @@ +bin/lowntfs-3g bin/ntfs-3g lib/libntfs-3g.so -lib/libntfs-3g.so.54 -lib/libntfs-3g.so.54.0.0 +lib/libntfs-3g.so.80 +lib/libntfs-3g.so.80.0.0 +sbin/mount.lowntfs-3g sbin/mount.ntfs-3g usr/bin/ntfs-3g.probe +usr/bin/ntfs-3g.secaudit +usr/bin/ntfs-3g.usermap #usr/include/ntfs-3g #usr/include/ntfs-3g/attrib.h #usr/include/ntfs-3g/attrlist.h #usr/include/ntfs-3g/bitmap.h #usr/include/ntfs-3g/bootsect.h +#usr/include/ntfs-3g/cache.h #usr/include/ntfs-3g/collate.h #usr/include/ntfs-3g/compat.h #usr/include/ntfs-3g/compress.h @@ -16,6 +21,7 @@ usr/bin/ntfs-3g.probe #usr/include/ntfs-3g/device.h #usr/include/ntfs-3g/device_io.h #usr/include/ntfs-3g/dir.h +#usr/include/ntfs-3g/efs.h #usr/include/ntfs-3g/endians.h #usr/include/ntfs-3g/index.h #usr/include/ntfs-3g/inode.h @@ -27,6 +33,9 @@ usr/bin/ntfs-3g.probe #usr/include/ntfs-3g/misc.h #usr/include/ntfs-3g/mst.h #usr/include/ntfs-3g/ntfstime.h +#usr/include/ntfs-3g/object_id.h +#usr/include/ntfs-3g/param.h +#usr/include/ntfs-3g/reparse.h #usr/include/ntfs-3g/runlist.h #usr/include/ntfs-3g/security.h #usr/include/ntfs-3g/support.h @@ -34,12 +43,16 @@ usr/bin/ntfs-3g.probe #usr/include/ntfs-3g/unistr.h #usr/include/ntfs-3g/version.h #usr/include/ntfs-3g/volume.h +#usr/include/ntfs-3g/xattrs.h #usr/lib/libntfs-3g.a #usr/lib/libntfs-3g.la usr/lib/libntfs-3g.so usr/lib/pkgconfig/libntfs-3g.pc #usr/share/doc/ntfs-3g #usr/share/doc/ntfs-3g/README +#usr/share/man/man8/mount.lowntfs-3g.8 #usr/share/man/man8/mount.ntfs-3g.8 #usr/share/man/man8/ntfs-3g.8 #usr/share/man/man8/ntfs-3g.probe.8 +#usr/share/man/man8/ntfs-3g.secaudit.8 +#usr/share/man/man8/ntfs-3g.usermap.8 diff --git a/lfs/ntfs-3g b/lfs/ntfs-3g index 06ecb0c49..4d65137ba 100644 --- a/lfs/ntfs-3g +++ b/lfs/ntfs-3g @@ -24,7 +24,7 @@ include Config -VER = 2009.4.4 +VER = 2011.1.15 THISAPP = ntfs-3g-$(VER) DL_FILE = $(THISAPP).tgz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e0b5c170f088a8d82968f0a6b34d31da +$(DL_FILE)_MD5 = 15a5cf5752012269fa168c24191f00e2 install : $(TARGET) From b4c8d582db1ca1a00193f827105a80523b1936e0 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 2 Apr 2011 12:13:59 +0200 Subject: [PATCH 28/59] MIME-Tools: Update to 5.502. --- lfs/MIME-Tools | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/MIME-Tools b/lfs/MIME-Tools index 00f0b4080..6e2e2ef99 100644 --- a/lfs/MIME-Tools +++ b/lfs/MIME-Tools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-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 # @@ -24,7 +24,7 @@ include Config -VER = 5.420 +VER = 5.502 THISAPP = MIME-tools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4db6505cc0132c80c5a9cc54f443a21a +$(DL_FILE)_MD5 = 6a87adda74867e3f8868a0599137bde0 install : $(TARGET) From 563e4c7d67ae869b12d050751ab27d2b357548d8 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 2 Apr 2011 12:15:19 +0200 Subject: [PATCH 29/59] Mail-tools: Update to 2.07. --- lfs/Mail-Tools | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/Mail-Tools b/lfs/Mail-Tools index b1ad6c8ce..4e4b8faab 100644 --- a/lfs/Mail-Tools +++ b/lfs/Mail-Tools @@ -24,7 +24,7 @@ include Config -VER = 1.74 +VER = 2.07 THISAPP = MailTools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = aba82a7eb87906278d98174e10d838be +$(DL_FILE)_MD5 = df861e05cbcf3a336ecebfb2c42529d0 install : $(TARGET) From e3341bc21612b4036801b32d6679fa3d17ca0d99 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Sat, 2 Apr 2011 14:32:31 +0200 Subject: [PATCH 30/59] Fixded localhost webservers are directed to the proxy if auto configuration is used. Fixes bug #770 --- config/rootfiles/core/49/filelists/files | 1 + html/cgi-bin/proxy.cgi | 1 + 2 files changed, 2 insertions(+) diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 0037af183..d4ff5e242 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -1 +1,2 @@ etc/system-release +srv/web/ipfire/cgi-bin/proxy.cgi diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 8b3200dab..fc65e7a1b 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -2924,6 +2924,7 @@ sub writepacfile if ( (isPlainHostName(host)) || (dnsDomainIs(host, ".$mainsettings{'DOMAINNAME'}")) || + (isInNet(host, "127.0.0.1", "255.0.0")) || (isInNet(host, "10.0.0.0", "255.0.0.0")) || (isInNet(host, "172.16.0.0", "255.240.0.0")) || (isInNet(host, "192.168.0.0", "255.255.0.0")) || From c03cf9ea9db6ed0d757b44211a6df6116275078c Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Sat, 2 Apr 2011 14:37:42 +0200 Subject: [PATCH 31/59] Fixed the last commit. A 0 was missing. --- html/cgi-bin/proxy.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index fc65e7a1b..a0aa1acd3 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -2924,7 +2924,7 @@ sub writepacfile if ( (isPlainHostName(host)) || (dnsDomainIs(host, ".$mainsettings{'DOMAINNAME'}")) || - (isInNet(host, "127.0.0.1", "255.0.0")) || + (isInNet(host, "127.0.0.1", "255.0.0.0")) || (isInNet(host, "10.0.0.0", "255.0.0.0")) || (isInNet(host, "172.16.0.0", "255.240.0.0")) || (isInNet(host, "192.168.0.0", "255.255.0.0")) || From 777d1bfd0ad10d4445b7a1300bb948561c350ed5 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 2 Apr 2011 17:51:13 +0200 Subject: [PATCH 32/59] lm_sensors: Update to 3.3.0. --- config/rootfiles/common/lm_sensors | 3 +-- lfs/lm_sensors | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/lm_sensors b/config/rootfiles/common/lm_sensors index 76e796ec3..217ac549d 100644 --- a/config/rootfiles/common/lm_sensors +++ b/config/rootfiles/common/lm_sensors @@ -8,9 +8,8 @@ usr/bin/sensors-conf-convert #usr/lib/libsensors.a usr/lib/libsensors.so usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.2.1 +usr/lib/libsensors.so.4.3.1 #usr/man/man1/sensors.1 -#usr/man/man3 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 #usr/man/man5/sensors3.conf.5 diff --git a/lfs/lm_sensors b/lfs/lm_sensors index 475c05b0e..b5ebcfba7 100644 --- a/lfs/lm_sensors +++ b/lfs/lm_sensors @@ -24,7 +24,7 @@ include Config -VER = 3.1.2 +VER = 3.3.0 THISAPP = lm_sensors-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 58a9a225808ac4587c4c8cbd12b40b5c +$(DL_FILE)_MD5 = 5eb18d7531ead4f54f28a1133a606535 install : $(TARGET) From 2d84d37af6df59404760cf4d1413a7b019ba295c Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 2 Apr 2011 17:52:42 +0200 Subject: [PATCH 33/59] Started core49. --- config/rootfiles/core/49/exclude | 1 + config/rootfiles/core/49/filelists/MIME-Tools | 1 + config/rootfiles/core/49/filelists/Mail-Tools | 1 + config/rootfiles/core/49/filelists/files | 4 ++ config/rootfiles/core/49/filelists/lm_sensors | 1 + config/rootfiles/core/49/meta | 1 + config/rootfiles/core/49/update.sh | 59 +++++++++++++++++++ make.sh | 2 +- 8 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 config/rootfiles/core/49/exclude create mode 120000 config/rootfiles/core/49/filelists/MIME-Tools create mode 120000 config/rootfiles/core/49/filelists/Mail-Tools create mode 100644 config/rootfiles/core/49/filelists/files create mode 120000 config/rootfiles/core/49/filelists/lm_sensors create mode 100644 config/rootfiles/core/49/meta create mode 100644 config/rootfiles/core/49/update.sh diff --git a/config/rootfiles/core/49/exclude b/config/rootfiles/core/49/exclude new file mode 100644 index 000000000..6fe46b4c8 --- /dev/null +++ b/config/rootfiles/core/49/exclude @@ -0,0 +1 @@ +/srv/web/ipfire/html/proxy.pac diff --git a/config/rootfiles/core/49/filelists/MIME-Tools b/config/rootfiles/core/49/filelists/MIME-Tools new file mode 120000 index 000000000..af86028c9 --- /dev/null +++ b/config/rootfiles/core/49/filelists/MIME-Tools @@ -0,0 +1 @@ +../../../common/MIME-Tools \ No newline at end of file diff --git a/config/rootfiles/core/49/filelists/Mail-Tools b/config/rootfiles/core/49/filelists/Mail-Tools new file mode 120000 index 000000000..55e3e0c42 --- /dev/null +++ b/config/rootfiles/core/49/filelists/Mail-Tools @@ -0,0 +1 @@ +../../../common/Mail-Tools \ No newline at end of file diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files new file mode 100644 index 000000000..6bc22d450 --- /dev/null +++ b/config/rootfiles/core/49/filelists/files @@ -0,0 +1,4 @@ +etc/system-release +var/ipfire/backup/bin/backup.pl +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi diff --git a/config/rootfiles/core/49/filelists/lm_sensors b/config/rootfiles/core/49/filelists/lm_sensors new file mode 120000 index 000000000..dd0df32e0 --- /dev/null +++ b/config/rootfiles/core/49/filelists/lm_sensors @@ -0,0 +1 @@ +../../../common/lm_sensors \ No newline at end of file diff --git a/config/rootfiles/core/49/meta b/config/rootfiles/core/49/meta new file mode 100644 index 000000000..d547fa86f --- /dev/null +++ b/config/rootfiles/core/49/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/49/update.sh b/config/rootfiles/core/49/update.sh new file mode 100644 index 000000000..b34d37d65 --- /dev/null +++ b/config/rootfiles/core/49/update.sh @@ -0,0 +1,59 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2011 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=48 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#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 +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index a05cfbcc2..f572b9304 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number -CORE="48" # Core Level (Filename) +CORE="49" # Core Level (Filename) PAKFIRE_CORE="48" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan From d02e057e21b3e0729dacba2611b5a527e3e46fe4 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Sat, 2 Apr 2011 19:44:35 +0200 Subject: [PATCH 34/59] Added ntfs-3g to core49. --- config/rootfiles/core/49/filelists/ntfs-3g | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/49/filelists/ntfs-3g diff --git a/config/rootfiles/core/49/filelists/ntfs-3g b/config/rootfiles/core/49/filelists/ntfs-3g new file mode 120000 index 000000000..d93adc2a1 --- /dev/null +++ b/config/rootfiles/core/49/filelists/ntfs-3g @@ -0,0 +1 @@ +../../../common/ntfs-3g \ No newline at end of file From 78e1facfba34d36f37f24ed0a232dadfeed72f61 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Sat, 2 Apr 2011 19:45:12 +0200 Subject: [PATCH 35/59] Change squid init script to kill remaining clamav redirectors. --- config/rootfiles/core/49/filelists/files | 1 + src/initscripts/init.d/squid | 1 + 2 files changed, 2 insertions(+) diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index d4ff5e242..8a642aa7e 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -1,2 +1,3 @@ etc/system-release +etc/init.d/squid srv/web/ipfire/cgi-bin/proxy.cgi diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid index 75dbbfa6b..1a1425d0c 100644 --- a/src/initscripts/init.d/squid +++ b/src/initscripts/init.d/squid @@ -88,6 +88,7 @@ case "$1" in evaluate_retval killproc /usr/bin/squidGuard >/dev/null killproc /usr/sbin/updxlrator >/dev/null + killproc /usr/bin/squidclamav >/dev/null killproc /usr/sbin/squid >/dev/null rm -rf /var/run/squid.pid fi From 6456279f4f2b6a19c552510d4dc24edd3d310882 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Tue, 5 Apr 2011 19:15:36 +0200 Subject: [PATCH 36/59] Changed snort update string to match the more relevant information. --- config/rootfiles/core/49/filelists/files | 4 ++++ config/rootfiles/core/49/update.sh | 2 +- langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 2 +- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 0051c60f9..a39cef671 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -4,3 +4,7 @@ var/ipfire/backup/bin/backup.pl srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi +var/ipfire/langs/de.pl +var/ipfire/langs/en.pl +var/ipfire/langs/es.pl +var/ipfire/langs/fr.pl diff --git a/config/rootfiles/core/49/update.sh b/config/rootfiles/core/49/update.sh index 7c2a8bfcd..98c4f74f5 100644 --- a/config/rootfiles/core/49/update.sh +++ b/config/rootfiles/core/49/update.sh @@ -44,7 +44,7 @@ extract_files # #Update Language cache -#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" #Rebuild module dep's #depmod 2.6.32.28-ipfire >/dev/null 2>&1 diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 808092e24..b78efc5da 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1749,7 +1749,7 @@ 'update transcript' => 'Aktualisieren', 'updatedatabase' => 'Datenbank auf Stand der letzten Reports setzen', 'updates' => 'Updates', -'updates installed' => 'Updates wurden installiert', +'updates installed' => 'Regelsatz vom', 'updates is old1' => 'Ihre Update-Datei ist ', 'updates is old2' => 'Tage alt. Wir empfehlen Ihnen, Ihr System über die "Updates"-Seite zu aktualisieren.', 'updxlrtr 3 months' => 'drei Monaten', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 26349e192..20a2681da 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1782,7 +1782,7 @@ 'update transcript' => 'Update transcript', 'updatedatabase' => 'Update Database with last report', 'updates' => 'Updates', -'updates installed' => 'Updates Installed', +'updates installed' => 'Ruleset update from', 'updates is old1' => 'Your update file is ', 'updates is old2' => 'days old. We recommend you update it on the System>Updates page.', 'updxlrtr 3 months' => 'three months', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index cad4406ac..e35c680b9 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1749,7 +1749,7 @@ 'update transcript' => 'Actualizar transcripción', 'updatedatabase' => 'Actualizar base de datos con el último reporte', 'updates' => 'Actualizaciones', -'updates installed' => 'Actualizaciones instaladas:', +'updates installed' => 'Conjunto de reglas de actualización de', 'updates is old1' => 'Su archivo de actualización es', 'updates is old2' => 'días de antigüedad. Recomendamos actualizarse en la página Actualizaciones del Sistema.', 'updxlrtr 3 months' => 'tres meses', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index eb81c5227..8d52e1d36 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1760,7 +1760,7 @@ 'update transcript' => 'Mettre à jour transcript', 'updatedatabase' => 'Mettre à jour la base de données avec le dernier rapport', 'updates' => 'Mises à jour', -'updates installed' => 'Mises à jour installées', +'updates installed' => 'Mise à jour de l ensemble de règles', 'updates is old1' => 'Votre fichier de mise à jour est vieux de ', 'updates is old2' => 'jours. Il est recommandé de le mettre à jour depuis la page Système>Mises à jour.', 'updxlrtr 3 months' => 'trois mois', From f40fd7918a407a4054181c34e4e61264107de957 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Sat, 9 Apr 2011 12:33:29 +0200 Subject: [PATCH 37/59] Changed openvpn CGI to create a CN without a blank as this may leed to errors when using the verify script. Even removed the net2net display options. Host connections should be default now. --- config/rootfiles/core/49/filelists/files | 1 + html/cgi-bin/ovpnmain.cgi | 99 +++--------------------- 2 files changed, 13 insertions(+), 87 deletions(-) diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index a39cef671..97a2c0029 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -2,6 +2,7 @@ etc/system-release etc/init.d/squid var/ipfire/backup/bin/backup.pl srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi var/ipfire/langs/de.pl diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index fcaeb5c35..c99e7beae 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -1862,35 +1862,6 @@ END } else { $errormessage = $Lang::tr{'invalid key'}; } -#test33 - -### -### Choose between adding a host-net or net-net connection -### -} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'add'} && $cgiparams{'TYPE'} eq '') { - &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); - &Header::showhttpheaders(); - &Header::openpage($Lang::tr{'vpn configuration main'}, 1, ''); - &Header::openbigbox('100%', 'LEFT', '', ''); - &Header::openbox('100%', 'LEFT', $Lang::tr{'connection type'}); - print <$Lang::tr{'connection type'}:
- - - - - - -
$Lang::tr{'host to net vpn'}
$Lang::tr{'net to net vpn'}
-END - ; - &Header::closebox(); - &Header::closebigbox(); - &Header::closepage(); - exit (0); -### -### Adding a new connection -### } elsif (($cgiparams{'ACTION'} eq $Lang::tr{'add'}) || ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) || ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'ADVANCED'} eq '')) { @@ -1904,9 +1875,10 @@ END $errormessage = $Lang::tr{'invalid key'}; goto VPNCONF_END; } + $cgiparams{'ENABLED'} = $confighash{$cgiparams{'KEY'}}[0]; $cgiparams{'NAME'} = $confighash{$cgiparams{'KEY'}}[1]; - $cgiparams{'TYPE'} = $confighash{$cgiparams{'KEY'}}[3]; + $cgiparams{'TYPE'} = 'host'; $cgiparams{'AUTH'} = $confighash{$cgiparams{'KEY'}}[4]; $cgiparams{'PSK'} = $confighash{$cgiparams{'KEY'}}[5]; $cgiparams{'SIDE'} = $confighash{$cgiparams{'KEY'}}[6]; @@ -1946,11 +1918,6 @@ END goto VPNCONF_ERROR; } -# if (($cgiparams{'TYPE'} eq 'net') && ($cgiparams{'SIDE'} !~ /^(left|right)$/)) { -# $errormessage = $Lang::tr{'ipfire side is invalid'}; -# goto VPNCONF_ERROR; -# } - # Check if there is no other entry with this name if (! $cgiparams{'KEY'}) { foreach my $key (keys %confighash) { @@ -1961,11 +1928,6 @@ END } } - if (($cgiparams{'TYPE'} eq 'net') && (! $cgiparams{'REMOTE'})) { - $errormessage = $Lang::tr{'invalid input for remote host/ip'}; - goto VPNCONF_ERROR; - } - if ($cgiparams{'REMOTE'}) { if (! &General::validip($cgiparams{'REMOTE'})) { if (! &General::validfqdn ($cgiparams{'REMOTE'})) { @@ -1994,10 +1956,6 @@ END } } } - if (($cgiparams{'TYPE'} eq 'net') && (! &General::validipandmask($cgiparams{'REMOTE_SUBNET'}))) { - $errormessage = $Lang::tr{'remote subnet is invalid'}; - goto VPNCONF_ERROR; - } if ($cgiparams{'ENABLED'} !~ /^(on|off)$/) { $errormessage = $Lang::tr{'invalid input'}; @@ -2121,6 +2079,9 @@ END goto VPNCONF_ERROR; } } elsif ($cgiparams{'AUTH'} eq 'certgen') { + + $cgiparams{'CERT_NAME'} =~ s/ //g; + if ($cgiparams{'KEY'}) { $errormessage = $Lang::tr{'cant change certificates'}; goto VPNCONF_ERROR; @@ -2279,17 +2240,13 @@ END if ((! $cgiparams{'KEY'}) && $cgiparams{'AUTH'} ne 'psk') { $confighash{$key}[2] = $cgiparams{'CERT_NAME'}; } - $confighash{$key}[3] = $cgiparams{'TYPE'}; + $confighash{$key}[3] = 'host'; if ($cgiparams{'AUTH'} eq 'psk') { $confighash{$key}[4] = 'psk'; $confighash{$key}[5] = $cgiparams{'PSK'}; } else { $confighash{$key}[4] = 'cert'; } - if ($cgiparams{'TYPE'} eq 'net') { - $confighash{$key}[6] = $cgiparams{'SIDE'}; - $confighash{$key}[11] = $cgiparams{'REMOTE_SUBNET'}; - } $confighash{$key}[8] = $cgiparams{'LOCAL_SUBNET'}; $confighash{$key}[10] = $cgiparams{'REMOTE'}; $confighash{$key}[25] = $cgiparams{'REMARK'}; @@ -2376,7 +2333,7 @@ END } print "
"; - print ""; + print ""; if ($cgiparams{'KEY'}) { print ""; @@ -2386,7 +2343,6 @@ END &Header::openbox('100%', 'LEFT', "$Lang::tr{'connection'}:"); print "\n"; print ""; - if ($cgiparams{'TYPE'} eq 'host') { if ($cgiparams{'KEY'}) { print "\n"; } else { @@ -2402,42 +2358,6 @@ END # print ""; # print ""; # print <"; - if ($cgiparams{'KEY'}) { - print ""; - } else { - print ""; - } - print <  - - - - - - - - - -ttt - - - - - - - - - - - - -END - ; - } print ""; print ""; @@ -2519,6 +2439,11 @@ END print < + + + + + From 377aa9b34d237d4180df182482bfda8ec327cfc3 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 10 Apr 2011 10:37:28 +0200 Subject: [PATCH 38/59] rootfile update: Mail-Tools, core48. --- config/rootfiles/common/Mail-Tools | 33 +++++++++---------- .../rootfiles/core/48/filelists/perl-modules | 28 ++++++++-------- config/rootfiles/core/49/filelists/files | 4 --- 3 files changed, 30 insertions(+), 35 deletions(-) diff --git a/config/rootfiles/common/Mail-Tools b/config/rootfiles/common/Mail-Tools index a9ee82899..71d57ebe5 100644 --- a/config/rootfiles/common/Mail-Tools +++ b/config/rootfiles/common/Mail-Tools @@ -1,45 +1,44 @@ #usr/lib/perl5/site_perl/5.12.3/Mail usr/lib/perl5/site_perl/5.12.3/Mail/Address.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Address.pod usr/lib/perl5/site_perl/5.12.3/Mail/Cap.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Cap.pod #usr/lib/perl5/site_perl/5.12.3/Mail/Field usr/lib/perl5/site_perl/5.12.3/Mail/Field.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Field.pod usr/lib/perl5/site_perl/5.12.3/Mail/Field/AddrList.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Field/AddrList.pod usr/lib/perl5/site_perl/5.12.3/Mail/Field/Date.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Field/Date.pod +usr/lib/perl5/site_perl/5.12.3/Mail/Field/Generic.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Field/Generic.pod usr/lib/perl5/site_perl/5.12.3/Mail/Filter.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Filter.pod usr/lib/perl5/site_perl/5.12.3/Mail/Header.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Header.pod usr/lib/perl5/site_perl/5.12.3/Mail/Internet.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Internet.pod #usr/lib/perl5/site_perl/5.12.3/Mail/Mailer usr/lib/perl5/site_perl/5.12.3/Mail/Mailer.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Mailer.pod usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/qmail.pm usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/rfc822.pm usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/sendmail.pm usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/smtp.pm +usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/smtps.pm usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/testfile.pm usr/lib/perl5/site_perl/5.12.3/Mail/Send.pm +#usr/lib/perl5/site_perl/5.12.3/Mail/Send.pod usr/lib/perl5/site_perl/5.12.3/Mail/Util.pm -#usr/lib/perl5/site_perl/5.12.3/auto/Mail -#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/_prephdr.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/add_signature.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/autosplit.ix -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/escape_from.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/nntppost.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/reply.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/send.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/sign.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/smtpsend.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/unescape_from.al -#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/autosplit.ix -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/mailaddress.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/maildomain.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/read_mbox.al +#usr/lib/perl5/site_perl/5.12.3/Mail/Util.pod #usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Mail #usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Mail/.packlist #usr/share/man/man3/Mail::Address.3 #usr/share/man/man3/Mail::Cap.3 #usr/share/man/man3/Mail::Field.3 #usr/share/man/man3/Mail::Field::AddrList.3 +#usr/share/man/man3/Mail::Field::Date.3 +#usr/share/man/man3/Mail::Field::Generic.3 #usr/share/man/man3/Mail::Filter.3 #usr/share/man/man3/Mail::Header.3 #usr/share/man/man3/Mail::Internet.3 diff --git a/config/rootfiles/core/48/filelists/perl-modules b/config/rootfiles/core/48/filelists/perl-modules index 1d14c69c1..9c884b8bc 100644 --- a/config/rootfiles/core/48/filelists/perl-modules +++ b/config/rootfiles/core/48/filelists/perl-modules @@ -136,20 +136,20 @@ usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/smtp.pm usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/testfile.pm usr/lib/perl5/site_perl/5.12.3/Mail/Send.pm usr/lib/perl5/site_perl/5.12.3/Mail/Util.pm -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/_prephdr.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/add_signature.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/autosplit.ix -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/escape_from.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/nntppost.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/reply.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/send.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/sign.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/smtpsend.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/unescape_from.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/autosplit.ix -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/mailaddress.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/maildomain.al -usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/read_mbox.al +#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/_prephdr.al +#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/add_signature.al +#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/autosplit.ix +#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/escape_from.al +#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/nntppost.al +#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/reply.al +#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/send.al +#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/sign.al +#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/smtpsend.al +#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/unescape_from.al +#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/autosplit.ix +#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/mailaddress.al +#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/maildomain.al +#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/read_mbox.al usr/lib/perl5/site_perl/5.12.3/MIME/Body.pm usr/lib/perl5/site_perl/5.12.3/MIME/Decoder usr/lib/perl5/site_perl/5.12.3/MIME/Decoder.pm diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index ed587ee92..0037af183 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -1,5 +1 @@ etc/system-release -var/ipfire/backup/bin/backup.pl -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/pppsetup.cgi -srv/web/ipfire/cgi-bin/proxy.cgi From 0ddf0594ddae080564606e4b36d6b5f3443a670e Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Thu, 14 Apr 2011 23:55:15 +0200 Subject: [PATCH 39/59] Some new icons for the webif (send in by traxxus). --- html/html/images/delete.gif | Bin 153 -> 1879 bytes html/html/images/document-save.png | Bin 911 -> 1572 bytes html/html/images/edit.gif | Bin 131 -> 1726 bytes html/html/images/floppy.gif | Bin 151 -> 1179 bytes html/html/images/forward.gif | Bin 609 -> 1669 bytes html/html/images/info.gif | Bin 1209 -> 1811 bytes html/html/images/list-add.png | Bin 323 -> 932 bytes html/html/images/list-remove.png | Bin 247 -> 651 bytes html/html/images/package-x-generic.png | Bin 540 -> 1666 bytes html/html/images/reload.gif | Bin 108 -> 1859 bytes html/html/images/stock_ok.png | Bin 672 -> 2830 bytes html/html/images/stock_stop.png | Bin 1379 -> 3051 bytes html/html/images/user-trash.png | Bin 655 -> 1562 bytes 13 files changed, 0 insertions(+), 0 deletions(-) diff --git a/html/html/images/delete.gif b/html/html/images/delete.gif index 855a9b3c2f26fce99bac3b6dc6d7505ee11d6299..edae2a7f77b189461ab9679f25f9a500df2ad709 100644 GIT binary patch literal 1879 zcmaJ?X+RT46i!HxQ>dswJ(r*;3dtrAa!5Fm7|tM}^i7KxDTnyewBgpiT3rHTroE%gFxt+t@GhrQ@VMf;<4{_M<~?|aA0H*dot1WcA_9Bv%W zFoeT~!C>g>>gw(7?eFh@^5luhWWtOdZ-{stZWPYPg0Nsi2q_uH-t#p?Z|?YzO1F}s zl+$z*QHLLNzbQFab$Zs)+Ux!`1I<8%i+yyfU5ihvjrmHJ6Vf!XGOYV(Wd0G=PVb!R zpqoWET~f+JdaU0>?Yt*$SUI_bk~M$#4X4~`INY3E86rE|Y&>zQ!DPPR7eLqPwRQUp z5iv1$@AWK8UE0%gr~6LNhLWOng$0?i73s?*rJGAKr0J1S;fqpIlNKfp3=A}%JG*sz zWmI%z{eHuhw#%2>+LISAIB;m+^B2!^^VWn#MyPXC7h7Apy1Nhs%oT*|3yZE^Ymb~4 zcc#hs;NksAlPAU{%_ki$Y@EWj6`BJ3L&tVTrQOb7+ipyg6Ihcs~Z0tt{x zIHU!1At*$6P=+)-M*$_|#3YJyGQ}(jDL4oSRI}CC(LtyPP|LF9O17Fq5=r1Rh>guH zW(o;-3qdnEq)^KSV2R0t6%artgT7)g00aW4WU8M(gTe3tXdo4&fHVq~=1XO;{b+0u z1l|u47EK{ZXUFpe?_*&r4k-gg5jKUAot;h2_9MfJEkY<%GH5Aj7$_9} zKU60BfL5aM(8qlL)3GvfH3CuMAtk&@A%-xxrzI4^<|!Z%3M&#}IBWP6V>4hBR%XBm zz)PS53#4)hoUMF|77E!BawRH~i=hZUhlKITQmKT^;QRY?1w1aD#b8pYb3qo5=EvhR zK!!j7@)$gDn9GO7t7MQI9p*|ta(N?iEkckXSY$q=kg6bwKmp5uw*|AMBj>^z(cgQn zWaL~zN90nlWGI$v{ns@Qn=tKIrXNI$Ek4K|l4Dv|V4}tk{r%UUfBgRDw_ktx`Snk) zUJefY_`{3m-#`2A>9}D2M_GuS6^qSt=YS0_pY7QJF2#C+ge#s zUbbcPrqYci8;Xkx*RLzk>+-dEn%uQ(a#pLeRjW{?VkH90Wm%akq#4W8A&EFml)5Zs z>5|2Zk{2#WnxB{u9~V0>Mi?Cx84(^Pn9JvJLqmdtIDvE6EG8p>?(av#9u(QvXZ9@b znKQhmPxB;s08^(-o-}d7r|xd9O^r9oQA; zio@9qY4db?or|VWv#_9~WYk*ClsL~&jl0)IeWbJ~)r#N@E)FZ4&n|&9$eJbAsZ-K9 zG`FB=*Fa5Vfkwr$$#wIbkg~{EGFu#;NzxdtR76IETkr%XC6?;uMqJUM*9aY0@ySWO zbO8V++L-mXQzC<4nY{qVg9kz)KJi7^r$(Wfql9wN;>P zTC+iG>m*BR)Yjlfdj?l@gdnC{c;du){vBG}z|Jxc^4iY9mHW-*j-$_4)y5@knd%Uw zVu~J{c?4ii=fkRs+L^jK-j-dqo{#x@@1+xnOc#^06(P^j9njG)+1UZrNhb$E?u#+b z8ZRHPQ>3*!;t?|rKgM8PZ1mq0{qjVZ$%^P){#(;C74qm}T4D2G0@uC_@95a=Ufxm+ zT?}lsTKVuPA)mO{30Gw5D=lNXk_jH>zH67%^(wEhD_}T{F*UCcowW+OB(D%HLUMW?vS#De*pN>c&8-3;_DY4VcPTO zbDOo@>sdDn7G}-*tz~arvEZ-Xv_D#|tKF9>vmKU{UL3Bl-_2ZKpuW*@^XcyE@ky_H zA9A1V$?w=u`RSnL0XvBY-~1z8QkJj$@~0x~-sa`j?USx-zVhnw`Rg|%;}v%ZX8*Oj zZ1LdJ7pD5VHGSFAyU$-2-j~+%N0+VQtNFuc`JaXTw+gU^-b)wSH?{Qb^RVi@SIhP9 zD(#GS5;*p?q4%KZ-J5ss&V1JzU*BfgFMW9Fih^GYfBs*iz&7Fgo%GFz<&BSD7WMlv zhySJvU&Ey{H&-5?qrLv~?dx^&^KM&+dw=_Eq<3sPOSA&3l>_6Jh9g@~Mtfg!OSHSP zX{Hfl)&izu2RJmuv-3HpwI=O1*gj*nbj??`*0W4u%n#j;{%4x$ZR+)U(e1?y3=FCz z^{x>mDTyViR>?)FK#IZ0z|cU~z*N`BB*ehn%EZXZ2*@?FGBB{&CXff#0n?D1pOTqY ziCcs3>lK%P8ca)o8hkR7Q}c>b88S*r3as??!FFYqr6%X+*5~Hu73<{}rR(QF)D-Lc zxCi*?8|fM9TOZsa0W?7pWI}L$T1k0gQ7S`udAVL@UUqSEVnHfM-|TlbQb0xg5Jja$ z$*Bx^rTJy45g|se6wK}brIZj-@u5LJFh_t@RY;ZS6_ghj=;fuBOzb?a3slbF>FVdQ I&MBb@0M(2k_5c6? delta 7 OcmZ3&)6c%4pBVrO;{u5Q diff --git a/html/html/images/edit.gif b/html/html/images/edit.gif index c749f465811338334bc05cbc13a6c49dfe6521e3..851d29e64e5565dda9d7f887bde5bdc03e4e0714 100644 GIT binary patch literal 1726 zcmaJ>dmvP46rVgwktA8!wXPxQVP0Y$jMogIMlwndJ?3#^FmuPul}X!<#-p;^u1Yp~ z>oK(wYB!`d^rls2ZKIY%V?;Dop3RiKqiFwFd;YoKckb`^JLi1g`OdQ7KoXf{g|b5B zkD?0C+KqM`eSVf&Sy`!6DpBL+Fk&15vCtH@T zR(9-hn(BQ%>|#jVg}kV0Ht$lSxu=nNhukE@g_xCahFOzb$1%3GWl%}MC-*KEO6^)! z>Vi-x&(_wiuKx1!^4G6>+uOT!y7&G4+JS)~wOY+)$CQ@dKYhBesp(Z)TbEX=YiM|> z(G2wV4yC51^7#q-_a7-JC{?R_2L|5N*SA$wHDqTWeEYUfEh2!YXom9hPd$A2OrfYB9MpDoY0AoOmzUp*jTI^sEqs2GM3Oo@tSc?OnwfbB zhLeMWLRPE@ZD>#_m8$ys7YfD8k&zLtRvR51-`UyI*{M;fRKC8nqN1Yg?Bgm`Pfkuw zdwb95m^qA^u4RM)bQa7)zFs~OA&V0S!T=kL<_V~1O~p+#z~fTUk?sr}Lr4Q-ctOb` zkeM7B!AXwekhy3dZ@^1Jk?@6l5M}`qe!M_Tkx3;zF zm^4TP0`3@`D+lL+13d5;yxUSDk+=jP;P5ysj)27zT=7JT8-aqu0iO(wL=$nhQo`wh zpJE|9Dmn&+g%m6{DJcn)O7THX+Jt#nWU4%6Cl+h3Gb=r3$!$X4u{crpJ?$x~M>3-eS`Km+R zu6o(l`l97|bJJhXo;E6<{Mqn_qW@9v%3x2mfuZ~k`Udd0Q!veK)+ z{&MAVNpaDo!ixnzUpOy6clONb{8J}S96xsSNM7#YpK=amA3U%>>&GAVeg9qN-aWfB z($i99yHcdz?)+v)@^(qmwnSJgN)SQ)wS))+XMpLA+)U@=B zG>i=;&d6xq?yLn{4TKgPQ=6&<;o8i26Eb_M9C=Xq4zRJV#YZit$C(h{+Ocz?hADuoZF;)-!lN@}&$xFpirL1^RaaV9t!L~)PQ~*dWTMDm delta 6 NcmdnT+srtj82|`v0%HIG diff --git a/html/html/images/floppy.gif b/html/html/images/floppy.gif index 7db2f32d1da65f4d4f12af9ee70cef5205620acc..d0562220dc61a9c3e2dc0c88c5111f2a2fb4a5b9 100644 GIT binary patch delta 1043 zcmXYvVN6?P6o%j1UV3jSlu{6GM(tqS0Vds6Ljy$EYyq`D02^0HH8-Rz&18vY*}xVF zS=#{{2vJDDY3!D=;X(`%L1efPb8!v$1DX;^WWkIwFfALI8#Xe;+GG2%m3uo|kM{a5_0_yt9heXNaev2g+A(r-WbbKg zYH~_*Kr{Ho;Oy<$n!1|yw)WVw*w}YttX8vlZ_9Vhm#IwA6|fa02Cm*}II62YQQ>Id zb{_2kc)YZ=rhV9`VBkV@9Sa+&zf3$OL5#ZhaV8FX9Ed~TrbpQ}D6t6Vn_$S|sNdoG z7~lYw1_AgyCaeb0I1M;4h?NKtVjy0w;q@{UP#AV$s4NU30*(=M(RL7Jr$A9~xu9Te z!BeH zgLBifxKBKfb4-F@X$9I46w`1yEv4y1WSN@~&HcM?D~*>r;&uVj^4Ly9LLBp>@LuML zyT`K%=ck5A=MW^KqChHy1t5qQ`TMls4GC|+glC`r`tklfwEb`%UF%m}4O zB~QY5TL!pVun0UCnp=Qoy%O6m02Jzu1V9Sh&dssW{YYw@v4{lHs2xlQ7SY|hp>+e@ z6Q~4_W}OYuQZRPGoG?pVMIz1@-!%lcscFXLL@nXi1q8RZ1Tm}uh0qT}SO@1AXE9HJ z^ucqq=c5n$7S5Q-)5!aeB*Zm9CyvSz4n@a7&>Hjiev>y%J7WuZFW*t>Y{uB!{RK&O zT0PzJ>WC~gsoY5uKUK|{6c)V%EOHJLumK4zWSLSE9+tz=)|o4h%> zlGfZVdG|U=$tT}BnHlz1AMqTPtHb=jp`^`)-gApZ*I92P+0&c()#7`_k+g&AeATK% zrebc^785colz1i+0VtL!MDkM5@iZcB$een$25R z9f%s|q{<3ENl4PYd`DHThos2|_5htv`!7mqi?P#qcrVPWDO*#ZC%;`1@xnackM9@bm? delta 6 NcmbQuIh}FBbN~nI0%QOH diff --git a/html/html/images/forward.gif b/html/html/images/forward.gif index 33d18b57197a951673ace2b3091fd202ba58dd47..fdda6afa9a4212d04374a9b192b026d636ddc29a 100644 GIT binary patch delta 1076 zcmaFJ(#pFbk*PkvC|%#s($Z4jz)0W7NVg~@O}Dr*uOzWTH?LS($xgurC}QQ3TAW;z zSx}OhpQixgCnn{Wme?vODOBX<|Z z5PB_f>IDWZ(4Kmr)h?+;nPsUdZbkXI3Sci=W#V>>8BPPCdQ)&a#vD^`J=7=qK>U%haDv3%LmC5sm=Trhv$+&Qyn&73iP z+SDnNCrzBt-`CsI-PPIA-qzaE+|<}mUsqdGT~%38URGLCTvS+)pO>4Hot2r9o|c-D zoRpXl9~T=F9Tgc79u^uB926Mf@8|2|UGL@T;qK<@;_T$;U~gw@V{K(=VQyw>Vr*n+ zps%N^qphW>p{}N?qO7E-ATK8?BP}Hh9_7Yhw{pm1^;t4nN!M>F}CcTR3rU+lnO4FG$vjFSKW delta 7 OcmZqWeaNyQkqH0`K>~{a diff --git a/html/html/images/info.gif b/html/html/images/info.gif index 94671ef2f88f359a09c7db13d53854a5390ea870..31e680c6c62d7b330c14dffc5f511fa1baeca6bd 100644 GIT binary patch delta 614 zcmV-s0-61}36l=6xdeag>+0#~=jP?)3Q(qoSdppPrqZo0^%JmzI^3 zlai5;kB*Iui;9VehlYiOgMxv8e|~*@dwO|zcXoAjb8>NTZ*G5WY-?(1XlG_+WMg7s zU|(KcTw7XMSXWk6R8vw>P)|-xOiM~hNJmCRL_zCFHW4BMwNxk&g(VVmI=(azettGI8pcUUg$g|^%`7`s!Vo({)k6<- zgeX@T-Q9atR()bG6B%j5Fp^h`4b2LJ0DE) AD*ylh delta 7 OcmbQtx07?jP8I+QrvlLc diff --git a/html/html/images/list-add.png b/html/html/images/list-add.png index 1aa7f095c6c282262390748ab2e596a3fc15c228..012cb2eb40e3d982f5f05811d5c0992c06027307 100644 GIT binary patch delta 621 zcmX@iw1j0ZzRg=VEx>om_l{Mc>YnDlofh?YiI>m3_jgl`P6`OB2(vi4{8HR_@i$jPWU9UC znV!kV&+%p2v+!LMbk=D!G7y~5IA?9q*0+A||FRT(m}6bas;#g}HO8^8DY$J_0YNVZ#7G1WM0L-pqk zwV`?z*U<)qy{@NFK4%PmjQ_uNh#98I5H=Wd!= zdNcjc<&(wx6xukL4(`4wn<>v#@1(P|VBrkeisP1j&pxlvtiN;4=fJA0y-&AZohbh| z@9TGIqm|EPmzbVRG`+mv$Ef&t!Q5DV1_lPz64!{5l*E!$tK_0oAjM#0U}&IgV5n)WoT?=V4`baZe?IFZHLHB6b-rgDVb@NP!081bUc5$CKaf|1Z0IzW^!s?aVkSb zNlAf~zCPHp%(B$v{M_99ykfolqICTnh>~J`_W&P#BRvECoGi8#K>d;+{lWQZCFO}l zsSM@i<$9TU*~Q6;1*sryv)|cB0TrbRLsXR(C8sjD`}zC2>N@A=p;fx9C=B~>pyKR-PuRS)PE{Q~{;y!_l$-DI#{{Q%jmuYsBwJYD@<);T3K0RX=n B{rLa@ delta 7 OcmZ3&ewb;4Ga~>C8v<88=%^6&-|%+~4^;E4F$5T8??j9M9ddFAH8YOn-3iYv{Yp)t(hS zQ=${j&rI&QkyExWI#oR^*SWOInlFIM^4RP?Z@r~|W7fZ~w%NSRk4-IeLgD6*w`C62 zv;Si(oYFUGo4O7Q0|SFRdP`(kYX@0Ff`CLs5jI#Gz>AYv@$fdGBD9K zFt;)=n6^XYCW?;S{FKbJN~jJj8lFF0lM2*e0-{x%A1sz13@CcZ;3g#1OEnZ$E<$4|9vc?6XSZlUfd6?ddtU_RZ_p zxl*$8Wp-9Pd{nG!>TF&eH7lIu`0?W>zkIo1ZxX^8A*Liy!MEnMRefW@jD@+kwN%{~ zo5buoGO5iiH|^KWiQVFQ^BAX0^iVPIHSU;Xz3AeKg4pTphY#mil=0j(2@Enax9NHR zn_)_~>$SJ{`-ucFPH^^seT&6qLc!1q&E=Gk~|Sl!)zeceNLCYHyAQv^H?x?k?|*(D}Cd-o1Nub@%r%pH5FtFO;coPcY~ZXqq)kDr{Yhr;eQZbdL%9 zOS_%4TI*klbl%;anVqdH!87UfQ;t?0pUX#9^z5DHw|uc%URv7e8#g4pG;?mdX|g)3 z3|SPSl{ic7?Ao+yvq=Iz0AROg;FdVg-Rm+!(Q zJW`>dic?Rf{8;qfMDg@710JR{hPx|zwlFarRM?g)yvd2f_k&J+LQYOk=Sh)uua%ZM zX?3oXzOn7Bwf8GSp2JrTJv8{bk?q=ge}PR-Pq-_&Slf$kE;XsQ@1G=e|MLm)Pg88? z7wznc4Ly3>Tl%BTekTXbDNM1~1H391ZQlIZ$wKDemD1SQ>!rRNfj9YAw3aq~s@=cn zPt(8dWpP$E`ztqZ-h7`!fhC0bTJ}HB|LJ-Y{<8c~vxSdwa$ zT$Bo=7>o=I4Rj3*bq(tcLkujf42`V}Omq#*tqcsN?GU+%q9ZpyB{QuOp#xpR^QUW4 zff`IeR`_Hlr{)!>GGvsL6jG;qfAGj6yDXDtt`T6NN lsd_+b^b7RU^YU|3b(6t*^#f$Lz6NS$@O1TaS?83{1OVb)_v!!u delta 7 OcmZqTox`$0h6w-(Ndf)< diff --git a/html/html/images/reload.gif b/html/html/images/reload.gif index a456e7e733e703442d5755520a9d870f670e000d..1b04197ee3410cad48a9b3c8c115a827ddeebbc8 100644 GIT binary patch literal 1859 zcmaJ>SwIt46dkB6A}B>vaGeB1M6yE2MkFC20umQYiyOj_3?xD_Loz@>ED8#!$SSxY zA|kDb78feiE$mAXv~@$RiddIcD_V;nrF4R#{V07OGxxoB&OP_eJM$L#iCJvO7O(|! zh5@}^fBEudU}O*m#u*s`SHr`w&o}06$vWyZ>n(rsgeB9$e3&mZB`byb0Uaq|VdBJI+V# zY4wutr3Phpb#?Xh^n|3HbzigVV#mWJiKhn#2YsW&$rx>ZaOPKE4+}3#c`F5R~|5-{m#pG96DB0 zcDkwfRQri4eN9tW=E)n94W|-|+hjQn(v2tK>^k=~xk-g}P@Cj+{nLhrhY7LO!v<*36e1cJWRR&O8P$UddeF!;H+LqJ=?c=RG%AHkr_ksm8k6Hj=TNEOhe5>E zH1cpxph)~d3!m|b3JgOz6iQrN968R7jA$Y#G&Y-U$U&!*a0E#kuf`x9Nv(Al%^-rc zGK~_&l!zKMWQ4+y7>q~6D}CRB3jLT?ttF4NLzW>biVi|4G&0rD(kM_O`G2TN^%1Sb z0^v{f{%2yXG#-U1fv^^d(a2yN?qHBYIYJE#VTeYGAW@@VahU?a5Um11LE#Dp7^GCo zkvQ!LS|Z{2skIoSmcf1^9ueo0l}b5B$P&1TSS&XN+k-))`B2$nHrtymV6$jGVz$8D zeUvLgWHBmOjg4~UpSbR0at%gMp}4XL)+l3Pxmbg!z>$VI%CT#qjhXKQS3Y(v^f9>< zycmk%SpRj*qf5AV4By?U#a9A!2gF-{r1+QJRdezFH zFTaqk2wc8w=@Lo6Vt+s1MPeV3&|ARwTFCR{a@Z`U2gBWsj{i_(lIsGO`Ofp4<~lkM z3E-UBvu4hiZf`ej>J;0_HlJHhnrLM?!D76*nW@RR&y4YV`2B61^!_%U3QPq6v*Ari z$thd5rluu@i|o0IMB?;yDVFxB<7eAgxLTRIT9|MxlPodD*2rl(wJFQdm+fLo_cxy7 zT9yLX6#DY{glK`l!;usy4yjHW@9)CCoCWIhh+s^?e&4aksK6dj1qh2|rn_Jj;oS8X*hUMCDLF0GXg5IU6P6U3nGY}dG zn9TL=*b`k^l568Ztw!n4GE*oa2Kl0ErYOG;rZSaF8t9_n51O|$?+0HGD| zUik*C$%CJORuRqtM-*3FJ0&R^^PL$QGZD&?Yb>M5l~NdteJo>}!Pic?veqEG7-T33 z*V-jp^t0aFtl7y{4BZm$xZTeE{r>o!&pFTeob$Y2&-?v6dEEEJp5$?WvlLMqtJ=s~ zAfw}r>Wta5jOyp1&ouATt4NszuNfxUnlIl>h2SKLn&*R0|(-+m<~l=FIgE z`EpdZM52U6UeZT-c}T-TKw(+vdF@%ov!11D7+P>hdX)a?vaRsAm9jOf$-Xhvdbp&0 zro8@me`*)Rlo_z)t4S9DS0;S!5cEfmT|Xx{AH*7I4$kSVaxSGQU+DEu4Uvh07w~r1 z%Di=#(88(uSCBegRJP`Y_aLHK-h4STNIRq|G}gg z`sd}Z2v=U**c=4hQH~3WIGZa2?G@a#s*wbmPN=xc+SZ$WiPGXoujmFH2Evxp)A}Ny zsprs7HNwt5N%DFzu~av*o4Kb#^IH)&>)cPhx3(sgmLS!K9ibE}ck_-Yw>3sv=PrHy((pTnp>v*`zlUm-1 zK;NEjX)l8;YaD2eaipI&wshjewax$h2d7X~Y#-yo^!CnLpp_iw)bGE<*vY8qJdCZ) zw2{luUOaf8ZA@wh#nS0vx>6s{b`b-)yhX!VT&10LV%!if z^YOALp}L@1e`SQLr`8p@C?R*9nmWPh@lK9z?2F)TiuM$j=cGHf{RY&xxG^P{t5>)9 zZ8@LEX46eZkw&q}lF$1dpz?P@?mG+pI}MConX5Gw;0%9WFGTkim047In);P{c?~pNa;N4{_>2=n>O!myO?NGXHULF@ zw?W)_JzwXBE}hWGU!57X@txKYjX?IxQh zvfi+1Ic8dXOk?#GJz*rPu#cxEq}1}vG_B^yM5f|<%hMUR`6?E|k7Qd^FLTxq2k`cn zM7u#7nb@A0CqvLk{gme0 z(!)P2nWrUz8k4|;Lin0%d5VvCp%ML|&3)!pVtil(W+g;xSIz^tS3 zCB<}sad^& zY8zjW!z{nFuh#)Z?Pf5+<%`Mt&HL*#^~bY0Ut0EtX6iS(VqQM=HT?8UHrveJi`Sra zUSd^awc%biy-nG4Y(s}cv9p{4<1Tpr{Nhbse6fAkrq$%jOVb#ZJ5Q-4{;L9GM1l~a z^s2LOkZDuUe{Fq~>;1&^#M(rR`8NJ`CYJO5sO@(74u3Ula}M7LJHr7v4lQYy*}uO6 z<|L?Pbn6ESM@Hn*zkq~B*rXU)foy1!kSVF|*SZ=v9M>&eN}H@Pur374lb6*GeiS({ ziWW5)I4-C+!C1fgDL>J=;=$wjxFL~kJuTsuFGUIdD+@IXuRk~iqI9msyW(MdLp!dt z=S^{+QU(4z>{>>n&pu2u2}|6qON?|8wvG}D7t*@X_vTst-kJE<_a zwfC{kq2F)lNyC3^7Aq7|ZNs_6Hn~!ge{s-{CC=sME{K0lTKKLi3% zr082wh(3;X6i1i?yFictfPoHH6|NqFp1kTVL z2S=(R;5QOAiQhwh%lBV*08lUlhJXOD>L@J0-s(L24(GTV&DekhC6t}=D%pt=VCUlq z2?z*Kb@6obCE9s89)^3kt|`e@i5#wSmF(w3bcC1%29X>+<&B8!{Hx*>OYFANzwO)C jEO6hKJsd{&36ZD}by~J= zON1z*GBs)`Vv2+!x^bqoN;)f#=bZD$dCv2Bp6~O0p3nRB{k}e*F3moJD-;cAWR2aI zvNonw>==PyWUNd(T`Tdx=}F#mhAYMZd6XO>N5J#>ms|^V?Do~dR>ZC(*M*cHz0u$! zQuy;KUYLGs-WhVe+jO*0T*gv*q$PNeTz=2cW8=k?mQq2>r+mP7(>hA~uVCEPO2tJd;k>X+tTCzYPv`6w98_ z{J(wWFW$ONOxQ2(Yagh5xj(&g@L~{tyDYP-k`KgQA}QfOD$=YL-dLSDps_a2)c$jP z+}YJa*Fq$Q?JGdduQsVXgCWkDFqP%;3J%)`)HU2X8Pl5ERH6Gx>fkcaqE*s&r!Quw zqx0Fm6MaopFCI-Bq2UJM+r;)vdm)uMZUI5mVdgthr8t9wI-UA%Z2{a5m!Nbzm# z+$ZDj$YIN8%HjDB88faV63aFki8cvCpIEWZmL#Bq=4N0O(5P-^t+0RmkAABvBHRBl zW~c?-f(~90m7~_F7Dx_a7w+=GeZ&R2FUqvk+LP)Y?`AU5A+vmj%d%EA8#^? z2shyi3?LWm@qjtUnZ|8|GW-zdO+|IY;hr5|I~2RIit2;wN6PlgUZbpgWB6UNE{Cs|s2BFs-jH2@Z`FC0H3-R5#p#1ene!{R(Bzt>i*vCpd3UiC9uaLiHi^c~|*OJsl!HaSxYeoEzR zga`>6i3Vd7iH=!~&TkowY5t1REg$S{E-V+47)bFs{52YYJK_jWY6;~ScDR`6b)1}+ zM7_q$nCB!)T@~_ZGB>DKfa#sVXNH&>24%fiUJiTtUPCd1rxtmOD(R_@LpRo%b!Riv zOUlwOZe>NI`bS~W`t5q(R$WIKDPiN#A;F}-o#1?)s+?DEG$AcbX0Apc{9ah3Z7w5~ z_dQU!@`QKHpMQKF_|?~{c^;&^pL4D`*^Tq#fEG&K{Oal-8n>(~C9-xymYesi-ede% zt*bU9qUT9?I;jA^*ffn#4rco5D_%k5T@8eHw}vH>^OL{? zwUryJAK6UcV%6Yx^y1CWu+D3i38}H!gxUTh)3skC?od^2y4u@A3y1mUyMtTOP zI+23;X{DsLsH`;ibMLzI(|bshfVOAk9rxtKGynjWafp5#N;ox`Lq&(E4!|4)t-ZG?iBt6n;?w^eHDYgF$1;CrBCxx7 z=!jsf1qQ?-+2P13W`_omF+i9@QFZIX)O>C^9h zqWJg3Y!+zpP-$AE@uQZps=B&xXAFad44=r+wpFW2TFf35?L6`H(_0?N2~VE6Fvh%{ zc|B`uz4F_#J9*}D>&5F2Twhb~;Wp{t@3R`Giuhe-$=tlg#=Esydny;hv{YUB3zJr* z#;spJ(`D~g5hj)mH%?t+%waL$N#6OSJ#yiM<8RB9*SJ+5lRKbiUb>Odk751s-FphZ z{?4Dd?)B-<2?h>YQ}cH6Ik2YetemVCaM}B)_x$>wqQAerJ8a^!YnNHz+R&5FKWonjpXy3^d$fMjZJHWriF_19`mu9`KLbbW!x{J05-0(f!SYuUNdZ68N9mQ zWwX?3$>gm+i$3Q~Sr*US^K8REMn#4#OCNA<-^IYdpjzS@QIcGgnpl#mn*t;lj0_Ac zbqx)54NXIgjI9hztPBlw4a}_!3^saCDuZbNskDOV0%`!MFw!+Ls0ZmVGP5!?h3H_j zj%h^Ek(-~AnN|ta0kpy}#K6)Dh>R>D8iaPYUIc0|0lCR1GdVS{IF%uzq@=(~Umt8) zW?5=-er|4lUa?+&QM!H(L`ku}dw`F=k)A=leohwK3Yd)$%LsVt-LEH3Kn>y`8-w#p zi;`0r-2ME0T@^f&^Yau!GE#F>5B^lk1S(NLD2WdZ@`1T4v8Y5ZJug2u73d Date: Sat, 16 Apr 2011 14:41:28 +0200 Subject: [PATCH 40/59] ntfs-3g: rootfile update. --- config/rootfiles/common/ntfs-3g | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/common/ntfs-3g b/config/rootfiles/common/ntfs-3g index 2762b8fd7..186e12be2 100644 --- a/config/rootfiles/common/ntfs-3g +++ b/config/rootfiles/common/ntfs-3g @@ -9,6 +9,7 @@ usr/bin/ntfs-3g.probe usr/bin/ntfs-3g.secaudit usr/bin/ntfs-3g.usermap #usr/include/ntfs-3g +#usr/include/ntfs-3g/acls.h #usr/include/ntfs-3g/attrib.h #usr/include/ntfs-3g/attrlist.h #usr/include/ntfs-3g/bitmap.h @@ -41,7 +42,6 @@ usr/bin/ntfs-3g.usermap #usr/include/ntfs-3g/support.h #usr/include/ntfs-3g/types.h #usr/include/ntfs-3g/unistr.h -#usr/include/ntfs-3g/version.h #usr/include/ntfs-3g/volume.h #usr/include/ntfs-3g/xattrs.h #usr/lib/libntfs-3g.a From 9c8fb3f27868d335efb96140242ebd0ffa8585ad Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 16 Apr 2011 14:42:18 +0200 Subject: [PATCH 41/59] core49: added updated icons. --- config/rootfiles/core/49/filelists/icons | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 config/rootfiles/core/49/filelists/icons diff --git a/config/rootfiles/core/49/filelists/icons b/config/rootfiles/core/49/filelists/icons new file mode 100644 index 000000000..52b22e005 --- /dev/null +++ b/config/rootfiles/core/49/filelists/icons @@ -0,0 +1,13 @@ +srv/web/ipfire/html/images/delete.gif +srv/web/ipfire/html/images/document-save.png +srv/web/ipfire/html/images/edit.gif +srv/web/ipfire/html/images/floppy.gif +srv/web/ipfire/html/images/forward.gif +srv/web/ipfire/html/images/info.gif +srv/web/ipfire/html/images/list-add.png +srv/web/ipfire/html/images/list-remove.png +srv/web/ipfire/html/images/package-x-generic.png +srv/web/ipfire/html/images/reload.gif +srv/web/ipfire/html/images/stock_ok.png +srv/web/ipfire/html/images/stock_stop.png +srv/web/ipfire/html/images/user-trash.png From 2909e8b90fc26c53e8f5f0376c5d084b77a4041a Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 16 Apr 2011 14:56:06 +0200 Subject: [PATCH 42/59] core49: fix squid initskript path. --- config/rootfiles/core/49/filelists/files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 97a2c0029..59f3ebc4e 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -1,5 +1,5 @@ etc/system-release -etc/init.d/squid +etc/rc.d/init.d/squid var/ipfire/backup/bin/backup.pl srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi From b1e4de058e71db030ec6e0e237fb479b77e8efb6 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 17 Apr 2011 18:01:03 +0200 Subject: [PATCH 43/59] add initskript to wait until slower drives are present at boot. fixes: #757 --- config/rootfiles/common/initscripts | 2 + config/rootfiles/core/49/filelists/files | 2 + lfs/initscripts | 1 + src/initscripts/init.d/waitdrives | 56 ++++++++++++++++++++++++ 4 files changed, 61 insertions(+) create mode 100644 src/initscripts/init.d/waitdrives diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts index 73a06a4ba..58bbf8c6a 100644 --- a/config/rootfiles/common/initscripts +++ b/config/rootfiles/common/initscripts @@ -13,6 +13,7 @@ etc/rc.d/init.d/beep #etc/rc.d/init.d/bluetooth etc/rc.d/init.d/checkfs etc/rc.d/init.d/checkfstab +etc/rc.d/init.d/waitdrives #etc/rc.d/init.d/clamav etc/rc.d/init.d/cleanfs #etc/rc.d/init.d/client175 @@ -202,6 +203,7 @@ etc/rc.d/rcsysinit.d/S00mountkernfs etc/rc.d/rcsysinit.d/S05modules etc/rc.d/rcsysinit.d/S10udev etc/rc.d/rcsysinit.d/S19checkfstab +etc/rc.d/rcsysinit.d/S19waitdrives etc/rc.d/rcsysinit.d/S20swap etc/rc.d/rcsysinit.d/S30checkfs etc/rc.d/rcsysinit.d/S40mountfs diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 59f3ebc4e..4975a5e30 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -1,5 +1,7 @@ etc/system-release etc/rc.d/init.d/squid +etc/rc.d/init.d/waitdrives +etc/rc.d/rcsysinit.d/S19waitdrives var/ipfire/backup/bin/backup.pl srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi diff --git a/lfs/initscripts b/lfs/initscripts index c4da41389..c32b1693f 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -163,6 +163,7 @@ $(TARGET) : ln -sf ../init.d/modules /etc/rc.d/rcsysinit.d/S05modules ln -sf ../init.d/udev /etc/rc.d/rcsysinit.d/S10udev ln -sf ../init.d/checkfstab /etc/rc.d/rcsysinit.d/S19checkfstab + ln -sf ../init.d/waitdrives /etc/rc.d/rcsysinit.d/S19waitdrives ln -sf ../init.d/swap /etc/rc.d/rcsysinit.d/S20swap ln -sf ../init.d/checkfs /etc/rc.d/rcsysinit.d/S30checkfs ln -sf ../init.d/mountfs /etc/rc.d/rcsysinit.d/S40mountfs diff --git a/src/initscripts/init.d/waitdrives b/src/initscripts/init.d/waitdrives new file mode 100644 index 000000000..93ae1ed70 --- /dev/null +++ b/src/initscripts/init.d/waitdrives @@ -0,0 +1,56 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/waitdrives +# +# Description : Wait for drives before fscheck/mount +# +# Authors : Arne Fitzenreiter - arne_f@ipfire.org +# +# Version : 00.00 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +check_drives () { + drives_ready="1"; + for drive in $drives; do + if [ `blkid | grep $drive | wc -l` == 0 ]; then + drives_ready="0"; + fi + done +} + +case "${1}" in + start) + if [ -e /sbin/mdadm ]; then + boot_mesg "Assemble mdadm managed raid-drives ..." + mdadm --assemble --scan + fi + + drives=`grep "^UUID=" /etc/fstab | cut -f1 | cut -d" " -f1 | cut -d"=" -f2`; + + check_drives; + if [ "$drives_ready" == "0" ]; then + boot_mesg -n "Wait for devices used in fstab " + for (( i=1; i<30; i++)) do + check_drives; + if [ "$drives_ready" == "1" ]; then + break; + fi + boot_mesg -n "." + sleep 1 + done + fi + exit 0; + ;; + *) + echo "Usage: ${0} {start}" + exit 1 + ;; +esac + +# End $rc_base/init.d/waitdrives From e44dfea3bad0ee92e2645bcd3b1082c7d780b39a Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 17 Apr 2011 18:07:54 +0200 Subject: [PATCH 44/59] extrahd: display also non-partitioned disks. --- html/cgi-bin/extrahd.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi index 2ea417886..fa12dbed4 100644 --- a/html/cgi-bin/extrahd.cgi +++ b/html/cgi-bin/extrahd.cgi @@ -202,7 +202,7 @@ END foreach $partitionentry (sort @partitions) { @partitionline = split( /\;/, $partitionentry ); - if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && ! ( "$partitionline[0]" eq "$scanline[0]" )) { + if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && !( "$partitionline[2]" == "" )) { $size = int($partitionline[1] / 1024); print < From 33af74ea91c5cf150f13be9bad2a1c8b8ea65cf5 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 17 Apr 2011 18:09:28 +0200 Subject: [PATCH 45/59] extrahd: add support for mdadm devices. remove wrong devline of some usb-keys. --- src/scripts/scanhd | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/scripts/scanhd b/src/scripts/scanhd index 2d76ba625..9d47e3d63 100644 --- a/src/scripts/scanhd +++ b/src/scripts/scanhd @@ -2,7 +2,10 @@ case "$1" in ide) - /sbin/kudzu -qps -c HD | egrep "desc|device:" | awk -F': ' '{print $2}' | sed -e '/"$/a\\' -e "s/$/\;/g" | tr "\n" "XX" | sed -e "s/XX/\n/g" -e "s/\;X/\;/g" > /var/ipfire/extrahd/scan + /sbin/kudzu -qps -c HD | egrep "desc|device:" | awk -F': ' '{print $2}' | sed -e '/"$/a\\' -e "s/$/\;/g" | tr "\n" "XX" | sed -e "s/XX/\n/g" -e "s/\;X/\;/g" | grep '^"' -v > /var/ipfire/extrahd/scan + if [ -e /dev/md ]; then + echo 'md;"MDADM software-raid";' >> /var/ipfire/extrahd/scan + fi ;; partitions) cat /proc/partitions | awk '{print $4 " " $3 }' | grep -v name | grep -v "^[:space:]*$" | \ From 154fbbe9fccc580792a82d1bb858d6911faa6269 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 17 Apr 2011 18:11:31 +0200 Subject: [PATCH 46/59] core49: add extrahd changes to updater. --- config/rootfiles/core/49/filelists/files | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 4975a5e30..8fc42ba29 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -3,6 +3,7 @@ etc/rc.d/init.d/squid etc/rc.d/init.d/waitdrives etc/rc.d/rcsysinit.d/S19waitdrives var/ipfire/backup/bin/backup.pl +srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi @@ -11,3 +12,4 @@ var/ipfire/langs/de.pl var/ipfire/langs/en.pl var/ipfire/langs/es.pl var/ipfire/langs/fr.pl +usr/local/bin/scanhd From 50d1ca7580ab255449ac23f2e89d2f67156fd13e Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 18 Apr 2011 20:44:50 +0200 Subject: [PATCH 47/59] extrahd: add mmcblk card reader support. --- src/scripts/scanhd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/scripts/scanhd b/src/scripts/scanhd index 9d47e3d63..7de68fbf4 100644 --- a/src/scripts/scanhd +++ b/src/scripts/scanhd @@ -6,6 +6,12 @@ case "$1" in if [ -e /dev/md ]; then echo 'md;"MDADM software-raid";' >> /var/ipfire/extrahd/scan fi + if [ -e /dev/mmcblk0 ]; then + echo 'mmcblk0;"MMC/SD Cardreader";' >> /var/ipfire/extrahd/scan + fi + if [ -e /dev/mmcblk1 ]; then + echo 'mmcblk1;"MMC/SD Cardreader";' >> /var/ipfire/extrahd/scan + fi ;; partitions) cat /proc/partitions | awk '{print $4 " " $3 }' | grep -v name | grep -v "^[:space:]*$" | \ From bbd544ea81ce56719560ceaae890357f66a656c7 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 18 Apr 2011 20:53:41 +0200 Subject: [PATCH 48/59] services.cgi: blacklist mdadm (no good idea to stop it with webif). --- html/cgi-bin/services.cgi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index b6efe0958..55740cf26 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -177,9 +177,10 @@ END # blacklist some packages # # alsa has trouble with the volume saving and was not really stopped + # mdadm should not stopped with webif because this could crash the system # chomp($_); - if ($_ ne "alsa"){ + if ( ($_ ne "alsa") && ($_ ne "mdadm") ) { $lines++; if ($lines % 2){ print ""; From 8ace0e749bd428fa66ef69279c6889246a1b6c7b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 18 Apr 2011 23:26:26 +0200 Subject: [PATCH 49/59] core49: add serices.cgi to core-update. --- config/rootfiles/core/49/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 8fc42ba29..9d0af8036 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -8,6 +8,7 @@ srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/services.cgi var/ipfire/langs/de.pl var/ipfire/langs/en.pl var/ipfire/langs/es.pl From d366bd9f33d2c79e0dab376bede95636cfcc2695 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 21 Apr 2011 11:03:43 +0200 Subject: [PATCH 50/59] mdadm: update to 3.2.1. changed initskript to scan also for raid devices if no config is present. --- config/rootfiles/packages/mdadm | 4 +++- lfs/mdadm | 11 +++++++---- src/initscripts/init.d/mdadm | 25 ++++++------------------- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/config/rootfiles/packages/mdadm b/config/rootfiles/packages/mdadm index da4238bde..b98ec3cd5 100644 --- a/config/rootfiles/packages/mdadm +++ b/config/rootfiles/packages/mdadm @@ -1,4 +1,6 @@ -lib/udev/rules.d +etc/rc.d/rc0.d/S85mdadm +etc/rc.d/rc6.d/S75mdadm +etc/rc.d/rcsysinit.d/S15mdadm lib/udev/rules.d/64-md-raid.rules sbin/mdadm sbin/mdmon diff --git a/lfs/mdadm b/lfs/mdadm index 7d898bbc2..5c4024700 100644 --- a/lfs/mdadm +++ b/lfs/mdadm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-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 # @@ -24,7 +24,7 @@ include Config -VER = 3.1.1 +VER = 3.2.1 THISAPP = mdadm-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mdadm -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4fd8e375a2ee314becd3196c1a250d98 +$(DL_FILE)_MD5 = d1e2549202bd79d9e99f1498d1109530 install : $(TARGET) @@ -79,5 +79,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + ln -sf ../init.d/mdadm /etc/rc.d/rcsysinit.d/S11mdadm + ln -sf ../init.d/mdadm /etc/rc.d/rc0.d/S85mdadm + ln -sf ../init.d/mdadm /etc/rc.d/rc6.d/S75mdadm @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/initscripts/init.d/mdadm b/src/initscripts/init.d/mdadm index 4b79ca849..03f6fe458 100644 --- a/src/initscripts/init.d/mdadm +++ b/src/initscripts/init.d/mdadm @@ -1,6 +1,6 @@ #!/bin/sh ######################################################################## -# Begin $rc_base/init.d/mdadmraid +# Begin $rc_base/init.d/mdadm # # Description : This script controls software Raid # @@ -17,28 +17,15 @@ case "${1}" in start) - - if [ -f /etc/mdadm.conf ] - then - boot_mesg "Starting Raid devices..." - - modprobe md - modprobe raid0 - modprobe raid1 - modprobe raid5 - - sleep 1 - - mdadm --assemble --scan - else - boot_mesg "Skipping raid devices, no config found..." - exit 1 - fi + boot_mesg "Scan/assemble mdadm raid devices..." + mdadm --assemble --scan + echo_ok ;; stop) boot_mesg "Stopping Raid devices..." mdadm --stop --scan + echo_ok ;; restart) @@ -57,4 +44,4 @@ case "${1}" in ;; esac -# End $rc_base/init.d/mdadmraid \ No newline at end of file +# End $rc_base/init.d/mdadm From 2a6b769a018fb5f301352b856ce070b63111fbd2 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 21 Apr 2011 11:06:30 +0200 Subject: [PATCH 51/59] waitdrives: remove mdadm assemble scan. this is not needed after fix the mdadm initskript. --- src/initscripts/init.d/waitdrives | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/initscripts/init.d/waitdrives b/src/initscripts/init.d/waitdrives index 93ae1ed70..d7df93b94 100644 --- a/src/initscripts/init.d/waitdrives +++ b/src/initscripts/init.d/waitdrives @@ -26,11 +26,6 @@ check_drives () { case "${1}" in start) - if [ -e /sbin/mdadm ]; then - boot_mesg "Assemble mdadm managed raid-drives ..." - mdadm --assemble --scan - fi - drives=`grep "^UUID=" /etc/fstab | cut -f1 | cut -d" " -f1 | cut -d"=" -f2`; check_drives; From fac5261ee3d0b1826e128d07aa482d4a863ee446 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 21 Apr 2011 11:08:14 +0200 Subject: [PATCH 52/59] extrahd: fix uuid emtpy string check. --- html/cgi-bin/extrahd.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi index fa12dbed4..3bb6afd8d 100644 --- a/html/cgi-bin/extrahd.cgi +++ b/html/cgi-bin/extrahd.cgi @@ -202,7 +202,7 @@ END foreach $partitionentry (sort @partitions) { @partitionline = split( /\;/, $partitionentry ); - if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && !( "$partitionline[2]" == "" )) { + if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && !( "$partitionline[2]" eq "" )) { $size = int($partitionline[1] / 1024); print < From 607d4baeaf89e8531a0f310d351d878855cd6b2c Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 21 Apr 2011 14:08:04 +0200 Subject: [PATCH 53/59] rootfile update: mdadm. --- config/rootfiles/packages/mdadm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/packages/mdadm b/config/rootfiles/packages/mdadm index b98ec3cd5..aa7358981 100644 --- a/config/rootfiles/packages/mdadm +++ b/config/rootfiles/packages/mdadm @@ -1,6 +1,6 @@ etc/rc.d/rc0.d/S85mdadm etc/rc.d/rc6.d/S75mdadm -etc/rc.d/rcsysinit.d/S15mdadm +etc/rc.d/rcsysinit.d/S11mdadm lib/udev/rules.d/64-md-raid.rules sbin/mdadm sbin/mdmon From e3f28dd56f0df59ec70aeb50df87f8bb552e1aa4 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 22 Apr 2011 14:26:51 +0200 Subject: [PATCH 54/59] extrahd: fix detection of md-raid without reboot. --- src/scripts/scanhd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/scanhd b/src/scripts/scanhd index 7de68fbf4..ee946b792 100644 --- a/src/scripts/scanhd +++ b/src/scripts/scanhd @@ -3,7 +3,7 @@ case "$1" in ide) /sbin/kudzu -qps -c HD | egrep "desc|device:" | awk -F': ' '{print $2}' | sed -e '/"$/a\\' -e "s/$/\;/g" | tr "\n" "XX" | sed -e "s/XX/\n/g" -e "s/\;X/\;/g" | grep '^"' -v > /var/ipfire/extrahd/scan - if [ -e /dev/md ]; then + if [ -e /dev/.mdadm ]; then echo 'md;"MDADM software-raid";' >> /var/ipfire/extrahd/scan fi if [ -e /dev/mmcblk0 ]; then From 339dbffc70042b8415d4407f35dc008fc9e51ecb Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 22 Apr 2011 17:03:23 +0200 Subject: [PATCH 55/59] mdadm: add cgi to display the md-state. --- config/menu/20-status.menu | 5 +++ config/rootfiles/common/apache2 | 1 + config/rootfiles/core/49/filelists/files | 1 + config/rootfiles/packages/mdadm | 1 + html/cgi-bin/mdstat.cgi | 51 ++++++++++++++++++++++++ src/scripts/scanhd | 2 +- 6 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 html/cgi-bin/mdstat.cgi diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu index d71354043..c0b780a06 100644 --- a/config/menu/20-status.menu +++ b/config/menu/20-status.menu @@ -69,3 +69,8 @@ 'title' => 'Atm-status', 'enabled' => `find /sys/class/atm/*/device 2>/dev/null`, }; + $substatus->{'76.mdstat'} = {'caption' => 'Mdstat', + 'uri' => '/cgi-bin/mdstat.cgi', + 'title' => 'Mdstat', + 'enabled' => 1, + }; diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index c7262a5ae..be4648b0a 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1333,6 +1333,7 @@ srv/web/ipfire/cgi-bin/ipinfo.cgi srv/web/ipfire/cgi-bin/iptables.cgi srv/web/ipfire/cgi-bin/logs.cgi srv/web/ipfire/cgi-bin/mac.cgi +#srv/web/ipfire/cgi-bin/mdstat.cgi srv/web/ipfire/cgi-bin/media.cgi srv/web/ipfire/cgi-bin/memory.cgi srv/web/ipfire/cgi-bin/modem.cgi diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 9d0af8036..8e21e3fd2 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -13,4 +13,5 @@ var/ipfire/langs/de.pl var/ipfire/langs/en.pl var/ipfire/langs/es.pl var/ipfire/langs/fr.pl +var/ipfire/menu.d/20-status.menu usr/local/bin/scanhd diff --git a/config/rootfiles/packages/mdadm b/config/rootfiles/packages/mdadm index aa7358981..d593cac25 100644 --- a/config/rootfiles/packages/mdadm +++ b/config/rootfiles/packages/mdadm @@ -9,3 +9,4 @@ sbin/mdmon #usr/share/man/man8/mdadm.8 #usr/share/man/man8/mdmon.8 etc/rc.d/init.d/mdadm +srv/web/ipfire/cgi-bin/mdstat.cgi diff --git a/html/cgi-bin/mdstat.cgi b/html/cgi-bin/mdstat.cgi new file mode 100644 index 000000000..35c7debf8 --- /dev/null +++ b/html/cgi-bin/mdstat.cgi @@ -0,0 +1,51 @@ +#!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# 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 # +# 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 . # +# # +############################################################################### + +use strict; + +# enable only the following on debugging purpose +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; + +require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/lang.pl"; +require "${General::swroot}/header.pl"; + +my %color = (); +my %mainsettings = (); + +&General::readhash("${General::swroot}/main/settings", \%mainsettings); +&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); + +&Header::showhttpheaders(); +&Header::openpage($Lang::tr{'status information'}, 1, ''); +&Header::openbigbox('100%', 'left'); + +&Header::openbox('100%', 'left',"MD Raid State"); + +print ''; + +&Header::closebox(); + +&Header::closebigbox(); +&Header::closepage(); diff --git a/src/scripts/scanhd b/src/scripts/scanhd index ee946b792..0d97d5530 100644 --- a/src/scripts/scanhd +++ b/src/scripts/scanhd @@ -4,7 +4,7 @@ case "$1" in ide) /sbin/kudzu -qps -c HD | egrep "desc|device:" | awk -F': ' '{print $2}' | sed -e '/"$/a\\' -e "s/$/\;/g" | tr "\n" "XX" | sed -e "s/XX/\n/g" -e "s/\;X/\;/g" | grep '^"' -v > /var/ipfire/extrahd/scan if [ -e /dev/.mdadm ]; then - echo 'md;"MDADM software-raid";' >> /var/ipfire/extrahd/scan + echo 'md;"MD Software-Raid";' >> /var/ipfire/extrahd/scan fi if [ -e /dev/mmcblk0 ]; then echo 'mmcblk0;"MMC/SD Cardreader";' >> /var/ipfire/extrahd/scan From 98e8c7b563dcede542b9c78ceed2e279c2358abc Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Fri, 15 Apr 2011 02:26:16 +0200 Subject: [PATCH 56/59] backup.cgi: Added Content-Length to show file status during download. --- html/cgi-bin/backup.cgi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi index fdcac538f..8c9381496 100644 --- a/html/cgi-bin/backup.cgi +++ b/html/cgi-bin/backup.cgi @@ -66,6 +66,8 @@ if ( $cgiparams{'ACTION'} eq "download" ) open(DLFILE, "; print "Content-Type:application/x-download\n"; + my @fileinfo = stat("/var/ipfire/backup/$cgiparams{'FILE'}"); + print "Content-Length:$fileinfo[7]\n"; print "Content-Disposition:attachment;filename=$cgiparams{'FILE'}\n\n"; print @fileholder; exit (0); @@ -75,6 +77,8 @@ if ( $cgiparams{'ACTION'} eq "downloadiso" ) open(DLFILE, "; print "Content-Type:application/x-download\n"; + my @fileinfo = stat("/var/tmp/backupiso/$cgiparams{'FILE'}"); + print "Content-Length:$fileinfo[7]\n"; print "Content-Disposition:attachment;filename=$cgiparams{'FILE'}\n\n"; print @fileholder; exit (0); @@ -84,6 +88,8 @@ if ( $cgiparams{'ACTION'} eq "downloadaddon" ) open(DLFILE, "; print "Content-Type:application/x-download\n"; + my @fileinfo = stat("/var/ipfire/backup/addons/backup/$cgiparams{'FILE'}"); + print "Content-Length:$fileinfo[7]\n"; print "Content-Disposition:attachment;filename=$cgiparams{'FILE'}\n\n"; print @fileholder; exit (0); From 342fa5543a381343e031401709074b1d7ce29c47 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 28 Apr 2011 18:45:18 +0200 Subject: [PATCH 57/59] core49: add backup.cgi to core update. --- config/rootfiles/core/49/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 8e21e3fd2..bac876931 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -3,6 +3,7 @@ etc/rc.d/init.d/squid etc/rc.d/init.d/waitdrives etc/rc.d/rcsysinit.d/S19waitdrives var/ipfire/backup/bin/backup.pl +srv/web/ipfire/cgi-bin/backup.cgi srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi From d05c4e8f5ce93e85310f43fc71cb495a63d4f0ec Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Tue, 3 May 2011 17:41:38 +0200 Subject: [PATCH 58/59] vdradmin: Fixed bug that no cache directory was created. --- config/rootfiles/packages/vdradmin | 1 + lfs/vdradmin | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/packages/vdradmin b/config/rootfiles/packages/vdradmin index 17be5a74f..20ea7d535 100644 --- a/config/rootfiles/packages/vdradmin +++ b/config/rootfiles/packages/vdradmin @@ -180,5 +180,6 @@ etc/rc.d/rc6.d/K01vdradmin etc/rc.d/rc3.d/S99vdradmin #usr/share/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo #usr/share/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo +var/cache/vdradmin var/log/vdradmin var/run/vdradmin diff --git a/lfs/vdradmin b/lfs/vdradmin index 43c2a085c..3bd788f0e 100644 --- a/lfs/vdradmin +++ b/lfs/vdradmin @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdradmin -PAK_VER = 3 +PAK_VER = 4 DEPS = "perl-gettext vdr" @@ -85,5 +85,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) /etc/vdradmin/vdradmind.conf mkdir /var/log/vdradmin mkdir /var/run/vdradmin + mkdir /var/cache/vdradmin @rm -rf $(DIR_APP) @$(POSTBUILD) From 211ca1f52bb9591ece685a123527c8390ff20b91 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 5 May 2011 22:00:08 +0200 Subject: [PATCH 59/59] mc: update to 4.7.5.2. --- config/rootfiles/packages/mc | 29 +++++++++++------------------ lfs/mc | 6 +++--- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc index 4cb6efa29..bb7e6d794 100644 --- a/config/rootfiles/packages/mc +++ b/config/rootfiles/packages/mc @@ -1,25 +1,20 @@ usr/bin/mc usr/bin/mcdiff usr/bin/mcedit -usr/bin/mcmfmt usr/bin/mcview usr/etc usr/etc/mc -usr/etc/mc/Syntax usr/etc/mc/cedit.menu usr/etc/mc/edit.indent.rc usr/etc/mc/edit.spell.rc usr/etc/mc/filehighlight.ini -usr/etc/mc/mc.charsets usr/etc/mc/mc.ext usr/etc/mc/mc.keymap usr/etc/mc/mc.keymap.default usr/etc/mc/mc.keymap.emacs -usr/etc/mc/mc.lib usr/etc/mc/mc.menu usr/etc/mc/mc.menu.sr usr/etc/mc/sfs.ini -#usr/libexec #usr/libexec/mc usr/libexec/mc/cons.saver #usr/libexec/mc/extfs.d @@ -79,27 +74,24 @@ usr/libexec/mc/mc.sh #usr/share/man/man1/mcedit.1 #usr/share/man/man1/mcview.1 #usr/share/mc -usr/share/mc/mc.hint -#usr/share/mc/mc.hint.cs -#usr/share/mc/mc.hint.es -#usr/share/mc/mc.hint.hu -#usr/share/mc/mc.hint.it -#usr/share/mc/mc.hint.nl -#usr/share/mc/mc.hint.pl -#usr/share/mc/mc.hint.ru -#usr/share/mc/mc.hint.sr -#usr/share/mc/mc.hint.uk -#usr/share/mc/mc.hint.zh -usr/share/mc/mc.hlp -usr/share/mc/skins +#usr/share/mc/help +usr/share/mc/help/mc.hlp +#usr/share/mc/hints +usr/share/mc/hints/mc.hint +usr/share/mc/mc.charsets +usr/share/mc/mc.lib +#usr/share/mc/skins +usr/share/mc/skins/dark.ini usr/share/mc/skins/darkfar.ini usr/share/mc/skins/default.ini usr/share/mc/skins/double-lines.ini usr/share/mc/skins/featured.ini usr/share/mc/skins/gotar.ini +usr/share/mc/skins/mc46.ini usr/share/mc/skins/nicedark.ini #usr/share/mc/syntax usr/share/mc/syntax/PKGBUILD.syntax +usr/share/mc/syntax/Syntax usr/share/mc/syntax/ada95.syntax usr/share/mc/syntax/aspx.syntax usr/share/mc/syntax/assembler.syntax @@ -110,6 +102,7 @@ usr/share/mc/syntax/changelog.syntax usr/share/mc/syntax/cs.syntax usr/share/mc/syntax/css.syntax usr/share/mc/syntax/cxx.syntax +usr/share/mc/syntax/cython.syntax usr/share/mc/syntax/d.syntax usr/share/mc/syntax/debian-changelog.syntax usr/share/mc/syntax/debian-control.syntax diff --git a/lfs/mc b/lfs/mc index d6badb5a6..25a949eda 100644 --- a/lfs/mc +++ b/lfs/mc @@ -24,7 +24,7 @@ include Config -VER = 4.7.3 +VER = 4.7.5.2 THISAPP = mc-$(VER) DL_FILE = $(THISAPP).tar.lzma @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mc -PAK_VER = 4 +PAK_VER = 5 DEPS = "glib" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 15b017b370668683aa8cbf6730667510 +$(DL_FILE)_MD5 = 9fede28ed63ced53f1beeba2f95473da install : $(TARGET)
$Lang::tr{'name'}:$cgiparams{'NAME'}
$cgiparams{'NAME'} 
$Lang::tr{'Act as'}$Lang::tr{'remote host/ip'}:
$Lang::tr{'local subnet'}$Lang::tr{'remote subnet'}
$Lang::tr{'ovpn subnet'}
$Lang::tr{'protocol'}$Lang::tr{'destination port'}:
$Lang::tr{'comp-lzo'}
$Lang::tr{'MTU'} 
$Lang::tr{'remark title'} 
 $Lang::tr{'valid till'} (days):
  $Lang::tr{'pkcs12 file password'}:
 $Lang::tr{'pkcs12 file password'}:
($Lang::tr{'confirmation'})