More files added to updater

diff --git a/.gitignore b/.gitignore
index 9744fc34b051980d4c21601b68d259c492b69667..b188ed50c02e3202d3c5919cd00c48ef3d538e7c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 *.diff
 *.img.gz
 *.iso
 *.diff
 *.img.gz
 *.iso

+*.tar.bz2

diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
new file mode 100644 (file)
index 0000000..db4090a
--- /dev/null
+++ b/config/rootfiles/common/collectd
@@ -0,0 +1,102 @@
+etc/collectd.conf
+etc/rc.d/rc0.d/K50collectd
+etc/rc.d/rc3.d/S20collectd
+etc/rc.d/rc6.d/K50collectd
+etc/rc.d/init.d/collectd
+#usr/bin/collectd-nagios
+#usr/etc/collectd.conf
+#usr/lib/collectd
+#usr/lib/collectd/apache.la
+usr/lib/collectd/apache.so
+#usr/lib/collectd/apcups.la
+usr/lib/collectd/apcups.so
+#usr/lib/collectd/ascent.la
+usr/lib/collectd/ascent.so
+#usr/lib/collectd/battery.la
+usr/lib/collectd/battery.so
+#usr/lib/collectd/cpu.la
+usr/lib/collectd/cpu.so
+#usr/lib/collectd/cpufreq.la
+usr/lib/collectd/cpufreq.so
+#usr/lib/collectd/df.la
+usr/lib/collectd/df.so
+#usr/lib/collectd/disk.la
+usr/lib/collectd/disk.so
+#usr/lib/collectd/dns.la
+usr/lib/collectd/dns.so
+#usr/lib/collectd/email.la
+usr/lib/collectd/email.so
+#usr/lib/collectd/entropy.la
+usr/lib/collectd/entropy.so
+#usr/lib/collectd/exec.la
+usr/lib/collectd/exec.so
+#usr/lib/collectd/hddtemp.la
+usr/lib/collectd/hddtemp.so
+#usr/lib/collectd/interface.la
+usr/lib/collectd/interface.so
+#usr/lib/collectd/iptables.la
+usr/lib/collectd/iptables.so
+#usr/lib/collectd/irq.la
+usr/lib/collectd/irq.so
+#usr/lib/collectd/load.la
+usr/lib/collectd/load.so
+#usr/lib/collectd/logfile.la
+usr/lib/collectd/logfile.so
+#usr/lib/collectd/memory.la
+usr/lib/collectd/memory.so
+#usr/lib/collectd/multimeter.la
+usr/lib/collectd/multimeter.so
+#usr/lib/collectd/network.la
+usr/lib/collectd/network.so
+#usr/lib/collectd/nfs.la
+usr/lib/collectd/nfs.so
+#usr/lib/collectd/ntpd.la
+usr/lib/collectd/ntpd.so
+#usr/lib/collectd/ping.la
+usr/lib/collectd/ping.so
+#usr/lib/collectd/powerdns.la
+usr/lib/collectd/powerdns.so
+#usr/lib/collectd/processes.la
+usr/lib/collectd/processes.so
+#usr/lib/collectd/rrdtool.la
+usr/lib/collectd/rrdtool.so
+#usr/lib/collectd/sensors.la
+usr/lib/collectd/sensors.so
+#usr/lib/collectd/swap.la
+usr/lib/collectd/swap.so
+#usr/lib/collectd/syslog.la
+usr/lib/collectd/syslog.so
+#usr/lib/collectd/tail.la
+usr/lib/collectd/tail.so
+#usr/lib/collectd/tcpconns.la
+usr/lib/collectd/tcpconns.so
+#usr/lib/collectd/teamspeak2.la
+usr/lib/collectd/teamspeak2.so
+usr/lib/collectd/types.db
+#usr/lib/collectd/unixsock.la
+usr/lib/collectd/unixsock.so
+#usr/lib/collectd/users.la
+usr/lib/collectd/users.so
+#usr/lib/collectd/uuid.la
+usr/lib/collectd/uuid.so
+#usr/lib/collectd/vmem.la
+usr/lib/collectd/vmem.so
+#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/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/sbin/collectd
+#usr/sbin/collectdmon
+#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-perl.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

diff --git a/config/rootfiles/common/vnstat b/config/rootfiles/common/vnstat
index 715250602fba12e867d0b902d4328b7c09c065e8..bc657fce586de6fe9a8031a7b00f6aa3fb2a167c 100644 (file)
--- a/config/rootfiles/common/vnstat
+++ b/config/rootfiles/common/vnstat
@@ -1,5 +1,5 @@
-/etc/cron.d
-/etc/cron.d/vnstat
+#/etc/cron.d
+#/etc/cron.d/vnstat

 /etc/vnstat.conf
 /usr/bin/vnstat
 #usr/share/man/man1/vnstat.1
 /etc/vnstat.conf
 /usr/bin/vnstat
 #usr/share/man/man1/vnstat.1

