Changes - j0ke.net Open Build Service

Changes of Revision 33

[-] [+]	Changed	Snorby.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 28 19:15:01 UTC 2013 - cs@linux-administrator.com + +- update to release 2.5.6 + +------------------------------------------------------------------- Sun Jan 20 22:00:36 UTC 2013 - cs@linux-administrator.com - update to use only ruby1.9 and rubygem-bundler
[-] [+]	Changed	Snorby.spec ^
@@ -5,7 +5,7 @@ %endif Name: Snorby -Version: 2.5.4 +Version: 2.5.6 Release: 1 License: GPLv3 Url: http://www.snorby.org @@ -20,9 +20,6 @@ Patch1: %{name}-gemfile-passenger.patch # upstream patches -Patch20: 29af37a09cbb037dfb1fd24257bdcef024c15c3e.patch -Patch21: 41a6f832fe7de926f1f48449235a3aba643c70aa.patch -Patch22: 774daa1e99275cc80ac6cae9a8f164e2eb39c983.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch @@ -72,9 +69,6 @@ %patch0 %patch1 # upstream patches -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 %build
[-] [+]	Deleted	29af37a09cbb037dfb1fd24257bdcef024c15c3e.patch ^
@@ -1,72 +0,0 @@ -commit 29af37a09cbb037dfb1fd24257bdcef024c15c3e -Author: Dustin Willis Webber <dustin.webber@gmail.com> -Date: Thu Jan 10 16:01:33 2013 -0600 - - fix @axis null error - -diff --git a/ChangeLog.md b/ChangeLog.md -index c4036e2..dc949eb 100644 ---- a/ChangeLog.md -+++ b/ChangeLog.md -@@ -1,4 +1,4 @@ --# Snorby 2.5.4 -+# Snorby 2.5.4/5 - - * Patch Multiple vulnerabilities in parameter parsing in Action Pack (CVE-2013-0156) - * Fix json parsing issue with new SearchRule() -diff --git a/app/controllers/page_controller.rb b/app/controllers/page_controller.rb -index 628ef8b..365264d 100644 ---- a/app/controllers/page_controller.rb -+++ b/app/controllers/page_controller.rb -@@ -27,8 +27,10 @@ class PageController < ApplicationController - - @event_count = @cache.all.map(&:event_count).sum - -- if @sensor_metrics.last -- @axis = @sensor_metrics.last[:range].join(',') -+ @axis = if @sensor_metrics.last -+ @sensor_metrics.last[:range].join(',') -+ else -+ "" - end - - @classifications = Classification.all(:order => [:events_count.desc]) -diff --git a/app/views/page/_graph_event.html.erb b/app/views/page/_graph_event.html.erb -index 5548829..3c426c6 100644 ---- a/app/views/page/_graph_event.html.erb -+++ b/app/views/page/_graph_event.html.erb -@@ -19,7 +19,7 @@ - x: -20 //center - }, - xAxis: { -- categories: [<%= @axis.html_safe %>], -+ categories: [<%= @axis.try(:html_safe) %>], - title: { - margin: 10, - <% if (@range == 'year' \|\| @range == 'quarter') %> -diff --git a/app/views/page/_graph_protocol.html.erb b/app/views/page/_graph_protocol.html.erb -index 93b1e23..8cce0af 100644 ---- a/app/views/page/_graph_protocol.html.erb -+++ b/app/views/page/_graph_protocol.html.erb -@@ -19,7 +19,7 @@ - x: -20 //center - }, - xAxis: { -- categories: [<%= @axis.html_safe %>], -+ categories: [<%= @axis.try(:html_safe) %>], - title: { - margin: 10, - <% if (@range == 'year' \|\| @range == 'quarter') %> -diff --git a/app/views/page/_graph_severity.html.erb b/app/views/page/_graph_severity.html.erb -index 3c40ed6..ad14444 100644 ---- a/app/views/page/_graph_severity.html.erb -+++ b/app/views/page/_graph_severity.html.erb -@@ -19,7 +19,7 @@ - x: -20 //center - }, - xAxis: { -- categories: [<%= @axis.html_safe %>], -+ categories: [<%= @axis.try(:html_safe) %>], - title: { - margin: 10, - <% if (@range == 'year' \|\| @range == 'quarter') %>
[-] [+]	Deleted	41a6f832fe7de926f1f48449235a3aba643c70aa.patch ^
@@ -1,60 +0,0 @@ -commit 41a6f832fe7de926f1f48449235a3aba643c70aa -Author: Dustin Willis Webber <dustin.webber@gmail.com> -Date: Thu Jan 10 19:33:03 2013 -0600 - - fix pdf graph issue - -diff --git a/app/views/page/dashboard.pdf.erb b/app/views/page/dashboard.pdf.erb -index c7322ca..e723f72 100644 ---- a/app/views/page/dashboard.pdf.erb -+++ b/app/views/page/dashboard.pdf.erb -@@ -30,7 +30,7 @@ - }, - plotOptions: { series: { enableMouseTracking: false, shadow: false, animation: false } }, - xAxis: { -- categories: [<%= @axis %>], -+ categories: [<%= @axis.try(:html_safe) %>], - title: { - margin: 10, - <% if (@range == 'year' \|\| @range == 'quarter') %> -@@ -93,7 +93,7 @@ - x: -20 //center - }, - xAxis: { -- categories: [<%= @axis %>], -+ categories: [<%= @axis.try(:html_safe) %>], - title: { - margin: 10, - <% if (@range == 'year' \|\| @range == 'quarter') %> -@@ -167,7 +167,7 @@ - }, - plotOptions: { series: { enableMouseTracking: false, shadow: false, animation: false } }, - xAxis: { -- categories: [<%= @axis %>], -+ categories: [<%= @axis.try(:html_safe) %>], - title: { - margin: 10, - <% if (@range == 'year' \|\| @range == 'quarter') %> -diff --git a/lib/snorby/report.rb b/lib/snorby/report.rb -index 9b0d2d2..772a7ae 100644 ---- a/lib/snorby/report.rb -+++ b/lib/snorby/report.rb -@@ -24,7 +24,11 @@ module Snorby - - @event_count = @cache.all.map(&:event_count).sum - -- @axis = @sensor_metrics.last[:range].join(',') if @sensor_metrics.last -+ @axis = if @sensor_metrics.last -+ @sensor_metrics.last[:range].join(',') -+ else -+ "" -+ end - - @classifications = Classification.all(:order => [:events_count.desc]) - @sensors = Sensor.all(:limit => 5, :order => [:events_count.desc]) -diff --git a/public/assets/snorby.css.gz b/public/assets/snorby.css.gz -index a7ed0a2..ce71a10 100644 -Binary files a/public/assets/snorby.css.gz and b/public/assets/snorby.css.gz differ -diff --git a/public/assets/snorby.js.gz b/public/assets/snorby.js.gz -index f554a41..2df9d8e 100644 -Binary files a/public/assets/snorby.js.gz and b/public/assets/snorby.js.gz differ
[-] [+]	Deleted	774daa1e99275cc80ac6cae9a8f164e2eb39c983.patch ^
@@ -1,50 +0,0 @@ -commit 774daa1e99275cc80ac6cae9a8f164e2eb39c983 -Author: Dustin Willis Webber <dustin.webber@gmail.com> -Date: Thu Jan 10 21:27:21 2013 -0600 - - update - -diff --git a/Gemfile b/Gemfile -index 31d35f5..309207e 100644 ---- a/Gemfile -+++ b/Gemfile -@@ -46,7 +46,7 @@ gem 'dm-serializer', DM_VERSION - gem 'dm-chunked_query', '~> 0.3' - - # Deploy with Capistrano --gem 'capistrano' -+gem 'capistrano', '2.14.1' - - # Rails Plugins - gem 'jammit', '~> 0.5.4' -diff --git a/Gemfile.lock b/Gemfile.lock -index 64cd53d..7e1129f 100644 ---- a/Gemfile.lock -+++ b/Gemfile.lock -@@ -69,7 +69,7 @@ GEM - bcrypt-ruby (3.0.1-java) - bouncy-castle-java (1.5.0146.1) - builder (3.0.4) -- capistrano (2.14.0) -+ capistrano (2.14.1) - highline - net-scp (>= 1.0.0) - net-sftp (>= 2.0.0) -@@ -219,7 +219,7 @@ GEM - net-ssh (>= 1.99.1) - net-sftp (2.0.5) - net-ssh (>= 2.0.9) -- net-ssh (2.6.2) -+ net-ssh (2.6.3) - net-ssh-gateway (1.1.0) - net-ssh (>= 1.99.1) - netaddr (1.5.0) -@@ -322,7 +322,7 @@ DEPENDENCIES - activesupport (= 3.1.10) - ansi - bundler (>= 1.0.0) -- capistrano -+ capistrano (= 2.14.1) - capybara - chronic (~> 0.3.0) - daemons (~> 1.1.0)
	Added	Snorby-2.5.6.tar.bz2 ^