Merge branch 'next' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x into next

Conflicts:
	doc/packages-list.txt
This commit is contained in:
Arne Fitzenreiter
2010-02-18 08:37:47 +01:00
24 changed files with 628 additions and 179 deletions

View File

@@ -8,7 +8,7 @@ Hostname "localhost"
BaseDir "/var/log/rrd/collectd"
PIDFile "/var/run/collectd.pid"
PluginDir "/usr/lib/collectd"
TypesDB "/usr/lib/collectd/types.db"
TypesDB "/usr/share/collectd/types.db"
Interval 30
ReadThreads 3

View File

@@ -1,113 +1,234 @@
etc/collectd.conf
etc/collectd.thermal
etc/rc.d/init.d/collectd
etc/rc.d/rc0.d/K50collectd
etc/rc.d/rc3.d/S21collectd
etc/rc.d/rc6.d/K50collectd
#usr/bin/collectd-nagios
#usr/etc/collectd.conf
#usr/bin/collectd-nagios
#usr/etc/collectd.conf
#usr/include/collectd
#usr/include/collectd/client.h
#usr/include/collectd/lcc_features.h
#usr/lib/collectd
#usr/lib/collectd/apache.a
#usr/lib/collectd/apache.la
usr/lib/collectd/apache.so
#usr/lib/collectd/apcups.a
#usr/lib/collectd/apcups.la
usr/lib/collectd/apcups.so
#usr/lib/collectd/ascent.a
#usr/lib/collectd/ascent.la
usr/lib/collectd/ascent.so
#usr/lib/collectd/battery.a
#usr/lib/collectd/battery.la
usr/lib/collectd/battery.so
#usr/lib/collectd/bind.a
#usr/lib/collectd/bind.la
usr/lib/collectd/bind.so
#usr/lib/collectd/conntrack.a
#usr/lib/collectd/conntrack.la
usr/lib/collectd/conntrack.so
#usr/lib/collectd/contextswitch.a
#usr/lib/collectd/contextswitch.la
usr/lib/collectd/contextswitch.so
#usr/lib/collectd/cpu.a
#usr/lib/collectd/cpu.la
usr/lib/collectd/cpu.so
#usr/lib/collectd/cpufreq.a
#usr/lib/collectd/cpufreq.la
usr/lib/collectd/cpufreq.so
#usr/lib/collectd/curl.a
#usr/lib/collectd/curl.la
usr/lib/collectd/curl.so
#usr/lib/collectd/df.a
#usr/lib/collectd/df.la
usr/lib/collectd/df.so
#usr/lib/collectd/disk.a
#usr/lib/collectd/disk.la
usr/lib/collectd/disk.so
#usr/lib/collectd/dns.a
#usr/lib/collectd/dns.la
usr/lib/collectd/dns.so
#usr/lib/collectd/email.a
#usr/lib/collectd/email.la
usr/lib/collectd/email.so
#usr/lib/collectd/entropy.a
#usr/lib/collectd/entropy.la
usr/lib/collectd/entropy.so
#usr/lib/collectd/exec.a
#usr/lib/collectd/exec.la
usr/lib/collectd/exec.so
usr/lib/collectd/filecount.la
#usr/lib/collectd/filecount.a
#usr/lib/collectd/filecount.la
usr/lib/collectd/filecount.so
#usr/lib/collectd/fscache.a
#usr/lib/collectd/fscache.la
usr/lib/collectd/fscache.so
#usr/lib/collectd/hddtemp.a
#usr/lib/collectd/hddtemp.la
usr/lib/collectd/hddtemp.so
#usr/lib/collectd/interface.a
#usr/lib/collectd/interface.la
usr/lib/collectd/interface.so
#usr/lib/collectd/iptables.a
#usr/lib/collectd/iptables.la
usr/lib/collectd/iptables.so
#usr/lib/collectd/irq.a
#usr/lib/collectd/irq.la
usr/lib/collectd/irq.so
#usr/lib/collectd/load.a
#usr/lib/collectd/load.la
usr/lib/collectd/load.so
#usr/lib/collectd/logfile.a
#usr/lib/collectd/logfile.la
usr/lib/collectd/logfile.so
#usr/lib/collectd/madwifi.a
#usr/lib/collectd/madwifi.la
usr/lib/collectd/madwifi.so
#usr/lib/collectd/match_empty_counter.a
#usr/lib/collectd/match_empty_counter.la
usr/lib/collectd/match_empty_counter.so
#usr/lib/collectd/match_hashed.a
#usr/lib/collectd/match_hashed.la
usr/lib/collectd/match_hashed.so
#usr/lib/collectd/match_regex.a
#usr/lib/collectd/match_regex.la
usr/lib/collectd/match_regex.so
#usr/lib/collectd/match_timediff.a
#usr/lib/collectd/match_timediff.la
usr/lib/collectd/match_timediff.so
#usr/lib/collectd/match_value.a
#usr/lib/collectd/match_value.la
usr/lib/collectd/match_value.so
#usr/lib/collectd/memory.a
#usr/lib/collectd/memory.la
usr/lib/collectd/memory.so
#usr/lib/collectd/multimeter.a
#usr/lib/collectd/multimeter.la
usr/lib/collectd/multimeter.so
#usr/lib/collectd/network.a
#usr/lib/collectd/network.la
usr/lib/collectd/network.so
#usr/lib/collectd/nfs.a
#usr/lib/collectd/nfs.la
usr/lib/collectd/nfs.so
#usr/lib/collectd/ntpd.a
#usr/lib/collectd/ntpd.la
usr/lib/collectd/ntpd.so
#usr/lib/collectd/olsrd.a
#usr/lib/collectd/olsrd.la
usr/lib/collectd/olsrd.so
#usr/lib/collectd/openvpn.a
#usr/lib/collectd/openvpn.la
usr/lib/collectd/openvpn.so
#usr/lib/collectd/ping.a
#usr/lib/collectd/ping.la
usr/lib/collectd/ping.so
#usr/lib/collectd/powerdns.a
#usr/lib/collectd/powerdns.la
usr/lib/collectd/powerdns.so
#usr/lib/collectd/processes.a
#usr/lib/collectd/processes.la
usr/lib/collectd/processes.so
#usr/lib/collectd/protocols.a
#usr/lib/collectd/protocols.la
usr/lib/collectd/protocols.so
#usr/lib/collectd/python.a
#usr/lib/collectd/python.la
usr/lib/collectd/python.so
#usr/lib/collectd/rrdtool.a
#usr/lib/collectd/rrdtool.la
usr/lib/collectd/rrdtool.so
#usr/lib/collectd/sensors.a
#usr/lib/collectd/sensors.la
usr/lib/collectd/sensors.so
#usr/lib/collectd/swap.a
#usr/lib/collectd/swap.la
usr/lib/collectd/swap.so
#usr/lib/collectd/syslog.a
#usr/lib/collectd/syslog.la
usr/lib/collectd/syslog.so
#usr/lib/collectd/table.a
#usr/lib/collectd/table.la
usr/lib/collectd/table.so
#usr/lib/collectd/tail.a
#usr/lib/collectd/tail.la
usr/lib/collectd/tail.so
#usr/lib/collectd/target_notification.a
#usr/lib/collectd/target_notification.la
usr/lib/collectd/target_notification.so
#usr/lib/collectd/target_replace.a
#usr/lib/collectd/target_replace.la
usr/lib/collectd/target_replace.so
#usr/lib/collectd/target_scale.a
#usr/lib/collectd/target_scale.la
usr/lib/collectd/target_scale.so
#usr/lib/collectd/target_set.a
#usr/lib/collectd/target_set.la
usr/lib/collectd/target_set.so
#usr/lib/collectd/tcpconns.a
#usr/lib/collectd/tcpconns.la
usr/lib/collectd/tcpconns.so
#usr/lib/collectd/teamspeak2.a
#usr/lib/collectd/teamspeak2.la
usr/lib/collectd/teamspeak2.so
usr/lib/collectd/thermal.la
#usr/lib/collectd/ted.a
#usr/lib/collectd/ted.la
usr/lib/collectd/ted.so
#usr/lib/collectd/thermal.a
#usr/lib/collectd/thermal.la
usr/lib/collectd/thermal.so
usr/lib/collectd/types.db
#usr/lib/collectd/unixsock.a
#usr/lib/collectd/unixsock.la
usr/lib/collectd/unixsock.so
#usr/lib/collectd/uptime.a
#usr/lib/collectd/uptime.la
usr/lib/collectd/uptime.so
#usr/lib/collectd/users.a
#usr/lib/collectd/users.la
usr/lib/collectd/users.so
#usr/lib/collectd/uuid.a
#usr/lib/collectd/uuid.la
usr/lib/collectd/uuid.so
#usr/lib/collectd/vmem.a
#usr/lib/collectd/vmem.la
usr/lib/collectd/vmem.so
#usr/lib/collectd/wireless.a
#usr/lib/collectd/wireless.la
usr/lib/collectd/wireless.so
#usr/lib/collectd/write_http.a
#usr/lib/collectd/write_http.la
usr/lib/collectd/write_http.so
#usr/lib/libcollectdclient.a
#usr/lib/libcollectdclient.la
usr/lib/libcollectdclient.so
usr/lib/libcollectdclient.so.0
usr/lib/libcollectdclient.so.0.0.0
#usr/lib/perl5/site_perl/5.8.8/Collectd
#usr/lib/perl5/site_perl/5.8.8/Collectd.pm
#usr/lib/perl5/site_perl/5.8.8/Collectd/Plugins
#usr/lib/perl5/site_perl/5.8.8/Collectd/Plugins/Monitorus.pm
#usr/lib/perl5/site_perl/5.8.8/Collectd/Plugins/OpenVZ.pm
#usr/lib/perl5/site_perl/5.8.8/Collectd/Unixsock.pm
#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Collectd
#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Collectd/.packlist
#usr/lib/pkgconfig/libcollectdclient.pc
usr/sbin/collectd
usr/sbin/collectdmon
#usr/share/collectd
#usr/share/collectd/postgresql_default.conf
usr/share/collectd/types.db
#usr/share/man/man1/collectd-nagios.1
#usr/share/man/man1/collectd.1
#usr/share/man/man1/collectdmon.1
#usr/share/man/man3/Collectd::Unixsock.3
#usr/share/man/man5/collectd-email.5
#usr/share/man/man5/collectd-exec.5
#usr/share/man/man5/collectd-java.5
#usr/share/man/man5/collectd-perl.5
#usr/share/man/man5/collectd-python.5
#usr/share/man/man5/collectd-snmp.5
#usr/share/man/man5/collectd-unixsock.5
#usr/share/man/man5/collectd.conf.5
#usr/share/man/man5/types.db.5
#var/lib/collectd
etc/rc.d/init.d/collectd

