sgallagh pushed to cockpit (f21). "Backport of upstream fix rhbz#1161759"

[notifications at fedoraproject.org]

>From 8cbbf43dab580e1d8dddbbdbcfd080415effb2f0 Mon Sep 17 00:00:00 2001
From: Sergio Pascual <sergiopr at fis.ucm.es>
Date: Wed, 25 Mar 2015 12:29:31 +0100
Subject: Backport of upstream fix rhbz#1161759


diff --git a/cockpit-bz1161759.patch b/cockpit-bz1161759.patch
new file mode 100644
index 0000000..41cbdcc
--- /dev/null
+++ b/cockpit-bz1161759.patch
@@ -0,0 +1,12 @@
+diff -ur cockpit-0.27/src/ws/cockpitwebservice.c cockpit-0.27-notimeout/src/ws/cockpitwebservice.c
+--- cockpit-0.27/src/ws/cockpitwebservice.c	2014-10-10 13:39:03.000000000 +0200
++++ cockpit-0.27-notimeout/src/ws/cockpitwebservice.c	2015-03-25 11:45:07.772068925 +0100
+@@ -166,7 +166,7 @@
+   g_hash_table_remove (sessions->by_channel, channel);
+   g_hash_table_remove (session->channels, channel);
+ 
+-  if (g_hash_table_size (session->channels) == 0)
++  if (g_hash_table_size (session->channels) == 0 && !session->primary)
+     {
+       /*
+        * Close sessions that are no longer in use after N seconds
diff --git a/cockpit.spec b/cockpit.spec
index 34168ea..af3e5a1 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,6 +1,6 @@
 Name:           cockpit
 Version:        0.27
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A user interface for Linux servers
 
 License:        LGPLv2+
@@ -8,6 +8,7 @@ URL:            http://cockpit-project.org/
 Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.bz2
 Source1:        cockpit.pam
 Patch0:         fedora-branding.patch
+Patch1:         cockpit-bz1161759.patch
 
 BuildRequires: pkgconfig(gio-unix-2.0)
 BuildRequires: pkgconfig(gudev-1.0)
@@ -82,6 +83,7 @@ embed or extend Cockpit.
 %setup -q
 git apply %{PATCH0}
 rm -rf src/libgsystem/*.{c,doap}
+%patch1 -p1
 
 %build
 %configure --disable-static --disable-silent-rules --with-cockpit-user=cockpit-ws
@@ -152,6 +154,9 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
 
 
 %changelog
+* Wed Mar 25 2015 Sergio Pascual <sergiopr at fedoraproject.org> - 0.27-4
+- Backport of upstream fix rhbz#1161759
+
 * Fri Dec 05 2014 Stef Walter <stefw at redhat.com> - 0.27-3
 - Update Fedora specific branding rhbz#1161775
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cockpit.git/commit/?h=f21&id=8cbbf43dab580e1d8dddbbdbcfd080415effb2f0

--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390