Update to version 0.74

* Display an intelligent message when password auth is not possible
 * Correctly start terminal in home directory
 * NetworkManager code is in a separate package
 * PCP is an optional build dependency
 * Lots of bugs, build and testing fixes
This commit is contained in:
Stef Walter 2015-09-03 11:00:19 +02:00
parent e962fab692
commit 0a7ca46534
3 changed files with 74 additions and 56 deletions

1
.gitignore vendored
View File

@ -52,3 +52,4 @@
/cockpit-0.70.tar.bz2
/cockpit-0.71.tar.bz2
/cockpit-0.73.tar.bz2
/cockpit-0.74.tar.bz2

View File

@ -1,4 +1,4 @@
%define tag 0.73
%define tag 0.74
%define rel 1
# Globals that might be defined elsewhere
# * gitcommit xxxx
@ -31,12 +31,9 @@
%define _hardened_build 1
%define libssh_version 0.7.1
%if 0%{?fedora} > 0 && 0%{?fedora} < 22
%define libssh_version 0.6.0
%if 0%{?fedora} > 0 && 0%{?fedora} >= 22
%define libssh_version 0.7.1
%endif
%if 0%{?rhel}
%define libssh_version 0.7.1
%endif
Name: cockpit
@ -57,10 +54,6 @@ Source0: cockpit-%{version}.tar.gz
Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.bz2
%endif
Source1: cockpit.pam
Patch0: test-use-after-free.patch
Patch1: relax-test-fs.patch
Patch10: backtrace-gdb.patch
Patch11: backtrace-webservice.patch
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(json-glib-1.0)
@ -80,13 +73,11 @@ BuildRequires: dbus-devel
BuildRequires: glib-networking
BuildRequires: sed
BuildRequires: gdb
BuildRequires: valgrind
BuildRequires: glib2-devel >= 2.37.4
BuildRequires: systemd-devel
BuildRequires: polkit
BuildRequires: pcp-libs-devel
BuildRequires: gdb
%if %{defined gitcommit}
BuildRequires: npm
@ -105,6 +96,7 @@ BuildRequires: sed
BuildRequires: xmlto
Requires: %{name}-bridge = %{version}-%{release}
Requires: %{name}-networkmanager = %{version}-%{release}
Requires: %{name}-ws = %{version}-%{release}
Requires: %{name}-shell = %{version}-%{release}
Requires: %{name}-storaged = %{version}-%{release}
@ -145,29 +137,6 @@ Requires: pcp
%description pcp
Cockpit support for reading PCP metrics and loading PCP archives.
%package shell
Summary: Cockpit Shell user interface package
Requires: %{name}-bridge = %{version}-%{release}
Requires: NetworkManager
Requires: shadow-utils
Requires: grep
Requires: libpwquality
Requires: /usr/bin/date
%if 0%{?rhel}
Provides: %{name}-subscriptions = %{version}-%{release}
Requires: subscription-manager >= 1.13
%ifarch x86_64 armv7hl
Provides: %{name}-docker = %{version}-%{release}
Requires: docker >= 1.3.0
%endif
%endif
Provides: %{name}-assets
Obsoletes: %{name}-assets < 0.32
BuildArch: noarch
%description shell
This package contains the Cockpit shell UI assets.
%package ws
Summary: Cockpit Web Service
Requires: glib-networking
@ -186,10 +155,6 @@ The Cockpit Web Service listens on the network, and authenticates users.
%if 0%{?fedora} == 20
sed -i s/unconfined_service_t/unconfined_t/g src/ws/test-server.service.in
%endif
%patch0 -p1
%patch1 -p1
%patch10 -p1
%patch11 -p1
%build
%if %{defined gitcommit}
@ -238,12 +203,18 @@ find %{buildroot}%{_datadir}/%{name}/shell -type f >> shell.list
echo '%dir %{_datadir}/%{name}/system' >> shell.list
find %{buildroot}%{_datadir}/%{name}/system -type f >> shell.list
echo '%dir %{_datadir}/%{name}/users' >> shell.list
find %{buildroot}%{_datadir}/%{name}/users -type f >> shell.list
echo '%dir %{_datadir}/%{name}/subscriptions' > subscriptions.list
find %{buildroot}%{_datadir}/%{name}/subscriptions -type f >> subscriptions.list
echo '%dir %{_datadir}/%{name}/storage' > storaged.list
find %{buildroot}%{_datadir}/%{name}/storage -type f >> storaged.list
echo '%dir %{_datadir}/%{name}/network' > networkmanager.list
find %{buildroot}%{_datadir}/%{name}/network -type f >> networkmanager.list
%ifarch x86_64 armv7hl
echo '%dir %{_datadir}/%{name}/docker' > docker.list
find %{buildroot}%{_datadir}/%{name}/docker -type f >> docker.list
@ -268,13 +239,17 @@ sed -i "s|%{buildroot}/usr/src/debug||" debug.list
tar -C %{buildroot}/usr/src/debug -cf - . | tar -C %{buildroot} -xf -
rm -rf %{buildroot}/usr/src/debug
# On RHEL subscriptions and docker are part of the shell package
# On RHEL subscriptions, networkmanager, and docker are part of the shell package
%if 0%{?rhel}
cat subscriptions.list docker.list >> shell.list
cat subscriptions.list docker.list networkmanager.list >> shell.list
%endif
# Only strip out debug info in non wip builds
%if %{defined gitcommit}
%define find_debug_info %{nil}
%else
%define find_debug_info %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_include_minidebuginfo:-m} %{?_find_debuginfo_dwz_opts} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}"
%endif
# Redefine how debug info is built to slip in our extra debug files
%define __debug_install_post \
@ -293,12 +268,10 @@ cat subscriptions.list docker.list >> shell.list
%files bridge
%doc %{_mandir}/man1/cockpit-bridge.1.gz
%doc %{_mandir}/man8/pam_ssh_add.8.gz
%{_bindir}/cockpit-bridge
%attr(4755, -, -) %{_libexecdir}/cockpit-polkit
%{_libexecdir}/cockpit-wrapper
%{_libdir}/security/pam_reauthorize.so
%{_libdir}/security/pam_ssh_add.so
%{_datadir}/dbus-1/services/com.redhat.Cockpit.service
%files doc
@ -319,18 +292,18 @@ cat subscriptions.list docker.list >> shell.list
# be out of sync with reality.
/usr/share/pcp/lib/pmlogger reload
%files shell -f shell.list
%files ws
%doc %{_mandir}/man5/cockpit.conf.5.gz
%doc %{_mandir}/man8/cockpit-ws.8.gz
%doc %{_mandir}/man8/remotectl.8.gz
%doc %{_mandir}/man8/pam_ssh_add.8.gz
%config(noreplace) %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/pam.d/cockpit
%{_unitdir}/cockpit.service
%{_unitdir}/cockpit.socket
%{_prefix}/lib/firewalld/services/cockpit.xml
%{_sbindir}/remotectl
%{_libdir}/security/pam_ssh_add.so
%{_libexecdir}/cockpit-ws
%attr(4750, root, cockpit-ws) %{_libexecdir}/cockpit-session
%attr(775, -, wheel) %{_localstatedir}/lib/%{name}
@ -352,6 +325,42 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
%postun ws
%systemd_postun_with_restart cockpit.socket
%package shell
Summary: Cockpit Shell user interface package
Requires: %{name}-bridge = %{version}-%{release}
Requires: shadow-utils
Requires: grep
Requires: libpwquality
Requires: /usr/bin/date
%if 0%{?rhel}
Provides: %{name}-subscriptions = %{version}-%{release}
Requires: subscription-manager >= 1.13
Provides: %{name}-networkmanager = %{version}-%{release}
Requires: NetworkManager
%ifarch x86_64 armv7hl
Provides: %{name}-docker = %{version}-%{release}
Requires: docker >= 1.3.0
%endif
%endif
Provides: %{name}-assets
Obsoletes: %{name}-assets < 0.32
BuildArch: noarch
%description shell
This package contains the Cockpit shell UI assets.
%files shell -f shell.list
%package storaged
Summary: Cockpit user interface for storage, using Storaged
Requires: storaged >= 2.1.1
BuildArch: noarch
%description storaged
The Cockpit component for managing storage. This package uses Storaged.
%files storaged -f storaged.list
# Conditionally built packages below
%if 0%{?rhel} == 0
@ -367,6 +376,16 @@ subscription management.
%files subscriptions -f subscriptions.list
%package networkmanager
Summary: Cockpit user interface for networking, using NetworkManager
Requires: NetworkManager
BuildArch: noarch
%description networkmanager
The Cockpit component for managing networking. This package uses NetworkManager.
%files networkmanager -f networkmanager.list
%ifarch x86_64 armv7hl
%package docker
@ -397,15 +416,6 @@ cluster. Installed on the Kubernetes master. This package is not yet complete.
%endif
%package storaged
Summary: Cockpit user interface for storage, using Storaged
Requires: storaged >= 2.1.1
%description storaged
The Cockpit component for managing storage. This package uses Storaged.
%files storaged -f storaged.list
%if %{defined gitcommit}
%package test-assets
@ -462,6 +472,13 @@ fi
%endif
%changelog
* Thu Sep 03 2015 Stef Walter <stefw@redhat.com> - 0.74-1
- * Display an intelligent message when password auth is not possible
- * Correctly start terminal in home directory
- * NetworkManager code is in a separate package
- * PCP is an optional build dependency
- * Lots of bugs, build and testing fixes
* Wed Aug 26 2015 Stef Walter <stefw@redhat.com> - 0.73-1
- * Kubernetes UI can connect to non-local API server
- * Automate Web Service container build on Docker Hub

View File

@ -1 +1 @@
e252e5815c7ba431da5c70e42d76d6b3 cockpit-0.73.tar.bz2
1d9c353392dd100e9e3e56cb0d7da8f3 cockpit-0.74.tar.bz2