View File

@@ -120,12 +120,17 @@ sbin/iptables-multi
#usr/include/asm-generic
#usr/include/asm-generic/errno-base.h
#usr/include/asm-generic/errno.h
#usr/include/iptables
#usr/include/iptables.h
#usr/include/iptables/internal.h
#usr/include/libipq.h
#usr/include/libiptc
#usr/include/libiptc/ipt_kernel_headers.h
#usr/include/libiptc/libip6tc.h
#usr/include/libiptc/libiptc.h
#usr/include/libiptc/libxtc.h
#usr/include/libipulog
#usr/include/libipulog/libipulog.h
#usr/include/libnetfilter_queue
#usr/include/libnetfilter_queue/libipq.h
#usr/include/libnetfilter_queue/libnetfilter_queue.h
@@ -208,6 +213,9 @@ sbin/iptables-multi
#usr/include/linux/netfilter/xt_tcpudp.h
#usr/include/linux/netfilter/xt_time.h
#usr/include/linux/netfilter/xt_u32.h
#usr/include/net/netfilter
#usr/include/net/netfilter/nf_conntrack_tuple.h
#usr/include/net/netfilter/nf_nat.h
#usr/include/xtables.h
#usr/lib/libnetfilter_queue.a
#usr/lib/libnetfilter_queue.la

