IPFire-SCM March 2011

ipfire-scm@lists.ipfire.org

1 participants
55 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. f1894c45ddc657360e9e8ad95f567f2b677c4544
by git＠ipfire.org 15 Mar '11

15 Mar '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via f1894c45ddc657360e9e8ad95f567f2b677c4544 (commit) via cb13f50d50b2d87e4e368d8f18ea945656cafa33 (commit) from d0cf29f084d7c47d61a0141e60c12e6cce78d8a8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f1894c45ddc657360e9e8ad95f567f2b677c4544 Merge: cb13f50 d0cf29f Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Tue Mar 15 18:28:51 2011 +0100 Merge branch 'master' of git://git.ipfire.org/ipfire-2.x commit cb13f50d50b2d87e4e368d8f18ea945656cafa33 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Tue Mar 15 18:28:07 2011 +0100 Fixed backup not taking user files into account. ----------------------------------------------------------------------- Summary of changes: config/backup/backup.pl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index 103807f..d2d6816 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') { hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. d0cf29f084d7c47d61a0141e60c12e6cce78d8a8
by git＠ipfire.org 15 Mar '11

15 Mar '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via d0cf29f084d7c47d61a0141e60c12e6cce78d8a8 (commit) via fc5592af4d8ccc026591535e4090f187a4d96a98 (commit) via f599cf7c4ae36a382a1baf0923ee24ce01b45fdc (commit) via 800c1607ae050be3e4334c5bdd5f29f76e005390 (commit) via 1432ca2e26cffcff0535e4e0ce5938057f003022 (commit) from 14820894ad62c06b0d7e64b67a2757ba76f4d9e2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d0cf29f084d7c47d61a0141e60c12e6cce78d8a8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 15 09:14:41 2011 +0100 core: add snort update to core. commit fc5592af4d8ccc026591535e4090f187a4d96a98 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 15 09:12:34 2011 +0100 core: add squid to core48. commit f599cf7c4ae36a382a1baf0923ee24ce01b45fdc Merge: 1482089 800c160 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 15 09:09:47 2011 +0100 Merge branch 'squid' commit 800c1607ae050be3e4334c5bdd5f29f76e005390 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 15 09:02:32 2011 +0100 squid: set --enable-async-io=8 commit 1432ca2e26cffcff0535e4e0ce5938057f003022 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Mar 4 13:32:28 2011 +0100 Updated squid (3.1.11). Set some cfg switches like in IPFire 3.x (enabled radius, aio ...) ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/squid | 50 ++++++++++++++++++++++ config/rootfiles/core/48/exclude | 1 + config/rootfiles/core/{44 => 48}/filelists/snort | 0 config/rootfiles/core/{44 => 48}/filelists/squid | 0 lfs/squid | 34 +++++++++++---- 5 files changed, 77 insertions(+), 8 deletions(-) copy config/rootfiles/core/{44 => 48}/filelists/snort (100%) copy config/rootfiles/core/{44 => 48}/filelists/squid (100%) Difference in files: diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index dd4122f..461a2a2 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/config/rootfiles/core/48/exclude b/config/rootfiles/core/48/exclude index e69de29..6fe46b4 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/snort b/config/rootfiles/core/48/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/core/48/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/48/filelists/squid b/config/rootfiles/core/48/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/48/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/lfs/squid b/lfs/squid index 16df621..bdc1646 100644 --- a/lfs/squid +++ b/lfs/squid @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,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=8 \ + --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 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 14820894ad62c06b0d7e64b67a2757ba76f4d9e2
by git＠ipfire.org 14 Mar '11

14 Mar '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 14820894ad62c06b0d7e64b67a2757ba76f4d9e2 (commit) from c07e938edbb6071fd01872622cc30f333045326c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 14820894ad62c06b0d7e64b67a2757ba76f4d9e2 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Mon Mar 14 20:04:16 2011 +0100 Fixed snort compile options and ipv6 config options ----------------------------------------------------------------------- Summary of changes: config/snort/snort.conf | 6 ++---- lfs/snort | 8 ++++++-- 2 files changed, 8 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/snort/snort.conf b/config/snort/snort.conf index 4de1a44..3afa6f1 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 fea3f92..ebffada 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/ hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. c07e938edbb6071fd01872622cc30f333045326c
by git＠ipfire.org 14 Mar '11

14 Mar '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via c07e938edbb6071fd01872622cc30f333045326c (commit) via 1b22e11a6dbe0ecf702cf6b5f5cc86201bf20786 (commit) via 05d4672c780eb90a44cbdf77dc37b09189290f90 (commit) from 3046fa42b116e8ff4531e48db8dabaa6b5750f48 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c07e938edbb6071fd01872622cc30f333045326c Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Mon Mar 14 18:52:11 2011 +0100 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. commit 1b22e11a6dbe0ecf702cf6b5f5cc86201bf20786 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Mon Mar 14 18:49:20 2011 +0100 Updated iperf to latest stable. commit 05d4672c780eb90a44cbdf77dc37b09189290f90 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Mon Mar 14 18:48:40 2011 +0100 Update htop to latest stable release. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/snort | 1 + config/snort/snort.conf | 232 +++++++++++++++++++++++++++-------------- html/cgi-bin/ids.cgi | 4 +- lfs/daq | 4 +- lfs/htop | 6 +- lfs/iperf | 6 +- lfs/snort | 4 +- 7 files changed, 165 insertions(+), 92 deletions(-) Difference in files: diff --git a/config/rootfiles/common/snort b/config/rootfiles/common/snort index 9c23e0b..090a950 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 fd4e8ea..4de1a44 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, <db_type>, user=<username> password=<password> test dbname=<name> host=<hostname> # output database: log, <db_type>, user=<username> password=<password> test dbname=<name> host=<hostname> -# 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 7da270c..220bad0 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=$s…'OINKCODE'}"; - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2903_s.tar.gz/$snortsett…'OINKCODE'}"; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2904_s.tar.gz/$snortsett…'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=$sno…'OINKCODE'}"; - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2903.tar.gz/$snortsettin…'OINKCODE'}"; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2904.tar.gz/$snortsettin…'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 106a380..47e404c 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/htop b/lfs/htop index c88995b..0f65426 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) diff --git a/lfs/iperf b/lfs/iperf index 8b58e19..38de994 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) diff --git a/lfs/snort b/lfs/snort index 7b5d41b..fea3f92 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) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9e7d3368df9e92589d8a4d783b12e0091993863f
by git＠ipfire.org 13 Mar '11

