From 7a5ed24ecc0ec2476f09478e6fe74e1f833b4b29 Mon Sep 17 00:00:00 2001 From: Maniacikarus Date: Sun, 21 Sep 2008 18:57:06 +0200 Subject: [PATCH] Upgraded collectd to 4.5 need to check for iptables errors Upgraded ntfs3g to current stable Fixed rootfiles of squidGuard mpfire and tripwire Added a little script to check rootfiles for updates --- config/rootfiles/common/collectd | 11 ++++++--- config/rootfiles/common/ntfs-3g | 12 ++++++--- config/rootfiles/common/squidguard | 4 ++- config/rootfiles/core/17/files | 6 +++++ config/rootfiles/core/17/update.sh | 2 ++ config/rootfiles/packages/mpfire | 29 ++++++++++++++++------ config/rootfiles/packages/tripwire | 4 +++ doc/packages-list.txt | 2 +- lfs/collectd | 4 +-- lfs/ntfs-3g | 4 +-- make.sh | 4 +++ tools/checknewlog.pl | 39 ++++++++++++++++++++++++++++++ 12 files changed, 101 insertions(+), 20 deletions(-) create mode 100755 tools/checknewlog.pl diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd index 8e6aeead0d..42fcbb1c79 100644 --- a/config/rootfiles/common/collectd +++ b/config/rootfiles/common/collectd @@ -2,7 +2,6 @@ etc/collectd.conf etc/rc.d/rc0.d/K50collectd etc/rc.d/rc3.d/S21collectd etc/rc.d/rc6.d/K50collectd -etc/rc.d/init.d/collectd #usr/bin/collectd-nagios #usr/etc/collectd.conf #usr/lib/collectd @@ -30,6 +29,8 @@ usr/lib/collectd/email.so usr/lib/collectd/entropy.so #usr/lib/collectd/exec.la usr/lib/collectd/exec.so +usr/lib/collectd/filecount.la +usr/lib/collectd/filecount.so #usr/lib/collectd/hddtemp.la usr/lib/collectd/hddtemp.so #usr/lib/collectd/interface.la @@ -72,6 +73,8 @@ usr/lib/collectd/tail.so usr/lib/collectd/tcpconns.so #usr/lib/collectd/teamspeak2.la usr/lib/collectd/teamspeak2.so +usr/lib/collectd/thermal.la +usr/lib/collectd/thermal.so usr/lib/collectd/types.db #usr/lib/collectd/unixsock.la usr/lib/collectd/unixsock.so @@ -79,10 +82,10 @@ usr/lib/collectd/unixsock.so usr/lib/collectd/users.so #usr/lib/collectd/uuid.la usr/lib/collectd/uuid.so -#usr/lib/collectd/wireless.la -usr/lib/collectd/wireless.so #usr/lib/collectd/vmem.la usr/lib/collectd/vmem.so +#usr/lib/collectd/wireless.la +usr/lib/collectd/wireless.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 @@ -90,6 +93,8 @@ usr/lib/collectd/vmem.so #usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Collectd/.packlist usr/sbin/collectd usr/sbin/collectdmon +usr/share/collectd +usr/share/collectd/postgresql_default.conf #usr/share/man/man1/collectd-nagios.1 #usr/share/man/man1/collectd.1 #usr/share/man/man1/collectdmon.1 diff --git a/config/rootfiles/common/ntfs-3g b/config/rootfiles/common/ntfs-3g index b93e28409f..57a8e6cdf8 100644 --- a/config/rootfiles/common/ntfs-3g +++ b/config/rootfiles/common/ntfs-3g @@ -1,10 +1,9 @@ bin/ntfs-3g -#lib/libntfs-3g.a -#lib/libntfs-3g.la lib/libntfs-3g.so lib/libntfs-3g.so.36 lib/libntfs-3g.so.36.0.0 sbin/mount.ntfs-3g +usr/bin/ntfs-3g.probe #usr/include/ntfs-3g #usr/include/ntfs-3g/attrib.h #usr/include/ntfs-3g/attrlist.h @@ -22,10 +21,10 @@ sbin/mount.ntfs-3g #usr/include/ntfs-3g/inode.h #usr/include/ntfs-3g/layout.h #usr/include/ntfs-3g/lcnalloc.h -#usr/include/ntfs-3g/list.h #usr/include/ntfs-3g/logfile.h #usr/include/ntfs-3g/logging.h #usr/include/ntfs-3g/mft.h +#usr/include/ntfs-3g/misc.h #usr/include/ntfs-3g/mst.h #usr/include/ntfs-3g/ntfstime.h #usr/include/ntfs-3g/runlist.h @@ -35,5 +34,12 @@ sbin/mount.ntfs-3g #usr/include/ntfs-3g/unistr.h #usr/include/ntfs-3g/version.h #usr/include/ntfs-3g/volume.h +usr/lib/libntfs-3g.a +usr/lib/libntfs-3g.la +usr/lib/libntfs-3g.so +usr/lib/pkgconfig/libntfs-3g.pc +#usr/share/doc/ntfs-3g +#usr/share/doc/ntfs-3g/README #usr/share/man/man8/mount.ntfs-3g.8 #usr/share/man/man8/ntfs-3g.8 +#usr/share/man/man8/ntfs-3g.probe.8 diff --git a/config/rootfiles/common/squidguard b/config/rootfiles/common/squidguard index effa507818..8e8509c1de 100644 --- a/config/rootfiles/common/squidguard +++ b/config/rootfiles/common/squidguard @@ -3,6 +3,7 @@ etc/squidGuard/squidGuard.conf srv/web/ipfire/html/repository usr/bin/squidGuard usr/sbin/redirect_wrapper +#usr/squidGuard var/ipfire/urlfilter/autoupdate/autoupdate.urls var/ipfire/urlfilter/autoupdate/cron.daily var/ipfire/urlfilter/autoupdate/cron.monthly @@ -10,7 +11,6 @@ var/ipfire/urlfilter/autoupdate/cron.weekly var/ipfire/urlfilter/bin/autoupdate.pl var/ipfire/urlfilter/bin/prebuild.pl var/ipfire/urlfilter/blacklists -var/ipfire/urlfilter/settings #var/ipfire/urlfilter/blacklists/README #var/ipfire/urlfilter/blacklists/ads #var/ipfire/urlfilter/blacklists/ads/domains @@ -74,7 +74,9 @@ var/ipfire/urlfilter/settings #var/ipfire/urlfilter/blacklists/warez/domains.db #var/ipfire/urlfilter/blacklists/warez/urls #var/ipfire/urlfilter/blacklists/warez/urls.db +var/ipfire/urlfilter/settings var/ipfire/urlfilter/squidGuard.conf var/ipfire/urlfilter/version +var/lib/squidguard #var/log/squidGuard var/log/squidGuard/squidGuard.log diff --git a/config/rootfiles/core/17/files b/config/rootfiles/core/17/files index ee3c6c31e9..de473058a5 100644 --- a/config/rootfiles/core/17/files +++ b/config/rootfiles/core/17/files @@ -16,3 +16,9 @@ srv/web/ipfire/cgi-bin/qos.cgi usr/local/bin/qosd var/ipfire/qos/bin var/ipfire/langs +usr/lib/collectd/ +var/lib/collectd/ +usr/sbin/collectd +usr/sbin/collectdmon +usr/share/collectd +usr/share/collectd/postgresql_default.conf diff --git a/config/rootfiles/core/17/update.sh b/config/rootfiles/core/17/update.sh index d2f5f2a27c..8729dcdf65 100644 --- a/config/rootfiles/core/17/update.sh +++ b/config/rootfiles/core/17/update.sh @@ -2,8 +2,10 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 /etc/init.d/squid stop +/etc/init.d/collectd stop extract_files /etc/init.d/squid start +/etc/init.d/collectd start perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" perl /var/ipfire/qos/bin/migrate.pl /var/ipfire/updatexlrator/bin/convert diff --git a/config/rootfiles/packages/mpfire b/config/rootfiles/packages/mpfire index 4a66212601..b000fcc370 100644 --- a/config/rootfiles/packages/mpfire +++ b/config/rootfiles/packages/mpfire @@ -1,18 +1,31 @@ -usr/lib/perl5/site_perl/5.8.8/Audio/MPD -usr/lib/perl5/site_perl/5.8.8/Audio/MPD.pm -usr/lib/perl5/5.8.8/Readonly.pm usr/lib/perl5/5.8.8/Class/Accessor usr/lib/perl5/5.8.8/Class/Accessor.pm -usr/local/bin/mpfirectrl -srv/web/ipfire/cgi-bin/mpfire.cgi -srv/web/ipfire/html/images/mpfire +usr/lib/perl5/5.8.8/Class/Accessor/Fast.pm +usr/lib/perl5/5.8.8/Class/Accessor/Faster.pm +usr/lib/perl5/5.8.8/Readonly.pm +usr/lib/perl5/site_perl/5.8.8/Audio +#usr/lib/perl5/site_perl/5.8.8/Audio/MPD +#usr/lib/perl5/site_perl/5.8.8/Audio/MPD.pm +#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Collection.pm +#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common +#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common.pm +#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item +#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item.pm +#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item/Directory.pm +#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item/Playlist.pm +#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item/Song.pm +#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Stats.pm +#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Status.pm +#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Time.pm +#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Playlist.pm +#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Test.pm var/ipfire/backup/addons/includes/mpfire -var/ipfire/menu.d/EX-mpfire.menu var/ipfire/mpfire var/ipfire/mpfire/bin var/ipfire/mpfire/bin/mpfire.pl var/ipfire/mpfire/db var/ipfire/mpfire/db/mpd.db +var/ipfire/mpfire/mpd.conf var/ipfire/mpfire/playlist.m3u var/ipfire/mpfire/settings -var/ipfire/mpfire/mpd.conf +var/ipfire/mpfire/webradio diff --git a/config/rootfiles/packages/tripwire b/config/rootfiles/packages/tripwire index 2cb3a03887..b30e843bd0 100644 --- a/config/rootfiles/packages/tripwire +++ b/config/rootfiles/packages/tripwire @@ -5,5 +5,9 @@ usr/sbin/tripwire usr/sbin/twadmin usr/sbin/twprint var/ipfire/tripwire +#var/ipfire/tripwire/twcfg.default +#var/ipfire/tripwire/twcfg.txt +#var/ipfire/tripwire/twpol.default +#var/ipfire/tripwire/twpol.txt srv/web/ipfire/cgi-bin/tripwire.cgi var/ipfire/menu.d/EX-tripwire.menu diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 4065413e28..f06d2b0d6d 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -63,7 +63,7 @@ * centerim-4.22.1 * clamav-0.94 * cmake-2.4.8 -* collectd-4.4.2 +* collectd-4.5.0 * coreutils-5.96 * cpio-2.6 * cpufrequtils-004 diff --git a/lfs/collectd b/lfs/collectd index 9eaa3b306f..a13c986a59 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -25,7 +25,7 @@ include Config PKG_NAME = collectd -VER = 4.4.2 +VER = 4.5.0 THISAPP = collectd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = faee2bb6e38da1051fdd31762bdf3ab7 +$(DL_FILE)_MD5 = 8c6500784677fcd6ca1f6919bf9e7c85 install : $(TARGET) diff --git a/lfs/ntfs-3g b/lfs/ntfs-3g index 16e863ec5a..ddbf98836f 100644 --- a/lfs/ntfs-3g +++ b/lfs/ntfs-3g @@ -24,7 +24,7 @@ include Config -VER = 1.2812 +VER = 1.2918 THISAPP = ntfs-3g-$(VER) DL_FILE = $(THISAPP).tgz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b250a8d6603dc8c5411ee50bea444ccb +$(DL_FILE)_MD5 = 8d87f12702dd0d97c3aa269582159848 install : $(TARGET) diff --git a/make.sh b/make.sh index 721bc6c00b..43b08d0865 100755 --- a/make.sh +++ b/make.sh @@ -748,6 +748,10 @@ build) beautify build_stage "Building packages" buildpackages + + beautify build_stage "Checking Logfiles for new Files" + tools/checknewlog.pl + beautify build_end ;; shell) diff --git a/tools/checknewlog.pl b/tools/checknewlog.pl new file mode 100755 index 0000000000..14d2cf711c --- /dev/null +++ b/tools/checknewlog.pl @@ -0,0 +1,39 @@ +#!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2008 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 . # +# # +############################################################################### + + +opendir(DIR, "./log") || die; +my @FILES = readdir(DIR); +closedir(DIR); + +foreach(@FILES) { + my $Found = 0; + if ( $_ =~ /$\.log/ || $_ =~ /^\.+/ ){next;} +# print $_."\n"; + open(DATEI, "<./log/$_") || die "File not found"; + my @Lines = ; + close(DATEI); + foreach (@Lines){ + if ( $_ =~ /^\+/ ){$Found=1;} + + } + if ($Found){print "Changes in $_ check rootfile!\n";} +} -- 2.39.2