Hello community,
here is the log from the commit of package wok-plugins-kimchi for
openSUSE:Factory checked in at 2017-11-07 10:01:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wok-plugins-kimchi (Old)
and /work/SRC/openSUSE:Factory/.wok-plugins-kimchi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wok-plugins-kimchi"
Tue Nov 7 10:01:22 2017 rev:2 rq:539238 version:2.5.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/wok-plugins-kimchi/wok-plugins-kimchi.changes
2017-08-30 16:21:26.712326980 +0200
+++
/work/SRC/openSUSE:Factory/.wok-plugins-kimchi.new/wok-plugins-kimchi.changes
2017-11-07 10:02:38.604190638 +0100
@@ -1,0 +2,14 @@
+Mon Nov 6 09:32:47 UTC 2017 - [email protected]
+
+- Update to 2.5.0
+ + Does not depend on Ginger Base anymore
+ + Remove OpenSans fonts need
+ + Move federation feature to Wok
+ + Bug fixes
+- Fix vnc urlencode path, bsc#1065768
+ Add patch: 0001-fix-vnc-urlencode.patch
+- Fix unable to create a password less libvirt connection to the
+ remote libvirt daemon
+ Add patch: 0002-fix-passwordless-connection.patch
+
+-------------------------------------------------------------------
Old:
----
2.4.0.tar.gz
New:
----
0001-fix-vnc-urlencode.patch
0002-fix-passwordless-connection.patch
2.5.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wok-plugins-kimchi.spec ++++++
--- /var/tmp/diff_new_pack.KOCh3z/_old 2017-11-07 10:02:40.564119529 +0100
+++ /var/tmp/diff_new_pack.KOCh3z/_new 2017-11-07 10:02:40.568119384 +0100
@@ -1,7 +1,7 @@
#
# spec file for package wok-plugins-kimchi
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: wok-plugins-kimchi
-Version: 2.4.0
+Version: 2.5.0
Release: %{version}%{?dist}
Summary: HTML5-based management tool for KVM
License: Apache-2.0
@@ -26,6 +26,10 @@
Url: https://github.com/kimchi-project/kimchi
Source0:
https://github.com/kimchi-project/kimchi/archive/%{version}.tar.gz
Source1: %{name}.rpmlintrc
+# Upstream patches
+Patch0: 0001-fix-vnc-urlencode.patch
+# be going upstream
+Patch1: 0002-fix-passwordless-connection.patch
Requires: gettext-tools
Requires: guestfs-tools
@@ -51,7 +55,6 @@
Requires: qemu
Requires: spice-html5
Requires: wok = %{version}
-Requires: wok-plugins-gingerbase
Obsoletes: kimchi < 2.0.0
Provides: kimchi = %{version}
@@ -61,11 +64,11 @@
BuildRequires: openssl
BuildRequires: pkg-config
BuildRequires: python-Cython
-BuildRequires: python3-libsass
BuildRequires: python-libxml2
BuildRequires: python-lxml
BuildRequires: python-requests
BuildRequires: python-setuptools
+BuildRequires: python3-libsass
BuildRequires: wok-devel = %{version}
%if 0%{?suse_version} >= 1210
@@ -82,6 +85,9 @@
%prep
%setup -n kimchi-%{version}
+%patch0 -p1
+%patch1 -p1
+
# force change of systemd system location trough monkey patching
# so if they finally fix it or make global this will just be old relic but
working
sed -ri 's@/etc/systemd/system@%_unitdir@g' Makefile.am
++++++ 0001-fix-vnc-urlencode.patch ++++++
diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js
index 0cacab3a..20a6544f 100644
--- a/ui/js/src/kimchi.api.js
+++ b/ui/js/src/kimchi.api.js
@@ -320,13 +320,15 @@ var kimchi = {
type : "POST",
dataType : "json"
}).done(function() {
+ var path = server_root + "/websockify";
+ path += "?token=" +
wok.urlSafeB64Encode(vm+'-console').replace(/=*$/g, "");
+ path += '&encrypt=1';
+
url = 'https://' + location.hostname + ':' + proxy_port;
url += server_root;
url += "/plugins/kimchi/serial/html/serial.html";
url += "?port=" + proxy_port;
- url += "&path=" + server_root + "/websockify";
- url += "?token=" +
wok.urlSafeB64Encode(vm+'-console').replace(/=*$/g, "");
- url += '&encrypt=1';
+ url += "&path=" + encodeURIComponent(path);
window.open(url);
}).error(function(data) {
wok.message.error(data.responseJSON.reason);
@@ -344,11 +346,7 @@ var kimchi = {
type : "POST",
dataType : "json"
}).done(function() {
- url = 'https://' + location.hostname + ':' + proxy_port;
- url += server_root;
- url += "/plugins/kimchi/novnc/vnc_auto.html";
- url += "?port=" + proxy_port;
- url += "&path=" + server_root + "/websockify";
+ var path = server_root + "/websockify";
/*
* From python documentation base64.urlsafe_b64encode(s)
* substitutes - instead of + and _ instead of / in the
@@ -356,8 +354,14 @@ var kimchi = {
* contain = which is not safe in a URL query component.
* So remove it when needed as base64 can work well without it.
* */
- url += "?token=" + wok.urlSafeB64Encode(vm).replace(/=*$/g, "");
- url += '&encrypt=1';
+ path += "?token=" + wok.urlSafeB64Encode(vm).replace(/=*$/g, "");
+ path += '&encrypt=1';
+
+ url = 'https://' + location.hostname + ':' + proxy_port;
+ url += server_root;
+ url += "/plugins/kimchi/novnc/vnc_auto.html";
+ url += "?port=" + proxy_port;
+ url += "&path=" + encodeURIComponent(path);
window.open(url);
});
},
++++++ 0002-fix-passwordless-connection.patch ++++++
diff --git a/model/vms.py b/model/vms.py
index 6da4f3b..92e771f 100644
--- a/model/vms.py
+++ b/model/vms.py
@@ -1885,10 +1885,11 @@ class VMModel(object):
def _check_remote_libvirt_conn(self, remote_host,
user='root', transport='ssh'):
+ FNULL = open(os.devnull, 'w')
dest_uri = 'qemu+%s://%s@%s/system' % (transport, user, remote_host)
cmd = ['virsh', '-c', dest_uri, 'list']
- proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
- shell=True, preexec_fn=os.setsid)
+ proc = subprocess.Popen(cmd, stdout=FNULL, stderr=FNULL,
+ shell=False, preexec_fn=os.setsid)
timeout = 0
while proc.poll() is None:
time.sleep(1)
++++++ 2.4.0.tar.gz -> 2.5.0.tar.gz ++++++
++++ 9090 lines of diff (skipped)