13 Mar '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 9e7d3368df9e92589d8a4d783b12e0091993863f (commit) via 755319ed35387d33d1677d5e52324a9cd4aad164 (commit) via 8bad4f693600a17b82b6f3843034995f9fa2123c (commit) via 65c63dd51c336e5ed28362fd48d9745e85eb4175 (commit) via 7ea7cedc9935dadea87d3eda31960ae10a1f496e (commit) via ecffe1e61d180cba8adacde8b27706ba76d9cb5a (commit) via 47b0a11583e6df56e776436174b55fc48198a2e1 (commit) via 61dfdc3b7befbf4df1f1873b539e9070769362ea (commit) from c10853e28e061cbbcac0539d79e9922379fb971f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9e7d3368df9e92589d8a4d783b12e0091993863f Merge: 755319e c10853e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 13 21:41:00 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 755319ed35387d33d1677d5e52324a9cd4aad164 Merge: 8bad4f6 6ea175e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 13 21:29:43 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 8bad4f693600a17b82b6f3843034995f9fa2123c Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Mar 13 21:06:59 2011 +0100 perl-libww-perl: Downgrade to 5.837. Version 6 was broken, so we had to downgrade it. Added a lot of dependencies to provide testsuite. commit 65c63dd51c336e5ed28362fd48d9745e85eb4175 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Mar 13 21:05:59 2011 +0100 mailcap: New package. Reference #144. commit 7ea7cedc9935dadea87d3eda31960ae10a1f496e Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Mar 13 21:05:15 2011 +0100 perl-Test-Simple: New package. Reference #144. commit ecffe1e61d180cba8adacde8b27706ba76d9cb5a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Mar 13 21:04:39 2011 +0100 perl-HTML-Tagset: New package. Reference #144. commit 47b0a11583e6df56e776436174b55fc48198a2e1 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Mar 13 21:04:06 2011 +0100 perl-HTML-Parser: New package. Reference #144. commit 61dfdc3b7befbf4df1f1873b539e9070769362ea Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Mar 13 17:28:42 2011 +0100 perl-HTML-Tagset: New package. Referece #144. ----------------------------------------------------------------------- Summary of changes: pkgs/{m4/m4.nm => mailcap/mailcap.nm} | 29 +++++++++++-------- .../perl-HTML-Parser.nm} | 24 +++++++++------- .../perl-HTML-Tagset.nm} | 20 ++++++++----- .../perl-Test-Simple.nm} | 23 ++++++++------- pkgs/perl-libwww-perl/perl-libwww-perl.nm | 18 +++++++++++- 5 files changed, 71 insertions(+), 43 deletions(-) copy pkgs/{m4/m4.nm => mailcap/mailcap.nm} (70%) copy pkgs/{perl-libwww-perl/perl-libwww-perl.nm => perl-HTML-Parser/perl-HTML-Parser.nm} (76%) copy pkgs/{perl-libwww-perl/perl-libwww-perl.nm => perl-HTML-Tagset/perl-HTML-Tagset.nm} (81%) copy pkgs/{perl-URI/perl-URI.nm => perl-Test-Simple/perl-Test-Simple.nm} (81%) Difference in files: diff --git a/pkgs/mailcap/mailcap.nm b/pkgs/mailcap/mailcap.nm new file mode 100644 index 0000000..b2532fe --- /dev/null +++ b/pkgs/mailcap/mailcap.nm @@ -0,0 +1,55 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = mailcap +PKG_VER = 2.1.36 +PKG_REL = 1 +PKG_ARCH = noarch + +PKG_MAINTAINER = +PKG_GROUP = System/Base +PKG_URL = https://fedorahosted.org/released/mailcap/ +PKG_LICENSE = Public Domain and MIT +PKG_SUMMARY = Helper application and MIME type associations for file types. + +define PKG_DESCRIPTION + The mailcap file is used by the metamail program. Metamail reads the \ + mailcap file to determine how it should display non-text or multimedia \ + material. Basically, mailcap associates a particular type of file \ + with a particular program that a mail agent or other program can call \ + in order to handle the file. Mailcap should be installed to allow \ + certain programs to be able to handle non-text files. +endef + +PKG_TARBALL = $(THISAPP).tar.xz + +INSTALL_TARGETS = sysconfdir=/etc mandir=/usr/share/man + +STAGE_BUILD = # Nothing to do + +define STAGE_TEST + cd $(DIR_APP) && make check +endef diff --git a/pkgs/perl-HTML-Parser/perl-HTML-Parser.nm b/pkgs/perl-HTML-Parser/perl-HTML-Parser.nm new file mode 100644 index 0000000..457ea1a --- /dev/null +++ b/pkgs/perl-HTML-Parser/perl-HTML-Parser.nm @@ -0,0 +1,54 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = HTML-Parser +PKG_VER = 3.68 +PKG_REL = 1 + +PKG_MAINTAINER = +PKG_GROUP = Development/Libratries +PKG_URL = http://search.cpan.org/dist/HTML-Parser/ +PKG_LICENSE = GPL+ or Artistic +PKG_SUMMARY = Perl module for parsing HTML. + +PKG_BUILD_DEPS+= perl-core perl-devel perl(HTML::Tagset) perl(Test::More) + +define PKG_DESCRIPTION + The HTML-Parser module for perl to parse and extract information from \ + HTML documents, including the HTML::Entities, HTML::HeadParser, \ + HTML::LinkExtor, HTML::PullParser, and HTML::TokeParser modules. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +define STAGE_BUILD + cd $(DIR_APP) && perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$(CFLAGS)" + cd $(DIR_APP) && make $(PARALLELISMFLAGS) +endef + +define STAGE_TEST + cd $(DIR_APP) && make test +endef diff --git a/pkgs/perl-HTML-Tagset/perl-HTML-Tagset.nm b/pkgs/perl-HTML-Tagset/perl-HTML-Tagset.nm new file mode 100644 index 0000000..f8b17ca --- /dev/null +++ b/pkgs/perl-HTML-Tagset/perl-HTML-Tagset.nm @@ -0,0 +1,54 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = HTML-Tagset +PKG_VER = 3.20 +PKG_REL = 1 +PKG_ARCH = noarch + +PKG_MAINTAINER = +PKG_GROUP = Development/Libratries +PKG_URL = http://search.cpan.org/dist/HTML-Tagset/ +PKG_LICENSE = GPL+ or Artistic +PKG_SUMMARY = HTML::Tagset - data tables useful in parsing HTML. + +PKG_BUILD_DEPS+= perl-core perl-devel + +define PKG_DESCRIPTION + This module contains several data tables useful in various kinds of \ + HTML parsing operations, such as tag and entity names. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +define STAGE_BUILD + cd $(DIR_APP) && perl Makefile.PL INSTALLDIRS=vendor + cd $(DIR_APP) && make $(PARALLELISMFLAGS) +endef + +define STAGE_TEST + cd $(DIR_APP) && make test +endef diff --git a/pkgs/perl-Test-Simple/perl-Test-Simple.nm b/pkgs/perl-Test-Simple/perl-Test-Simple.nm new file mode 100644 index 0000000..c4a4a44 --- /dev/null +++ b/pkgs/perl-Test-Simple/perl-Test-Simple.nm @@ -0,0 +1,54 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = Test-Simple +PKG_VER = 0.98 +PKG_REL = 1 +PKG_ARCH = noarch + +PKG_MAINTAINER = +PKG_GROUP = Development/Libratries +PKG_URL = http://search.cpan.org/dist/Test-Simple/ +PKG_LICENSE = GPL+ or Artistic +PKG_SUMMARY = Basic utilities for writing tests. + +PKG_BUILD_DEPS+= perl-core perl-devel perl(Test::Harness) + +define PKG_DESCRIPTION + This package provides the bulk of the core testing facilities. For more \ + information, see perldoc for Test::Simple, Test::More, etc. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +define STAGE_BUILD + cd $(DIR_APP) && perl Makefile.PL INSTALLDIRS=perl + cd $(DIR_APP) && make $(PARALLELISMFLAGS) +endef + +define STAGE_TEST + cd $(DIR_APP) && make test +endef diff --git a/pkgs/perl-libwww-perl/perl-libwww-perl.nm b/pkgs/perl-libwww-perl/perl-libwww-perl.nm index 8226085..20fa29d 100644 --- a/pkgs/perl-libwww-perl/perl-libwww-perl.nm +++ b/pkgs/perl-libwww-perl/perl-libwww-perl.nm @@ -25,8 +25,9 @@ include $(PKGROOT)/Include PKG_NAME = libwww-perl -PKG_VER = 6.01 +PKG_VER = 5.837 PKG_REL = 1 +PKG_EPOCH = 1 PKG_ARCH = noarch PKG_MAINTAINER = @@ -35,16 +36,29 @@ PKG_URL = http://search.cpan.org/dist/libwww-perl/ PKG_LICENSE = GPL+ or Artistic PKG_SUMMARY = A Perl interface to the World-Wide Web. -PKG_BUILD_DEPS+= perl-core perl-devel +PKG_BUILD_DEPS+= mailcap perl-core perl-devel perl-HTML-Parser perl-libwww-perl \ + perl(Test::More) perl(Compress::Zlib) perl(MIME::Base64) perl(Net::FTP) define PKG_DESCRIPTION The libwww-perl collection is a set of Perl modules which provides a simple and \ consistent application programming interface to the World-Wide Web. endef +# Filter string for very weird dependencies. +PKG_REQUIRES_FILTER = (HTTP::Headers|HTTP::GHTTP|Win32|Authen::NTLM) + PKG_TARBALL = $(THISAPP).tar.gz define STAGE_BUILD cd $(DIR_APP) && perl Makefile.PL INSTALLDIRS=perl --aliases < /dev/null cd $(DIR_APP) && make $(PARALLELISMFLAGS) endef + +define STAGE_TEST + # Use system wide MIME types (link also to blib/... for "make test"). Doing + # this stuff before "make install" would not cause the symlink to be packaged + # but a copy of /etc/mime.types. + ln -svf /etc/mime.types $(DIR_APP)/blib/lib/LWP/media.types + + cd $(DIR_APP) && make test +endef hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. c10853e28e061cbbcac0539d79e9922379fb971f
by git＠ipfire.org 13 Mar '11

