abrooks/cockpit
SHA256
1
0
Fork 0
forked from cockpit/cockpit
Code Pull Requests Activity

Accepting request 812928 from home:lnussel:branches:systemsmanagement:cockpit

Browse Source 
- new version 220:
  https://cockpit-project.org/blog/cockpit-220.html

OBS-URL: https://build.opensuse.org/request/show/812928
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=34
This commit is contained in:
Ludwig Nussel 2020-06-09 13:07:16 +00:00 committed by Git OBS Bridge
parent dc3c881a2a
commit 3a3d89f14d
7 changed files with 25 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
0001-bridge-Pass-connectable-to-TLS-client-connection.patch
View File

@ -1,35 +0,0 @@
From 979e3a4f0f499c2128094c00ca9b9e9accb9efe4 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martinpitt@users.noreply.github.com>
Date: Mon, 30 Mar 2020 19:14:18 +0200
Subject: [PATCH] bridge: Pass connectable to TLS client connection
This is being used for SNI and better error messages for TLS
connections [1]. Recent glib versions started to warn about this, which
makes our tests fail:
(test-httpstream:172365): GLib-Net-WARNING **: 02:19:07.627: GTlsClientConnection certificate verification will fail because its server-identity property is NULL. Fix your application!
(test-websocketstream:172431): GLib-Net-WARNING **: 02:19:08.201: GTlsClientConnection certificate verification will fail because its server-identity property is NULL. Fix your application!
[1] https://developer.gnome.org/gio/stable/GTlsClientConnection.html#GTlsClientConnection--server-identity
Closes #13814
---
src/bridge/cockpitconnect.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bridge/cockpitconnect.c b/src/bridge/cockpitconnect.c
index dab1c7946..baee6bba3 100644
--- a/src/bridge/cockpitconnect.c
+++ b/src/bridge/cockpitconnect.c
@@ -135,7 +135,7 @@ on_socket_connect (GObject *object,
if (connectable->tls)
{
- cs->io = g_tls_client_connection_new (G_IO_STREAM (object), NULL, &error);
+ cs->io = g_tls_client_connection_new (G_IO_STREAM (object), connectable->address, &error);
if (cs->io)
{
g_debug ("%s: tls handshake", connectable->name);
--
2.16.4

79
0001-openSUSE-Tumbleweed-branding.patch
View File

@ -1,79 +0,0 @@
From 43541b196f8816b743f83e38a4e33367610dbde8 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Tue, 31 Mar 2020 13:12:18 +0200
Subject: [PATCH] openSUSE Tumbleweed branding
---
Makefile.am | 1 +
src/branding/opensuse-tumbleweed/Makefile.am | 11 ++++++++++
src/branding/opensuse-tumbleweed/branding.css | 30 +++++++++++++++++++++++++++
tools/cockpit.spec | 2 +-
4 files changed, 43 insertions(+), 1 deletion(-)
create mode 100644 src/branding/opensuse-tumbleweed/Makefile.am
create mode 100644 src/branding/opensuse-tumbleweed/branding.css
diff --git a/Makefile.am b/Makefile.am
index bee855890..f76b4a349 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -444,6 +444,7 @@ include src/branding/debian/Makefile.am
include src/branding/default/Makefile.am
include src/branding/fedora/Makefile.am
include src/branding/kubernetes/Makefile.am
+include src/branding/opensuse-tumbleweed/Makefile.am
include src/branding/registry/Makefile.am
include src/branding/rhel/Makefile.am
include src/branding/scientific/Makefile.am
diff --git a/src/branding/opensuse-tumbleweed/Makefile.am b/src/branding/opensuse-tumbleweed/Makefile.am
new file mode 100644
index 000000000..f45234ccb
--- /dev/null
+++ b/src/branding/opensuse-tumbleweed/Makefile.am
@@ -0,0 +1,11 @@
+tumbleweedbrandingdir = $(datadir)/cockpit/branding/opensuse-tumbleweed
+
+tumbleweedbranding_DATA = \
+ src/branding/opensuse-tumbleweed/branding.css \
+ $(NULL)
+
+EXTRA_DIST += $(tumbleweedbranding_DATA)
+
+install-data-hook::
+ $(LN_S) -f /usr/share/wallpapers/default-1920x1200.jpg $(DESTDIR)$(tumbleweedbrandingdir)/default-1920x1200.jpg
+ $(LN_S) -f /usr/share/pixmaps/distribution-logos/square-hicolor.svg $(DESTDIR)$(tumbleweedbrandingdir)/square-hicolor.svg
diff --git a/src/branding/opensuse-tumbleweed/branding.css b/src/branding/opensuse-tumbleweed/branding.css
new file mode 100644
index 000000000..e9191d4ef
--- /dev/null
+++ b/src/branding/opensuse-tumbleweed/branding.css
@@ -0,0 +1,30 @@
+.navbar-pf {
+ border-color: #73ba25 !important;
+}
+
+body.login-pf {
+ background: url("default-1920x1200.jpg") no-repeat 50% 0;
+ background-size: cover;
+ background-color: #42474c;
+}
+
+#badge {
+ width: 5em;
+ height: 5em;
+ background-image: url("square-hicolor.svg");
+ background-size: contain;
+ background-repeat: no-repeat;
+}
+
+#brand {
+ font-size: 18pt;
+ text-transform: uppercase;
+}
+
+#brand:before {
+ content: "${NAME}";
+}
+
+#index-brand:before {
+ content: "${NAME}";
+}