View File

@@ -0,0 +1,23 @@
usr/bin/oping
#usr/include/oping.h
#usr/lib/liboping.a
#usr/lib/liboping.la
usr/lib/liboping.so
usr/lib/liboping.so.0
usr/lib/liboping.so.0.2.3
usr/lib/perl5/site_perl/5.8.8/i586-linux/Net/Oping.pm
usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/Oping
usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/Oping/.packlist
usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/Oping/Oping.bs
usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Net/Oping/Oping.so
#usr/share/man/man3/Net::Oping.3
#usr/share/man/man3/liboping.3
#usr/share/man/man3/ping_construct.3
#usr/share/man/man3/ping_get_error.3
#usr/share/man/man3/ping_host_add.3
#usr/share/man/man3/ping_iterator_get.3
#usr/share/man/man3/ping_iterator_get_context.3
#usr/share/man/man3/ping_iterator_get_info.3
#usr/share/man/man3/ping_send.3
#usr/share/man/man3/ping_setopt.3
#usr/share/man/man8/oping.8

View File

@@ -6,12 +6,21 @@ usr/bin/rrdupdate
#usr/lib/librrd.la
usr/lib/librrd.so
usr/lib/librrd.so.2
usr/lib/librrd.so.2.0.8
usr/lib/librrd.so.2.0.15
#usr/lib/librrd_th.a
#usr/lib/librrd_th.la
usr/lib/librrd_th.so
usr/lib/librrd_th.so.2
usr/lib/librrd_th.so.2.0.8
usr/lib/librrd_th.so.2.0.13
usr/lib/perl5/site_perl/5.8.8/RRDp.pm
usr/lib/perl5/site_perl/5.8.8/i586-linux/RRDs.pm
#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDp
#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDp/.packlist
#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDs
#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDs/.packlist
usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDs/RRDs.bs
usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDs/RRDs.so
usr/lib/perl5/site_perl/5.8.8/i586-linux/ntmake.pl
#usr/share/man/man1/bin_dec_hex.1
#usr/share/man/man1/cdeftutorial.1
#usr/share/man/man1/rpntutorial.1
@@ -29,6 +38,7 @@ usr/lib/librrd_th.so.2.0.8
#usr/share/man/man1/rrdgraph_rpn.1
#usr/share/man/man1/rrdinfo.1
#usr/share/man/man1/rrdlast.1
#usr/share/man/man1/rrdlastupdate.1
#usr/share/man/man1/rrdresize.1
#usr/share/man/man1/rrdrestore.1
#usr/share/man/man1/rrdthreads.1
@@ -39,114 +49,105 @@ usr/lib/librrd_th.so.2.0.8
#usr/share/man/man1/rrdxport.1
#usr/share/man/man3/RRDp.3
#usr/share/man/man3/RRDs.3
#usr/share/rrdtool-1.2.15
#usr/share/rrdtool-1.2.15/include
#usr/share/rrdtool-1.2.15/include/rrd.h
usr/lib/perl5/site_perl/5.8.8/RRDp.pm
usr/lib/perl5/site_perl/5.8.8/i586-linux/RRDs.pm
#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDp
#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDp/.packlist
#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDs
#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDs/.packlist
usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDs/RRDs.bs
usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/RRDs/RRDs.so
usr/lib/perl5/site_perl/5.8.8/i586-linux/ntmake.pl
#usr/share/rrdtool-1.2.15/share
#usr/share/rrdtool-1.2.15/share/doc
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/RRDp.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/RRDs.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/bin_dec_hex.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/cdeftutorial.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/index.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rpntutorial.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrd-beginners.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdbuild.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdcgi.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdcreate.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrddump.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdfetch.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdfirst.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdgraph.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdgraph_data.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdgraph_examples.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdgraph_graph.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdgraph_rpn.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdinfo.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdlast.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdresize.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdrestore.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdthreads.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdtool.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdtune.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdtutorial.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdupdate.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/html/rrdxport.html
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/bin_dec_hex.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/bin_dec_hex.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/cdeftutorial.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/cdeftutorial.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rpntutorial.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rpntutorial.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrd-beginners.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrd-beginners.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdbuild.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdbuild.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdcgi.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdcgi.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdcreate.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdcreate.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrddump.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrddump.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdfetch.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdfetch.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdfirst.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdfirst.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph_data.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph_data.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph_examples.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph_examples.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph_graph.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph_graph.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph_rpn.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdgraph_rpn.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdinfo.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdinfo.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdlast.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdlast.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdresize.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdresize.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdrestore.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdrestore.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdthreads.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdthreads.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdtool.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdtool.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdtune.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdtune.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdtutorial.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdtutorial.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdupdate.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdupdate.txt
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdxport.pod
#usr/share/rrdtool-1.2.15/share/doc/rrdtool-1.2.15/txt/rrdxport.txt
#usr/share/rrdtool-1.2.15/share/man
#usr/share/rrdtool-1.2.15/share/man/man3
#usr/share/rrdtool-1.2.15/share/man/man3/RRDp.3
#usr/share/rrdtool-1.2.15/share/man/man3/RRDs.3
#usr/share/rrdtool-1.2.15/share/rrdtool
#usr/share/rrdtool-1.2.15/share/rrdtool/examples
#usr/share/rrdtool-1.2.15/share/rrdtool/examples/4charts.pl
#usr/share/rrdtool-1.2.15/share/rrdtool/examples/bigtops.pl
#usr/share/rrdtool-1.2.15/share/rrdtool/examples/cgi-demo.cgi
#usr/share/rrdtool-1.2.15/share/rrdtool/examples/minmax.pl
#usr/share/rrdtool-1.2.15/share/rrdtool/examples/piped-demo.pl
#usr/share/rrdtool-1.2.15/share/rrdtool/examples/shared-demo.pl
#usr/share/rrdtool-1.2.15/share/rrdtool/examples/stripes.pl
#usr/share/rrdtool-1.2.15/share/rrdtool/fonts
usr/share/rrdtool-1.2.15/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
#usr/share/rrdtool-1.2.30
#usr/share/rrdtool-1.2.30/include
#usr/share/rrdtool-1.2.30/include/rrd.h
#usr/share/rrdtool-1.2.30/share
#usr/share/rrdtool-1.2.30/share/doc
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/RRDp.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/RRDs.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/bin_dec_hex.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/cdeftutorial.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/index.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rpntutorial.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrd-beginners.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdbuild.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdcgi.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdcreate.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrddump.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdfetch.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdfirst.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdgraph.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdgraph_data.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdgraph_examples.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdgraph_graph.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdgraph_rpn.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdinfo.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdlast.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdlastupdate.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdresize.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdrestore.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdthreads.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdtool.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdtune.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdtutorial.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdupdate.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/html/rrdxport.html
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/bin_dec_hex.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/bin_dec_hex.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/cdeftutorial.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/cdeftutorial.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rpntutorial.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rpntutorial.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrd-beginners.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrd-beginners.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdbuild.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdbuild.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdcgi.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdcgi.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdcreate.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdcreate.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrddump.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrddump.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdfetch.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdfetch.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdfirst.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdfirst.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph_data.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph_data.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph_examples.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph_examples.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph_graph.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph_graph.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph_rpn.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdgraph_rpn.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdinfo.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdinfo.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdlast.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdlast.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdlastupdate.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdlastupdate.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdresize.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdresize.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdrestore.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdrestore.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdthreads.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdthreads.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdtool.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdtool.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdtune.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdtune.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdtutorial.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdtutorial.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdupdate.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdupdate.txt
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdxport.pod
#usr/share/rrdtool-1.2.30/share/doc/rrdtool-1.2.30/txt/rrdxport.txt
#usr/share/rrdtool-1.2.30/share/rrdtool
#usr/share/rrdtool-1.2.30/share/rrdtool/examples
#usr/share/rrdtool-1.2.30/share/rrdtool/examples/4charts.pl
#usr/share/rrdtool-1.2.30/share/rrdtool/examples/bigtops.pl
#usr/share/rrdtool-1.2.30/share/rrdtool/examples/cgi-demo.cgi
#usr/share/rrdtool-1.2.30/share/rrdtool/examples/minmax.pl
#usr/share/rrdtool-1.2.30/share/rrdtool/examples/perftest.pl
#usr/share/rrdtool-1.2.30/share/rrdtool/examples/piped-demo.pl
#usr/share/rrdtool-1.2.30/share/rrdtool/examples/shared-demo.pl
#usr/share/rrdtool-1.2.30/share/rrdtool/examples/stripes.pl
#usr/share/rrdtool-1.2.30/share/rrdtool/fonts
usr/share/rrdtool-1.2.30/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
var/log/rrd