diff --git a/config/rootfiles/updater/filelists/collectd b/config/rootfiles/updater/filelists/collectd
new file mode 100644 (file)
index 0000000..db4090a
--- /dev/null
+++ b/config/rootfiles/updater/filelists/collectd
@@ -0,0 +1,102 @@
+etc/collectd.conf
+etc/rc.d/rc0.d/K50collectd
+etc/rc.d/rc3.d/S20collectd
+etc/rc.d/rc6.d/K50collectd
+etc/rc.d/init.d/collectd
+#usr/bin/collectd-nagios
+#usr/etc/collectd.conf
+#usr/lib/collectd
+#usr/lib/collectd/apache.la
+usr/lib/collectd/apache.so
+#usr/lib/collectd/apcups.la
+usr/lib/collectd/apcups.so
+#usr/lib/collectd/ascent.la
+usr/lib/collectd/ascent.so
+#usr/lib/collectd/battery.la
+usr/lib/collectd/battery.so
+#usr/lib/collectd/cpu.la
+usr/lib/collectd/cpu.so
+#usr/lib/collectd/cpufreq.la
+usr/lib/collectd/cpufreq.so
+#usr/lib/collectd/df.la
+usr/lib/collectd/df.so
+#usr/lib/collectd/disk.la
+usr/lib/collectd/disk.so
+#usr/lib/collectd/dns.la
+usr/lib/collectd/dns.so
+#usr/lib/collectd/email.la
+usr/lib/collectd/email.so
+#usr/lib/collectd/entropy.la
+usr/lib/collectd/entropy.so
+#usr/lib/collectd/exec.la
+usr/lib/collectd/exec.so
+#usr/lib/collectd/hddtemp.la
+usr/lib/collectd/hddtemp.so
+#usr/lib/collectd/interface.la
+usr/lib/collectd/interface.so
+#usr/lib/collectd/iptables.la
+usr/lib/collectd/iptables.so
+#usr/lib/collectd/irq.la
+usr/lib/collectd/irq.so
+#usr/lib/collectd/load.la
+usr/lib/collectd/load.so
+#usr/lib/collectd/logfile.la
+usr/lib/collectd/logfile.so
+#usr/lib/collectd/memory.la
+usr/lib/collectd/memory.so
+#usr/lib/collectd/multimeter.la
+usr/lib/collectd/multimeter.so
+#usr/lib/collectd/network.la
+usr/lib/collectd/network.so
+#usr/lib/collectd/nfs.la
+usr/lib/collectd/nfs.so
+#usr/lib/collectd/ntpd.la
+usr/lib/collectd/ntpd.so
+#usr/lib/collectd/ping.la
+usr/lib/collectd/ping.so
+#usr/lib/collectd/powerdns.la
+usr/lib/collectd/powerdns.so
+#usr/lib/collectd/processes.la
+usr/lib/collectd/processes.so
+#usr/lib/collectd/rrdtool.la
+usr/lib/collectd/rrdtool.so
+#usr/lib/collectd/sensors.la
+usr/lib/collectd/sensors.so
+#usr/lib/collectd/swap.la
+usr/lib/collectd/swap.so
+#usr/lib/collectd/syslog.la
+usr/lib/collectd/syslog.so
+#usr/lib/collectd/tail.la
+usr/lib/collectd/tail.so
+#usr/lib/collectd/tcpconns.la
+usr/lib/collectd/tcpconns.so
+#usr/lib/collectd/teamspeak2.la
+usr/lib/collectd/teamspeak2.so
+usr/lib/collectd/types.db
+#usr/lib/collectd/unixsock.la
+usr/lib/collectd/unixsock.so
+#usr/lib/collectd/users.la
+usr/lib/collectd/users.so
+#usr/lib/collectd/uuid.la
+usr/lib/collectd/uuid.so
+#usr/lib/collectd/vmem.la
+usr/lib/collectd/vmem.so
+#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/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/sbin/collectd
+#usr/sbin/collectdmon
+#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-perl.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

