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 5e818d6afbfafec7ee11a30eb3ef36240d5ccde6 (commit) via 76fd8bcf7be92abeae859c9ab618b30d2ea32467 (commit) from 4bdbf22ee4609aed3cc378f80a1eb656ed68a634 (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 5e818d6afbfafec7ee11a30eb3ef36240d5ccde6 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Oct 23 00:17:38 2016 +0200
log.dat: cosmetical upgrade
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 76fd8bcf7be92abeae859c9ab618b30d2ea32467 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Oct 23 16:09:19 2016 +0200
hdparm: Update to 9.50
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: html/cgi-bin/logs.cgi/log.dat | 70 +++++++++++++++++++++++-------------------- lfs/hdparm | 4 +-- 2 files changed, 39 insertions(+), 35 deletions(-)
Difference in files: diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 82b6aa0..138bf9b 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -49,50 +49,54 @@ $cgiparams{'ACTION'} = ''; $cgiparams{'SECTION'} = 'ipfire';
my %sections = ( - 'ipfire' => '(ipfire: )', - 'red' => '(red:|pppd[.*]: |chat[.*]|pppoe[.*]|pptp[.*]|pppoa[.*]|pppoa3[.*]|pppoeci[.*]|ipppd|ipppd[.*]|kernel: ippp\d|kernel: isdn.*|ibod[.*]|dhcpcd[.*]|modem_run[.*])', - 'ddns' => '(ddns[\d+]:)', - 'dns' => '(dnsmasq[.*]: |unbound[.*]: )', - 'dma' => '(dma[.*]: )', - 'dhcp' => '(dhcpd: )', + 'auth' => '(\w+(pam_unix)[.*]: )', 'clamav' => '(clamd[.*]: |freshclam[.*]: )', 'collectd' => '(collectd[.*]: )', 'cron' => '(fcron[.*]: )', - 'ntp' => '(ntpd(?:ate)?[.*]: )', - 'ssh' => '(sshd(?:(.*))?[.*]: )', - 'auth' => '(\w+(pam_unix)[.*]: )', - 'kernel' => '(kernel: (?!DROP_))', + 'ddns' => '(ddns[\d+]:)', + 'dhcp' => '(dhcpd: )', + 'dma' => '(dma[.*]: )', + 'dnsmasq' => '(dnsmasq[.*]: )', + 'unbound' => '(unbound: [.*:.*])(.*:.*$)', + 'guardian' => '(guardian[.*]: )', + 'ipfire' => '(ipfire: )', 'ipsec' => '(ipsec_[\w_]+: |pluto[.*]: |charon: |vpnwatch: )', + 'kernel' => '(kernel: (?!DROP_))', + 'ntp' => '(ntpd(?:ate)?[.*]: )', 'openvpn' => '(openvpnserver[.*]: |.*n2n[.*]: )', - 'pakfire' => '(pakfire:) ', - 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) ', - 'squid' => '(squid[.*]: |squid: )', + 'pakfire' => '(pakfire:)', + 'red' => '(red:|pppd[.*]: |chat[.*]|pppoe[.*]|pptp[.*]|pppoa[.*]|pppoa3[.*]|pppoeci[.*]|ipppd|ipppd[.*]|kernel: ippp\d|kernel: isdn.*|ibod[.*]|dhcpcd[.*]|modem_run[.*])', 'snort' => '(snort[.*]: )', - 'guardian' => '(guardian[.*]: )' + 'squid' => '(squid[.*]: |squid: )', + 'ssh' => '(sshd(?:(.*))?[.*]: )', + 'urlfilter bl' => '(installpackage[urlfilter]: )', + 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:)' );
# Translations for the %sections array. my %trsections = ( - 'ipfire' => 'IPFire', - 'red' => 'RED', + 'auth' => "$Lang::tr{'loginlogout'}", + 'clamav' => 'ClamAV', + 'collectd' => 'Collectd', + 'cron' => 'Cron', 'ddns' => "$Lang::tr{'dynamic dns'}", - 'dns' => 'DNS', - 'dma' => 'Mail', 'dhcp' => "$Lang::tr{'dhcp server'}", - 'cron' => 'Cron', - 'collectd' => 'Collectd', - 'clamav' => 'ClamAV', - 'ntp' => 'NTP', - 'ssh' => 'SSH', - 'auth' => "$Lang::tr{'loginlogout'}", - 'kernel' => "$Lang::tr{'kernel'}", + 'dma' => 'Mail', + 'dnsmasq' => 'DNS: Dnsmasq', + 'unbound' => 'DNS: Unbound', + 'guardian' => "$Lang::tr{'guardian'}", + 'ipfire' => 'IPFire', 'ipsec' => 'IPSec', + 'kernel' => "$Lang::tr{'kernel'}", + 'ntp' => 'NTP', 'openvpn' => 'OpenVPN', 'pakfire' => 'Pakfire', - 'wireless' => 'Wireless', - 'squid' => "$Lang::tr{'web proxy'}", + 'red' => 'RED', 'snort' => "$Lang::tr{'intrusion detection'}", - 'guardian' => "$Lang::tr{'guardian'}" + 'squid' => "$Lang::tr{'web proxy'}", + 'ssh' => 'SSH', + 'urlfilter bl' => 'URLFilter Blacklist', + 'wireless' => 'Wireless' );
@@ -212,7 +216,7 @@ while ($gzindex >=0 && $loop) { READ:while (<FILE>) { my $line = $_; if ($line =~ /^${monthstr} ${daystr} ..:..:.. [\w-]+ ${section}(.*)/) { - # when standart viewing, just keep in memory the correct slice + # when standard viewing, just keep in memory the correct slice # it starts a '$start' and size is $viewport # If export, then keep all lines... if ($cgiparams{'ACTION'} eq $Lang::tr{'export'}){ @@ -223,7 +227,7 @@ while ($gzindex >=0 && $loop) { if (@log > $Header::viewsize) { shift (@log); } - #} else { dont do this optimisation, need to count lines ! + #} else { don't do this optimisation, need to count lines ! # $datetime = $maxtime; # we have read viewsize lines, stop main loop # last READ; # exit read file } @@ -288,7 +292,7 @@ print <<END <select name='SECTION'> END ; -foreach $section (keys %sections) { +foreach $section (sort {$trsections{$a} cmp $trsections{$b}} keys %sections) { print "\t<option "; if ($section eq $cgiparams{'SECTION'}) { print "selected='selected' "; } @@ -369,8 +373,8 @@ print <<END <table width='100%' class='tbl'> <tr> <th width='10%' align='center' class='boldbase'><b>$Lang::tr{'time'}</b></th> - <th width='10%' align='center' class='boldbase'><b>$Lang::tr{'section'}</b></th> - <th width='80%'> </th> + <th width='15%' align='center' class='boldbase'><b>$Lang::tr{'section'}</b></th> + <th width='75%'> </th> </tr> END ; diff --git a/lfs/hdparm b/lfs/hdparm index e4e9ac1..6c7dc4d 100644 --- a/lfs/hdparm +++ b/lfs/hdparm @@ -24,7 +24,7 @@
include Config
-VER = 9.48 +VER = 9.50
THISAPP = hdparm-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 213efdbe7471fad3408198918e164354 +$(DL_FILE)_MD5 = d380062ad6c4b40076736efbb640f1f5
install : $(TARGET)
hooks/post-receive -- IPFire 2.x development tree