From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ea31a62aadf428e37a686568e5b95caf0fbc07b6 Date: Tue, 05 Feb 2013 08:10:36 +0100 Message-ID: <20130205071048.11BE8200DC@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5277981332983091520==" List-Id: --===============5277981332983091520== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 ea31a62aadf428e37a686568e5b95caf0fbc07b6 (commit) via 20d78d9e76d15992ebd9d4f0db783b7a83fb8f23 (commit) via d50fe89686deaa8527c81a7292e5eba0efa32a82 (commit) from d0abcb92d28020f2d786cba29fef69fc2fecccb7 (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 ea31a62aadf428e37a686568e5b95caf0fbc07b6 Author: Arne Fitzenreiter Date: Tue Feb 5 02:07:42 2013 +0100 graphs: add mmcblk to media graphs. commit 20d78d9e76d15992ebd9d4f0db783b7a83fb8f23 Author: Arne Fitzenreiter Date: Tue Feb 5 01:48:27 2013 +0100 hostapd: update to 2.0. commit d50fe89686deaa8527c81a7292e5eba0efa32a82 Author: Arne Fitzenreiter Date: Tue Feb 5 01:47:58 2013 +0100 wpa_supplicant: update to 2.0. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/66/filelists/files | 2 ++ html/cgi-bin/media.cgi | 6 +++--- lfs/hostapd | 8 ++++---- lfs/wpa_supplicant | 6 +++--- src/scripts/makegraphs | 4 ++-- 5 files changed, 14 insertions(+), 12 deletions(-) Difference in files: diff --git a/config/rootfiles/core/66/filelists/files b/config/rootfiles/core= /66/filelists/files index 7740615..5e38af7 100644 --- a/config/rootfiles/core/66/filelists/files +++ b/config/rootfiles/core/66/filelists/files @@ -27,6 +27,7 @@ opt/pakfire/lib/functions.sh srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat +srv/web/ipfire/cgi-bin/media.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/qos.cgi @@ -34,6 +35,7 @@ srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/updatexlrator.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/bin/watch +usr/local/bin/makegraphs usr/local/bin/readhash usr/local/bin/scanhd usr/sbin/ovpn-ccd-convert diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi index f67c178..52d9337 100644 --- a/html/cgi-bin/media.cgi +++ b/html/cgi-bin/media.cgi @@ -2,7 +2,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2011 IPFire Team = # +# Copyright (C) 2007-2013 IPFire Team = # # = # # 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 = # @@ -45,9 +45,9 @@ my @querry =3D split(/\?/,$ENV{'QUERY_STRING'}); $querry[0] =3D '' unless defined $querry[0]; $querry[1] =3D 'hour' unless defined $querry[1]; =20 -my @devices =3D `ls -1 /sys/block | grep -E '^sd|^xvd|^vd|^md' | sort | uniq= `; +my @devices =3D `ls -1 /sys/block | grep -E '^sd|^mmcblk|^xvd|^vd|^md' | sor= t | uniq`; =20 -if ( $querry[0] =3D~ "sd?" || $querry[0] =3D~ "xvd??" || $querry[0] =3D~ "vd= ?" || $querry[0] =3D~ "md*" ){ +if ( $querry[0] =3D~ "sd?" || $querry[0] =3D~ "mmcblk?" || $querry[0] =3D~ "= xvd??" || $querry[0] =3D~ "vd?" || $querry[0] =3D~ "md*" ){ print "Content-type: image/png\n\n"; binmode(STDOUT); =09 diff --git a/lfs/hostapd b/lfs/hostapd index f29712a..2ce9c21 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2012 IPFire Team = # +# Copyright (C) 2007-2013 IPFire Team = # # = # # 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 = # @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 1.1 +VER =3D 2.0 =20 THISAPP =3D hostapd-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D hostapd -PAK_VER =3D 23 +PAK_VER =3D 24 =20 DEPS =3D "" =20 @@ -44,7 +44,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D e3ace8306d066ab2d24b4c9f668e2dd7 +$(DL_FILE)_MD5 =3D ba22e639bc57aa4035d2ea8ffa9bbbee =20 install : $(TARGET) =20 diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant index e8a67e0..1172e60 100644 --- a/lfs/wpa_supplicant +++ b/lfs/wpa_supplicant @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2012 IPFire Team = # +# Copyright (C) 2007-2013 IPFire Team = # # = # # 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 = # @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 1.1 +VER =3D 2.0 =20 THISAPP =3D wpa_supplicant-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D b29b9af02d7e092db8c5c8508de0e45c +$(DL_FILE)_MD5 =3D 3be2ebfdcced52e00eda0afe2889839d =20 install : $(TARGET) =20 diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs index 7cdd2f9..0b56b93 100644 --- a/src/scripts/makegraphs +++ b/src/scripts/makegraphs @@ -3,7 +3,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2008-2011 IPFire Team = # +# Copyright (C) 2008-2013 IPFire Team = # # = # # 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 = # @@ -102,7 +102,7 @@ sub updatehdddata{ ## Update vnstat system ('/usr/bin/vnstat -u'); =20 -my @disks =3D `ls -1 /sys/block | grep -E '^sd|^xvd|^vd|^md' | sort | uniq`; +my @disks =3D `ls -1 /sys/block | grep -E '^sd|^mmcblk|^xvd|^vd|^md' | sort = | uniq`; system("unlink /var/run/hddstatus 2>/dev/null && touch /var/run/hddstatus"); foreach (@disks){ my $disk =3D $_; hooks/post-receive -- IPFire 2.x development tree --===============5277981332983091520==--