* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ea31a62aadf428e37a686568e5b95caf0fbc07b6
@ 2013-02-05 7:10 git
0 siblings, 0 replies; only message in thread
From: git @ 2013-02-05 7:10 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 7718 bytes --]
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 <arne_f(a)ipfire.org>
Date: Tue Feb 5 02:07:42 2013 +0100
graphs: add mmcblk to media graphs.
commit 20d78d9e76d15992ebd9d4f0db783b7a83fb8f23
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 5 01:48:27 2013 +0100
hostapd: update to 2.0.
commit d50fe89686deaa8527c81a7292e5eba0efa32a82
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
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 <info(a)ipfire.org> #
+# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> #
# #
# 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 = split(/\?/,$ENV{'QUERY_STRING'});
$querry[0] = '' unless defined $querry[0];
$querry[1] = 'hour' unless defined $querry[1];
-my @devices = `ls -1 /sys/block | grep -E '^sd|^xvd|^vd|^md' | sort | uniq`;
+my @devices = `ls -1 /sys/block | grep -E '^sd|^mmcblk|^xvd|^vd|^md' | sort | uniq`;
-if ( $querry[0] =~ "sd?" || $querry[0] =~ "xvd??" || $querry[0] =~ "vd?" || $querry[0] =~ "md*" ){
+if ( $querry[0] =~ "sd?" || $querry[0] =~ "mmcblk?" || $querry[0] =~ "xvd??" || $querry[0] =~ "vd?" || $querry[0] =~ "md*" ){
print "Content-type: image/png\n\n";
binmode(STDOUT);
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 <info(a)ipfire.org> #
+# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> #
# #
# 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 @@
include Config
-VER = 1.1
+VER = 2.0
THISAPP = hostapd-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = hostapd
-PAK_VER = 23
+PAK_VER = 24
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e3ace8306d066ab2d24b4c9f668e2dd7
+$(DL_FILE)_MD5 = ba22e639bc57aa4035d2ea8ffa9bbbee
install : $(TARGET)
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 <info(a)ipfire.org> #
+# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> #
# #
# 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 @@
include Config
-VER = 1.1
+VER = 2.0
THISAPP = wpa_supplicant-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b29b9af02d7e092db8c5c8508de0e45c
+$(DL_FILE)_MD5 = 3be2ebfdcced52e00eda0afe2889839d
install : $(TARGET)
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 <info(a)ipfire.org> #
+# Copyright (C) 2008-2013 IPFire Team <info(a)ipfire.org> #
# #
# 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');
-my @disks = `ls -1 /sys/block | grep -E '^sd|^xvd|^vd|^md' | sort | uniq`;
+my @disks = `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 = $_;
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-02-05 7:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-05 7:10 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ea31a62aadf428e37a686568e5b95caf0fbc07b6 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox