webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-13 12:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into python

Browse Source
This commit is contained in:
Arne Fitzenreiter
2011-05-07 20:43:22 +02:00
parent 410d03d7ab 211ca1f52b
commit 4bdb372a5c
82 changed files with 712 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/backup/backup.pl
View File

@@ -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') {

2
config/gnump3d/gnump3d.conf
View File

@@ -731,7 +731,7 @@ sort_order = $TRACK
# the installation script - if this doesn't happen report this as
# a bug.
#
plugin_directory = /usr/lib/perl5/5.8.8/gnump3d/plugins
plugin_directory = /usr/lib/perl5/5.12.3/gnump3d/plugins
#

5
config/menu/20-status.menu
View File

@@ -69,3 +69,8 @@
'title' => 'Atm-status',
'enabled' => `find /sys/class/atm/*/device 2>/dev/null`,
};
$substatus->{'76.mdstat'} = {'caption' => 'Mdstat',
'uri' => '/cgi-bin/mdstat.cgi',
'title' => 'Mdstat',
'enabled' => 1,
};

33
config/rootfiles/common/Mail-Tools
View File

@@ -1,45 +1,44 @@
#usr/lib/perl5/site_perl/5.12.3/Mail
usr/lib/perl5/site_perl/5.12.3/Mail/Address.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/Address.pod
usr/lib/perl5/site_perl/5.12.3/Mail/Cap.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/Cap.pod
#usr/lib/perl5/site_perl/5.12.3/Mail/Field
usr/lib/perl5/site_perl/5.12.3/Mail/Field.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/Field.pod
usr/lib/perl5/site_perl/5.12.3/Mail/Field/AddrList.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/Field/AddrList.pod
usr/lib/perl5/site_perl/5.12.3/Mail/Field/Date.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/Field/Date.pod
usr/lib/perl5/site_perl/5.12.3/Mail/Field/Generic.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/Field/Generic.pod
usr/lib/perl5/site_perl/5.12.3/Mail/Filter.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/Filter.pod
usr/lib/perl5/site_perl/5.12.3/Mail/Header.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/Header.pod
usr/lib/perl5/site_perl/5.12.3/Mail/Internet.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/Internet.pod
#usr/lib/perl5/site_perl/5.12.3/Mail/Mailer
usr/lib/perl5/site_perl/5.12.3/Mail/Mailer.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/Mailer.pod
usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/qmail.pm
usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/rfc822.pm
usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/sendmail.pm
usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/smtp.pm
usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/smtps.pm
usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/testfile.pm
usr/lib/perl5/site_perl/5.12.3/Mail/Send.pm
#usr/lib/perl5/site_perl/5.12.3/Mail/Send.pod
usr/lib/perl5/site_perl/5.12.3/Mail/Util.pm
#usr/lib/perl5/site_perl/5.12.3/auto/Mail
#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/_prephdr.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/add_signature.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/autosplit.ix
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/escape_from.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/nntppost.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/reply.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/send.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/sign.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/smtpsend.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/unescape_from.al
#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/autosplit.ix
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/mailaddress.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/maildomain.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/read_mbox.al
#usr/lib/perl5/site_perl/5.12.3/Mail/Util.pod
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Mail
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Mail/.packlist
#usr/share/man/man3/Mail::Address.3
#usr/share/man/man3/Mail::Cap.3
#usr/share/man/man3/Mail::Field.3
#usr/share/man/man3/Mail::Field::AddrList.3
#usr/share/man/man3/Mail::Field::Date.3
#usr/share/man/man3/Mail::Field::Generic.3
#usr/share/man/man3/Mail::Filter.3
#usr/share/man/man3/Mail::Header.3
#usr/share/man/man3/Mail::Internet.3

1
config/rootfiles/common/apache2
View File

@@ -1333,6 +1333,7 @@ srv/web/ipfire/cgi-bin/ipinfo.cgi
srv/web/ipfire/cgi-bin/iptables.cgi
srv/web/ipfire/cgi-bin/logs.cgi
srv/web/ipfire/cgi-bin/mac.cgi
#srv/web/ipfire/cgi-bin/mdstat.cgi
srv/web/ipfire/cgi-bin/media.cgi
srv/web/ipfire/cgi-bin/memory.cgi
srv/web/ipfire/cgi-bin/modem.cgi

2
config/rootfiles/common/initscripts
View File

@@ -13,6 +13,7 @@ etc/rc.d/init.d/beep
#etc/rc.d/init.d/bluetooth
etc/rc.d/init.d/checkfs
etc/rc.d/init.d/checkfstab
etc/rc.d/init.d/waitdrives
#etc/rc.d/init.d/clamav
etc/rc.d/init.d/cleanfs
#etc/rc.d/init.d/client175
@@ -202,6 +203,7 @@ etc/rc.d/rcsysinit.d/S00mountkernfs
etc/rc.d/rcsysinit.d/S05modules
etc/rc.d/rcsysinit.d/S10udev
etc/rc.d/rcsysinit.d/S19checkfstab
etc/rc.d/rcsysinit.d/S19waitdrives
etc/rc.d/rcsysinit.d/S20swap
etc/rc.d/rcsysinit.d/S30checkfs
etc/rc.d/rcsysinit.d/S40mountfs

3
config/rootfiles/common/lm_sensors
View File

@@ -8,9 +8,8 @@ usr/bin/sensors-conf-convert
#usr/lib/libsensors.a
usr/lib/libsensors.so
usr/lib/libsensors.so.4
usr/lib/libsensors.so.4.2.1
usr/lib/libsensors.so.4.3.1
#usr/man/man1/sensors.1
#usr/man/man3
#usr/man/man3/libsensors.3
#usr/man/man5/sensors.conf.5
#usr/man/man5/sensors3.conf.5

19
config/rootfiles/common/ntfs-3g
View File

@@ -1,14 +1,20 @@
bin/lowntfs-3g
bin/ntfs-3g
lib/libntfs-3g.so
lib/libntfs-3g.so.54
lib/libntfs-3g.so.54.0.0
lib/libntfs-3g.so.80
lib/libntfs-3g.so.80.0.0
sbin/mount.lowntfs-3g
sbin/mount.ntfs-3g
usr/bin/ntfs-3g.probe
usr/bin/ntfs-3g.secaudit
usr/bin/ntfs-3g.usermap
#usr/include/ntfs-3g
#usr/include/ntfs-3g/acls.h
#usr/include/ntfs-3g/attrib.h
#usr/include/ntfs-3g/attrlist.h
#usr/include/ntfs-3g/bitmap.h
#usr/include/ntfs-3g/bootsect.h
#usr/include/ntfs-3g/cache.h
#usr/include/ntfs-3g/collate.h
#usr/include/ntfs-3g/compat.h
#usr/include/ntfs-3g/compress.h
@@ -16,6 +22,7 @@ usr/bin/ntfs-3g.probe
#usr/include/ntfs-3g/device.h
#usr/include/ntfs-3g/device_io.h
#usr/include/ntfs-3g/dir.h
#usr/include/ntfs-3g/efs.h
#usr/include/ntfs-3g/endians.h
#usr/include/ntfs-3g/index.h
#usr/include/ntfs-3g/inode.h
@@ -27,19 +34,25 @@ usr/bin/ntfs-3g.probe
#usr/include/ntfs-3g/misc.h
#usr/include/ntfs-3g/mst.h
#usr/include/ntfs-3g/ntfstime.h
#usr/include/ntfs-3g/object_id.h
#usr/include/ntfs-3g/param.h
#usr/include/ntfs-3g/reparse.h
#usr/include/ntfs-3g/runlist.h
#usr/include/ntfs-3g/security.h
#usr/include/ntfs-3g/support.h
#usr/include/ntfs-3g/types.h
#usr/include/ntfs-3g/unistr.h
#usr/include/ntfs-3g/version.h
#usr/include/ntfs-3g/volume.h
#usr/include/ntfs-3g/xattrs.h
#usr/lib/libntfs-3g.a
#usr/lib/libntfs-3g.la
usr/lib/libntfs-3g.so
usr/lib/pkgconfig/libntfs-3g.pc
#usr/share/doc/ntfs-3g
#usr/share/doc/ntfs-3g/README
#usr/share/man/man8/mount.lowntfs-3g.8
#usr/share/man/man8/mount.ntfs-3g.8
#usr/share/man/man8/ntfs-3g.8
#usr/share/man/man8/ntfs-3g.probe.8
#usr/share/man/man8/ntfs-3g.secaudit.8
#usr/share/man/man8/ntfs-3g.usermap.8

1
config/rootfiles/common/snort
View File

@@ -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

50
config/rootfiles/common/squid
View File

@@ -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

1
config/rootfiles/core/48/exclude
View File

@@ -0,0 +1 @@
/srv/web/ipfire/html/proxy.pac

1
config/rootfiles/core/48/filelists/daq Symbolic link
View File

@@ -0,0 +1 @@
../../../common/daq

3
config/rootfiles/core/48/filelists/files
View File

@@ -1 +1,4 @@
etc/system-release
var/ipfire/backup/bin/backup.pl
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi

1
config/rootfiles/core/48/filelists/perl-GD Symbolic link
View File

@@ -0,0 +1 @@
../../../common/perl-GD

111
config/rootfiles/core/48/filelists/perl-modules
View File

@@ -136,20 +136,20 @@ usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/smtp.pm
usr/lib/perl5/site_perl/5.12.3/Mail/Mailer/testfile.pm
usr/lib/perl5/site_perl/5.12.3/Mail/Send.pm
usr/lib/perl5/site_perl/5.12.3/Mail/Util.pm
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/_prephdr.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/add_signature.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/autosplit.ix
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/escape_from.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/nntppost.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/reply.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/send.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/sign.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/smtpsend.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/unescape_from.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/autosplit.ix
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/mailaddress.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/maildomain.al
usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/read_mbox.al
#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/_prephdr.al
#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/add_signature.al
#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/autosplit.ix
#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/escape_from.al
#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/nntppost.al
#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/reply.al
#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/send.al
#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/sign.al
#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/smtpsend.al
#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Internet/unescape_from.al
#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/autosplit.ix
#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/mailaddress.al
#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/maildomain.al
#usr/lib/perl5/site_perl/5.12.3/auto/Mail/Util/read_mbox.al
usr/lib/perl5/site_perl/5.12.3/MIME/Body.pm
usr/lib/perl5/site_perl/5.12.3/MIME/Decoder
usr/lib/perl5/site_perl/5.12.3/MIME/Decoder.pm
@@ -238,13 +238,81 @@ usr/lib/perl5/site_perl/5.12.3/Net/Server/Single.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Net/SSLeay.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Net/SSLeay/Handle.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/SSLeay.so
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/GD.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/GD/Image.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/GD/Polygon.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/GD/Polyline.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/GD/Simple.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/GD/GD.so
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/qd.pl
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/autosplit.ix
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/debug_read.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_https.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_https2.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_https3.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_https4.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_httpx2.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_httpx3.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/do_httpx4.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/dump_peer_certificate.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_http.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_http3.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_http4.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_https.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_https3.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_https4.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_httpx.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_httpx3.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/get_httpx4.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_http.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_http3.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_http4.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_https.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_https3.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_https4.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_httpx.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_httpx3.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/head_httpx4.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/http_cat.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/https_cat.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/httpx_cat.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/make_form.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/make_headers.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/new_x_ctx.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/open_proxy_tcp_connection.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/open_tcp_connection.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_http.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_http3.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_http4.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_https.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_https3.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_https4.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_httpx.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_httpx3.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/post_httpx4.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_http.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_http3.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_http4.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_https.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_https3.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_https4.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_httpx.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_httpx3.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/put_httpx4.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/randomize.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/set_cert_and_key.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/set_proxy.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/set_server_cert_and_key.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/ssl_read_CRLF.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/ssl_read_all.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/ssl_read_until.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/ssl_write_CRLF.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/ssl_write_all.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/sslcat.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcp_read_CRLF.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcp_read_all.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcp_read_until.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcp_write_CRLF.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcp_write_all.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcpcat.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/tcpxcat.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/want_X509_lookup.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/want_nothing.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/want_read.al
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/want_write.al
usr/lib/perl5/site_perl/5.12.3/RRDp.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/RRDs.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/RRDs/RRDs.so
@@ -310,4 +378,3 @@ usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/XML/Parser/Style/Stream.p
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/XML/Parser/Style/Subs.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/XML/Parser/Style/Tree.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/XML/Parser/Expat/Expat.so
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Net/SSLeay/autosplit.ix

1
config/rootfiles/core/48/filelists/snort Symbolic link
View File