41
0001-test-handle-XDG_CONFIG_DIRS.patch
View File

@ -1,41 +0,0 @@
From 0f38a3a889b71351dae831d017958bec955daaaa Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Thu, 26 Mar 2020 18:12:07 +0100
Subject: [PATCH] test: handle XDG_CONFIG_DIRS
Previously the test would fail in an environment where XDG_CONFIG_DIRS
was set as it takes precedence over the built in defaults. So let's just
set XDG_CONFIG_DIRS and test that feature instead.
---
src/common/test-config.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/common/test-config.c b/src/common/test-config.c
index cf5b8746b..4b5153153 100644
--- a/src/common/test-config.c
+++ b/src/common/test-config.c
@@ -27,7 +27,6 @@
/* Mock override cockpitconf.c */
extern const gchar *cockpit_config_file;
-extern const gchar *cockpit_config_dirs[];
static void
test_get_strings (void)
@@ -134,11 +133,11 @@ test_get_strvs (void)
static void
test_load_dir (void)
{
- cockpit_config_dirs[0] = SRCDIR "/src/ws/mock-config";
+ g_setenv("XDG_CONFIG_DIRS", "/does-not-exist:" SRCDIR "/src/ws/mock-config", 1);
cockpit_config_file = "cockpit.conf";
g_assert_cmpstr (cockpit_conf_string ("Section2", "value1"), ==, "string");
- g_assert_cmpstr (cockpit_conf_get_dirs ()[0], ==, SRCDIR "/src/ws/mock-config");
+ g_assert_cmpstr (cockpit_conf_get_dirs ()[1], ==, SRCDIR "/src/ws/mock-config");
cockpit_conf_cleanup ();
}
--
2.16.4

BIN
cockpit-215.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

BIN
cockpit-220.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

6
cockpit.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jun 9 12:11:54 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- new version 220:
https://cockpit-project.org/blog/cockpit-220.html
-------------------------------------------------------------------
Tue Jun 9 08:46:59 UTC 2020 - Ludwig Nussel <lnussel@suse.de>

37
cockpit.spec
View File

