Hello community, here is the log from the commit of package hawk for openSUSE:Factory checked in at 2015-10-08 08:26:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hawk (Old) and /work/SRC/openSUSE:Factory/.hawk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hawk" Changes: -------- --- /work/SRC/openSUSE:Factory/hawk/hawk.changes 2015-10-02 09:23:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hawk.new/hawk.changes 2015-10-08 08:26:18.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Oct 07 11:44:00 UTC 2015 - [email protected] + +- Make gem bundling conditional on SLE or openSUSE (bsc#949046) +- Update to version 1.0.0+git.1444218188.b3b6d44: + + Dashboard: Fix CORS preflight handling for dashboard (bsc#949237) + +------------------------------------------------------------------- +Wed Oct 7 08:17:41 UTC 2015 - [email protected] + +- Bundle gems in SLE 12 SP1 (bsc#949046) + +------------------------------------------------------------------- Old: ---- hawk-1.0.0+git.1443626139.ed258cf.tar.bz2 New: ---- hawk-1.0.0+git.1444218188.b3b6d44.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawk.spec ++++++ --- /var/tmp/diff_new_pack.ndsKJ2/_old 2015-10-08 08:26:18.000000000 +0200 +++ /var/tmp/diff_new_pack.ndsKJ2/_new 2015-10-08 08:26:18.000000000 +0200 @@ -28,7 +28,7 @@ %define pkg_group System Environment/Daemons %endif -%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1315 +%if 0%{?suse_version} && !0%{?is_opensuse} %define bundle_gems 1 %endif @@ -39,7 +39,7 @@ Summary: HA Web Konsole License: GPL-2.0 and Apache-2.0 Group: %{pkg_group} -Version: 1.0.0+git.1443626139.ed258cf +Version: 1.0.0+git.1444218188.b3b6d44 Release: 0 Url: http://www.clusterlabs.org/wiki/Hawk Source: %{name}-%{version}.tar.bz2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ndsKJ2/_old 2015-10-08 08:26:18.000000000 +0200 +++ /var/tmp/diff_new_pack.ndsKJ2/_new 2015-10-08 08:26:18.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/hawk.git</param> - <param name="changesrevision">ed258cfdaaea78d7920e8f34e729e92b6572c392</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">b3b6d440e170b909f28b4e84cd6362e7e3f7eab8</param></service></servicedata> \ No newline at end of file ++++++ hawk-1.0.0+git.1443626139.ed258cf.tar.bz2 -> hawk-1.0.0+git.1444218188.b3b6d44.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-1.0.0+git.1443626139.ed258cf/hawk/app/assets/javascripts/application.js new/hawk-1.0.0+git.1444218188.b3b6d44/hawk/app/assets/javascripts/application.js --- old/hawk-1.0.0+git.1443626139.ed258cf/hawk/app/assets/javascripts/application.js 2015-09-30 17:16:27.000000000 +0200 +++ new/hawk-1.0.0+git.1444218188.b3b6d44/hawk/app/assets/javascripts/application.js 2015-10-07 13:43:52.000000000 +0200 @@ -117,15 +117,8 @@ // include a CSRF token with every AJAX request. For details see: // http://jasoncodes.com/posts/rails-csrf-vulnerability function CSRFProtection(xhr, options) { - if (options.cross_domain_hack) { - // Cross-domain requests for the cluster dashboard must have *no* - // extra headers, or they trigger CORS preflight on Firefox. Also - // we need to ensure session cookies are passed. - xhr.withCredentials = true; - } else { - var token = $('meta[name="csrf-token"]').attr("content"); - if (token) xhr.setRequestHeader("X-CSRF-Token", token); - } + var token = $('meta[name="csrf-token"]').attr("content"); + if (token) xhr.setRequestHeader("X-CSRF-Token", token); } if ("ajaxPrefilter" in $) { $.ajaxPrefilter(function(options, originalOptions, xhr) { CSRFProtection(xhr, options); }); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-1.0.0+git.1443626139.ed258cf/hawk/app/views/dashboard/index.html.erb new/hawk-1.0.0+git.1444218188.b3b6d44/hawk/app/views/dashboard/index.html.erb --- old/hawk-1.0.0+git.1443626139.ed258cf/hawk/app/views/dashboard/index.html.erb 2015-09-30 17:16:27.000000000 +0200 +++ new/hawk-1.0.0+git.1444218188.b3b6d44/hawk/app/views/dashboard/index.html.erb 2015-10-07 13:43:52.000000000 +0200 @@ -150,7 +150,8 @@ "&password=" + escape(e.find("input[name=password]").val()), dataType: "json", // necessary? type: "POST", - cross_domain_hack: true, + crossDomain: true, + xhrFields: { withCredentials: true }, success: function(data) { self.element.find(".cluster-login").hide(); self.element.find(".spinner").show(); @@ -190,7 +191,8 @@ dataType: "json", // necessary? type: "GET", cache: false, - cross_domain_hack: true, // needed to get proper headers + crossDomain: true, + xhrFields: { withCredentials: true }, success: function(data) { if (self.deleted) return; // Note: success fires on broken request (e.g.: SSL cert or CORS problem) @@ -219,7 +221,8 @@ data: "format=json&mini=true", dataType: "json", // necessary? type: "GET", - cross_domain_hack: true, // needed to get proper headers + crossDomain: true, + xhrFields: { withCredentials: true }, success: function(data) { if (self.deleted) return; // Note: success fires on broken request (e.g.: SSL cert or CORS problem) @@ -486,7 +489,8 @@ data: "format=json", dataType: "json", // necessary? type: "GET", - cross_domain_hack: true, // needed to get proper headers + crossDomain: true, + xhrFields: { withCredentials: true }, success: function(data, status, xhr) { if (xhr && xhr.status == 200) { new_cluster(cn, { node_list: [ hn ], mon_node: hn });