View File

@@ -0,0 +1,13 @@
usr/bin/faad
#usr/include/faad.h
#usr/include/mp4ff.h
#usr/include/mp4ffint.h
#usr/include/neaacdec.h
usr/lib/libfaad.a
usr/lib/libfaad.la
usr/lib/libfaad.so
usr/lib/libfaad.so.2
usr/lib/libfaad.so.2.0.0
usr/lib/libmp4ff.a
#usr/share/man/manm
#usr/share/man/manm/faad.man

View File

@@ -1,4 +1,13 @@
usr/bin/squidclamav
etc/squidclamav.conf
srv/web/ipfire/html/clwarn.cgi
usr/bin/squidclamav
#usr/libexec/squidclamav
#usr/libexec/squidclamav/clwarn.cgi
#usr/libexec/squidclamav/clwarn.cgi.de_DE
#usr/libexec/squidclamav/clwarn.cgi.en_EN
#usr/libexec/squidclamav/clwarn.cgi.fr_FR
#usr/libexec/squidclamav/clwarn.cgi.pt_BR
#usr/share/man/man1/squidclamav.1
#usr/share/squidclamav
#usr/share/squidclamav/README
var/ipfire/backup/addons/includes/squidclamav
srv/web/ipfire/html/clwarn.cgi

