package Header;
use CGI();
+use HTML::Entities();
use Socket;
use Time::Local;
return (($ip >= $start) && ($ip <= $end));
}
-sub cleanhtml
-{
+sub escape($) {
+ my $s = shift;
+ return HTML::Entities::encode_entities($s);
+}
+
+sub cleanhtml {
my $outstring =$_[0];
$outstring =~ tr/,/ / if not defined $_[1] or $_[1] ne 'y';
- $outstring =~ s/&/&/g;
- $outstring =~ s/\'/'/g;
- $outstring =~ s/\"/"/g; #" This is just a workaround for the syntax highlighter
- $outstring =~ s/</</g;
- $outstring =~ s/>/>/g;
- return $outstring;
+
+ return escape($outstring);
}
sub connectionstatus
GOOGLE,Google Toolbar,(Google\sToolbar)
JAVA,Java,(Java)
KONQUEROR,Konqueror,(Konqueror)
-LIBWWWPERL,libwww-perl,(libww-perl)
+LIBWWWPERL,libwww-perl,(libwww-perl)
LYNX,Lynx,(Lynx)
MSIE,Internet Explorer,(MSIE.*[)]$)
NETSCAPE,Netscape,(^Mozilla\/4.[7|8])|(Netscape)
--- /dev/null
+usr/lib/perl5/site_perl/5.12.3/HTML/Template
+usr/lib/perl5/site_perl/5.12.3/HTML/Template.pm
+usr/lib/perl5/site_perl/5.12.3/HTML/Template/FAQ.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/HTML/Template
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/HTML/Template/.packlist
+#usr/share/man/man3/HTML::Template.3
+#usr/share/man/man3/HTML::Template::FAQ.3
srv/web/ipfire/cgi-bin/cachemgr.cgi
srv/web/ipfire/html/proxy.pac
srv/web/ipfire/html/wpad.dat
+usr/bin/purge
usr/bin/squidclient
#usr/lib/squid
usr/lib/squid/auth
+usr/lib/squid/basic_db_auth
+usr/lib/squid/basic_fake_auth
+usr/lib/squid/basic_getpwnam_auth
+usr/lib/squid/basic_ldap_auth
+usr/lib/squid/basic_msnt_auth
+usr/lib/squid/basic_msnt_multi_domain_auth
+usr/lib/squid/basic_ncsa_auth
+usr/lib/squid/basic_nis_auth
+usr/lib/squid/basic_pam_auth
+usr/lib/squid/basic_pop3_auth
+usr/lib/squid/basic_radius_auth
+usr/lib/squid/basic_sasl_auth
+usr/lib/squid/basic_smb_auth
+usr/lib/squid/basic_smb_auth.sh
#usr/lib/squid/cachemgr.cgi
+usr/lib/squid/cert_tool
+usr/lib/squid/digest_edirectory_auth
+usr/lib/squid/digest_file_auth
+usr/lib/squid/digest_ldap_auth
usr/lib/squid/diskd
#usr/lib/squid/errors
#usr/lib/squid/errors/COPYRIGHT
#usr/lib/squid/errors/af/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/af/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/af/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/af/ERR_CONFLICT_HOST
#usr/lib/squid/errors/af/ERR_CONNECT_FAIL
#usr/lib/squid/errors/af/ERR_DIR_LISTING
#usr/lib/squid/errors/af/ERR_DNS_FAIL
#usr/lib/squid/errors/ar/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/ar/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/ar/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/ar/ERR_CONFLICT_HOST
#usr/lib/squid/errors/ar/ERR_CONNECT_FAIL
#usr/lib/squid/errors/ar/ERR_DIR_LISTING
#usr/lib/squid/errors/ar/ERR_DNS_FAIL
#usr/lib/squid/errors/az/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/az/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/az/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/az/ERR_CONFLICT_HOST
#usr/lib/squid/errors/az/ERR_CONNECT_FAIL
#usr/lib/squid/errors/az/ERR_DIR_LISTING
#usr/lib/squid/errors/az/ERR_DNS_FAIL
#usr/lib/squid/errors/bg/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/bg/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/bg/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/bg/ERR_CONFLICT_HOST
#usr/lib/squid/errors/bg/ERR_CONNECT_FAIL
#usr/lib/squid/errors/bg/ERR_DIR_LISTING
#usr/lib/squid/errors/bg/ERR_DNS_FAIL
#usr/lib/squid/errors/ca/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/ca/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/ca/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/ca/ERR_CONFLICT_HOST
#usr/lib/squid/errors/ca/ERR_CONNECT_FAIL
#usr/lib/squid/errors/ca/ERR_DIR_LISTING
#usr/lib/squid/errors/ca/ERR_DNS_FAIL
#usr/lib/squid/errors/cs/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/cs/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/cs/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/cs/ERR_CONFLICT_HOST
#usr/lib/squid/errors/cs/ERR_CONNECT_FAIL
#usr/lib/squid/errors/cs/ERR_DIR_LISTING
#usr/lib/squid/errors/cs/ERR_DNS_FAIL
#usr/lib/squid/errors/da/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/da/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/da/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/da/ERR_CONFLICT_HOST
#usr/lib/squid/errors/da/ERR_CONNECT_FAIL
#usr/lib/squid/errors/da/ERR_DIR_LISTING
#usr/lib/squid/errors/da/ERR_DNS_FAIL
usr/lib/squid/errors/de/ERR_CACHE_ACCESS_DENIED
usr/lib/squid/errors/de/ERR_CACHE_MGR_ACCESS_DENIED
usr/lib/squid/errors/de/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/de/ERR_CONFLICT_HOST
usr/lib/squid/errors/de/ERR_CONNECT_FAIL
usr/lib/squid/errors/de/ERR_DIR_LISTING
usr/lib/squid/errors/de/ERR_DNS_FAIL
#usr/lib/squid/errors/el/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/el/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/el/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/el/ERR_CONFLICT_HOST
#usr/lib/squid/errors/el/ERR_CONNECT_FAIL
#usr/lib/squid/errors/el/ERR_DIR_LISTING
#usr/lib/squid/errors/el/ERR_DNS_FAIL
usr/lib/squid/errors/en/ERR_CACHE_ACCESS_DENIED
usr/lib/squid/errors/en/ERR_CACHE_MGR_ACCESS_DENIED
usr/lib/squid/errors/en/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/en/ERR_CONFLICT_HOST
usr/lib/squid/errors/en/ERR_CONNECT_FAIL
usr/lib/squid/errors/en/ERR_DIR_LISTING
usr/lib/squid/errors/en/ERR_DNS_FAIL
usr/lib/squid/errors/es/ERR_CACHE_ACCESS_DENIED
usr/lib/squid/errors/es/ERR_CACHE_MGR_ACCESS_DENIED
usr/lib/squid/errors/es/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/es/ERR_CONFLICT_HOST
usr/lib/squid/errors/es/ERR_CONNECT_FAIL
usr/lib/squid/errors/es/ERR_DIR_LISTING
usr/lib/squid/errors/es/ERR_DNS_FAIL
#usr/lib/squid/errors/et/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/et/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/et/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/et/ERR_CONFLICT_HOST
#usr/lib/squid/errors/et/ERR_CONNECT_FAIL
#usr/lib/squid/errors/et/ERR_DIR_LISTING
#usr/lib/squid/errors/et/ERR_DNS_FAIL
#usr/lib/squid/errors/fa/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/fa/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/fa/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/fa/ERR_CONFLICT_HOST
#usr/lib/squid/errors/fa/ERR_CONNECT_FAIL
#usr/lib/squid/errors/fa/ERR_DIR_LISTING
#usr/lib/squid/errors/fa/ERR_DNS_FAIL
#usr/lib/squid/errors/fi/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/fi/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/fi/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/fi/ERR_CONFLICT_HOST
#usr/lib/squid/errors/fi/ERR_CONNECT_FAIL
#usr/lib/squid/errors/fi/ERR_DIR_LISTING
#usr/lib/squid/errors/fi/ERR_DNS_FAIL
usr/lib/squid/errors/fr/ERR_CACHE_ACCESS_DENIED
usr/lib/squid/errors/fr/ERR_CACHE_MGR_ACCESS_DENIED
usr/lib/squid/errors/fr/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/fr/ERR_CONFLICT_HOST
usr/lib/squid/errors/fr/ERR_CONNECT_FAIL
usr/lib/squid/errors/fr/ERR_DIR_LISTING
usr/lib/squid/errors/fr/ERR_DNS_FAIL
#usr/lib/squid/errors/he/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/he/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/he/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/he/ERR_CONFLICT_HOST
#usr/lib/squid/errors/he/ERR_CONNECT_FAIL
#usr/lib/squid/errors/he/ERR_DIR_LISTING
#usr/lib/squid/errors/he/ERR_DNS_FAIL
#usr/lib/squid/errors/hu/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/hu/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/hu/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/hu/ERR_CONFLICT_HOST
#usr/lib/squid/errors/hu/ERR_CONNECT_FAIL
#usr/lib/squid/errors/hu/ERR_DIR_LISTING
#usr/lib/squid/errors/hu/ERR_DNS_FAIL
#usr/lib/squid/errors/hy/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/hy/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/hy/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/hy/ERR_CONFLICT_HOST
#usr/lib/squid/errors/hy/ERR_CONNECT_FAIL
#usr/lib/squid/errors/hy/ERR_DIR_LISTING
#usr/lib/squid/errors/hy/ERR_DNS_FAIL
#usr/lib/squid/errors/id/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/id/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/id/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/id/ERR_CONFLICT_HOST
#usr/lib/squid/errors/id/ERR_CONNECT_FAIL
#usr/lib/squid/errors/id/ERR_DIR_LISTING
#usr/lib/squid/errors/id/ERR_DNS_FAIL
#usr/lib/squid/errors/it/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/it/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/it/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/it/ERR_CONFLICT_HOST
#usr/lib/squid/errors/it/ERR_CONNECT_FAIL
#usr/lib/squid/errors/it/ERR_DIR_LISTING
#usr/lib/squid/errors/it/ERR_DNS_FAIL
#usr/lib/squid/errors/ja/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/ja/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/ja/ERR_CONFLICT_HOST
#usr/lib/squid/errors/ja/ERR_CONNECT_FAIL
#usr/lib/squid/errors/ja/ERR_DIR_LISTING
#usr/lib/squid/errors/ja/ERR_DNS_FAIL
#usr/lib/squid/errors/ko/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/ko/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/ko/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/ko/ERR_CONFLICT_HOST
#usr/lib/squid/errors/ko/ERR_CONNECT_FAIL
#usr/lib/squid/errors/ko/ERR_DIR_LISTING
#usr/lib/squid/errors/ko/ERR_DNS_FAIL
#usr/lib/squid/errors/lt/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/lt/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/lt/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/lt/ERR_CONFLICT_HOST
#usr/lib/squid/errors/lt/ERR_CONNECT_FAIL
#usr/lib/squid/errors/lt/ERR_DIR_LISTING
#usr/lib/squid/errors/lt/ERR_DNS_FAIL
#usr/lib/squid/errors/lv/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/lv/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/lv/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/lv/ERR_CONFLICT_HOST
#usr/lib/squid/errors/lv/ERR_CONNECT_FAIL
#usr/lib/squid/errors/lv/ERR_DIR_LISTING
#usr/lib/squid/errors/lv/ERR_DNS_FAIL
#usr/lib/squid/errors/ms/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/ms/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/ms/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/ms/ERR_CONFLICT_HOST
#usr/lib/squid/errors/ms/ERR_CONNECT_FAIL
#usr/lib/squid/errors/ms/ERR_DIR_LISTING
#usr/lib/squid/errors/ms/ERR_DNS_FAIL
usr/lib/squid/errors/nl/ERR_CACHE_ACCESS_DENIED
usr/lib/squid/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED
usr/lib/squid/errors/nl/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/nl/ERR_CONFLICT_HOST
usr/lib/squid/errors/nl/ERR_CONNECT_FAIL
usr/lib/squid/errors/nl/ERR_DIR_LISTING
usr/lib/squid/errors/nl/ERR_DNS_FAIL
#usr/lib/squid/errors/oc/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/oc/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/oc/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/oc/ERR_CONFLICT_HOST
#usr/lib/squid/errors/oc/ERR_CONNECT_FAIL
#usr/lib/squid/errors/oc/ERR_DIR_LISTING
#usr/lib/squid/errors/oc/ERR_DNS_FAIL
usr/lib/squid/errors/pl/ERR_CACHE_ACCESS_DENIED
usr/lib/squid/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED
usr/lib/squid/errors/pl/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/pl/ERR_CONFLICT_HOST
usr/lib/squid/errors/pl/ERR_CONNECT_FAIL
usr/lib/squid/errors/pl/ERR_DIR_LISTING
usr/lib/squid/errors/pl/ERR_DNS_FAIL
#usr/lib/squid/errors/pt-br/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/pt-br/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/pt-br/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/pt-br/ERR_CONFLICT_HOST
#usr/lib/squid/errors/pt-br/ERR_CONNECT_FAIL
#usr/lib/squid/errors/pt-br/ERR_DIR_LISTING
#usr/lib/squid/errors/pt-br/ERR_DNS_FAIL
#usr/lib/squid/errors/pt/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/pt/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/pt/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/pt/ERR_CONFLICT_HOST
#usr/lib/squid/errors/pt/ERR_CONNECT_FAIL
#usr/lib/squid/errors/pt/ERR_DIR_LISTING
#usr/lib/squid/errors/pt/ERR_DNS_FAIL
#usr/lib/squid/errors/ro/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/ro/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/ro/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/ro/ERR_CONFLICT_HOST
#usr/lib/squid/errors/ro/ERR_CONNECT_FAIL
#usr/lib/squid/errors/ro/ERR_DIR_LISTING
#usr/lib/squid/errors/ro/ERR_DNS_FAIL
usr/lib/squid/errors/ru/ERR_CACHE_ACCESS_DENIED
usr/lib/squid/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED
usr/lib/squid/errors/ru/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/ru/ERR_CONFLICT_HOST
usr/lib/squid/errors/ru/ERR_CONNECT_FAIL
usr/lib/squid/errors/ru/ERR_DIR_LISTING
usr/lib/squid/errors/ru/ERR_DNS_FAIL
#usr/lib/squid/errors/sk/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/sk/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/sk/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/sk/ERR_CONFLICT_HOST
#usr/lib/squid/errors/sk/ERR_CONNECT_FAIL
#usr/lib/squid/errors/sk/ERR_DIR_LISTING
#usr/lib/squid/errors/sk/ERR_DNS_FAIL
#usr/lib/squid/errors/sl/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/sl/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/sl/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/sl/ERR_CONFLICT_HOST
#usr/lib/squid/errors/sl/ERR_CONNECT_FAIL
#usr/lib/squid/errors/sl/ERR_DIR_LISTING
#usr/lib/squid/errors/sl/ERR_DNS_FAIL
#usr/lib/squid/errors/sr-cyrl/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/sr-cyrl/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/sr-cyrl/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/sr-cyrl/ERR_CONFLICT_HOST
#usr/lib/squid/errors/sr-cyrl/ERR_CONNECT_FAIL
#usr/lib/squid/errors/sr-cyrl/ERR_DIR_LISTING
#usr/lib/squid/errors/sr-cyrl/ERR_DNS_FAIL
#usr/lib/squid/errors/sr-latn/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/sr-latn/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/sr-latn/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/sr-latn/ERR_CONFLICT_HOST
#usr/lib/squid/errors/sr-latn/ERR_CONNECT_FAIL
#usr/lib/squid/errors/sr-latn/ERR_DIR_LISTING
#usr/lib/squid/errors/sr-latn/ERR_DNS_FAIL
#usr/lib/squid/errors/sv/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/sv/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/sv/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/sv/ERR_CONFLICT_HOST
#usr/lib/squid/errors/sv/ERR_CONNECT_FAIL
#usr/lib/squid/errors/sv/ERR_DIR_LISTING
#usr/lib/squid/errors/sv/ERR_DNS_FAIL
#usr/lib/squid/errors/templates/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/templates/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/templates/ERR_CONFLICT_HOST
#usr/lib/squid/errors/templates/ERR_CONNECT_FAIL
#usr/lib/squid/errors/templates/ERR_DIR_LISTING
#usr/lib/squid/errors/templates/ERR_DNS_FAIL
#usr/lib/squid/errors/th/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/th/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/th/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/th/ERR_CONFLICT_HOST
#usr/lib/squid/errors/th/ERR_CONNECT_FAIL
#usr/lib/squid/errors/th/ERR_DIR_LISTING
#usr/lib/squid/errors/th/ERR_DNS_FAIL
usr/lib/squid/errors/tr/ERR_CACHE_ACCESS_DENIED
usr/lib/squid/errors/tr/ERR_CACHE_MGR_ACCESS_DENIED
usr/lib/squid/errors/tr/ERR_CANNOT_FORWARD
+usr/lib/squid/errors/tr/ERR_CONFLICT_HOST
usr/lib/squid/errors/tr/ERR_CONNECT_FAIL
usr/lib/squid/errors/tr/ERR_DIR_LISTING
usr/lib/squid/errors/tr/ERR_DNS_FAIL
#usr/lib/squid/errors/uk/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/uk/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/uk/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/uk/ERR_CONFLICT_HOST
#usr/lib/squid/errors/uk/ERR_CONNECT_FAIL
#usr/lib/squid/errors/uk/ERR_DIR_LISTING
#usr/lib/squid/errors/uk/ERR_DNS_FAIL
#usr/lib/squid/errors/uz/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/uz/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/uz/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/uz/ERR_CONFLICT_HOST
#usr/lib/squid/errors/uz/ERR_CONNECT_FAIL
#usr/lib/squid/errors/uz/ERR_DIR_LISTING
#usr/lib/squid/errors/uz/ERR_DNS_FAIL
#usr/lib/squid/errors/vi/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/vi/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/vi/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/vi/ERR_CONFLICT_HOST
#usr/lib/squid/errors/vi/ERR_CONNECT_FAIL
#usr/lib/squid/errors/vi/ERR_DIR_LISTING
#usr/lib/squid/errors/vi/ERR_DNS_FAIL
#usr/lib/squid/errors/zh-cn/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/zh-cn/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/zh-cn/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/zh-cn/ERR_CONFLICT_HOST
#usr/lib/squid/errors/zh-cn/ERR_CONNECT_FAIL
#usr/lib/squid/errors/zh-cn/ERR_DIR_LISTING
#usr/lib/squid/errors/zh-cn/ERR_DNS_FAIL
#usr/lib/squid/errors/zh-tw/ERR_CACHE_ACCESS_DENIED
#usr/lib/squid/errors/zh-tw/ERR_CACHE_MGR_ACCESS_DENIED
#usr/lib/squid/errors/zh-tw/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/zh-tw/ERR_CONFLICT_HOST
#usr/lib/squid/errors/zh-tw/ERR_CONNECT_FAIL
#usr/lib/squid/errors/zh-tw/ERR_DIR_LISTING
#usr/lib/squid/errors/zh-tw/ERR_DNS_FAIL
#usr/lib/squid/errors/zh-tw/ERR_WRITE_ERROR
#usr/lib/squid/errors/zh-tw/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/zh-tw/error-details.txt
-usr/lib/squid/fakeauth_auth
+usr/lib/squid/ext_edirectory_userip_acl
+usr/lib/squid/ext_file_userip_acl
+usr/lib/squid/ext_kerberos_ldap_group_acl
+usr/lib/squid/ext_ldap_group_acl
+usr/lib/squid/ext_session_acl
+usr/lib/squid/ext_sql_session_acl
+usr/lib/squid/ext_time_quota_acl
+usr/lib/squid/ext_unix_group_acl
+usr/lib/squid/ext_wbinfo_group_acl
+usr/lib/squid/helper-mux.pl
usr/lib/squid/icons
-#usr/lib/squid/icons/anthony-binhex.gif
-#usr/lib/squid/icons/anthony-bomb.gif
-#usr/lib/squid/icons/anthony-box.gif
-#usr/lib/squid/icons/anthony-box2.gif
-#usr/lib/squid/icons/anthony-c.gif
-#usr/lib/squid/icons/anthony-compressed.gif
-#usr/lib/squid/icons/anthony-dir.gif
-#usr/lib/squid/icons/anthony-dirup.gif
-#usr/lib/squid/icons/anthony-dvi.gif
-#usr/lib/squid/icons/anthony-f.gif
-#usr/lib/squid/icons/anthony-image.gif
-#usr/lib/squid/icons/anthony-image2.gif
-#usr/lib/squid/icons/anthony-layout.gif
-#usr/lib/squid/icons/anthony-link.gif
-#usr/lib/squid/icons/anthony-movie.gif
-#usr/lib/squid/icons/anthony-pdf.gif
-#usr/lib/squid/icons/anthony-portal.gif
-#usr/lib/squid/icons/anthony-ps.gif
-#usr/lib/squid/icons/anthony-quill.gif
-#usr/lib/squid/icons/anthony-script.gif
-#usr/lib/squid/icons/anthony-sound.gif
-#usr/lib/squid/icons/anthony-tar.gif
-#usr/lib/squid/icons/anthony-tex.gif
-#usr/lib/squid/icons/anthony-text.gif
-#usr/lib/squid/icons/anthony-unknown.gif
-#usr/lib/squid/icons/anthony-xbm.gif
-#usr/lib/squid/icons/anthony-xpm.gif
-usr/lib/squid/ip_user_check
+usr/lib/squid/icons/SN.png
+usr/lib/squid/icons/silk
+usr/lib/squid/icons/silk/application.png
+usr/lib/squid/icons/silk/arrow_up.png
+usr/lib/squid/icons/silk/bomb.png
+usr/lib/squid/icons/silk/box.png
+usr/lib/squid/icons/silk/bricks.png
+usr/lib/squid/icons/silk/bullet_red.png
+usr/lib/squid/icons/silk/cd.png
+usr/lib/squid/icons/silk/chart_line.png
+usr/lib/squid/icons/silk/compress.png
+usr/lib/squid/icons/silk/computer_link.png
+usr/lib/squid/icons/silk/css.png
+usr/lib/squid/icons/silk/cup.png
+usr/lib/squid/icons/silk/database.png
+usr/lib/squid/icons/silk/database_table.png
+usr/lib/squid/icons/silk/drive_disk.png
+usr/lib/squid/icons/silk/film.png
+usr/lib/squid/icons/silk/film_key.png
+usr/lib/squid/icons/silk/folder.png
+usr/lib/squid/icons/silk/folder_table.png
+usr/lib/squid/icons/silk/image.png
+usr/lib/squid/icons/silk/information.png
+usr/lib/squid/icons/silk/layers.png
+usr/lib/squid/icons/silk/layout.png
+usr/lib/squid/icons/silk/link.png
+usr/lib/squid/icons/silk/music.png
+usr/lib/squid/icons/silk/package.png
+usr/lib/squid/icons/silk/package_go.png
+usr/lib/squid/icons/silk/page_code.png
+usr/lib/squid/icons/silk/page_excel.png
+usr/lib/squid/icons/silk/page_green.png
+usr/lib/squid/icons/silk/page_white.png
+usr/lib/squid/icons/silk/page_white_acrobat.png
+usr/lib/squid/icons/silk/page_white_c.png
+usr/lib/squid/icons/silk/page_white_cplusplus.png
+usr/lib/squid/icons/silk/page_white_flash.png
+usr/lib/squid/icons/silk/page_white_magnify.png
+usr/lib/squid/icons/silk/page_white_picture.png
+usr/lib/squid/icons/silk/page_white_powerpoint.png
+usr/lib/squid/icons/silk/page_white_stack.png
+usr/lib/squid/icons/silk/page_white_text.png
+usr/lib/squid/icons/silk/page_white_word.png
+usr/lib/squid/icons/silk/page_white_zip.png
+usr/lib/squid/icons/silk/page_world.png
+usr/lib/squid/icons/silk/photo.png
+usr/lib/squid/icons/silk/picture.png
+usr/lib/squid/icons/silk/plugin.png
+usr/lib/squid/icons/silk/plugin_add.png
+usr/lib/squid/icons/silk/script.png
+usr/lib/squid/icons/silk/script_gear.png
+usr/lib/squid/icons/silk/script_palette.png
+usr/lib/squid/log_db_daemon
+usr/lib/squid/log_file_daemon
usr/lib/squid/mib.txt
-usr/lib/squid/msnt_auth
-usr/lib/squid/ncsa_auth
-usr/lib/squid/no_check.pl
+usr/lib/squid/negotiate_wrapper_auth
+usr/lib/squid/ntlm_fake_auth
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/lib/squid/url_fake_rewrite
+usr/lib/squid/url_fake_rewrite.sh
usr/sbin/squid
usr/sbin/updxlrator
#usr/share/man/man1/squidclient.1
+#usr/share/man/man8/basic_db_auth.8
+#usr/share/man/man8/basic_getpwnam_auth.8
+#usr/share/man/man8/basic_ldap_auth.8
+#usr/share/man/man8/basic_ncsa_auth.8
+#usr/share/man/man8/basic_pam_auth.8
+#usr/share/man/man8/basic_radius_auth.8
+#usr/share/man/man8/basic_sasl_auth.8
#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/digest_file_auth.8
+#usr/share/man/man8/ext_edirectory_userip_acl.8
+#usr/share/man/man8/ext_file_userip_acl.8
+#usr/share/man/man8/ext_ldap_group_acl.8
+#usr/share/man/man8/ext_session_acl.8
+#usr/share/man/man8/ext_sql_session_acl.8
+#usr/share/man/man8/ext_time_quota_acl.8
+#usr/share/man/man8/ext_unix_group_acl.8
+#usr/share/man/man8/ext_wbinfo_group_acl.8
+#usr/share/man/man8/log_db_daemon.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/cache/squid
var/ipfire/proxy/errorpage-ipfire.css
var/ipfire/proxy/errorpage-squid.css
var/ipfire/updatexlrator/autocheck/cron.daily
var/log/squid/access.log
var/log/updatexlrator
#var/logs
+#var/run/squid
--- /dev/null
+srv/web/ipfire/html/proxy.pac
+boot/config.txt
+etc/udev/rules.d/30-persistent-network.rules
+etc/collectd.custom
+etc/shadow
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/log/cache
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+var/state/dhcp/dhcpd.leases
--- /dev/null
+../../../common/HTML-Template
\ No newline at end of file
--- /dev/null
+lib/modules/3.2.48-ipfire-omap/kernel/drivers/net/wireless/ath/ath.ko
+lib/modules/3.2.48-ipfire-kirkwood/kernel/drivers/net/wireless/ath/ath.ko
+lib/modules/3.2.48-ipfire-rpi/kernel/drivers/net/wireless/ath/ath.ko
--- /dev/null
+etc/system-release
+etc/issue
+etc/rc.d/init.d/dnsmasq
+etc/rc.d/init.d/squid
+srv/web/ipfire/cgi-bin/logs.cgi/proxylog.dat
+srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/html/redirect.cgi
+srv/web/ipfire/html/redirect-templates/
+var/ipfire/header.pl
+var/ipfire/langs
+var/ipfire/proxy/advanced/useragents
--- /dev/null
+lib/modules/2.6.32.61-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko
+lib/modules/3.2.48-ipfire/kernel/drivers/net/wireless/ath/ath.ko
+lib/modules/3.2.48-ipfire-pae/kernel/drivers/net/wireless/ath/ath.ko
--- /dev/null
+../../../common/squid
\ No newline at end of file
--- /dev/null
+#!/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) 2013 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /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=73
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+
+#
+#Stop services
+/etc/init.d/squid stop
+
+
+#
+#Extract files
+extract_files
+
+# Regenerate squid configuration files.
+/srv/web/ipfire/cgi-bin/proxy.cgi
+
+#
+#Start services
+/etc/init.d/squid start
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+sync
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
+
--- /dev/null
+usr/sbin/iptraf-ng
+usr/sbin/rvnamed-ng
+var/lib/iptraf-ng
+var/lock/iptraf-ng
+var/log/iptraf-ng
--- /dev/null
+usr/bin/wavemon
+#usr/share/man/man1/wavemon.1
+#usr/share/man/man5/wavemonrc.5
+#usr/share/wavemon
+#usr/share/wavemon/AUTHORS
+#usr/share/wavemon/COPYING
+#usr/share/wavemon/ChangeLog
+#usr/share/wavemon/NEWS
+#usr/share/wavemon/README
+#usr/share/wavemon/THANKS
--- /dev/null
+etc/rc.d/init.d/xinetd
+etc/xinetd.conf
+#etc/xinetd.d
+#usr/man/man5/xinetd.conf.5
+#usr/man/man8/itox.8
+#usr/man/man8/xconv.pl.8
+#usr/man/man8/xinetd.8
+#usr/man/man8/xinetd.log.8
+#usr/sbin/itox
+#usr/sbin/xconv.pl
+usr/sbin/xinetd
--- /dev/null
+defaults
+{
+ instances = 10
+ log_type = SYSLOG daemon
+ log_on_success = HOST PID
+ log_on_failure = HOST
+ #only_from = <your local networks>
+}
+includedir /etc/xinetd.d
WARNING: untranslated string: tor traffic read written
WARNING: untranslated string: tor use exit nodes
WARNING: untranslated string: uptime load average
+WARNING: untranslated string: urlfilter redirect template
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: wlan client
WARNING: untranslated string: uptime load average
WARNING: untranslated string: urlfilter file ext block
WARNING: untranslated string: urlfilter mode block
+WARNING: untranslated string: urlfilter redirect template
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: wlan client
WARNING: untranslated string: tor traffic read written
WARNING: untranslated string: tor use exit nodes
WARNING: untranslated string: uptime load average
+WARNING: untranslated string: urlfilter redirect template
WARNING: untranslated string: wlan client
WARNING: untranslated string: wlan client advanced settings
WARNING: untranslated string: wlan client and
WARNING: untranslated string: tor traffic read written
WARNING: untranslated string: tor use exit nodes
WARNING: untranslated string: uptime load average
+WARNING: untranslated string: urlfilter redirect template
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: wlan client
WARNING: untranslated string: tor traffic read written
WARNING: untranslated string: tor use exit nodes
WARNING: untranslated string: uptime load average
+WARNING: untranslated string: urlfilter redirect template
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: wlan client
WARNING: untranslated string: tor traffic limit soft
WARNING: untranslated string: tor traffic read written
WARNING: untranslated string: tor use exit nodes
+WARNING: untranslated string: urlfilter redirect template
WARNING: untranslated string: wlan client
WARNING: untranslated string: wlan client advanced settings
WARNING: untranslated string: wlan client and
< uptime load average
< urlfilter file ext block
< urlfilter mode block
+< urlfilter redirect template
< visit us at
< vpn keyexchange
< wlanap access point
< updxlrtr standard view
< uptime
< uptime load average
+< urlfilter redirect template
< visit us at
< vpn keyexchange
< wlanap country
< updxlrtr standard view
< uptime
< uptime load average
+< urlfilter redirect template
< visit us at
< vpn keyexchange
< wlanap country
< updxlrtr standard view
< uptime
< uptime load average
+< urlfilter redirect template
< visit us at
< vpn keyexchange
< week-graph
$cgiparams{'MONTH'} = $temp[1];
$cgiparams{'DAY'} = $temp[2];
$cgiparams{'SOURCE_IP'} = $temp[3];
- $cgiparams{'USERNAME'} = $temp[4];
+ $cgiparams{'USERNAME'} = &Header::escape($temp[4]);
}
if (!($cgiparams{'MONTH'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11)$/) ||
END
;
foreach my $so (sort keys %users) {
+ $so = &Header::escape($so);
print "<option value='$so' $selected{'USERNAME'}{$so}>$so</option>\n"; }
print <<END
</select>
if ($proxysettings{'LOGGING'} eq 'on')
{
print FILE <<END
-access_log /var/log/squid/access.log
+access_log stdio:/var/log/squid/access.log
cache_log /var/log/squid/cache.log
cache_store_log none
END
;
- if ($proxysettings{'LOGUSERAGENT'} eq 'on') { print FILE "useragent_log \/var\/log\/squid\/user_agent.log\n"; }
+ if ($proxysettings{'LOGUSERAGENT'} eq 'on') { print FILE "access_log stdio:\/var\/log\/squid\/user_agent.log useragent\n"; }
if ($proxysettings{'LOGQUERY'} eq 'on') { print FILE "\nstrip_query_terms off\n"; }
} else {
print FILE <<END
{
if ($proxysettings{'AUTH_METHOD'} eq 'ncsa')
{
- print FILE "auth_param basic program $authdir/ncsa_auth $userdb\n";
+ print FILE "auth_param basic program $authdir/basic_ncsa_auth $userdb\n";
print FILE "auth_param basic children $proxysettings{'AUTH_CHILDREN'}\n";
print FILE "auth_param basic realm $authrealm\n";
print FILE "auth_param basic credentialsttl $proxysettings{'AUTH_CACHE_TTL'} minutes\n";
if ($proxysettings{'AUTH_METHOD'} eq 'ldap')
{
print FILE "auth_param basic utf8 on\n";
- print FILE "auth_param basic program $authdir/squid_ldap_auth -b \"$proxysettings{'LDAP_BASEDN'}\"";
+ print FILE "auth_param basic program $authdir/basic_ldap_auth -b \"$proxysettings{'LDAP_BASEDN'}\"";
if (!($proxysettings{'LDAP_BINDDN_USER'} eq '')) { print FILE " -D \"$proxysettings{'LDAP_BINDDN_USER'}\""; }
if (!($proxysettings{'LDAP_BINDDN_PASS'} eq '')) { print FILE " -w $proxysettings{'LDAP_BINDDN_PASS'}"; }
if ($proxysettings{'LDAP_TYPE'} eq 'ADS')
print FILE "auth_param ntlm children $proxysettings{'AUTH_CHILDREN'}\n";
if (!($proxysettings{'AUTH_IPCACHE_TTL'} eq '0')) { print FILE "\nauthenticate_ip_ttl $proxysettings{'AUTH_IPCACHE_TTL'} minutes\n"; }
} else {
- print FILE "auth_param basic program $authdir/msnt_auth\n";
+ print FILE "auth_param basic program $authdir/basic_msnt_auth\n";
print FILE "auth_param basic children $proxysettings{'AUTH_CHILDREN'}\n";
print FILE "auth_param basic realm $authrealm\n";
print FILE "auth_param basic credentialsttl $proxysettings{'AUTH_CACHE_TTL'} minutes\n";
if ($proxysettings{'AUTH_METHOD'} eq 'radius')
{
- print FILE "auth_param basic program $authdir/squid_radius_auth -h $proxysettings{'RADIUS_SERVER'} -p $proxysettings{'RADIUS_PORT'} ";
+ print FILE "auth_param basic program $authdir/basic_radius_auth -h $proxysettings{'RADIUS_SERVER'} -p $proxysettings{'RADIUS_PORT'} ";
if (!($proxysettings{'RADIUS_IDENTIFIER'} eq '')) { print FILE "-i $proxysettings{'RADIUS_IDENTIFIER'} "; }
print FILE "-w $proxysettings{'RADIUS_SECRET'}\n";
print FILE "auth_param basic children $proxysettings{'AUTH_CHILDREN'}\n";
print FILE "acl blocked_mimetypes rep_mime_type \"$mimetypes\"\n\n";
}
- print FILE <<END
-#acl all src all
-acl localhost src 127.0.0.1/32
-END
-;
open (PORTS,"$acl_ports_ssl");
@temp = <PORTS>;
close PORTS;
if ($proxysettings{'ENABLE_CLAMAV'} eq 'on') {
print FILE "\n#Settings for squidclamav:\n";
print FILE "http_port 127.0.0.1:$proxysettings{'PROXY_PORT'} transparent\n";
- print FILE "acl to_localhost dst 127.0.0.0/8\n";
print FILE "acl purge method PURGE\n";
print FILE "http_access deny to_localhost\n";
print FILE "http_access allow localhost\n";
my $uqfile = "${General::swroot}/urlfilter/userquota";
my $dbdir = "${General::swroot}/urlfilter/blacklists";
my $editdir = "${General::swroot}/urlfilter/editor";
+my $templatedir = "/srv/web/ipfire/html/redirect-templates";
my $repository = "/var/urlrepo";
my $hintcolour = '#FFFFCC';
$filtersettings{'ENABLE_USERNAME_LOG'} = 'off';
$filtersettings{'ENABLE_CATEGORY_LOG'} = 'off';
$filtersettings{'ENABLE_AUTOUPDATE'} = 'off';
+$filtersettings{'REDIRECT_TEMPLATE'} = 'legacy';
$filtersettings{'ACTION'} = '';
$filtersettings{'VALID'} = '';
$checked{$category}{$filtersettings{$category}} = "checked='checked'";
}
+$selected{'REDIRECT_TEMPLATE'}{$filtersettings{'REDIRECT_TEMPLATE'}} = "selected='selected'";
+
$selected{'DEFINITION'}{$tcsettings{'DEFINITION'}} = "selected='selected'";
$selected{'FROM_HOUR'}{$tcsettings{'FROM_HOUR'}} = "selected='selected'";
$selected{'FROM_MINUTE'}{$tcsettings{'FROM_MINUTE'}} = "selected='selected'";
<tr>
<td colspan='4'><b>$Lang::tr{'urlfilter block settings'}</b></td>
</tr>
+<tr>
+ <td width='25%' class='base'>$Lang::tr{'urlfilter redirect template'}</td>
+ <td width='75%' colspan='2'>
+ <select name='REDIRECT_TEMPLATE'>
+END
+;
+
+ foreach (<$templatedir/*>) {
+ if ((-d "$_") && (-e "$_/template.html")) {
+ my $template = substr($_,rindex($_,"/")+1);
+ print "<option value='$template' $selected{'REDIRECT_TEMPLATE'}{$template}>$template</option>\n";
+ }
+ }
+
+print <<END
+ </select>
+ </td>
+</tr>
<tr>
<td width='25%' class='base'>$Lang::tr{'urlfilter show category'}:</td>
<td width='12%'><input type='checkbox' name='SHOW_CATEGORY' $checked{'SHOW_CATEGORY'}{'on'} /></td>
--- /dev/null
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <title>ACCESS MESSAGE</title>
+ </head>
+ <body>
+ <table width="100%" height='100%' border="0">
+ <tr>
+ <td colspan='3' width='100%' height='130' align="center" background="<TMPL_VAR NAME="ADDRESS">/images/background.gif">
+ <tr>
+ <td width='10%'>
+ <td align='center' bgcolor='#CC000000' width='80%'>
+ <font face="verdana, arial, sans serif" color="#FFFFFF" size="5">
+ <b><TMPL_VAR NAME="MSG_TEXT_1"></b>
+ </font>
+ <td width='10%'>
+
+ <TMPL_IF NAME="CATEGORY">
+ <tr>
+ <td colspan='3' align='center'>
+ <font face="verdana, arial, sans serif" color="#CC000000" size="1">
+ <b>[<TMPL_VAR NAME="CATEGORY">]</b>
+ </font>
+ </TMPL_IF>
+
+ <tr>
+ <td colspan='3' align="center">
+ <font face="verdana, arial, sans serif" color="#000000" size="4">
+ <b><TMPL_VAR NAME="MSG_TEXT_2"></b>
+ </font>
+ <font face="verdana,arial,sans serif" color="#000000" size="2">
+ <TMPL_IF NAME="URL">
+ <p>URL: <a href="<TMPL_VAR NAME="URL">"><TMPL_VAR NAME="URL"></a>
+ </TMPL_IF>
+
+ <TMPL_IF NAME="IP_ADDRESS">
+ <p>Client IP address: <i><TMPL_VAR NAME="IP_ADDRESS"></i>
+ </TMPL_IF>
+
+ <br><p><TMPL_VAR NAME="MSG_TEXT_3">
+ </font>
+
+ <tr>
+ <td colspan='3' height='60%' valign="bottom" align="right">
+ <font face="verdana,arial,sans serif" color="#656565" size="1">
+ Web Filtering by
+ </font>
+ <a href="http://www.ipfire.org" target="_blank">
+ <font face="verdana,arial,sans serif" color="#656565" size="1"><b>IPFire</b></font>
+ </a>
+
+ </table>
+ </body>
+</html>
# #
###############################################################################
-use CGI qw(param);
+use CGI;
+use HTML::Entities;
+use HTML::Template;
-$swroot="/var/ipfire";
+my $swroot="/var/ipfire";
+my $templateroot = "/srv/web/ipfire/html/redirect-templates";
my %netsettings;
my %filtersettings;
&readhash("$swroot/ethernet/settings", \%netsettings);
&readhash("$swroot/urlfilter/settings", \%filtersettings);
-$category=param("category");
-$url=param("url");
-$ip=param("ip");
+# Read the template file.
+my $template = $filtersettings{'REDIRECT_TEMPLATE'};
+if (($template eq '') || (! -e "$templateroot/$template")) {
+ $template = "legacy";
+}
+my $tmpl = HTML::Template->new(
+ filename => "$templateroot/$template/template.html",
+ die_on_bad_params => 0
+);
+
+# Address where to load more resources from.
+$tmpl->param(ADDRESS => "http://$netsettings{'GREEN_ADDRESS'}:81");
-if ($filtersettings{'MSG_TEXT_1'} eq '') {
+# Message text 1
+my $msgtext1 = $filtersettings{'MSG_TEXT_1'};
+if ($msgtext1 eq '') {
$msgtext1 = "A C C E S S D E N I E D";
-} else { $msgtext1 = $filtersettings{'MSG_TEXT_1'}; }
-if ($filtersettings{'MSG_TEXT_2'} eq '') {
+}
+$tmpl->param(MSG_TEXT_1 => $msgtext1);
+
+# Message text 2
+my $msgtext2 = $filtersettings{'MSG_TEXT_2'};
+if ($msgtext2 eq '') {
$msgtext2 = "Access to the requested page has been denied";
-} else { $msgtext2 = $filtersettings{'MSG_TEXT_2'}; }
-if ($filtersettings{'MSG_TEXT_3'} eq '') {
+}
+$tmpl->param(MSG_TEXT_2 => $msgtext2);
+
+# Message text 3
+my $msgtext3 = $filtersettings{'MSG_TEXT_3'};
+if ($msgtext3 eq '') {
$msgtext3 = "Please contact the Network Administrator if you think there has been an error";
-} else { $msgtext3 = $filtersettings{'MSG_TEXT_3'}; }
+}
+$tmpl->param(MSG_TEXT_3 => $msgtext3);
+
+# Category
+my $category = CGI::param("category");
+$tmpl->param(CATEGORY => &escape($category));
+
+# URL
+my $url = CGI::param("url");
+$tmpl->param(URL => &escape($url));
-if ($category eq '') { $category = ' '; } else { $category = '['.$category.']'; }
+# IP address
+my $ip_address = CGI::param("ip");
+$tmpl->param(IP_ADDRESS => &escape($ip_address));
+# Print header
print "Pragma: no-cache\n";
print "Cache-control: no-cache\n";
print "Connection: close\n";
print "Content-type: text/html\n\n";
+print $tmpl->output;
-print <<END
-
-<html>
-<head>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>ACCESS MESSAGE</title>
-</head>
-
-<body>
-<table width="100%" height='100%' border="0">
-<tr>
- <td colspan='3' width='100%' height='130' align="center" background="http://$netsettings{'GREEN_ADDRESS'}:81/images/background.gif">
-<tr> <td width='10%'><td align='center' bgcolor='#CC000000' width='80%'><font face="verdana, arial, sans serif" color="#FFFFFF" size="5">
- <b>$msgtext1</b>
- </font>
- <td width='10%'>
-END
-;
-
-if (!($category eq ""))
-{
- print <<END
- <tr> <td colspan='3' align='center'>
- <font face="verdana, arial, sans serif" color="#CC000000" size="1">
- <b>$category</b>
- </font>
-END
-;
+sub escape($) {
+ my $s = shift;
+ return HTML::Entities::encode_entities($s);
}
-print <<END
-<tr>
- <td colspan='3' align="center">
- <font face="verdana, arial, sans serif" color="#000000" size="4">
- <b>$msgtext2</b>
- </font>
- <font face="verdana,arial,sans serif" color="#000000" size="2">
-END
-;
-
-if (!($url eq ""))
-{
-print <<END
- <p>URL: <a href="$url">$url</a>
-END
-;
-}
-
-if (!($ip eq ""))
-{
-print <<END
- <p>Client IP address: <i>$ip</i>
-END
-;
-}
-
-print <<END
- <br><p>$msgtext3
- </font>
-<tr>
- <td colspan='3' height='60%' valign="bottom" align="right">
- <font face="verdana,arial,sans serif" color="#656565" size="1">Web Filtering by
- </font>
- <a href="http://www.ipfire.org" target="_blank"><b>
- <font face="verdana,arial,sans serif" color="#656565" size="1">IPFire</b></a>
- </font>
-
-</table>
-</body>
-
-</html>
-END
-;
-
-sub readhash
-{
+sub readhash {
my $filename = $_[0];
my $hash = $_[1];
my ($var, $val);
- if (-e $filename)
- {
+ if (-e $filename) {
open(FILE, $filename) or die "Unable to read file $filename";
- while (<FILE>)
- {
+ while (<FILE>) {
chop;
($var, $val) = split /=/, $_, 2;
- if ($var)
- {
+ if ($var) {
$val =~ s/^\'//g;
$val =~ s/\'$//g;
$hash->{$var} = $val;
}
}
+
close FILE;
}
}
'urlfilter quota restart message' => 'Hinweis: Beim Neustart des URL-Filters werden die Zähler für alle Benutzer zurückgesetzt',
'urlfilter quota time error' => 'Ungültiger Wert für Zeitkontingent',
'urlfilter quota user error' => 'Mindestens ein Benutzername erforderlich',
+'urlfilter redirect template' => 'Sperrseitenvorlage',
'urlfilter redirectpage' => 'Leite zu dieser URL um',
'urlfilter remove file' => 'Datei aus der Ablage entfernen',
'urlfilter renewal' => 'Erneuerung',
'firewall log' => 'Firewall log',
'firewall log viewer' => 'Firewall Log Viewer',
'firewall logs' => 'Firewall Logs',
-'firewall logs ip' => 'Fw-Logdgraphs (IP)',
+'firewall logs ip' => 'Fw-Loggraphs (IP)',
'firewall logs port' => 'Fw-Loggraphs (Port)',
'firewallhits' => 'firewallhits',
'firmware' => 'Firmware',
'urlfilter quota restart message' => 'Note: The counters will be reset for all users when restarting the URL filter',
'urlfilter quota time error' => 'Invalid value for time quota',
'urlfilter quota user error' => 'At least one username is required',
+'urlfilter redirect template' => 'Redirect page template',
'urlfilter redirectpage' => 'Redirect to this URL',
'urlfilter remove file' => 'Remove file from repository',
'urlfilter renewal' => 'Renewal',
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 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 Config
+
+VER = 2.94
+
+THISAPP = HTML-Template-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 7b7683c3672d55fb922734ea1e9ba7e8
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && perl Makefile.PL
+ cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
+
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8-1-u-kref_get_unless_zero.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch
# kfifo has no license info and taints kernel
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch
--- /dev/null
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info@ipfire.org> #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.1.4
+
+THISAPP = iptraf-ng-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = iptraf-ng
+PAK_VER = 2
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = de27cfeeede96e2acfb0edc8439b034a
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr
+
+ cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+
+ # Binary install
+ cd $(DIR_APP) && install -v -m750 -D iptraf-ng /usr/sbin/iptraf-ng
+ cd $(DIR_APP) && install -v -m750 -D rvnamed-ng /usr/sbin/rvnamed-ng
+
+ # Directory install
+ -mkdir -vp /var/log/iptraf-ng
+ chmod 750 /var/log/iptraf-ng
+ chown root.root /var/log/iptraf-ng
+ -mkdir -vp /var/lib/iptraf-ng
+ chmod 750 /var/lib/iptraf-ng
+ chown root.root /var/lib/iptraf-ng
+ -mkdir -vp /var/lock/iptraf-ng
+ chmod 755 /var/lock/iptraf-ng
+ chown root.root /var/lock/iptraf-ng
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
include Config
-VER = 3.6.17
+VER = 3.6.18
THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
-PAK_VER = 51
+PAK_VER = 52
DEPS = "cups"
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c67c3330545c8f1f7ee26e017c28439b
+$(DL_FILE)_MD5 = c7eec3e83fe4c4750240a8a0a214bbd4
install : $(TARGET)
include Config
-VER = 3.1.23
+VER = 3.3.8
THISAPP = squid-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e15fdb8c615cf1f9525be0a2b75c60a7
+$(DL_FILE)_MD5 = 6a8fa0075f2fbdd899ac4c9d95fe67cb
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
-
- cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.1-10486.patch
- cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.1-10487.patch
-
- 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 \
- --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,PAM,squid_radius_auth" \
- --enable-useragent-log \
- --enable-referer-log \
- --enable-snmp \
- --with-pthreads --with-dl \
- --with-maxfd="65536" \
- --with-filedescriptors=65536 \
- --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 \
- --enable-cache-digests \
- --enable-forw-via-db \
- --enable-htcp \
- --enable-ipf-transparent \
- --enable-kill-parent-hack \
- --disable-wccpv2 \
- --enable-icap-client \
- --disable-esi
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc/squid \
+ --datadir=/usr/lib/squid \
+ --mandir=/usr/share/man \
+ --libexecdir=/usr/lib/squid \
+ --localstatedir=/var \
+ --disable-ipv6 \
+ --enable-poll \
+ --disable-icmp \
+ --disable-wccp \
+ --enable-ident-lookups \
+ --enable-storeio="aufs,diskd,ufs" \
+ --enable-ssl \
+ --enable-underscores \
+ --enable-http-violations \
+ --enable-removal-policies="heap,lru" \
+ --enable-delay-pools \
+ --enable-linux-netfilter \
+ --enable-snmp \
+ --enable-auth \
+ --enable-auth-basic \
+ --enable-auth-digest \
+ --enable-auth-negotiate \
+ --enable-auth-ntlm \
+ --enable-log-daemon-helpers \
+ --enable-url-rewrite-helpers \
+ --enable-build-info \
+ --enable-eui \
+ --with-pthreads \
+ --with-dl \
+ --with-maxfd="65536" \
+ --with-filedescriptors=65536 \
+ --with-large-files \
+ --with-aio \
+ --enable-async-io=8 \
+ --enable-unlinkd \
+ --enable-internal-dns \
+ --enable-epoll \
+ --disable-kqueue \
+ --enable-select \
+ --enable-cache-digests \
+ --enable-forw-via-db \
+ --enable-htcp \
+ --enable-ipf-transparent \
+ --enable-kill-parent-hack \
+ --disable-wccpv2 \
+ --enable-icap-client \
+ --disable-esi
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
include Config
-VER = 2.81
+VER = 2.82
THISAPP = transmission-$(VER)
DL_FILE = $(THISAPP).tar.xz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = transmission
-PAK_VER = 8
+PAK_VER = 9
DEPS = "libevent2"
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = db1ad10ecff07150486dab2365ccb3a8
+$(DL_FILE)_MD5 = a5ef870c0410b12d10449c2d36fa4661
install : $(TARGET)
--- /dev/null
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info@ipfire.org> #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.7.5
+
+THISAPP = wavemon-$(VER)
+DL_FILE = $(THISAPP).tar.bz2
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = wavemon
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 77d4a0f099ca98cf98a915adc70694ba
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr
+
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 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 Config
+
+VER = 2.3.15
+
+THISAPP = xinetd-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = xinetd
+PAK_VER = 1
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 77358478fd58efa6366accae99b8b04c
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ -mkdir -pv /etc/xinetd.d
+ cp -f $(DIR_SRC)/config/xinetd/xinetd.conf /etc/xinetd.conf
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.13" # Version number
-CORE="72" # Core Level (Filename)
+CORE="73" # Core Level (Filename)
PAKFIRE_CORE="72" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
ipfiremake URI
ipfiremake HTML-Tagset
ipfiremake HTML-Parser
+ ipfiremake HTML-Template
ipfiremake Compress-Zlib
ipfiremake Digest
ipfiremake Digest-SHA1
ipfiremake acpid
ipfiremake fping
ipfiremake telnet
+ ipfiremake xinetd
ipfiremake libgpg-error
ipfiremake libassuan
ipfiremake gpgme
ipfiremake swatch
ipfiremake tor
ipfiremake arm
+ ipfiremake wavemon
+ ipfiremake iptraf-ng
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild
boot_mesg "Starting Domain Name Service Proxy..."
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
- ARGS=
- [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN"
+ ARGS="$CUSTOM_ARGS"
+ [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="$ARGS -s $DOMAIN_NAME_GREEN"
echo > /var/ipfire/red/resolv.conf # Clear it
if [ -e "/var/ipfire/red/dns1" ]; then
# Add custom forward dns zones.
ARGS="${ARGS} $(dns_forward_args /var/ipfire/dnsforward/config)"
- ARGS="$ARGS $CUSTOM_ARGS"
-
loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS
if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
if [ -e /var/ipfire/proxy/enable -o -e /var/ipfire/proxy/enable_blue ]; then
-
# Add Address to errorpage stylesheet
sed "s|XXXhostXXX|$GREEN_ADDRESS|g" /var/ipfire/proxy/errorpage-$ERR_DESIGN.css > \
/etc/squid/errorpage.css
+ boot_mesg "Creating Squid swap directories..."
+ /usr/sbin/squid -z >/dev/null 2>&1
+ evaluate_retval
+
+ # Make sure, that the process above has finished.
+ counter=5
+ while [ ${counter} -gt 0 ]; do
+ if pidofproc -s /usr/sbin/squid; then
+ sleep 1
+ else
+ break
+ fi
+ done
+
boot_mesg "Starting Squid Proxy Server..."
- loadproc /usr/sbin/squid -z >/dev/null 2>&1
loadproc /usr/sbin/squid
fi
--- /dev/null
+#!/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 2 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) 2007 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+restore_backup ${NAME}
+
+mkdir /etc/xinetd.d
+
+start_service --background ${NAME}
+
+ln -sf ../init.d/${NAME} /etc/rc.d/rc0.d/K30xinetd
+ln -sf ../init.d/${NAME} /etc/rc.d/rc3.d/S30xinetd
+ln -sf ../init.d/${NAME} /etc/rc.d/rc6.d/K30xinetd
--- /dev/null
+#!/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 2 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) 2007 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+stop_service ${NAME}
+make_backup ${NAME}
+remove_files
--- /dev/null
+#!/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 2 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) 2007 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh
--- /dev/null
+diff -Naur compat-drivers-3.8.3-2-snpu.org/drivers/net/wireless/ath/regd.c compat-drivers-3.8.3-2-snpu/drivers/net/wireless/ath/regd.c
+--- compat-drivers-3.8.3-2-snpu.org/drivers/net/wireless/ath/regd.c 2013-03-15 22:55:09.000000000 +0100
++++ compat-drivers-3.8.3-2-snpu/drivers/net/wireless/ath/regd.c 2013-08-22 11:51:36.793297656 +0200
+@@ -200,6 +200,8 @@
+ u32 bandwidth = 0;
+ int r;
+
++ return;
++
+ for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+
+ if (!wiphy->bands[band])
+@@ -259,6 +261,8 @@
+ u32 bandwidth = 0;
+ int r;
+
++ return;
++
+ sband = wiphy->bands[IEEE80211_BAND_2GHZ];
+ if (!sband)
+ return;
+@@ -308,6 +312,8 @@
+ struct ieee80211_channel *ch;
+ unsigned int i;
+
++ return;
++
+ if (!wiphy->bands[IEEE80211_BAND_5GHZ])
+ return;
+
+@@ -514,6 +520,8 @@
+ {
+ const struct ieee80211_regdomain *regd;
+
++ return 0;
++
+ wiphy->reg_notifier = reg_notifier;
+ wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY;
+
--- /dev/null
+diff -Nur iptraf-ng-1.1.4-orig/src/tcptable.c iptraf-ng-1.1.4/src/tcptable.c
+--- iptraf-ng-1.1.4-orig/src/tcptable.c 2013-07-23 15:06:11.000000000 +0200
++++ iptraf-ng-1.1.4/src/tcptable.c 2013-08-28 19:10:33.000000000 +0200
+@@ -444,6 +444,8 @@
+ size_t bufsize)
+ {
+ time_t interval = time(NULL) - entry->conn_starttime;
++ if (interval < 1)
++ interval = 1;
+
+ char rbuf[64];
+ rate_print(entry->bcount / interval, rbuf, sizeof(rbuf));
projects / ipfire-2.x.git / commitdiff