diff --git a/config/rootfiles/updater/filelists/l7-protocols b/config/rootfiles/updater/filelists/l7-protocols
deleted file mode 100644 (file)
index 835232d..0000000
--- a/config/rootfiles/updater/filelists/l7-protocols
+++ /dev/null
@@ -1,267 +0,0 @@
-#etc/l7-protocols
-#etc/l7-protocols/CHANGELOG
-#etc/l7-protocols/HOWTO
-#etc/l7-protocols/LICENSE
-#etc/l7-protocols/Makefile
-#etc/l7-protocols/README
-#etc/l7-protocols/WANTED
-#etc/l7-protocols/extra
-#etc/l7-protocols/extra/README
-#etc/l7-protocols/extra/audiogalaxy.pat
-#etc/l7-protocols/extra/http-dap.pat
-#etc/l7-protocols/extra/http-freshdownload.pat
-#etc/l7-protocols/extra/http-itunes.pat
-#etc/l7-protocols/extra/httpaudio.pat
-#etc/l7-protocols/extra/httpcachehit.pat
-#etc/l7-protocols/extra/httpcachemiss.pat
-#etc/l7-protocols/extra/httpvideo.pat
-#etc/l7-protocols/extra/pressplay.pat
-#etc/l7-protocols/extra/quicktime.pat
-#etc/l7-protocols/extra/snmp-mon.pat
-#etc/l7-protocols/extra/snmp-trap.pat
-#etc/l7-protocols/file_types
-#etc/l7-protocols/file_types/README
-#etc/l7-protocols/file_types/exe.pat
-#etc/l7-protocols/file_types/flash.pat
-#etc/l7-protocols/file_types/gif.pat
-#etc/l7-protocols/file_types/html.pat
-#etc/l7-protocols/file_types/jpeg.pat
-#etc/l7-protocols/file_types/ogg.pat
-#etc/l7-protocols/file_types/pdf.pat
-#etc/l7-protocols/file_types/perl.pat
-#etc/l7-protocols/file_types/postscript.pat
-#etc/l7-protocols/file_types/rar.pat
-#etc/l7-protocols/file_types/rpm.pat
-#etc/l7-protocols/file_types/rtf.pat
-#etc/l7-protocols/file_types/tar.pat
-#etc/l7-protocols/file_types/zip.pat
-#etc/l7-protocols/groups.sh
-#etc/l7-protocols/l7-protocols.spec
-#etc/l7-protocols/malware
-#etc/l7-protocols/malware/README
-#etc/l7-protocols/malware/code_red.pat
-#etc/l7-protocols/malware/nimda.pat
-etc/l7-protocols/protocols
-#etc/l7-protocols/protocols/100bao.pat
-#etc/l7-protocols/protocols/aim.pat
-#etc/l7-protocols/protocols/aimwebcontent.pat
-#etc/l7-protocols/protocols/applejuice.pat
-#etc/l7-protocols/protocols/ares.pat
-#etc/l7-protocols/protocols/battlefield1942.pat
-#etc/l7-protocols/protocols/battlefield2.pat
-#etc/l7-protocols/protocols/bgp.pat
-#etc/l7-protocols/protocols/biff.pat
-#etc/l7-protocols/protocols/bittorrent.pat
-#etc/l7-protocols/protocols/ciscovpn.pat
-#etc/l7-protocols/protocols/citrix.pat
-#etc/l7-protocols/protocols/counterstrike-source.pat
-#etc/l7-protocols/protocols/cvs.pat
-#etc/l7-protocols/protocols/dayofdefeat-source.pat
-#etc/l7-protocols/protocols/dhcp.pat
-#etc/l7-protocols/protocols/directconnect.pat
-#etc/l7-protocols/protocols/dns.pat
-#etc/l7-protocols/protocols/doom3.pat
-#etc/l7-protocols/protocols/edonkey.pat
-#etc/l7-protocols/protocols/fasttrack.pat
-#etc/l7-protocols/protocols/finger.pat
-#etc/l7-protocols/protocols/freenet.pat
-#etc/l7-protocols/protocols/ftp.pat
-#etc/l7-protocols/protocols/gkrellm.pat
-#etc/l7-protocols/protocols/gnucleuslan.pat
-#etc/l7-protocols/protocols/gnutella.pat
-#etc/l7-protocols/protocols/goboogy.pat
-#etc/l7-protocols/protocols/gopher.pat
-#etc/l7-protocols/protocols/h323.pat
-#etc/l7-protocols/protocols/halflife2-deathmatch.pat
-#etc/l7-protocols/protocols/hddtemp.pat
-#etc/l7-protocols/protocols/hotline.pat
-#etc/l7-protocols/protocols/http-rtsp.pat
-#etc/l7-protocols/protocols/http.pat
-#etc/l7-protocols/protocols/ident.pat
-#etc/l7-protocols/protocols/imap.pat
-#etc/l7-protocols/protocols/imesh.pat
-#etc/l7-protocols/protocols/ipp.pat
-#etc/l7-protocols/protocols/irc.pat
-#etc/l7-protocols/protocols/jabber.pat
-#etc/l7-protocols/protocols/kugoo.pat
-#etc/l7-protocols/protocols/live365.pat
-#etc/l7-protocols/protocols/lpd.pat
-#etc/l7-protocols/protocols/mohaa.pat
-#etc/l7-protocols/protocols/msn-filetransfer.pat
-#etc/l7-protocols/protocols/msnmessenger.pat
-#etc/l7-protocols/protocols/mute.pat
-#etc/l7-protocols/protocols/napster.pat
-#etc/l7-protocols/protocols/nbns.pat
-#etc/l7-protocols/protocols/ncp.pat
-#etc/l7-protocols/protocols/netbios.pat
-#etc/l7-protocols/protocols/nntp.pat
-#etc/l7-protocols/protocols/ntp.pat
-#etc/l7-protocols/protocols/openft.pat
-#etc/l7-protocols/protocols/pcanywhere.pat
-#etc/l7-protocols/protocols/poco.pat
-#etc/l7-protocols/protocols/pop3.pat
-#etc/l7-protocols/protocols/qq.pat
-#etc/l7-protocols/protocols/quake-halflife.pat
-#etc/l7-protocols/protocols/quake1.pat
-#etc/l7-protocols/protocols/rdp.pat
-#etc/l7-protocols/protocols/rlogin.pat
-#etc/l7-protocols/protocols/rtsp.pat
-#etc/l7-protocols/protocols/shoutcast.pat
-#etc/l7-protocols/protocols/sip.pat
-#etc/l7-protocols/protocols/skypeout.pat
-#etc/l7-protocols/protocols/skypetoskype.pat
-#etc/l7-protocols/protocols/smb.pat
-#etc/l7-protocols/protocols/smtp.pat
-#etc/l7-protocols/protocols/snmp.pat
-#etc/l7-protocols/protocols/socks.pat
-#etc/l7-protocols/protocols/soribada.pat
-#etc/l7-protocols/protocols/soulseek.pat
-#etc/l7-protocols/protocols/ssdp.pat
-#etc/l7-protocols/protocols/ssh.pat
-#etc/l7-protocols/protocols/ssl.pat
-#etc/l7-protocols/protocols/subspace.pat
-#etc/l7-protocols/protocols/subversion.pat
-#etc/l7-protocols/protocols/teamspeak.pat
-#etc/l7-protocols/protocols/telnet.pat
-#etc/l7-protocols/protocols/tesla.pat
-#etc/l7-protocols/protocols/testing.pat
-#etc/l7-protocols/protocols/tftp.pat
-#etc/l7-protocols/protocols/thecircle.pat
-#etc/l7-protocols/protocols/tls.pat
-#etc/l7-protocols/protocols/tsp.pat
-#etc/l7-protocols/protocols/unknown.pat
-#etc/l7-protocols/protocols/uucp.pat
-#etc/l7-protocols/protocols/validcertssl.pat
-#etc/l7-protocols/protocols/ventrilo.pat
-#etc/l7-protocols/protocols/vnc.pat
-#etc/l7-protocols/protocols/whois.pat
-#etc/l7-protocols/protocols/worldofwarcraft.pat
-#etc/l7-protocols/protocols/x11.pat
-#etc/l7-protocols/protocols/xboxlive.pat
-#etc/l7-protocols/protocols/xunlei.pat
-#etc/l7-protocols/protocols/yahoo.pat
-#etc/l7-protocols/protocols/zmaap.pat
-#etc/l7-protocols/testing
-#etc/l7-protocols/testing/Makefile
-#etc/l7-protocols/testing/README
-#etc/l7-protocols/testing/add.sh
-#etc/l7-protocols/testing/data
-#etc/l7-protocols/testing/data/aim-1
-#etc/l7-protocols/testing/data/aim-2
-#etc/l7-protocols/testing/data/aim-3
-#etc/l7-protocols/testing/data/aim-4
-#etc/l7-protocols/testing/data/aim-5
-#etc/l7-protocols/testing/data/aim-6
-#etc/l7-protocols/testing/data/bittorrent-a-1
-#etc/l7-protocols/testing/data/bittorrent-a-2
-#etc/l7-protocols/testing/data/bittorrent-a-3
-#etc/l7-protocols/testing/data/bittorrent-a-4
-#etc/l7-protocols/testing/data/bittorrent-b-1
-#etc/l7-protocols/testing/data/bittorrent-b-2
-#etc/l7-protocols/testing/data/bittorrent-b-3
-#etc/l7-protocols/testing/data/bittorrent-b-4
-#etc/l7-protocols/testing/data/dce-rpc-spam-a-1
-#etc/l7-protocols/testing/data/dce-rpc-spam-b-1
-#etc/l7-protocols/testing/data/dns-1
-#etc/l7-protocols/testing/data/dns-2
-#etc/l7-protocols/testing/data/edonkey-tcp-a-1
-#etc/l7-protocols/testing/data/edonkey-tcp-a-2
-#etc/l7-protocols/testing/data/edonkey-tcp-b-1
-#etc/l7-protocols/testing/data/edonkey-tcp-b-2
-#etc/l7-protocols/testing/data/edonkey-tcp-b-3
-#etc/l7-protocols/testing/data/edonkey-tcp-b-4
-#etc/l7-protocols/testing/data/edonkey-tcp-b-5
-#etc/l7-protocols/testing/data/edonkey-tcp-b-6
-#etc/l7-protocols/testing/data/edonkey-udp-a-1
-#etc/l7-protocols/testing/data/edonkey-udp-b-1
-#etc/l7-protocols/testing/data/ftp-1
-#etc/l7-protocols/testing/data/ftp-2
-#etc/l7-protocols/testing/data/ftp-3
-#etc/l7-protocols/testing/data/ftp-4
-#etc/l7-protocols/testing/data/ftp-5
-#etc/l7-protocols/testing/data/gnutella-1
-#etc/l7-protocols/testing/data/gnutella-2
-#etc/l7-protocols/testing/data/gnutella-3
-#etc/l7-protocols/testing/data/gnutella-connect-1
-#etc/l7-protocols/testing/data/gnutella-connect-2
-#etc/l7-protocols/testing/data/gnutella-udp-a-1
-#etc/l7-protocols/testing/data/gnutella-udp-b-1
-#etc/l7-protocols/testing/data/gnutella-udp-c-1
-#etc/l7-protocols/testing/data/http-digg-304-1
-#etc/l7-protocols/testing/data/http-digg-304-2
-#etc/l7-protocols/testing/data/http-wunderground-1
-#etc/l7-protocols/testing/data/http-wunderground-2
-#etc/l7-protocols/testing/data/imap-1
-#etc/l7-protocols/testing/data/imap-2
-#etc/l7-protocols/testing/data/imap-3
-#etc/l7-protocols/testing/data/imap-4
-#etc/l7-protocols/testing/data/imap-5
-#etc/l7-protocols/testing/data/imap-6
-#etc/l7-protocols/testing/data/ipp-1
-#etc/l7-protocols/testing/data/jabber-1
-#etc/l7-protocols/testing/data/jabber-2
-#etc/l7-protocols/testing/data/jabber-3
-#etc/l7-protocols/testing/data/jabber-4
-#etc/l7-protocols/testing/data/jabber-5
-#etc/l7-protocols/testing/data/jabber-6
-#etc/l7-protocols/testing/data/skypeout-a-1
-#etc/l7-protocols/testing/data/skypeout-a-2
-#etc/l7-protocols/testing/data/skypeout-a-3
-#etc/l7-protocols/testing/data/skypeout-a-4
-#etc/l7-protocols/testing/data/skypeout-a-5
-#etc/l7-protocols/testing/data/skypeout-a-6
-#etc/l7-protocols/testing/data/skypeout-b-1
-#etc/l7-protocols/testing/data/skypeout-b-2
-#etc/l7-protocols/testing/data/skypeout-b-3
-#etc/l7-protocols/testing/data/skypeout-b-4
-#etc/l7-protocols/testing/data/skypeout-b-5
-#etc/l7-protocols/testing/data/skypeout-b-6
-#etc/l7-protocols/testing/data/skypeout-b-7
-#etc/l7-protocols/testing/data/skypeout-b-8
-#etc/l7-protocols/testing/data/skypeout-b-9
-#etc/l7-protocols/testing/data/skypeout-c-1
-#etc/l7-protocols/testing/data/skypeout-c-2
-#etc/l7-protocols/testing/data/skypeout-c-3
-#etc/l7-protocols/testing/data/skypeout-c-4
-#etc/l7-protocols/testing/data/skypeout-c-5
-#etc/l7-protocols/testing/data/skypeout-c-6
-#etc/l7-protocols/testing/data/skypeout-c-7
-#etc/l7-protocols/testing/data/skypeout-c-8
-#etc/l7-protocols/testing/data/skypeout-c-9
-#etc/l7-protocols/testing/data/ssdp-1
-#etc/l7-protocols/testing/data/ssh-1
-#etc/l7-protocols/testing/data/ssh-2
-#etc/l7-protocols/testing/data/ssh-3
-#etc/l7-protocols/testing/data/ssh-4
-#etc/l7-protocols/testing/data/ssh-5
-#etc/l7-protocols/testing/data/ssh-6
-#etc/l7-protocols/testing/data/validcertssl-1
-#etc/l7-protocols/testing/data/validcertssl-2
-#etc/l7-protocols/testing/data/validcertssl-3
-#etc/l7-protocols/testing/data/validcertssl-4
-#etc/l7-protocols/testing/data/validcertssl-5
-#etc/l7-protocols/testing/data/validcertssl-6
-#etc/l7-protocols/testing/data/winmx-1
-#etc/l7-protocols/testing/data/winmx-2
-#etc/l7-protocols/testing/data/winmx-3
-#etc/l7-protocols/testing/data/x11-1
-#etc/l7-protocols/testing/data/x11-2
-#etc/l7-protocols/testing/data/x11-3
-#etc/l7-protocols/testing/data/x11-4
-#etc/l7-protocols/testing/data/x11-5
-#etc/l7-protocols/testing/data/yahoo-1
-#etc/l7-protocols/testing/data/yahoo-2
-#etc/l7-protocols/testing/data/yahoo-3
-#etc/l7-protocols/testing/data/yahoo-4
-#etc/l7-protocols/testing/match.c
-#etc/l7-protocols/testing/randchars.c
-#etc/l7-protocols/testing/randprintable.c
-#etc/l7-protocols/testing/regexp
-#etc/l7-protocols/testing/regexp/regerror.c
-#etc/l7-protocols/testing/regexp/regexp.c
-#etc/l7-protocols/testing/regexp/regexp.h
-#etc/l7-protocols/testing/regexp/regmagic.h
-#etc/l7-protocols/testing/regexp/regsub.c
-#etc/l7-protocols/testing/test_match.sh
-#etc/l7-protocols/testing/test_speed.c
-#etc/l7-protocols/testing/timeit.sh