@@ -0,0 +1 @@
../../../common/snort

1
config/rootfiles/core/48/filelists/squid Symbolic link
View File

@@ -0,0 +1 @@
../../../common/squid

1
config/rootfiles/core/49/exclude Normal file
View File

@@ -0,0 +1 @@
/srv/web/ipfire/html/proxy.pac

1
config/rootfiles/core/49/filelists/MIME-Tools Symbolic link
View File

@@ -0,0 +1 @@
../../../common/MIME-Tools

1
config/rootfiles/core/49/filelists/Mail-Tools Symbolic link
View File

@@ -0,0 +1 @@
../../../common/Mail-Tools

18
config/rootfiles/core/49/filelists/files Normal file
View File

@@ -0,0 +1,18 @@
etc/system-release
etc/rc.d/init.d/squid
etc/rc.d/init.d/waitdrives
etc/rc.d/rcsysinit.d/S19waitdrives
var/ipfire/backup/bin/backup.pl
srv/web/ipfire/cgi-bin/backup.cgi
srv/web/ipfire/cgi-bin/extrahd.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/services.cgi
var/ipfire/langs/de.pl
var/ipfire/langs/en.pl
var/ipfire/langs/es.pl
var/ipfire/langs/fr.pl
var/ipfire/menu.d/20-status.menu
usr/local/bin/scanhd

13
config/rootfiles/core/49/filelists/icons Normal file
View File

@@ -0,0 +1,13 @@
srv/web/ipfire/html/images/delete.gif
srv/web/ipfire/html/images/document-save.png
srv/web/ipfire/html/images/edit.gif
srv/web/ipfire/html/images/floppy.gif
srv/web/ipfire/html/images/forward.gif
srv/web/ipfire/html/images/info.gif
srv/web/ipfire/html/images/list-add.png
srv/web/ipfire/html/images/list-remove.png
srv/web/ipfire/html/images/package-x-generic.png
srv/web/ipfire/html/images/reload.gif
srv/web/ipfire/html/images/stock_ok.png
srv/web/ipfire/html/images/stock_stop.png
srv/web/ipfire/html/images/user-trash.png

1
config/rootfiles/core/49/filelists/lm_sensors Symbolic link
View File

@@ -0,0 +1 @@
../../../common/lm_sensors

1
config/rootfiles/core/49/filelists/ntfs-3g Symbolic link
View File

@@ -0,0 +1 @@
../../../common/ntfs-3g

1
config/rootfiles/core/49/filelists/perl-GD Symbolic link
View File

@@ -0,0 +1 @@
../../../common/perl-GD

1
config/rootfiles/core/49/meta Normal file
View File

@@ -0,0 +1 @@
DEPS=""

59
config/rootfiles/core/49/update.sh Normal file
View File

@@ -0,0 +1,59 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 3 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2011 IPFire-Team <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=49
for (( i=1; i<=$core; i++ ))
do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
done
#
#Stop services
#
#Extract files
extract_files
#
#Start services
#
#Update Language cache
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
#Rebuild module dep's
#depmod 2.6.32.28-ipfire >/dev/null 2>&1
#depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1
#depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1
#
#Finish
/etc/init.d/fireinfo start
sendprofile
#Don't report the exitcode last command
exit 0

2
config/rootfiles/packages/ipfireseeder
View File

@@ -1,5 +1,5 @@
etc/rc.d/init.d/ipfireseeder
#var/ipfire/seeder
var/ipfire/seeder/ipfire-2.9.i586-full-core47.iso.torrent
var/ipfire/seeder/ipfire-2.9.i586-full-core48.iso.torrent
#var/log/seeder
var/log/seeder/info

29
config/rootfiles/packages/mc
View File

@@ -1,25 +1,20 @@
usr/bin/mc
usr/bin/mcdiff
usr/bin/mcedit
usr/bin/mcmfmt
usr/bin/mcview
usr/etc
usr/etc/mc
usr/etc/mc/Syntax
usr/etc/mc/cedit.menu
usr/etc/mc/edit.indent.rc
usr/etc/mc/edit.spell.rc
usr/etc/mc/filehighlight.ini
usr/etc/mc/mc.charsets
usr/etc/mc/mc.ext
usr/etc/mc/mc.keymap
usr/etc/mc/mc.keymap.default
usr/etc/mc/mc.keymap.emacs
usr/etc/mc/mc.lib
usr/etc/mc/mc.menu
usr/etc/mc/mc.menu.sr
usr/etc/mc/sfs.ini
#usr/libexec
#usr/libexec/mc
usr/libexec/mc/cons.saver
#usr/libexec/mc/extfs.d
@@ -79,27 +74,24 @@ usr/libexec/mc/mc.sh
#usr/share/man/man1/mcedit.1
#usr/share/man/man1/mcview.1
#usr/share/mc
usr/share/mc/mc.hint
#usr/share/mc/mc.hint.cs
#usr/share/mc/mc.hint.es
#usr/share/mc/mc.hint.hu
#usr/share/mc/mc.hint.it
#usr/share/mc/mc.hint.nl
#usr/share/mc/mc.hint.pl
#usr/share/mc/mc.hint.ru
#usr/share/mc/mc.hint.sr
#usr/share/mc/mc.hint.uk
#usr/share/mc/mc.hint.zh
usr/share/mc/mc.hlp
usr/share/mc/skins
#usr/share/mc/help
usr/share/mc/help/mc.hlp
#usr/share/mc/hints
usr/share/mc/hints/mc.hint
usr/share/mc/mc.charsets
usr/share/mc/mc.lib
#usr/share/mc/skins
usr/share/mc/skins/dark.ini
usr/share/mc/skins/darkfar.ini
usr/share/mc/skins/default.ini
usr/share/mc/skins/double-lines.ini
usr/share/mc/skins/featured.ini
usr/share/mc/skins/gotar.ini
usr/share/mc/skins/mc46.ini
usr/share/mc/skins/nicedark.ini
#usr/share/mc/syntax
usr/share/mc/syntax/PKGBUILD.syntax
usr/share/mc/syntax/Syntax
usr/share/mc/syntax/ada95.syntax
usr/share/mc/syntax/aspx.syntax
usr/share/mc/syntax/assembler.syntax
@@ -110,6 +102,7 @@ usr/share/mc/syntax/changelog.syntax
usr/share/mc/syntax/cs.syntax
usr/share/mc/syntax/css.syntax
usr/share/mc/syntax/cxx.syntax
usr/share/mc/syntax/cython.syntax
usr/share/mc/syntax/d.syntax
usr/share/mc/syntax/debian-changelog.syntax
usr/share/mc/syntax/debian-control.syntax