13 Mar '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 6ea175e4b3ca6ae193ec3ba83351678b566d4476
by git＠ipfire.org 13 Mar '11

13 Mar '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 6ea175e4b3ca6ae193ec3ba83351678b566d4476 (commit) from 3c6e9c89ccefe828e9656e4bf1b6fd9088aea54f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6ea175e4b3ca6ae193ec3ba83351678b566d4476 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 13 21:23:31 2011 +0100 build-essentials: Move stripping before setting capabilities. The stripping caused a reset of the capabilities and needed to move out of the quality agent. Fixes #143. ----------------------------------------------------------------------- Summary of changes: pkgs/build-essentials/build-essentials.nm | 2 +- pkgs/build-essentials/buildsystem-tools/stripper | 31 ++++++++++++++++++++ pkgs/build-essentials/buildsystem/Constants | 1 + pkgs/build-essentials/buildsystem/Functions | 7 +++- .../quality-agent/quality-agent.d/099-strip | 23 -------------- 5 files changed, 38 insertions(+), 26 deletions(-) create mode 100755 pkgs/build-essentials/buildsystem-tools/stripper delete mode 100755 pkgs/build-essentials/quality-agent/quality-agent.d/099-strip Difference in files: diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm index 7c04a84..9d4de3a 100644 --- a/pkgs/build-essentials/build-essentials.nm +++ b/pkgs/build-essentials/build-essentials.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = build-essentials PKG_VER = $(DISTRO_VERSION) -PKG_REL = 6 +PKG_REL = 7 PKG_EPOCH = 1 PKG_ARCH = noarch diff --git a/pkgs/build-essentials/buildsystem-tools/stripper b/pkgs/build-essentials/buildsystem-tools/stripper new file mode 100755 index 0000000..b35d72e --- /dev/null +++ b/pkgs/build-essentials/buildsystem-tools/stripper @@ -0,0 +1,31 @@ +#!/bin/bash + +# Based on RedHat's brp-strip*. + +BUILDROOT=${1} + +for f in `find ${BUILDROOT} -type f $ -perm -0100 -or -perm -0010 -or -perm -0001 $ -exec file {} \; | \ + grep -v "^${BUILDROOT}/\?usr/lib/debug" | \ + grep -v ' shared object,' | \ + sed -n -e 's/^$.*$:[ ]*ELF.*, not stripped/\1/p'`; do + + # Strip ELF binaries + strip -g "$f" || : + + note="-R .note" + if objdump -h $f | grep '^[ ]*[0-9]*[ ]*.note[ ]' -A 1 | \ + grep ALLOC >/dev/null; then + note= + fi + strip -R .comment $note "$f" || : +done + +# Strip ELF shared objects +# Please note we don't restrict our search to executable files because +# our libraries are not (should not be, at least) +x. +for f in `find ${BUILDROOT} -type f -a -exec file {} \; | \ + grep -v "^${BUILDROOT}/\?usr/lib/debug" | \ + grep ' shared object,' | \ + sed -n -e 's/^$.*$:[ ]*ELF.*, not stripped/\1/p'`; do + strip --strip-unneeded "$f" +done diff --git a/pkgs/build-essentials/buildsystem/Constants b/pkgs/build-essentials/buildsystem/Constants index e23671a..500e2f1 100644 --- a/pkgs/build-essentials/buildsystem/Constants +++ b/pkgs/build-essentials/buildsystem/Constants @@ -25,6 +25,7 @@ VPATH = $(DIR_DL) # Paths to scripts DO_EXTRACT = tar xaf DO_QUALITY_AGENT = quality-agent +DO_STRIP = /usr/lib/buildsystem-tools/stripper $(BUILDROOT) ############################################################################### # diff --git a/pkgs/build-essentials/buildsystem/Functions b/pkgs/build-essentials/buildsystem/Functions index 6aca8b9..53cceb6 100644 --- a/pkgs/build-essentials/buildsystem/Functions +++ b/pkgs/build-essentials/buildsystem/Functions @@ -144,12 +144,15 @@ define DO_INSTALL $(DO_INSTALL_INIT) $(DO_INSTALL_PAM) - $(DO_PYTHON_COMPILE) - @echo "#####################################################################" @echo "# $(PKG_NAME) - Install finished" @echo "#####################################################################" + $(DO_STRIP) + $(DO_PYTHON_COMPILE) + + $(STAGE_INSTALL_POST) + $(DO_QUALITY_AGENT) $(DO_FILELIST) endef diff --git a/pkgs/build-essentials/quality-agent/quality-agent.d/099-strip b/pkgs/build-essentials/quality-agent/quality-agent.d/099-strip deleted file mode 100755 index bd7a16a..0000000 --- a/pkgs/build-essentials/quality-agent/quality-agent.d/099-strip +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -. $(dirname ${0})/qa-include - -DESC="Stripping reduces size of binary files." - -function check() { - # Strip debugging symbols - for f in $(find ${BUILDROOT} -type f $ -perm -0100 -or -perm -0010 -or -perm -0001 $); do - if (file $f | grep -q ' shared object,'); then - strip --strip-debug "$f" || : - fi - done - - for f in $(find ${BUILDROOT} -type f); do - if (file $f | grep -q ' shared object,'); then - strip --strip-unneeded "$f" || : - fi - done -} - -run - hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 3c6e9c89ccefe828e9656e4bf1b6fd9088aea54f
by git＠ipfire.org 13 Mar '11

