This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 646370c1346f335c5878dfbadce3b2f69747fe65 (commit) via 7c7ea34ad7458e279212b55371a5c77713b6e6d2 (commit) via f0d9dab6f78fd46a9b5a2acf7be7d25c7515e720 (commit) from 35fcdc416d9d86ab291cd65ecfacd4f785e05593 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 646370c1346f335c5878dfbadce3b2f69747fe65 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Feb 17 00:45:51 2010 +0100
Updated collectd (4.9.1).
commit 7c7ea34ad7458e279212b55371a5c77713b6e6d2 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Feb 17 00:45:09 2010 +0100
Add liboping (1.3.4).
commit f0d9dab6f78fd46a9b5a2acf7be7d25c7515e720 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Feb 17 00:43:57 2010 +0100
Updated rrdtool (1.2.30).
-----------------------------------------------------------------------
Summary of changes: config/collectd/collectd.conf | 2 +- config/rootfiles/common/collectd | 133 +++++++++++++++++++++- config/rootfiles/common/liboping | 23 ++++ config/rootfiles/common/rrdtool | 225 +++++++++++++++++++------------------- lfs/collectd | 6 +- lfs/{libsigc++ => liboping} | 6 +- lfs/rrdtool | 4 +- make.sh | 1 + 8 files changed, 273 insertions(+), 127 deletions(-) create mode 100644 config/rootfiles/common/liboping copy lfs/{libsigc++ => liboping} (97%)
Difference in files: diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf index a148b08..2f86f07 100644 --- a/config/collectd/collectd.conf +++ b/config/collectd/collectd.conf @@ -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
diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd index 2916094..0fe7afc 100644 --- a/config/rootfiles/common/collectd +++ b/config/rootfiles/common/collectd @@ -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 diff --git a/config/rootfiles/common/liboping b/config/rootfiles/common/liboping new file mode 100644 index 0000000..40b0cc9 --- /dev/null +++ b/config/rootfiles/common/liboping @@ -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 diff --git a/config/rootfiles/common/rrdtool b/config/rootfiles/common/rrdtool index c57a8ca..1589e1a 100644 --- a/config/rootfiles/common/rrdtool +++ b/config/rootfiles/common/rrdtool @@ -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 diff --git a/lfs/collectd b/lfs/collectd index b65eb7d..7884056 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -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)
@@ -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 diff --git a/lfs/liboping b/lfs/liboping new file mode 100644 index 0000000..cfe985c --- /dev/null +++ b/lfs/liboping @@ -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) diff --git a/lfs/rrdtool b/lfs/rrdtool index 4aade20..db44716 100644 --- a/lfs/rrdtool +++ b/lfs/rrdtool @@ -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)
diff --git a/make.sh b/make.sh index 94f3f5b..2a85a96 100755 --- a/make.sh +++ b/make.sh @@ -550,6 +550,7 @@ buildipfire() { ipfiremake br2684ctl ipfiremake pcmciautils ipfiremake lm_sensors + ipfiremake liboping ipfiremake collectd ipfiremake lcd4linux ipfiremake tcptrack
hooks/post-receive -- IPFire 2.x development tree