View File

@@ -83,6 +83,7 @@ usr/lib/vlc/codec/libcmml_plugin.so
usr/lib/vlc/codec/libcvdsub_plugin.so
usr/lib/vlc/codec/libdts_plugin.so
usr/lib/vlc/codec/libdvbsub_plugin.so
usr/lib/vlc/codec/libfaad_plugin.so
usr/lib/vlc/codec/libfake_plugin.so
usr/lib/vlc/codec/libflacdec_plugin.so
usr/lib/vlc/codec/liblibmpeg2_plugin.so

View File

@@ -1,31 +1,40 @@
#squid_ip 127.0.0.1
#squid_port 3128
proxy none
#
logfile /var/log/squidclamav.log
redirect http://127.0.0.1:81/clwarn.cgi
#
debug 0
force 1
stat 0
#
clamd_local /var/run/clamav/clamd
timeout 30
abort ^.*\.pdf$
abort ^.*\.js$
abort ^.*\.html$
abort ^.*\.css$
abort ^.*\.xml$
abort ^.*\.xsl$
abort ^.*\.js$
abort ^.*\.html$
abort ^.*\.css$
abort ^.*\.xml$
abort ^.*\.xsl$
abort ^.*\.js$
abort ^.*\.jsp$
abort ^.*\.jsp\?.*$
aborti ^.*servlet.*$
abort ^.*\.ico$
aborti ^.*\.gif$
aborti ^.*\.png$
aborti ^.*\.jpg$
aborti ^.*\.swf$
abortcontenti ^.*application\/x-mms-framed.*$
abortcontenti ^.*application\/x-javascript.*$
content ^.*application\/.*$
#clamd_ip 192.168.1.5
#clamd_port 3310
#
maxsize 5000000
maxredir 30
timeout 60
#trust_cache 1
#
# Do not scan standard HTTP images
abort ^.*\.(ico|gif|png|jpg)$
abortcontent ^image\/.*$
#
# Do not scan text and javascript files
abort ^.*\.(css|xml|xsl|js|html|jsp)$
abortcontent ^text\/.*$
abortcontent ^application\/x-javascript$
#
# Do not scan streaming videos
abortcontent ^video\/mp4$
abortcontent ^video\/x-flv$
#
# Do not scan pdf and flash
#abort ^.*\.(pdf|swf)$
#
# Do not scan sequence of framed Microsoft Media Server (MMS) data packets
abortcontent ^.*application\/x-mms-framed.*$
#
# White list some sites
whitelist .*\.clamav.net