13 Mar '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 3c6e9c89ccefe828e9656e4bf1b6fd9088aea54f (commit) via bbaafb6bdf1a57eac2d69ca4e953579b2f280bca (commit) via ab67471f1e1630995e8803f9e0a87e4ff845ff1a (commit) from 7a7d1fdc77082e905cccf695c5cde49596a31d7b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3c6e9c89ccefe828e9656e4bf1b6fd9088aea54f Merge: 7a7d1fd bbaafb6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 13 16:56:55 2011 +0100 Merge remote-tracking branch 'stevee/shadow' commit bbaafb6bdf1a57eac2d69ca4e953579b2f280bca Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Mar 13 16:43:49 2011 +0100 shadow: Update to 4.1.4.3. Fixes #138. commit ab67471f1e1630995e8803f9e0a87e4ff845ff1a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Mar 13 15:22:03 2011 +0100 perl-libwww-perl: New package. Fixes #144. ----------------------------------------------------------------------- Summary of changes: .../perl-libwww-perl.nm} | 19 ++++++++----------- ...oodname.patch => shadow-4.1.4.3-goodname.patch} | 2 +- pkgs/shadow/shadow.nm | 7 +++++-- 3 files changed, 14 insertions(+), 14 deletions(-) copy pkgs/{perl-URI/perl-URI.nm => perl-libwww-perl/perl-libwww-perl.nm} (81%) rename pkgs/shadow/patches/{shadow-4.1.4.2-goodname.patch => shadow-4.1.4.3-goodname.patch} (98%) Difference in files: diff --git a/pkgs/perl-libwww-perl/perl-libwww-perl.nm b/pkgs/perl-libwww-perl/perl-libwww-perl.nm new file mode 100644 index 0000000..8226085 --- /dev/null +++ b/pkgs/perl-libwww-perl/perl-libwww-perl.nm @@ -0,0 +1,50 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = libwww-perl +PKG_VER = 6.01 +PKG_REL = 1 +PKG_ARCH = noarch + +PKG_MAINTAINER = +PKG_GROUP = Development/Libraries +PKG_URL = http://search.cpan.org/dist/libwww-perl/ +PKG_LICENSE = GPL+ or Artistic +PKG_SUMMARY = A Perl interface to the World-Wide Web. + +PKG_BUILD_DEPS+= perl-core perl-devel + +define PKG_DESCRIPTION + The libwww-perl collection is a set of Perl modules which provides a simple and \ + consistent application programming interface to the World-Wide Web. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +define STAGE_BUILD + cd $(DIR_APP) && perl Makefile.PL INSTALLDIRS=perl --aliases < /dev/null + cd $(DIR_APP) && make $(PARALLELISMFLAGS) +endef diff --git a/pkgs/shadow/patches/shadow-4.1.4.2-goodname.patch b/pkgs/shadow/patches/shadow-4.1.4.2-goodname.patch deleted file mode 100644 index 45e3814..0000000 --- a/pkgs/shadow/patches/shadow-4.1.4.2-goodname.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -Nur shadow-4.1.4.2_orig/libmisc/chkname.c shadow-4.1.4.2/libmisc/chkname.c ---- shadow-4.1.4.2_orig/libmisc/chkname.c 2009-04-28 19:14:04.000000000 +0000 -+++ shadow-4.1.4.2/libmisc/chkname.c 2009-08-03 18:47:59.000000000 +0000 -@@ -49,21 +49,29 @@ - static bool is_valid_name (const char *name) - { - /* -- * User/group names must match [a-z_][a-z0-9_-]*[$] -- */ -- if (('\0' == *name) || -- !((('a' <= *name) && ('z' >= *name)) || ('_' == *name))) { -+ * User/group names must match gnu e-regex: -+ * [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]? -+ * -+ * as a non-POSIX, extension, allow "$" as the last char for -+ * sake of Samba 3.x "add machine script" -+ */ -+ if ( ('\0' == *name) || -+ !((*name >= 'a' && *name <= 'z') || -+ (*name >= 'A' && *name <= 'Z') || -+ (*name >= '0' && *name <= '9') || -+ (*name == '_') || (*name == '.') -+ )) { - return false; - } - - while ('\0' != *++name) { -- if (!(( ('a' <= *name) && ('z' >= *name) ) || -- ( ('0' <= *name) && ('9' >= *name) ) || -- ('_' == *name) || -- ('-' == *name) || -- ( ('$' == *name) && ('\0' == *(name + 1)) ) -- )) { -- return false; -+ if (!( (*name >= 'a' && *name <= 'z') || -+ (*name >= 'A' && *name <= 'Z') || -+ (*name >= '0' && *name <= '9') || -+ (*name == '_') || (*name == '.') || (*name == '-') || -+ (*name == '$' && *(name + 1) == '\0') -+ )) { -+ return false; - } - } - -diff -Nur shadow-4.1.4.2_orig/man/groupadd.8 shadow-4.1.4.2/man/groupadd.8 ---- shadow-4.1.4.2_orig/man/groupadd.8 2009-07-24 01:16:24.000000000 +0000 -+++ shadow-4.1.4.2/man/groupadd.8 2009-08-03 18:51:10.000000000 +0000 -@@ -153,9 +153,7 @@ - .RE - .SH "CAVEATS" - .PP --Groupnames must start with a lower case letter or an underscore, followed by lower case letters, digits, underscores, or dashes\&. They can end with a dollar sign\&. In regular expression terms: [a\-z_][a\-z0\-9_\-]*[$]? --.PP --Groupnames may only be up to 16 characters long\&. -+Groupnames may only be up to 32 characters long\&. - .PP - You may not add a NIS or LDAP group\&. This must be performed on the corresponding server\&. - .PP -diff -Nur shadow-4.1.4.2_orig/man/useradd.8 shadow-4.1.4.2/man/useradd.8 ---- shadow-4.1.4.2_orig/man/useradd.8 2009-07-24 01:16:44.000000000 +0000 -+++ shadow-4.1.4.2/man/useradd.8 2009-08-03 18:51:52.000000000 +0000 -@@ -405,8 +405,6 @@ - \fBuseradd\fR - will deny the user account creation request\&. - .PP --Usernames must start with a lower case letter or an underscore, followed by lower case letters, digits, underscores, or dashes\&. They can end with a dollar sign\&. In regular expression terms: [a\-z_][a\-z0\-9_\-]*[$]? --.PP - Usernames may only be up to 32 characters long\&. - .SH "CONFIGURATION" - .PP diff --git a/pkgs/shadow/patches/shadow-4.1.4.3-goodname.patch b/pkgs/shadow/patches/shadow-4.1.4.3-goodname.patch new file mode 100644 index 0000000..fe49765 --- /dev/null +++ b/pkgs/shadow/patches/shadow-4.1.4.3-goodname.patch @@ -0,0 +1,70 @@ +diff -Nur shadow-4.1.4.2_orig/libmisc/chkname.c shadow-4.1.4.2/libmisc/chkname.c +--- shadow-4.1.4.2_orig/libmisc/chkname.c 2009-04-28 19:14:04.000000000 +0000 ++++ shadow-4.1.4.2/libmisc/chkname.c 2009-08-03 18:47:59.000000000 +0000 +@@ -49,21 +49,29 @@ + static bool is_valid_name (const char *name) + { + /* +- * User/group names must match [a-z_][a-z0-9_-]*[$] +- */ +- if (('\0' == *name) || +- !((('a' <= *name) && ('z' >= *name)) || ('_' == *name))) { ++ * User/group names must match gnu e-regex: ++ * [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]? ++ * ++ * as a non-POSIX, extension, allow "$" as the last char for ++ * sake of Samba 3.x "add machine script" ++ */ ++ if ( ('\0' == *name) || ++ !((*name >= 'a' && *name <= 'z') || ++ (*name >= 'A' && *name <= 'Z') || ++ (*name >= '0' && *name <= '9') || ++ (*name == '_') || (*name == '.') ++ )) { + return false; + } + + while ('\0' != *++name) { +- if (!(( ('a' <= *name) && ('z' >= *name) ) || +- ( ('0' <= *name) && ('9' >= *name) ) || +- ('_' == *name) || +- ('-' == *name) || +- ( ('$' == *name) && ('\0' == *(name + 1)) ) +- )) { +- return false; ++ if (!( (*name >= 'a' && *name <= 'z') || ++ (*name >= 'A' && *name <= 'Z') || ++ (*name >= '0' && *name <= '9') || ++ (*name == '_') || (*name == '.') || (*name == '-') || ++ (*name == '$' && *(name + 1) == '\0') ++ )) { ++ return false; + } + } + +diff -Nur shadow-4.1.4.2_orig/man/groupadd.8 shadow-4.1.4.2/man/groupadd.8 +--- shadow-4.1.4.2_orig/man/groupadd.8 2009-07-24 01:16:24.000000000 +0000 ++++ shadow-4.1.4.2/man/groupadd.8 2009-08-03 18:51:10.000000000 +0000 +@@ -153,9 +153,7 @@ + .RE + .SH "CAVEATS" + .PP +-Groupnames must start with a lower case letter or an underscore, followed by lower case letters, digits, underscores, or dashes\&. They can end with a dollar sign\&. In regular expression terms: [a\-z_][a\-z0\-9_\-]*[$]? +-.PP +-Groupnames may only be up to characters long\&. ++Groupnames may only be up to 32 characters long\&. + .PP + You may not add a NIS or LDAP group\&. This must be performed on the corresponding server\&. + .PP +diff -Nur shadow-4.1.4.2_orig/man/useradd.8 shadow-4.1.4.2/man/useradd.8 +--- shadow-4.1.4.2_orig/man/useradd.8 2009-07-24 01:16:44.000000000 +0000 ++++ shadow-4.1.4.2/man/useradd.8 2009-08-03 18:51:52.000000000 +0000 +@@ -405,8 +405,6 @@ + \fBuseradd\fR + will deny the user account creation request\&. + .PP +-Usernames must start with a lower case letter or an underscore, followed by lower case letters, digits, underscores, or dashes\&. They can end with a dollar sign\&. In regular expression terms: [a\-z_][a\-z0\-9_\-]*[$]? +-.PP + Usernames may only be up to 32 characters long\&. + .SH "CONFIGURATION" + .PP diff --git a/pkgs/shadow/shadow.nm b/pkgs/shadow/shadow.nm index d7ec1ed..e8c8f55 100644 --- a/pkgs/shadow/shadow.nm +++ b/pkgs/shadow/shadow.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = shadow -PKG_VER = 4.1.4.2 -PKG_REL = 2 +PKG_VER = 4.1.4.3 +PKG_REL = 3 PKG_MAINTAINER = PKG_GROUP = System/Base @@ -66,6 +66,9 @@ define STAGE_PREPARE_CMDS # Do not install korean and zh man pages cd $(DIR_APP) && sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile.in + + # Do not install russion man pages - was broken in 4.1.4.3 + cd $(DIR_APP) && sed -i -e 's/ ru//' man/Makefile.in endef define STAGE_INSTALL_CMDS hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 7a7d1fdc77082e905cccf695c5cde49596a31d7b
by git＠ipfire.org 13 Mar '11