diff --git a/config/rootfiles/updater/filelists/openswan b/config/rootfiles/updater/filelists/openswan
new file mode 100644 (file)
index 0000000..34ffe89
--- /dev/null
+++ b/config/rootfiles/updater/filelists/openswan
@@ -0,0 +1,304 @@
+etc/ipsec.conf
+#etc/ipsec.d
+etc/ipsec.d/aacerts
+etc/ipsec.d/cacerts
+etc/ipsec.d/certs
+etc/ipsec.d/crls
+#etc/ipsec.d/examples
+#etc/ipsec.d/examples/l2tp-cert-orgWIN2KXP.conf
+#etc/ipsec.d/examples/l2tp-cert.conf
+#etc/ipsec.d/examples/l2tp-psk-orgWIN2KXP.conf
+#etc/ipsec.d/examples/l2tp-psk.conf
+#etc/ipsec.d/examples/linux-linux.conf
+#etc/ipsec.d/examples/no_oe.conf
+#etc/ipsec.d/examples/sysctl.conf
+etc/ipsec.d/ocspcerts
+etc/ipsec.d/policies
+#etc/ipsec.d/policies/block
+#etc/ipsec.d/policies/clear
+#etc/ipsec.d/policies/clear-or-private
+#etc/ipsec.d/policies/private
+#etc/ipsec.d/policies/private-or-clear
+etc/ipsec.d/private
+etc/ipsec.secrets
+#etc/rc.d/init.d/ipsec.old
+#etc/rc.d/rc0.d/K76ipsec
+#etc/rc.d/rc1.d
+#etc/rc.d/rc1.d/K76ipsec
+#etc/rc.d/rc2.d
+#etc/rc.d/rc2.d/S47ipsec
+#etc/rc.d/rc3.d/S47ipsec
+#etc/rc.d/rc4.d
+#etc/rc.d/rc4.d/S47ipsec
+#etc/rc.d/rc5.d
+#etc/rc.d/rc5.d/S47ipsec
+#etc/rc.d/rc6.d/K76ipsec
+usr/lib/ipsec
+#usr/lib/ipsec/_confread
+#usr/lib/ipsec/_copyright
+#usr/lib/ipsec/_include
+#usr/lib/ipsec/_keycensor
+#usr/lib/ipsec/_plutoload
+#usr/lib/ipsec/_plutorun
+#usr/lib/ipsec/_realsetup
+#usr/lib/ipsec/_secretcensor
+#usr/lib/ipsec/_startklips
+#usr/lib/ipsec/_updown
+#usr/lib/ipsec/_updown_x509
+usr/libexec/ipsec
+#usr/libexec/ipsec/_pluto_adns
+#usr/libexec/ipsec/auto
+#usr/libexec/ipsec/barf
+#usr/libexec/ipsec/calcgoo
+#usr/libexec/ipsec/eroute
+#usr/libexec/ipsec/ikeping
+#usr/libexec/ipsec/klipsdebug
+#usr/libexec/ipsec/livetest
+#usr/libexec/ipsec/look
+#usr/libexec/ipsec/mailkey
+#usr/libexec/ipsec/manual
+#usr/libexec/ipsec/newhostkey
+#usr/libexec/ipsec/pf_key
+#usr/libexec/ipsec/pluto
+#usr/libexec/ipsec/ranbits
+#usr/libexec/ipsec/rsasigkey
+#usr/libexec/ipsec/secrets
+#usr/libexec/ipsec/setup
+#usr/libexec/ipsec/showdefaults
+#usr/libexec/ipsec/showhostkey
+#usr/libexec/ipsec/spi
+#usr/libexec/ipsec/spigrp
+#usr/libexec/ipsec/tncfg
+#usr/libexec/ipsec/verify
+#usr/libexec/ipsec/whack
+#usr/man/man3/ipsec_addrbytesof.3
+#usr/man/man3/ipsec_addrbytesptr.3
+#usr/man/man3/ipsec_addrcmp.3
+#usr/man/man3/ipsec_addrinsubnet.3
+#usr/man/man3/ipsec_addrlenof.3
+#usr/man/man3/ipsec_addrtoa.3
+#usr/man/man3/ipsec_addrtosubnet.3
+#usr/man/man3/ipsec_addrtot.3
+#usr/man/man3/ipsec_addrtypeof.3
+#usr/man/man3/ipsec_anyaddr.3
+#usr/man/man3/ipsec_atoaddr.3
+#usr/man/man3/ipsec_atoasr.3
+#usr/man/man3/ipsec_atosubnet.3
+#usr/man/man3/ipsec_atoul.3
+#usr/man/man3/ipsec_bitstomask.3
+#usr/man/man3/ipsec_broadcastof.3
+#usr/man/man3/ipsec_copyright_notice.3
+#usr/man/man3/ipsec_datatot.3
+#usr/man/man3/ipsec_goodmask.3
+#usr/man/man3/ipsec_hostof.3
+#usr/man/man3/ipsec_initaddr.3
+#usr/man/man3/ipsec_initsaid.3
+#usr/man/man3/ipsec_initsubnet.3
+#usr/man/man3/ipsec_isanyaddr.3
+#usr/man/man3/ipsec_isloopbackaddr.3
+#usr/man/man3/ipsec_isunspecaddr.3
+#usr/man/man3/ipsec_loopbackaddr.3
+#usr/man/man3/ipsec_maskof.3
+#usr/man/man3/ipsec_masktobits.3
+#usr/man/man3/ipsec_masktocount.3
+#usr/man/man3/ipsec_networkof.3
+#usr/man/man3/ipsec_optionsfrom.3
+#usr/man/man3/ipsec_portof.3
+#usr/man/man3/ipsec_rangetoa.3
+#usr/man/man3/ipsec_rangetosubnet.3
+#usr/man/man3/ipsec_sameaddr.3
+#usr/man/man3/ipsec_sameaddrtype.3
+#usr/man/man3/ipsec_samesaid.3
+#usr/man/man3/ipsec_samesubnet.3
+#usr/man/man3/ipsec_samesubnettype.3
+#usr/man/man3/ipsec_satot.3
+#usr/man/man3/ipsec_setportof.3
+#usr/man/man3/ipsec_sockaddrlenof.3
+#usr/man/man3/ipsec_sockaddrof.3
+#usr/man/man3/ipsec_subnetinsubnet.3
+#usr/man/man3/ipsec_subnetishost.3
+#usr/man/man3/ipsec_subnetof.3
+#usr/man/man3/ipsec_subnettoa.3
+#usr/man/man3/ipsec_subnettot.3
+#usr/man/man3/ipsec_subnettypeof.3
+#usr/man/man3/ipsec_tnatoaddr.3
+#usr/man/man3/ipsec_ttoaddr.3
+#usr/man/man3/ipsec_ttodata.3
+#usr/man/man3/ipsec_ttosa.3
+#usr/man/man3/ipsec_ttosubnet.3
+#usr/man/man3/ipsec_ttoul.3
+#usr/man/man3/ipsec_ultoa.3
+#usr/man/man3/ipsec_ultot.3
+#usr/man/man3/ipsec_unspecaddr.3
+#usr/man/man3/ipsec_version.3
+#usr/man/man3/ipsec_version_code.3
+#usr/man/man3/ipsec_version_string.3
+#usr/man/man5/ipsec.conf.5
+#usr/man/man5/ipsec.secrets.5
+#usr/man/man5/ipsec_eroute.5
+#usr/man/man5/ipsec_klipsdebug.5
+#usr/man/man5/ipsec_spi.5
+#usr/man/man5/ipsec_spigrp.5
+#usr/man/man5/ipsec_tncfg.5
+#usr/man/man5/ipsec_trap_count.5
+#usr/man/man5/ipsec_trap_sendcount.5
+#usr/man/man5/ipsec_version.5
+#usr/man/man5/pf_key.5
+#usr/man/man8/ipsec.8
+#usr/man/man8/ipsec__confread.8
+#usr/man/man8/ipsec__copyright.8
+#usr/man/man8/ipsec__include.8
+#usr/man/man8/ipsec__keycensor.8
+#usr/man/man8/ipsec__plutoload.8
+#usr/man/man8/ipsec__plutorun.8
+#usr/man/man8/ipsec__realsetup.8
+#usr/man/man8/ipsec__secretcensor.8
+#usr/man/man8/ipsec__startklips.8
+#usr/man/man8/ipsec__updown.8
+#usr/man/man8/ipsec__updown_x509.8
+#usr/man/man8/ipsec_auto.8
+#usr/man/man8/ipsec_barf.8
+#usr/man/man8/ipsec_calcgoo.8
+#usr/man/man8/ipsec_eroute.8
+#usr/man/man8/ipsec_ikeping.8
+#usr/man/man8/ipsec_klipsdebug.8
+#usr/man/man8/ipsec_livetest.8
+#usr/man/man8/ipsec_look.8
+#usr/man/man8/ipsec_mailkey.8
+#usr/man/man8/ipsec_manual.8
+#usr/man/man8/ipsec_newhostkey.8
+#usr/man/man8/ipsec_pf_key.8
+#usr/man/man8/ipsec_pluto.8
+#usr/man/man8/ipsec_ranbits.8
+#usr/man/man8/ipsec_rsasigkey.8
+#usr/man/man8/ipsec_secrets.8
+#usr/man/man8/ipsec_setup.8
+#usr/man/man8/ipsec_showdefaults.8
+#usr/man/man8/ipsec_showhostkey.8
+#usr/man/man8/ipsec_spi.8
+#usr/man/man8/ipsec_spigrp.8
+#usr/man/man8/ipsec_tncfg.8
+#usr/man/man8/ipsec_verify.8
+usr/sbin/ipsec
+#usr/share/doc/openswan
+#usr/share/doc/openswan/index.html
+#usr/share/doc/openswan/ipsec.8.html
+#usr/share/doc/openswan/ipsec.conf-sample
+#usr/share/doc/openswan/ipsec.conf.5.html
+#usr/share/doc/openswan/ipsec.secrets.5.html
+#usr/share/doc/openswan/ipsec__confread.8.html
+#usr/share/doc/openswan/ipsec__copyright.8.html
+#usr/share/doc/openswan/ipsec__include.8.html
+#usr/share/doc/openswan/ipsec__keycensor.8.html
+#usr/share/doc/openswan/ipsec__plutoload.8.html
+#usr/share/doc/openswan/ipsec__plutorun.8.html
+#usr/share/doc/openswan/ipsec__realsetup.8.html
+#usr/share/doc/openswan/ipsec__secretcensor.8.html
+#usr/share/doc/openswan/ipsec__startklips.8.html
+#usr/share/doc/openswan/ipsec__updown.8.html
+#usr/share/doc/openswan/ipsec__updown_x509.8.html
+#usr/share/doc/openswan/ipsec_addrbytesof.3.html
+#usr/share/doc/openswan/ipsec_addrbytesptr.3.html
+#usr/share/doc/openswan/ipsec_addrcmp.3.html
+#usr/share/doc/openswan/ipsec_addrinsubnet.3.html
+#usr/share/doc/openswan/ipsec_addrlenof.3.html
+#usr/share/doc/openswan/ipsec_addrtoa.3.html
+#usr/share/doc/openswan/ipsec_addrtosubnet.3.html
+#usr/share/doc/openswan/ipsec_addrtot.3.html
+#usr/share/doc/openswan/ipsec_addrtypeof.3.html
+#usr/share/doc/openswan/ipsec_anyaddr.3.html
+#usr/share/doc/openswan/ipsec_atoaddr.3.html
+#usr/share/doc/openswan/ipsec_atoasr.3.html
+#usr/share/doc/openswan/ipsec_atosubnet.3.html
+#usr/share/doc/openswan/ipsec_atoul.3.html
+#usr/share/doc/openswan/ipsec_auto.8.html
+#usr/share/doc/openswan/ipsec_barf.8.html
+#usr/share/doc/openswan/ipsec_bitstomask.3.html
+#usr/share/doc/openswan/ipsec_broadcastof.3.html
+#usr/share/doc/openswan/ipsec_calcgoo.8.html
+#usr/share/doc/openswan/ipsec_copyright_notice.3.html
+#usr/share/doc/openswan/ipsec_datatot.3.html
+#usr/share/doc/openswan/ipsec_eroute.5.html
+#usr/share/doc/openswan/ipsec_eroute.8.html
+#usr/share/doc/openswan/ipsec_goodmask.3.html
+#usr/share/doc/openswan/ipsec_hostof.3.html
+#usr/share/doc/openswan/ipsec_ikeping.8.html
+#usr/share/doc/openswan/ipsec_initaddr.3.html
+#usr/share/doc/openswan/ipsec_initsaid.3.html
+#usr/share/doc/openswan/ipsec_initsubnet.3.html
+#usr/share/doc/openswan/ipsec_isanyaddr.3.html
+#usr/share/doc/openswan/ipsec_isloopbackaddr.3.html
+#usr/share/doc/openswan/ipsec_isunspecaddr.3.html
+#usr/share/doc/openswan/ipsec_keyblobtoid.3.html
+#usr/share/doc/openswan/ipsec_klipsdebug.5.html
+#usr/share/doc/openswan/ipsec_klipsdebug.8.html
+#usr/share/doc/openswan/ipsec_livetest.8.html
+#usr/share/doc/openswan/ipsec_look.8.html
+#usr/share/doc/openswan/ipsec_loopbackaddr.3.html
+#usr/share/doc/openswan/ipsec_lwdnsq.8.html
+#usr/share/doc/openswan/ipsec_mailkey.8.html
+#usr/share/doc/openswan/ipsec_manual.8.html
+#usr/share/doc/openswan/ipsec_maskof.3.html
+#usr/share/doc/openswan/ipsec_masktobits.3.html
+#usr/share/doc/openswan/ipsec_masktocount.3.html
+#usr/share/doc/openswan/ipsec_networkof.3.html
+#usr/share/doc/openswan/ipsec_newhostkey.8.html
+#usr/share/doc/openswan/ipsec_optionsfrom.3.html
+#usr/share/doc/openswan/ipsec_pf_key.5.html
+#usr/share/doc/openswan/ipsec_pf_key.8.html
+#usr/share/doc/openswan/ipsec_pluto.8.html
+#usr/share/doc/openswan/ipsec_portof.3.html
+#usr/share/doc/openswan/ipsec_prng.3.html
+#usr/share/doc/openswan/ipsec_prng_bytes.3.html
+#usr/share/doc/openswan/ipsec_prng_final.3.html
+#usr/share/doc/openswan/ipsec_prng_init.3.html
+#usr/share/doc/openswan/ipsec_ranbits.8.html
+#usr/share/doc/openswan/ipsec_rangetoa.3.html
+#usr/share/doc/openswan/ipsec_rangetosubnet.3.html
+#usr/share/doc/openswan/ipsec_rsasigkey.8.html
+#usr/share/doc/openswan/ipsec_sameaddr.3.html
+#usr/share/doc/openswan/ipsec_sameaddrtype.3.html
+#usr/share/doc/openswan/ipsec_samesaid.3.html
+#usr/share/doc/openswan/ipsec_samesubnet.3.html
+#usr/share/doc/openswan/ipsec_samesubnettype.3.html
+#usr/share/doc/openswan/ipsec_satot.3.html
+#usr/share/doc/openswan/ipsec_secrets.8.html
+#usr/share/doc/openswan/ipsec_send-pr.8.html
+#usr/share/doc/openswan/ipsec_setportof.3.html
+#usr/share/doc/openswan/ipsec_setup.8.html
+#usr/share/doc/openswan/ipsec_showdefaults.8.html
+#usr/share/doc/openswan/ipsec_showhostkey.8.html
+#usr/share/doc/openswan/ipsec_showpolicy.8.html
+#usr/share/doc/openswan/ipsec_sockaddrlenof.3.html
+#usr/share/doc/openswan/ipsec_sockaddrof.3.html
+#usr/share/doc/openswan/ipsec_spi.5.html
+#usr/share/doc/openswan/ipsec_spi.8.html
+#usr/share/doc/openswan/ipsec_spigrp.5.html
+#usr/share/doc/openswan/ipsec_spigrp.8.html
+#usr/share/doc/openswan/ipsec_splitkeytoid.3.html
+#usr/share/doc/openswan/ipsec_starter.8.html
+#usr/share/doc/openswan/ipsec_subnetinsubnet.3.html
+#usr/share/doc/openswan/ipsec_subnetishost.3.html
+#usr/share/doc/openswan/ipsec_subnetof.3.html
+#usr/share/doc/openswan/ipsec_subnettoa.3.html
+#usr/share/doc/openswan/ipsec_subnettot.3.html
+#usr/share/doc/openswan/ipsec_subnettypeof.3.html
+#usr/share/doc/openswan/ipsec_tnatoaddr.3.html
+#usr/share/doc/openswan/ipsec_tncfg.5.html
+#usr/share/doc/openswan/ipsec_tncfg.8.html
+#usr/share/doc/openswan/ipsec_trap_count.5.html
+#usr/share/doc/openswan/ipsec_trap_sendcount.5.html
+#usr/share/doc/openswan/ipsec_ttoaddr.3.html
+#usr/share/doc/openswan/ipsec_ttodata.3.html
+#usr/share/doc/openswan/ipsec_ttosa.3.html
+#usr/share/doc/openswan/ipsec_ttosubnet.3.html
+#usr/share/doc/openswan/ipsec_ttoul.3.html
+#usr/share/doc/openswan/ipsec_ultoa.3.html
+#usr/share/doc/openswan/ipsec_ultot.3.html
+#usr/share/doc/openswan/ipsec_unspecaddr.3.html
+#usr/share/doc/openswan/ipsec_verify.8.html
+#usr/share/doc/openswan/ipsec_version.3.html
+#usr/share/doc/openswan/ipsec_version.5.html
+#usr/share/doc/openswan/ipsec_version_code.3.html
+#usr/share/doc/openswan/ipsec_version_string.3.html
+var/run/pluto

diff --git a/config/rootfiles/updater/filelists/other b/config/rootfiles/updater/filelists/other
new file mode 100644 (file)
index 0000000..c510b1f
--- /dev/null
+++ b/config/rootfiles/updater/filelists/other
@@ -0,0 +1,10 @@
+etc/udev/dvb.sh
+etc/udev/rules.d/10-dvb.rules
+etc/udev/rules.d/55-scsi-cdrom.rules
+etc/rc.d/init.d/network
+etc/rc.d/init.d/networking/any
+etc/rc.d/init.d/networking/red
+etc/rc.d/init.d/networking/red.up/40-ipac
+usr/local/bin/getiptstate
+usr/local/bin/makegraphs
+srv/web/ipfire/cgi-bin/traffic.cgi

diff --git a/config/rootfiles/updater/filelists/vnstat b/config/rootfiles/updater/filelists/vnstat
index 715250602fba12e867d0b902d4328b7c09c065e8..bc657fce586de6fe9a8031a7b00f6aa3fb2a167c 100644 (file)
--- a/config/rootfiles/updater/filelists/vnstat
+++ b/config/rootfiles/updater/filelists/vnstat
@@ -1,5 +1,5 @@
-/etc/cron.d
-/etc/cron.d/vnstat
+#/etc/cron.d
+#/etc/cron.d/vnstat

 /etc/vnstat.conf
 /usr/bin/vnstat
 #usr/share/man/man1/vnstat.1
 /etc/vnstat.conf
 /usr/bin/vnstat
 #usr/share/man/man1/vnstat.1