5
config/rootfiles/packages/mdadm
View File

@@ -1,4 +1,6 @@
lib/udev/rules.d
etc/rc.d/rc0.d/S85mdadm
etc/rc.d/rc6.d/S75mdadm
etc/rc.d/rcsysinit.d/S11mdadm
lib/udev/rules.d/64-md-raid.rules
sbin/mdadm
sbin/mdmon
@@ -7,3 +9,4 @@ sbin/mdmon
#usr/share/man/man8/mdadm.8
#usr/share/man/man8/mdmon.8
etc/rc.d/init.d/mdadm
srv/web/ipfire/cgi-bin/mdstat.cgi

17
config/rootfiles/packages/nano
View File

@@ -9,17 +9,34 @@ usr/bin/rnano
#usr/share/man/man5/nanorc.5
#usr/share/nano
usr/share/nano/asm.nanorc
usr/share/nano/awk.nanorc
usr/share/nano/c.nanorc
usr/share/nano/cmake.nanorc
usr/share/nano/css.nanorc
usr/share/nano/debian.nanorc
usr/share/nano/fortran.nanorc
usr/share/nano/gentoo.nanorc
usr/share/nano/groff.nanorc
usr/share/nano/html.nanorc
usr/share/nano/java.nanorc
usr/share/nano/makefile.nanorc
#usr/share/nano/man-html
#usr/share/nano/man-html/nano.1.html
#usr/share/nano/man-html/nanorc.5.html
#usr/share/nano/man-html/rnano.1.html
usr/share/nano/man.nanorc
usr/share/nano/mgp.nanorc
usr/share/nano/mutt.nanorc
usr/share/nano/nanorc.nanorc
usr/share/nano/objc.nanorc
usr/share/nano/ocaml.nanorc
usr/share/nano/patch.nanorc
usr/share/nano/perl.nanorc
usr/share/nano/php.nanorc
usr/share/nano/pov.nanorc
usr/share/nano/python.nanorc
usr/share/nano/ruby.nanorc
usr/share/nano/sh.nanorc
usr/share/nano/tcl.nanorc
usr/share/nano/tex.nanorc
usr/share/nano/xml.nanorc

1
config/rootfiles/packages/vdradmin
View File

@@ -180,5 +180,6 @@ etc/rc.d/rc6.d/K01vdradmin
etc/rc.d/rc3.d/S99vdradmin
#usr/share/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo
#usr/share/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo
var/cache/vdradmin
var/log/vdradmin
var/run/vdradmin

232
config/snort/snort.conf
View File

@@ -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,63 @@ 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
# 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,58 +233,83 @@ 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 }
preprocessor 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 }
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
@@ -254,8 +317,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 +337,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 +362,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

6
html/cgi-bin/backup.cgi
View File

@@ -66,6 +66,8 @@ if ( $cgiparams{'ACTION'} eq "download" )
open(DLFILE, "</var/ipfire/backup/$cgiparams{'FILE'}") or die "Unable to open $cgiparams{'FILE'}: $!";
my @fileholder = <DLFILE>;
print "Content-Type:application/x-download\n";
my @fileinfo = stat("/var/ipfire/backup/$cgiparams{'FILE'}");
print "Content-Length:$fileinfo[7]\n";
print "Content-Disposition:attachment;filename=$cgiparams{'FILE'}\n\n";
print @fileholder;
exit (0);
@@ -75,6 +77,8 @@ if ( $cgiparams{'ACTION'} eq "downloadiso" )
open(DLFILE, "</var/tmp/backupiso/$cgiparams{'FILE'}") or die "Unable to open $cgiparams{'FILE'}: $!";
my @fileholder = <DLFILE>;
print "Content-Type:application/x-download\n";
my @fileinfo = stat("/var/tmp/backupiso/$cgiparams{'FILE'}");
print "Content-Length:$fileinfo[7]\n";
print "Content-Disposition:attachment;filename=$cgiparams{'FILE'}\n\n";
print @fileholder;
exit (0);
@@ -84,6 +88,8 @@ if ( $cgiparams{'ACTION'} eq "downloadaddon" )
open(DLFILE, "</var/ipfire/backup/addons/backup/$cgiparams{'FILE'}") or die "Unable to open $cgiparams{'FILE'}: $!";
my @fileholder = <DLFILE>;
print "Content-Type:application/x-download\n";
my @fileinfo = stat("/var/ipfire/backup/addons/backup/$cgiparams{'FILE'}");
print "Content-Length:$fileinfo[7]\n";
print "Content-Disposition:attachment;filename=$cgiparams{'FILE'}\n\n";
print @fileholder;
exit (0);

2
html/cgi-bin/extrahd.cgi
View File