13 Mar '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 7a7d1fdc77082e905cccf695c5cde49596a31d7b (commit) via 60a9c985c2439c5028e12e0548e7cb097d3e9d7b (commit) from a48c328e9c19a513233f0a75824fcc3c1987e121 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7a7d1fdc77082e905cccf695c5cde49596a31d7b Merge: 60a9c98 a48c328 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 13 15:54:59 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 60a9c985c2439c5028e12e0548e7cb097d3e9d7b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 13 15:54:10 2011 +0100 xorg-x11-drv-intel: Fix build. ----------------------------------------------------------------------- Summary of changes: pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) Difference in files: diff --git a/pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm b/pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm index 8543e41..1c82190 100644 --- a/pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm +++ b/pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = xorg-x11-drv-intel PKG_VER = 2.12.0 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Driver @@ -34,9 +34,10 @@ PKG_URL = http://www.x.org/ PKG_LICENSE = MIT PKG_SUMMARY = Xorg X11 intel video driver. -PKG_BUILD_DEPS += autoconf automake libdrm-devel libudev-devel libXvMC-devel \ - libxcb-devel libtool mesa-devel pkg-config xcb-util-devel \ - xorg-x11-proto-devel xorg-x11-server-devel xorg-x11-util-macros +PKG_BUILD_DEPS += autoconf automake libdrm-devel libudev-devel libX11-devel \ + libXvMC-devel libxcb-devel libtool mesa-devel pkg-config \ + xcb-util-devel xorg-x11-proto-devel xorg-x11-server-devel \ + xorg-x11-util-macros define PKG_DESCRIPTION X.Org X11 intel video driver. hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. a48c328e9c19a513233f0a75824fcc3c1987e121
by git＠ipfire.org 13 Mar '11

13 Mar '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via a48c328e9c19a513233f0a75824fcc3c1987e121 (commit) via aa6bc41eaf642cc6cfea36d0bd446bd3ba3dfe5d (commit) via 9368dd0a94174e99b92f826c8d8b3252ddcc6599 (commit) via e528964ed43721c760275fd3c1b50ddba8c7e9a4 (commit) from 81e51d58ddc66500dfd097e7f207d876bc0b5b48 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a48c328e9c19a513233f0a75824fcc3c1987e121 Merge: aa6bc41 81e51d5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 13 15:06:27 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit aa6bc41eaf642cc6cfea36d0bd446bd3ba3dfe5d Merge: e528964 9368dd0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 13 14:52:41 2011 +0100 Merge remote-tracking branch 'stevee/vsftpd-update' commit 9368dd0a94174e99b92f826c8d8b3252ddcc6599 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Mar 13 10:57:19 2011 +0100 vsftpd: Update to 2.3.4. Fixes #145. commit e528964ed43721c760275fd3c1b50ddba8c7e9a4 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Mar 10 22:20:00 2011 +0100 pychecker: Update to 0.8.19. Fixes #136. ----------------------------------------------------------------------- Summary of changes: pkgs/pychecker/pychecker.nm | 4 ++-- pkgs/vsftpd/vsftpd.nm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/pkgs/pychecker/pychecker.nm b/pkgs/pychecker/pychecker.nm index 108491e..5b19331 100644 --- a/pkgs/pychecker/pychecker.nm +++ b/pkgs/pychecker/pychecker.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = pychecker -PKG_VER = 0.8.17 -PKG_REL = 1 +PKG_VER = 0.8.19 +PKG_REL = 2 PKG_ARCH = noarch PKG_MAINTAINER = diff --git a/pkgs/vsftpd/vsftpd.nm b/pkgs/vsftpd/vsftpd.nm index 56849ad..69458c5 100644 --- a/pkgs/vsftpd/vsftpd.nm +++ b/pkgs/vsftpd/vsftpd.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = vsftpd -PKG_VER = 2.3.2 -PKG_REL = 1 +PKG_VER = 2.3.4 +PKG_REL = 2 PKG_MAINTAINER = PKG_GROUP = Networking/Daemons hooks/post-receive -- IPFire 3.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM March 2011