View File

@@ -66,7 +66,7 @@
* centerim-4.22.1
* clamav-0.95.3
* cmake-2.4.8
* collectd-4.5.4
* collectd-4.9.1
* coreutils-5.96
* cpio-2.6
* cpufrequtils-007
@@ -94,6 +94,7 @@
* ethtool-3
* expat-2.0.0
* ez-ipupdate-3.0.11b8
* faad2-2.7
* fbset-2.1
* fcron-3.0.4
* feedparser-4.1
@@ -171,6 +172,7 @@
* libnet-1.1.2.1
* libnl-1.1
* libogg-1.1.4
* liboping-1.3.4
* libpcap-1.0.0
* libpng-1.2.12
* libpri-1.4.10.2
@@ -273,7 +275,7 @@
* reiser4progs-1.0.5
* reiserfsprogs-3.6.19
* rp-pppoe-3.8
* rrdtool-1.2.15
* rrdtool-1.2.30
* rssdler-0.4.0a
* rsync-3.0.7
* rtorrent-0.8.6
@@ -295,13 +297,13 @@
* squashfs-lzma-cvs20100214
* squid-2.7.STABLE7
* squidGuard-1.4.1
* squidclamav-4.1
* squidclamav-5.0
* sshfs-fuse-2.2
* sslh-1.6i
* streamripper-1.63.5
* sudo-1.6.8p12
* sysfsutils-1.3.0
* sysklogd-1.4.1
* sysklogd-1.5
* syslinux-3.62
* sysstat-6.0.2
* sysvinit-2.86