@ -76,7 +76,7 @@ Summary: Web Console for Linux servers
License: LGPL-2.1-or-later
URL: https://cockpit-project.org/
Version: 215
Version: 220
%if %{defined wip}
Release: 1.%{wip}%{?dist}
Source0: cockpit-%{version}.tar.xz
@ -86,11 +86,6 @@ Source0: https://github.com/cockpit-project/cockpit/releases/download/%{v
%endif
Source1: cockpit.pam
Source2: cockpit-rpmlintrc
# merged upstream after 215
Patch: 0001-test-handle-XDG_CONFIG_DIRS.patch
Patch1: 0001-openSUSE-Tumbleweed-branding.patch
# backport from upstream
Patch2: 0001-bridge-Pass-connectable-to-TLS-client-connection.patch
BuildRequires: gcc
BuildRequires: pkgconfig(gio-unix-2.0)
@ -102,7 +97,7 @@ BuildRequires: autoconf automake
BuildRequires: /usr/bin/python3
BuildRequires: gettext >= 0.19.7
%if %{defined build_dashboard}
BuildRequires: libssh-devel >= 0.8
BuildRequires: libssh-devel >= 0.8.5
%endif
BuildRequires: openssl-devel
BuildRequires: gnutls-devel >= 3.4.3
@ -155,7 +150,6 @@ Recommends: (cockpit-docker if /usr/bin/docker)
%endif
%if 0%{?rhel} == 0
Recommends: cockpit-dashboard
Recommends: (cockpit-networkmanager if NetworkManager)
Suggests: cockpit-selinux
%endif
@ -186,7 +180,13 @@ make -j4 %{?extra_flags} all
%check
exec 2>&1
make -j4 check
# HACK: Fedora koji builders are very slow, unreliable, and inaccessible for debugging; https://github.com/cockpit-project/cockpit/issues/13909
%if 0%{?fedora} >= 0
%ifarch s390x
%define testsuite_fail || true
%endif
%endif
make -j4 check %{?testsuite_fail}
%install
make install DESTDIR=%{buildroot}
@ -294,7 +294,7 @@ for pkg in apps dashboard docker machines packagekit pcp playground storaged; do
rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg
done
# files from -tests
rm -r %{buildroot}/%{_prefix}/%{__lib}/cockpit-test-assets %{buildroot}/%{_sysconfdir}/cockpit/cockpit.conf
rm -r %{buildroot}/%{_prefix}/%{__lib}/cockpit-test-assets
# files from -pcp
rm -r %{buildroot}/%{_libexecdir}/cockpit-pcp %{buildroot}/%{_localstatedir}/lib/pcp/
# files from -machines
@ -435,6 +435,7 @@ Recommends: NetworkManager-team
Recommends: setroubleshoot-server >= 3.3.3
Provides: cockpit-selinux = %{version}-%{release}
Provides: cockpit-sosreport = %{version}-%{release}
Requires: sos
%endif
%if 0%{?fedora} >= 29
# 0.7.0 (actually) supports task cancellation.
@ -442,8 +443,8 @@ Provides: cockpit-sosreport = %{version}-%{release}
Recommends: (reportd >= 0.7.1 if abrt)
%endif
# NPM modules which are also available as packages
Provides: bundled(js-jquery) = 3.4.1
Provides: bundled(js-moment) = 2.24.0
Provides: bundled(js-jquery) = 3.5.1
Provides: bundled(js-moment) = 2.25.3
Provides: bundled(nodejs-flot) = 0.8.3
Provides: bundled(xstatic-bootstrap-datepicker-common) = 1.9.0
Provides: bundled(xstatic-patternfly-common) = 3.59.4
@ -648,11 +649,7 @@ The Cockpit component for managing storage. This package uses udisks.
Summary: Tests for Cockpit
Requires: cockpit-bridge >= 138
Requires: cockpit-system >= 138
%if 0%{?suse_version}
Requires: openssh
%else
Requires: openssh-clients
%endif
Requires: /usr/bin/ssh-agent /usr/bin/ssh-add
Provides: cockpit-test-assets = %{version}-%{release}
%description -n cockpit-tests
@ -660,7 +657,6 @@ This package contains tests and files used while testing Cockpit.
These files are not required for running Cockpit.
%files -n cockpit-tests -f tests.list
%config(noreplace) %{_sysconfdir}/cockpit/cockpit.conf
%{_prefix}/%{__lib}/cockpit-test-assets
%if !0%{?suse_version}
@ -710,14 +706,13 @@ Cockpit support for reading PCP metrics and loading PCP archives.
%if %{defined build_dashboard}
%package -n cockpit-dashboard
Summary: Cockpit remote servers and dashboard
Summary: Cockpit remote server dashboard
BuildArch: noarch
Requires: cockpit-ssh >= 135
Conflicts: cockpit-ws < 135
%description -n cockpit-dashboard
Cockpit support for connecting to remote servers (through ssh),
bastion hosts, and a basic dashboard.
Cockpit page for showing performance graphs for up to 20 remote servers.
%files -n cockpit-dashboard -f dashboard.list