@@ -202,7 +202,7 @@ END
foreach $partitionentry (sort @partitions)
{
@partitionline = split( /\;/, $partitionentry );
if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && ! ( "$partitionline[0]" eq "$scanline[0]" )) {
if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && !( "$partitionline[2]" eq "" )) {
$size = int($partitionline[1] / 1024);
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>

4
html/cgi-bin/ids.cgi
View File

@@ -264,11 +264,11 @@ if (-e "/etc/snort/snort.conf") {
if ($snortsettings{'RULES'} eq 'subscripted') {
#$url="http://dl.snort.org/sub-rules/snortrules-snapshot-2.8_s.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
$url=" http://www.snort.org/reg-rules/snortrules-snapshot-2903_s.tar.gz/$snortsettings{'OINKCODE'}";
$url=" http://www.snort.org/reg-rules/snortrules-snapshot-2904_s.tar.gz/$snortsettings{'OINKCODE'}";
#$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8_s.tar.gz";
} elsif ($snortsettings{'RULES'} eq 'registered') {
#$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2.8.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
$url=" http://www.snort.org/reg-rules/snortrules-snapshot-2903.tar.gz/$snortsettings{'OINKCODE'}";
$url=" http://www.snort.org/reg-rules/snortrules-snapshot-2904.tar.gz/$snortsettings{'OINKCODE'}";
#$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8.tar.gz";
} else {
$url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz";

51
html/cgi-bin/mdstat.cgi Normal file
View File

@@ -0,0 +1,51 @@
#!/usr/bin/perl
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2011 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
use strict;
# enable only the following on debugging purpose
#use warnings;
#use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
&Header::showhttpheaders();
&Header::openpage($Lang::tr{'status information'}, 1, '');
&Header::openbigbox('100%', 'left');
&Header::openbox('100%', 'left',"MD Raid State");
print '<textarea rows="25" cols="80" readonly="true">';
print `cat "/proc/mdstat"`;
print '</textarea>';
&Header::closebox();
&Header::closebigbox();
&Header::closepage();

99
html/cgi-bin/ovpnmain.cgi
View File

@@ -1862,35 +1862,6 @@ END
} else {
$errormessage = $Lang::tr{'invalid key'};
}
#test33
###
### Choose between adding a host-net or net-net connection
###
} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'add'} && $cgiparams{'TYPE'} eq '') {
&General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings);
&Header::showhttpheaders();
&Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
&Header::openbigbox('100%', 'LEFT', '', '');
&Header::openbox('100%', 'LEFT', $Lang::tr{'connection type'});
print <<END
<b>$Lang::tr{'connection type'}:</b><br />
<table><form method='post'>
<tr><td><input type='radio' name='TYPE' value='host' checked /></td>
<td class='base'>$Lang::tr{'host to net vpn'}</td></tr>
<tr><td><input type='radio' name='TYPE' value='net' disabled='disabled' /></td>
<td class='base'>$Lang::tr{'net to net vpn'}</td></tr>
<tr><td align='center' colspan='2'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr>
</form></table>
END
;
&Header::closebox();
&Header::closebigbox();
&Header::closepage();
exit (0);
###
### Adding a new connection
###
} elsif (($cgiparams{'ACTION'} eq $Lang::tr{'add'}) ||
($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) ||
($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'ADVANCED'} eq '')) {
@@ -1904,9 +1875,10 @@ END
$errormessage = $Lang::tr{'invalid key'};
goto VPNCONF_END;
}
$cgiparams{'ENABLED'} = $confighash{$cgiparams{'KEY'}}[0];
$cgiparams{'NAME'} = $confighash{$cgiparams{'KEY'}}[1];
$cgiparams{'TYPE'} = $confighash{$cgiparams{'KEY'}}[3];
$cgiparams{'TYPE'} = 'host';
$cgiparams{'AUTH'} = $confighash{$cgiparams{'KEY'}}[4];
$cgiparams{'PSK'} = $confighash{$cgiparams{'KEY'}}[5];
$cgiparams{'SIDE'} = $confighash{$cgiparams{'KEY'}}[6];
@@ -1946,11 +1918,6 @@ END
goto VPNCONF_ERROR;
}
# if (($cgiparams{'TYPE'} eq 'net') && ($cgiparams{'SIDE'} !~ /^(left|right)$/)) {
# $errormessage = $Lang::tr{'ipfire side is invalid'};
# goto VPNCONF_ERROR;
# }
# Check if there is no other entry with this name
if (! $cgiparams{'KEY'}) {
foreach my $key (keys %confighash) {
@@ -1961,11 +1928,6 @@ END
}
}
if (($cgiparams{'TYPE'} eq 'net') && (! $cgiparams{'REMOTE'})) {
$errormessage = $Lang::tr{'invalid input for remote host/ip'};
goto VPNCONF_ERROR;
}
if ($cgiparams{'REMOTE'}) {
if (! &General::validip($cgiparams{'REMOTE'})) {
if (! &General::validfqdn ($cgiparams{'REMOTE'})) {
@@ -1994,10 +1956,6 @@ END
}
}
}
if (($cgiparams{'TYPE'} eq 'net') && (! &General::validipandmask($cgiparams{'REMOTE_SUBNET'}))) {
$errormessage = $Lang::tr{'remote subnet is invalid'};
goto VPNCONF_ERROR;
}
if ($cgiparams{'ENABLED'} !~ /^(on|off)$/) {
$errormessage = $Lang::tr{'invalid input'};
@@ -2121,6 +2079,9 @@ END
goto VPNCONF_ERROR;
}
} elsif ($cgiparams{'AUTH'} eq 'certgen') {
$cgiparams{'CERT_NAME'} =~ s/ //g;
if ($cgiparams{'KEY'}) {
$errormessage = $Lang::tr{'cant change certificates'};
goto VPNCONF_ERROR;
@@ -2279,17 +2240,13 @@ END
if ((! $cgiparams{'KEY'}) && $cgiparams{'AUTH'} ne 'psk') {
$confighash{$key}[2] = $cgiparams{'CERT_NAME'};
}
$confighash{$key}[3] = $cgiparams{'TYPE'};
$confighash{$key}[3] = 'host';
if ($cgiparams{'AUTH'} eq 'psk') {
$confighash{$key}[4] = 'psk';
$confighash{$key}[5] = $cgiparams{'PSK'};
} else {
$confighash{$key}[4] = 'cert';
}
if ($cgiparams{'TYPE'} eq 'net') {
$confighash{$key}[6] = $cgiparams{'SIDE'};
$confighash{$key}[11] = $cgiparams{'REMOTE_SUBNET'};
}
$confighash{$key}[8] = $cgiparams{'LOCAL_SUBNET'};
$confighash{$key}[10] = $cgiparams{'REMOTE'};
$confighash{$key}[25] = $cgiparams{'REMARK'};
@@ -2376,7 +2333,7 @@ END
}
print "<form method='post' enctype='multipart/form-data'>";
print "<input type='hidden' name='TYPE' value='$cgiparams{'TYPE'}' />";
print "<input type='hidden' name='TYPE' value='host' />";
if ($cgiparams{'KEY'}) {
print "<input type='hidden' name='KEY' value='$cgiparams{'KEY'}' />";
@@ -2386,7 +2343,6 @@ END
&Header::openbox('100%', 'LEFT', "$Lang::tr{'connection'}:");
print "<table width='100%'>\n";
print "<tr><td width='25%' class='boldbase'>$Lang::tr{'name'}:</td>";
if ($cgiparams{'TYPE'} eq 'host') {
if ($cgiparams{'KEY'}) {
print "<td width='35%' class='base'><input type='hidden' name='NAME' value='$cgiparams{'NAME'}' />$cgiparams{'NAME'}</td>\n";
} else {
@@ -2402,42 +2358,6 @@ END
# print "<option value='ORANGE' $selected{'INTERFACE'}{'ORANGE'}>ORANGE</option>";
# print "</select></td></tr>";
# print <<END
} else {
print "<input type='hidden' name='INTERFACE' value='red' />";
if ($cgiparams{'KEY'}) {
print "<td width='25%' class='base' nowrap='nowrap'><input type='hidden' name='NAME' value='$cgiparams{'NAME'}' />$cgiparams{'NAME'}</td>";
} else {
print "<td width='25%'><input type='text' name='NAME' value='$cgiparams{'NAME'}' maxlength='20' /></td>";
}
print <<END
<td width='25%'>&nbsp;</td>
<td width='25%'>&nbsp;</td></tr>
<tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'Act as'}</td>
<td><select name='SIDE'><option value='server' $selected{'SIDE'}{'server'}>OpenVPN Server</option>
<option value='client' $selected{'SIDE'}{'client'}>OpenVPN Client</option></select></td>
<td class='boldbase'>$Lang::tr{'remote host/ip'}:</td>
<td><input type='TEXT' name='REMOTE' value='$cgiparams{'REMOTE'}' /></td></tr>
<tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'local subnet'}</td>
<td><input type='TEXT' name='LOCAL_SUBNET' value='$cgiparams{'LOCAL_SUBNET'}' /></td>
<td class='boldbase' nowrap='nowrap'>$Lang::tr{'remote subnet'}</td>
<td><input type='text' name='REMOTE_SUBNET' value='$cgiparams{'REMOTE_SUBNET'}' /></td></tr>
ttt
<tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn subnet'}</td>
<td><input type='TEXT' name='OVPN_SUBNET' value='$cgiparams{'OVPN_SUBNET'}' /></td></tr>
<tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'protocol'}</td>
<td><select name='PROTOCOL'><option value='udp' $selected{'PROTOCOL'}{'udp'}>UDP</option>
<option value='tcp' $selected{'PROTOCOL'}{'tcp'}>TCP</option></select></td>
<td class='boldbase'>$Lang::tr{'destination port'}:</td>
<td><input type='TEXT' name='DEST_PORT' value='$cgiparams{'DEST_PORT'}' size='5' /></td></tr>
<tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'comp-lzo'}</td>
<td><input type='checkbox' name='COMPLZO' $checked{'COMPLZO'}{'on'} /></td>
<tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'}&nbsp;<img src='/blob.gif' /></td>
<td> <input type='TEXT' name='MTU' VALUE='$cgiparams{'MTU'}'size='5' /></TD>
END
;
}
print "<tr><td class='boldbase'>$Lang::tr{'remark title'}&nbsp;<img src='/blob.gif' /></td>";
print "<td colspan='3'><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='55' maxlength='50' /></td></tr>";
@@ -2519,6 +2439,11 @@ END
print <<END
</select></td></tr>
<tr><td>&nbsp;</td>
<td class='base'>$Lang::tr{'valid till'} (days):</td>
<td class='base' nowrap='nowrap'><input type='text' name='DAYS_VALID' value='$cgiparams{'DAYS_VALID'}' size='32' $cakeydisabled /></td></tr>
<tr><td>&nbsp;</td>
<td class='base'>$Lang::tr{'pkcs12 file password'}:</td>
<td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS1' value='$cgiparams{'CERT_PASS1'}' size='32' $cakeydisabled /></td></tr>
<tr><td>&nbsp;</td><td class='base'>$Lang::tr{'pkcs12 file password'}:<BR>($Lang::tr{'confirmation'})</td>