View File

@@ -25,7 +25,7 @@
include Config
PKG_NAME = collectd
VER = 4.5.4
VER = 4.9.1
THISAPP = collectd-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = b59500d1346c16a63ba10cbc6c0cf7df
$(DL_FILE)_MD5 = 5753496651c8c84afaea1fe290876bfc
install : $(TARGET)
@@ -77,8 +77,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && sed -i 's|with_libiptc="no (Linux iptables header.*|with_libiptc="yes"|g' \
./configure
#cd $(DIR_APP) && sed -i 's|with_libiptc="no (Linux iptables header.*|with_libiptc="yes"|g' \
# ./configure
cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \
--disable-{apple_sensors,csv,ipvs,mbmon,memcached,mysql} \
--disable-{netlink,nginx,nut,perl,serial,snmp,tape,vserver,xmms} \
@@ -87,7 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--enable-{interface,iptables,irq,load,logfile,memory,multimeter} \
--enable-{network,nfs,ntpd,ping,processes,rrdtool,sensors,swap,syslog} \
--enable-{tcpconns,unixsock,users,wireless} \
--with-rrdtool=/usr/share/rrdtool-1.2.15
--with-librrd=/usr/share/rrdtool-1.2.30
cd $(DIR_APP) && make install
cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/
ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd

84
lfs/faad Normal file
View File

@@ -0,0 +1,84 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2010 Michael Tremer & Christian Schmidt #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 2.7
THISAPP = faad2-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = faad2
PAK_VER = 1
DEPS = ""
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = ee1b4d67ea2d76ee52c5621bc6dbf61e
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:
@$(PAK)
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

84
lfs/faad2 Normal file
View File

@@ -0,0 +1,84 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2010 Michael Tremer & Christian Schmidt #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 2.7
THISAPP = faad2-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = faad2
PAK_VER = 1
DEPS = ""
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = ee1b4d67ea2d76ee52c5621bc6dbf61e
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:
@$(PAK)
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -31,7 +31,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ffmpeg
PAK_VER = 3
PAK_VER = 4
DEPS = "ffmpeg-libs sdl lame libvorbis xvid"
@@ -79,8 +79,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ln -s $(THISAPP) /usr/src/ffmpeg
cd $(DIR_SRC)/ffmpeg && ./configure --prefix=/usr \
--enable-shared \
--enable-postproc \
--enable-gpl
--enable-postproc \
--enable-pthreads \
--enable-gpl
cd $(DIR_SRC)/ffmpeg && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_SRC)/ffmpeg && make install
cd $(DIR_SRC)/ffmpeg && make install-libs

View File

@@ -27,7 +27,7 @@ include Config
VER = 2008-04-13
THISAPP = ffmpeg-export-$(VER)
PROG = ffmpeg-libs
PAK_VER = 3
PAK_VER = 4
DEPS = ""

View File