diff --git a/lfs/updater b/lfs/updater
index 993e4293e32dc20f6e38c5b6704f935aa981f874..3ea49b8c27d466bc976e5c1811ad81b25c5417bc 100644 (file)
--- a/lfs/updater
+++ b/lfs/updater
@@ -59,17 +59,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        rm -f /tmp/ROOTFILES
        tar -x -C /tmp -f /$(SNAME).tar
        rm -f /$(SNAME).tar
        rm -f /tmp/ROOTFILES
        tar -x -C /tmp -f /$(SNAME).tar
        rm -f /$(SNAME).tar

-       cd /tmp && tar cf /install/updater/files * && rm -rf *
-       tar tf /install/updater/files > /install/updater/ROOTFILES
+       cd /tmp && tar jcf /install/updater/files.ipfire * && rm -rf *
+

        # Other files
        cp $(DIR_SRC)/config/rootfiles/updater/update.sh /install/updater/
        chmod 755 /install/updater/update.sh
        # Other files
        cp $(DIR_SRC)/config/rootfiles/updater/update.sh /install/updater/
        chmod 755 /install/updater/update.sh

-       cd /install/updater && tar cf ../packages/updater-$(SNAME)-$(VERSION).ipfire \
-               update.sh files ROOTFILES
+       cd /install/updater && tar jcf ../images/updater-$(SNAME)-$(VERSION).tar.bz2 \
+               update.sh files.ipfire

        rm -rf /install/updater
        rm -rf /install/updater

-#      sed -e "s/NAME/updater/g" \
-#              -e "s/VER/$(VERSION)/g" \
-#              -e "s/RELEASE/$$(basename $@)/g" \
-#              -e "s/DEPS/$(DEPS)/g" \
-#              -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-$(VERSION)-$$(basename $@).ipfire | awk '{ print $$5 }'`/g" \
-#              < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-$$(basename $@)

diff --git a/make.sh b/make.sh
index 1ce7c6924b2aff9772da7e5b98cdae90ed8cf911..ec6c79e7fb257e116bbae02370f28d9a637fe706 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -647,10 +647,10 @@ buildpackages() {
   if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
        ipfiremake usb-stick
   fi
   if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
        ipfiremake usb-stick
   fi

-  mv $LFS/install/images/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1

 
   # Create updater package
   ipfiremake updater
 
   # Create updater package
   ipfiremake updater

+  mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1

 
   ipfirepackages
 
 
   ipfirepackages