commit webyast-status-ws for openSUSE:Factory
Hello community,
here is the log from the commit of package webyast-status-ws for openSUSE:Factory
checked in at Fri Feb 11 01:31:04 CET 2011.
--------
--- webyast-status-ws/webyast-status-ws.changes 2010-09-10 16:26:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/webyast-status-ws/webyast-status-ws.changes 2011-02-09 09:28:27.000000000 +0100
@@ -1,0 +2,13 @@
+Wed Feb 9 08:21:46 UTC 2011 - schubi@novell.com
+
+- webyast-status-ws-rpmlintrc removed
+- 0.2.5
+
+-------------------------------------------------------------------
+Fri Oct 1 10:42:29 UTC 2010 - vgorobets@novell.com
+
+- Missing text in tab headers (jquery.accordion) in Status module after update from WebYaST-SP1 to WebYaST 1.1 (bnc#636616)
+- added ruby script to check the status_configuration.yaml file
+- 0.2.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
webyast-status-ws-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ webyast-status-ws.spec ++++++
--- /var/tmp/diff_new_pack.QqcNHc/_old 2011-02-11 01:30:54.000000000 +0100
+++ /var/tmp/diff_new_pack.QqcNHc/_new 2011-02-11 01:30:54.000000000 +0100
@@ -27,7 +27,7 @@
Group: Productivity/Networking/Web/Utilities
Url: http://en.opensuse.org/Portal:WebYaST
AutoReqProv: on
-Version: 0.2.3
+Version: 0.2.5
Release: 1
Summary: WebYaST - system status service
Source: www.tar.bz2
@@ -140,6 +140,11 @@
sed -i "s/^#LoadPlugin df.*/LoadPlugin df/" "/etc/collectd.conf"
#
+# check status_configuration.yaml bnc#636616
+#
+ruby %{plugin_dir}/lib/configcheck.rb
+
+#
# set "Hostname" to WebYaST and remove already generated old log files
#
sed -i "s/^#Hostname[[:space:]].*/#If you change hostname please delete \/var\/lib\/collectd\/WebYaST\nHostname \"WebYaST\"/" "/etc/collectd.conf"
++++++ LogFile.rb ++++++
--- /var/tmp/diff_new_pack.QqcNHc/_old 2011-02-11 01:30:54.000000000 +0100
+++ /var/tmp/diff_new_pack.QqcNHc/_new 2011-02-11 01:30:54.000000000 +0100
@@ -43,7 +43,7 @@
p_begin = pos_begin.to_i rescue 1 #if someone pass type which doesn't have to_i
lcount = lines.to_i rescue 50 #if someone pass type which doesn't have to_i
lcount = 50 if lcount<=0
- ret = `wc -l #{path}`
+ ret = `wc -l #{path}` # RORSCAN_ITL
file_length = ret.split()[0].to_i rescue 0 #if someone pass type which doesn't have to_i
if p_begin > 0 && p_begin < file_length-lcount
tail_pos = file_length-p_begin
@@ -51,7 +51,7 @@
tail_pos = lcount
end
#it is secure, because vendor specify path and lines is always number
- ret = `tail -n #{tail_pos} #{path}|head -n #{lcount}`
+ ret = `tail -n #{tail_pos} #{path}|head -n #{lcount}` # RORSCAN_ITL
return {:value=>ret, :position=>"#{file_length-tail_pos}"}
end
end
++++++ www.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/controllers/graphs_controller.rb new/www/app/controllers/graphs_controller.rb
--- old/www/app/controllers/graphs_controller.rb 2010-08-13 13:27:23.000000000 +0200
+++ new/www/app/controllers/graphs_controller.rb 2011-02-01 10:49:25.000000000 +0100
@@ -45,7 +45,7 @@
# PUT /graphs
def update
- permission_check("org.opensuse.yast.system.status.writelimits")
+ permission_check("org.opensuse.yast.system.status.writelimits") # RORSCAN_ITL
if params.has_key?(:graphs)
@graph = Graph.new(params[:id], params[:graphs])
@graph.save
@@ -60,7 +60,7 @@
# GET /graphs.xml
#
def index
- permission_check("org.opensuse.yast.system.status.read")
+ permission_check("org.opensuse.yast.system.status.read") # RORSCAN_ITL
init_translation
bgr = params['background'] == 'true'
@@ -74,7 +74,7 @@
# GET /graphs/1.xml
#
def show
- permission_check("org.opensuse.yast.system.status.read")
+ permission_check("org.opensuse.yast.system.status.read") # RORSCAN_ITL
init_translation
@graph = Graph.find(params[:id], params[:checklimits] || false)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/controllers/logs_controller.rb new/www/app/controllers/logs_controller.rb
--- old/www/app/controllers/logs_controller.rb 2010-08-13 13:27:23.000000000 +0200
+++ new/www/app/controllers/logs_controller.rb 2011-02-01 10:49:25.000000000 +0100
@@ -38,7 +38,7 @@
# GET /logs.xml
#
def index
- permission_check("org.opensuse.yast.system.status.read")
+ permission_check("org.opensuse.yast.system.status.read") # RORSCAN_ITL
@logs = Log.find(:all)
render :show
end
@@ -47,7 +47,7 @@
# GET /logs/system.xml
#
def show
- permission_check("org.opensuse.yast.system.status.read")
+ permission_check("org.opensuse.yast.system.status.read") # RORSCAN_ITL
@logs = Log.find(params[:id])
@logs.evaluate_content(params[:pos_begin], params[:lines])
render :show
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/controllers/metrics_controller.rb new/www/app/controllers/metrics_controller.rb
--- old/www/app/controllers/metrics_controller.rb 2010-08-13 13:27:23.000000000 +0200
+++ new/www/app/controllers/metrics_controller.rb 2011-02-01 10:49:25.000000000 +0100
@@ -44,7 +44,7 @@
# GET /metrics.xml
#
def index
- permission_check("org.opensuse.yast.system.status.read")
+ permission_check("org.opensuse.yast.system.status.read") # RORSCAN_ITL
conditions = {}
# support filtering by host, plugin, plugin_instance ...
[:host, :plugin, :type, :plugin_instance, :type_instance, :plugin_full, :type_full ].each do |key|
@@ -60,7 +60,7 @@
# GET /metrics/1
# GET /metrics/1.xml
def show
- permission_check("org.opensuse.yast.system.status.read")
+ permission_check("org.opensuse.yast.system.status.read") # RORSCAN_ITL
@metric = Metric.find(params[:id])
data_opts = {}
data_opts[:stop] = params[:stop].blank? ? Time.now : Time.at(params[:stop].to_i)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/controllers/plugins_controller.rb new/www/app/controllers/plugins_controller.rb
--- old/www/app/controllers/plugins_controller.rb 2010-08-13 13:27:23.000000000 +0200
+++ new/www/app/controllers/plugins_controller.rb 2011-02-01 10:49:25.000000000 +0100
@@ -62,7 +62,7 @@
# GET /plugins.xml
#
def index
- permission_check("org.opensuse.yast.system.status.read")
+ permission_check("org.opensuse.yast.system.status.read") # RORSCAN_ITL
load_translations
@plugins = Plugin.find(:all)
render :show
@@ -72,7 +72,7 @@
# GET /plugins/users.xml
#
def show
- permission_check("org.opensuse.yast.system.status.read")
+ permission_check("org.opensuse.yast.system.status.read") # RORSCAN_ITL
load_translations
@plugins = Plugin.find(params[:id])
render :show
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/models/metric.rb new/www/app/models/metric.rb
--- old/www/app/models/metric.rb 2010-08-13 13:27:23.000000000 +0200
+++ new/www/app/models/metric.rb 2011-02-01 10:49:25.000000000 +0100
@@ -154,7 +154,7 @@
# but because it is not fatal information and if someone hackly run process
# which itself identify as collectd, then he runs into problems, but no
# security problem occur
- ret = `ps xaf | grep '/usr/sbin/collectd' | grep -vc 'grep'`
+ ret = `ps xaf | grep '/usr/sbin/collectd' | grep -vc 'grep'` # RORSCAN_ITL
ret.to_i > 0
end
@@ -308,7 +308,7 @@
#get last entry of rrd database
def self.last_db_entry(file)
- `/bin/sh -c "LC_ALL=C rrdtool last #{file}"`
+ `/bin/sh -c "LC_ALL=C rrdtool last #{file}"` # RORSCAN_ITL ok, as long as no user input
end
@@ -331,7 +331,7 @@
stop = opts.has_key?(:stop) ? opts[:stop] : Time.now
start = opts.has_key?(:start) ? opts[:start] : stop - 300
- output = `/bin/sh -c "LC_ALL=C rrdtool fetch #{file} AVERAGE --start #{start.to_i} --end #{stop.to_i}"`
+ output = `/bin/sh -c "LC_ALL=C rrdtool fetch #{file} AVERAGE --start #{start.to_i} --end #{stop.to_i}"` # RORSCAN_ITL as long as no user input
raise output unless $?.exitstatus.zero?
output
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/lib/configcheck.rb new/www/lib/configcheck.rb
--- old/www/lib/configcheck.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/www/lib/configcheck.rb 2011-02-09 09:26:27.000000000 +0100
@@ -0,0 +1,85 @@
+#--
+# Copyright (c) 2009-2010 Novell, Inc.
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License
+# as published by the Free Software Foundation.
+#
+# 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, contact Novell, Inc.
+#
+# To contact Novell about this file by physical or electronic mail,
+# you may find current contact information at www.novell.com
+#++
+
+#
+# Model over collectd data
+#
+# @author Bjoern Geuken
participants (1)
-
root@hilbert.suse.de