@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.41 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-1.0.0 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
@cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-cd /usr/include && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.6-errorno_includes.patch
@@ -102,6 +102,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
# Iptables doesn't install all headers
mkdir -p /usr/include/net/netfilter
cp -f $(DIR_APP)/include/net/netfilter/*.h /usr/include/net/netfilter/
mkdir -p /usr/include/iptables
cp -f $(DIR_APP)/include/iptables/*.h /usr/include/iptables/
cp -f $(DIR_APP)/include/iptables.h /usr/include/
mkdir -p /usr/include/libipulog
cp -f $(DIR_APP)/include/libipulog/*.h /usr/include/libipulog/
mkdir -p /usr/include/libiptc
cp -f $(DIR_APP)/include/libiptc/*.h /usr/include/libiptc/
cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-1.0.0.tar.bz2
cd $(DIR_SRC)/libnfnetlink-1.0.0 && ./configure --prefix=/usr
cd $(DIR_SRC)/libnfnetlink-1.0.0 && make $(MAKETUNING) $(EXTRA_MAKE)
@@ -112,5 +123,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_SRC)/libnetfilter_queue-0.0.17 && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_SRC)/libnetfilter_queue-0.0.17 && make install
@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.41 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-1.0.0 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
@$(POSTBUILD)

77
lfs/liboping Normal file
View File

@@ -0,0 +1,77 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 1.3.4
THISAPP = liboping-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 208e185f75f9f8ac96e508bd9e17ef61
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -24,7 +24,7 @@
include Config
VER = 1.2.15
VER = 1.2.30
THISAPP = rrdtool-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = bde8b12c202bc4e27fb9a9588a0aaddf
$(DL_FILE)_MD5 = 19b24f7184a8dbf7b48c1bbb565ad9fb
install : $(TARGET)

View File

@@ -24,7 +24,7 @@
include Config
VER = 4.1
VER = 5.0
THISAPP = squidclamav-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = squidclamav
PAK_VER = 8
PAK_VER = 9
DEPS = "clamav"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 5e79064fce4dacc1af34ba21fd4f0880
$(DL_FILE)_MD5 = fe6456c25294653cb5f19ff7afdb5f90
install : $(TARGET)

View File

@@ -24,10 +24,10 @@
include Config
VER = 1.4.1
VER = 1.5
THISAPP = sysklogd-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = f587720988bc1670071f31d3694ca0fb
$(DL_FILE)_MD5 = e053094e8103165f98ddafe828f6ae4b
install : $(TARGET)
@@ -69,10 +69,10 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fixes-1.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-8bit-1.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_xen_empty_buffer_check.patch
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fixes-1.patch
#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-8bit-1.patch
#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_xen_empty_buffer_check.patch
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
touch /var/log/{dhcpcd.log,messages,ovpnserver.log}

View File

@@ -33,9 +33,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = videolan
PAK_VER = 4
PAK_VER = 5
DEPS = "libshout libmpeg2 libmad libdvbpsi directfb ffmpeg"
DEPS = "libshout libmpeg2 libmad libdvbpsi directfb ffmpeg faad2"
###############################################################################
# Top-level Rules
@@ -96,7 +96,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--with-v4l=/usr/src/v4l-dvb \
--enable-libdvbpsi --enable-faac --enable-mkv \
--enable-x264 --enable-release --enable-sout \
--disable-nls \
--disable-nls --enable-faad \
--enable-directfb --with-directfb=/usr/src/directfb
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install

View File

@@ -550,6 +550,7 @@ buildipfire() {
ipfiremake br2684ctl
ipfiremake pcmciautils
ipfiremake lm_sensors
ipfiremake liboping
ipfiremake collectd
ipfiremake lcd4linux
ipfiremake tcptrack
@@ -569,6 +570,7 @@ buildipfire() {
ipfiremake freefont
ipfiremake directfb
ipfiremake dfb++
ipfiremake faad2
ipfiremake ffmpeg
ipfiremake videolan
ipfiremake vdr

View File

@@ -132,7 +132,7 @@ case "$1" in
# original do nothing line
#/sbin/iptables -A INPUT -p tcp -m tcp --tcp-flags SYN,RST,ACK SYN -m limit --limit 10/sec
# the correct one, but the negative '!' do nothing...
#/sbin/iptables -A INPUT -p tcp -m tcp --tcp-flags SYN,RST,ACK SYN -m limit ! --limit 10/sec -j DROP
#/sbin/iptables -A INPUT -p tcp -m tcp --tcp-flags SYN,RST,ACK SYN ! -m limit --limit 10/sec -j DROP
# Fix for braindead ISP's
/sbin/iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu

View File

@@ -17,10 +17,13 @@
# 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) 2010 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
./uninstall.sh
./install.sh
extract_files
# Restoring the backup has to be excluded because config file changed
# restore_backup ${NAME}
/etc/init.d/squid restart