11
html/cgi-bin/pppsetup.cgi
View File

@@ -748,7 +748,7 @@ END
if ($pppsettings{'TYPE'} =~ /^(pppoe|vdsl|pppoeatm)$/) {
print <<END
<tr>
<td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>IPTV:</b></td>
<td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>IPTV/VLAN:</b></td>
</tr>
END
;
@@ -778,6 +778,15 @@ END
}
else {
print "<tr><td colspan='4' width='100%'>No IPTV possible install addon igmpproxy</td></tr>";
if ($pppsettings{'TYPE'} eq 'vdsl') {
print <<END
<tr>
<td>INET_VLAN</td>
<td><input size=5 type='number' name='INET_VLAN' value='$pppsettings{'INET_VLAN'}' /></td>
</tr>
END
;
}
}
}

1
html/cgi-bin/proxy.cgi
View File

@@ -2924,6 +2924,7 @@ sub writepacfile
if (
(isPlainHostName(host)) ||
(dnsDomainIs(host, ".$mainsettings{'DOMAINNAME'}")) ||
(isInNet(host, "127.0.0.1", "255.0.0.0")) ||
(isInNet(host, "10.0.0.0", "255.0.0.0")) ||
(isInNet(host, "172.16.0.0", "255.240.0.0")) ||
(isInNet(host, "192.168.0.0", "255.255.0.0")) ||

3
html/cgi-bin/services.cgi
View File

@@ -177,9 +177,10 @@ END
# blacklist some packages
#
# alsa has trouble with the volume saving and was not really stopped
# mdadm should not stopped with webif because this could crash the system
#
chomp($_);
if ($_ ne "alsa"){
if ( ($_ ne "alsa") && ($_ ne "mdadm") ) {
$lines++;
if ($lines % 2){
print "<tr bgcolor='$color{'color22'}'>";

BIN
html/html/images/delete.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 153 B

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
html/html/images/document-save.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 911 B

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
html/html/images/edit.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 131 B

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
html/html/images/floppy.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 151 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
html/html/images/forward.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 609 B

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
html/html/images/info.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
html/html/images/list-add.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 323 B

After

Width:  |  Height:  |  Size: 932 B

BIN
html/html/images/list-remove.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 247 B

After

Width:  |  Height:  |  Size: 651 B

BIN
html/html/images/package-x-generic.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 540 B

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
html/html/images/reload.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 108 B

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
html/html/images/stock_ok.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 672 B

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
html/html/images/stock_stop.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
html/html/images/user-trash.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 655 B

After

Width:  |  Height:  |  Size: 1.5 KiB

2
langs/de/cgi-bin/de.pl
View File

@@ -1749,7 +1749,7 @@
'update transcript' => 'Aktualisieren',
'updatedatabase' => 'Datenbank auf Stand der letzten Reports setzen',
'updates' => 'Updates',
'updates installed' => 'Updates wurden installiert',
'updates installed' => 'Regelsatz vom',
'updates is old1' => 'Ihre Update-Datei ist ',
'updates is old2' => 'Tage alt. Wir empfehlen Ihnen, Ihr System über die &quot;Updates&quot;-Seite zu aktualisieren.',
'updxlrtr 3 months' => 'drei Monaten',

2
langs/en/cgi-bin/en.pl
View File

@@ -1782,7 +1782,7 @@
'update transcript' => 'Update transcript',
'updatedatabase' => 'Update Database with last report',
'updates' => 'Updates',
'updates installed' => 'Updates Installed',
'updates installed' => 'Ruleset update from',
'updates is old1' => 'Your update file is ',
'updates is old2' => 'days old. We recommend you update it on the <b>System>Updates</b> page.',
'updxlrtr 3 months' => 'three months',

2
langs/es/cgi-bin/es.pl
View File

@@ -1749,7 +1749,7 @@
'update transcript' => 'Actualizar transcripción',
'updatedatabase' => 'Actualizar base de datos con el último reporte',
'updates' => 'Actualizaciones',
'updates installed' => 'Actualizaciones instaladas:',
'updates installed' => 'Conjunto de reglas de actualización de',
'updates is old1' => 'Su archivo de actualización es',
'updates is old2' => 'días de antigüedad. Recomendamos actualizarse en la página <b>Actualizaciones del Sistema</b>.',
'updxlrtr 3 months' => 'tres meses',

2
langs/fr/cgi-bin/fr.pl
View File

@@ -1760,7 +1760,7 @@
'update transcript' => 'Mettre à jour transcript',
'updatedatabase' => 'Mettre à jour la base de données avec le dernier rapport',
'updates' => 'Mises à jour',
'updates installed' => 'Mises à jour installées',
'updates installed' => 'Mise à jour de l ensemble de règles',
'updates is old1' => 'Votre fichier de mise à jour est vieux de ',
'updates is old2' => 'jours. Il est recommandé de le mettre à jour depuis la page <b>Système>Mises à jour</b>.',
'updxlrtr 3 months' => 'trois mois',

6
lfs/MIME-Tools
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
VER = 5.420
VER = 5.502
THISAPP = MIME-tools-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 4db6505cc0132c80c5a9cc54f443a21a
$(DL_FILE)_MD5 = 6a87adda74867e3f8868a0599137bde0
install : $(TARGET)

4
lfs/Mail-Tools
View File

@@ -24,7 +24,7 @@
include Config
VER = 1.74
VER = 2.07
THISAPP = MailTools-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = aba82a7eb87906278d98174e10d838be
$(DL_FILE)_MD5 = df861e05cbcf3a336ecebfb2c42529d0
install : $(TARGET)

4
lfs/daq
View File

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

2
lfs/gnump3d
View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = gnump3d
PAK_VER = 4
PAK_VER = 5
DEPS = ""

6
lfs/htop
View File

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

1
lfs/initscripts
View File

@@ -163,6 +163,7 @@ $(TARGET) :
ln -sf ../init.d/modules /etc/rc.d/rcsysinit.d/S05modules
ln -sf ../init.d/udev /etc/rc.d/rcsysinit.d/S10udev
ln -sf ../init.d/checkfstab /etc/rc.d/rcsysinit.d/S19checkfstab
ln -sf ../init.d/waitdrives /etc/rc.d/rcsysinit.d/S19waitdrives
ln -sf ../init.d/swap /etc/rc.d/rcsysinit.d/S20swap
ln -sf ../init.d/checkfs /etc/rc.d/rcsysinit.d/S30checkfs
ln -sf ../init.d/mountfs /etc/rc.d/rcsysinit.d/S40mountfs

6
lfs/iperf
View File

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

6
lfs/ipfireseeder
View File

@@ -27,13 +27,13 @@ include Config
VER = 1.00
THISAPP = ipfireseeder-$(VER)
DL_FILE = ipfire-2.9.i586-full-core47.iso.torrent
DL_FILE = ipfire-2.9.i586-full-core48.iso.torrent
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ipfireseeder
PAK_VER = 23
PAK_VER = 24
DEPS = "rtorrent"
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 388d32a2f741df4afa76578948804ae3
$(DL_FILE)_MD5 = 37dd855f48af4efae045eb9b1f971a6e
install : $(TARGET)

4
lfs/lm_sensors
View File

@@ -24,7 +24,7 @@
include Config
VER = 3.1.2
VER = 3.3.0
THISAPP = lm_sensors-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 58a9a225808ac4587c4c8cbd12b40b5c
$(DL_FILE)_MD5 = 5eb18d7531ead4f54f28a1133a606535
install : $(TARGET)

6
lfs/mc
View File

@@ -24,7 +24,7 @@
include Config
VER = 4.7.3
VER = 4.7.5.2
THISAPP = mc-$(VER)
DL_FILE = $(THISAPP).tar.lzma
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mc
PAK_VER = 4
PAK_VER = 5
DEPS = "glib"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 15b017b370668683aa8cbf6730667510
$(DL_FILE)_MD5 = 9fede28ed63ced53f1beeba2f95473da
install : $(TARGET)

11
lfs/mdadm
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
VER = 3.1.1
VER = 3.2.1
THISAPP = mdadm-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mdadm
PAK_VER = 1
PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 4fd8e375a2ee314becd3196c1a250d98
$(DL_FILE)_MD5 = d1e2549202bd79d9e99f1498d1109530
install : $(TARGET)
@@ -79,5 +79,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
ln -sf ../init.d/mdadm /etc/rc.d/rcsysinit.d/S11mdadm
ln -sf ../init.d/mdadm /etc/rc.d/rc0.d/S85mdadm
ln -sf ../init.d/mdadm /etc/rc.d/rc6.d/S75mdadm
@rm -rf $(DIR_APP)
@$(POSTBUILD)

6
lfs/nano
View File

@@ -24,7 +24,7 @@
include Config
VER = 2.0.9
VER = 2.2.6
THISAPP = nano-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nano
PAK_VER = 2
PAK_VER = 3
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 2be94dc43fb60fff4626a2401a977220
$(DL_FILE)_MD5 = 03233ae480689a008eb98feb1b599807
install : $(TARGET)

6
lfs/nmap
View File

@@ -24,7 +24,7 @@
include Config
VER = 5.50
VER = 5.51
THISAPP = nmap-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nmap
PAK_VER = 4
PAK_VER = 5
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = a4df96e52cb52a1bbe76caace5f21388
$(DL_FILE)_MD5 = 0b80d2cb92ace5ebba8095a4c2850275
install : $(TARGET)

4
lfs/ntfs-3g
View File

@@ -24,7 +24,7 @@
include Config
VER = 2009.4.4
VER = 2011.1.15
THISAPP = ntfs-3g-$(VER)
DL_FILE = $(THISAPP).tgz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = e0b5c170f088a8d82968f0a6b34d31da
$(DL_FILE)_MD5 = 15a5cf5752012269fa168c24191f00e2
install : $(TARGET)

12
lfs/snort
View File

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

34
lfs/squid
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,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

3
lfs/vdradmin
View File

@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdradmin
PAK_VER = 3
PAK_VER = 4
DEPS = "perl-gettext vdr"
@@ -85,5 +85,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
/etc/vdradmin/vdradmind.conf
mkdir /var/log/vdradmin
mkdir /var/run/vdradmin
mkdir /var/cache/vdradmin
@rm -rf $(DIR_APP)
@$(POSTBUILD)

6
lfs/vsftpd
View File

@@ -24,7 +24,7 @@
include Config
VER = 2.2.2
VER = 2.3.4
THISAPP = vsftpd-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vsftpd
PAK_VER = 6
PAK_VER = 7
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 6d6bc136af14c23f8fef6f1a51f55418
$(DL_FILE)_MD5 = 2ea5d19978710527bb7444d93b67767a
install : $(TARGET)

6
make.sh
View File

@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# Copyright (C) 2007-2011 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.9" # Version number
CORE="48" # Core Level (Filename)
PAKFIRE_CORE="47" # Core Level (PAKFIRE)
CORE="49" # Core Level (Filename)
PAKFIRE_CORE="48" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir

25
src/initscripts/init.d/mdadm
View File

@@ -1,6 +1,6 @@
#!/bin/sh
########################################################################
# Begin $rc_base/init.d/mdadmraid
# Begin $rc_base/init.d/mdadm
#
# Description : This script controls software Raid
#
@@ -17,28 +17,15 @@
case "${1}" in
start)
if [ -f /etc/mdadm.conf ]
then
boot_mesg "Starting Raid devices..."
modprobe md
modprobe raid0
modprobe raid1
modprobe raid5
sleep 1
mdadm --assemble --scan
else
boot_mesg "Skipping raid devices, no config found..."
exit 1
fi
boot_mesg "Scan/assemble mdadm raid devices..."
mdadm --assemble --scan
echo_ok
;;
stop)
boot_mesg "Stopping Raid devices..."
mdadm --stop --scan
echo_ok
;;
restart)
@@ -57,4 +44,4 @@ case "${1}" in
;;
esac
# End $rc_base/init.d/mdadmraid
# End $rc_base/init.d/mdadm

1
src/initscripts/init.d/squid
View File

@@ -88,6 +88,7 @@ case "$1" in
evaluate_retval
killproc /usr/bin/squidGuard >/dev/null
killproc /usr/sbin/updxlrator >/dev/null
killproc /usr/bin/squidclamav >/dev/null
killproc /usr/sbin/squid >/dev/null
rm -rf /var/run/squid.pid
fi

51
src/initscripts/init.d/waitdrives Normal file
View File

@@ -0,0 +1,51 @@
#!/bin/sh
########################################################################
# Begin $rc_base/init.d/waitdrives
#
# Description : Wait for drives before fscheck/mount
#
# Authors : Arne Fitzenreiter - arne_f@ipfire.org
#
# Version : 00.00
#
# Notes :
#
########################################################################
. /etc/sysconfig/rc
. ${rc_functions}
check_drives () {
drives_ready="1";
for drive in $drives; do
if [ `blkid | grep $drive | wc -l` == 0 ]; then
drives_ready="0";
fi
done
}
case "${1}" in
start)
drives=`grep "^UUID=" /etc/fstab | cut -f1 | cut -d" " -f1 | cut -d"=" -f2`;
check_drives;
if [ "$drives_ready" == "0" ]; then
boot_mesg -n "Wait for devices used in fstab "
for (( i=1; i<30; i++)) do
check_drives;
if [ "$drives_ready" == "1" ]; then
break;
fi
boot_mesg -n "."
sleep 1
done
fi
exit 0;
;;
*)
echo "Usage: ${0} {start}"
exit 1
;;
esac
# End $rc_base/init.d/waitdrives

1
src/paks/gnump3d/install.sh
View File

@@ -24,6 +24,7 @@
. /opt/pakfire/lib/functions.sh
extract_files
[ -d /var/mp3 ] || ( mkdir /var/mp3 && chown nobody.nobody /var/mp3 )
/usr/bin/gnump3d-index &
start_service ${NAME}
ln -svf ../init.d/gnump3d /etc/rc.d/rc0.d/K00gnump3d
ln -svf ../init.d/gnump3d /etc/rc.d/rc3.d/S99gnump3d

11
src/scripts/scanhd
View File

@@ -2,7 +2,16 @@
case "$1" in
ide)
/sbin/kudzu -qps -c HD | egrep "desc|device:" | awk -F': ' '{print $2}' | sed -e '/"$/a\\' -e "s/$/\;/g" | tr "\n" "XX" | sed -e "s/XX/\n/g" -e "s/\;X/\;/g" > /var/ipfire/extrahd/scan
/sbin/kudzu -qps -c HD | egrep "desc|device:" | awk -F': ' '{print $2}' | sed -e '/"$/a\\' -e "s/$/\;/g" | tr "\n" "XX" | sed -e "s/XX/\n/g" -e "s/\;X/\;/g" | grep '^"' -v > /var/ipfire/extrahd/scan
if [ -e /dev/.mdadm ]; then
echo 'md;"MD Software-Raid";' >> /var/ipfire/extrahd/scan
fi
if [ -e /dev/mmcblk0 ]; then
echo 'mmcblk0;"MMC/SD Cardreader";' >> /var/ipfire/extrahd/scan
fi
if [ -e /dev/mmcblk1 ]; then
echo 'mmcblk1;"MMC/SD Cardreader";' >> /var/ipfire/extrahd/scan
fi
;;
partitions)
cat /proc/partitions | awk '{print $4 " " $3 }' | grep -v name | grep -v "^[:space:]*$" | \