rpms/cockpit
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 129-1

Browse Source 
- Diagnostic sosreport feature now works on RHEL Atomic again
- The configure script has a --disable-ssh option to toggle libssh dep
- The configure --disable-ws option has been replaced with above.
- Unit tests have been fixed on recent GLib versions
- Several Fedora and Debian packaging fixes
This commit is contained in:
Cockpit Project 2017-01-18 15:17:43 +00:00
parent e7b39290c9
commit a536696436
3 changed files with 181 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -97,3 +97,4 @@
/cockpit-124.tar.xz /cockpit-124.tar.xz
/cockpit-125.tar.xz /cockpit-125.tar.xz
/cockpit-126.tar.xz /cockpit-126.tar.xz
/cockpit-129.tar.xz

324
cockpit.spec
View File

@ -1,5 +1,5 @@
# This spec file has been automatically updated # This spec file has been automatically updated
Version: 126 Version: 129
Release: 1%{?dist} Release: 1%{?dist}
# #
# This file is maintained at the following location: # This file is maintained at the following location:
@ -47,6 +47,7 @@ BuildRequires: pkgconfig(polkit-agent-1) >= 0.105
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: autoconf automake BuildRequires: autoconf automake
BuildRequires: /usr/bin/python
BuildRequires: intltool BuildRequires: intltool
BuildRequires: libssh-devel >= %{libssh_version} BuildRequires: libssh-devel >= %{libssh_version}
BuildRequires: openssl-devel BuildRequires: openssl-devel
@ -74,7 +75,8 @@ BuildRequires: xmlto
Requires: %{name}-bridge = %{version}-%{release} Requires: %{name}-bridge = %{version}-%{release}
Requires: %{name}-ws = %{version}-%{release} Requires: %{name}-ws = %{version}-%{release}
Requires: %{name}-shell = %{version}-%{release} Requires: %{name}-dashboard = %{version}-%{release}
Requires: %{name}-system = %{version}-%{release}
# Optional components (for f24 we use soft deps) # Optional components (for f24 we use soft deps)
%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 %if 0%{?fedora} >= 24 || 0%{?rhel} >= 8
@ -97,49 +99,19 @@ Requires: %{name}-docker = %{version}-%{release}
%endif %endif
%description %description
Cockpit runs in a browser and can manage your network of GNU/Linux Cockpit runs in a browser and can manage your network of GNU/Linux
machines. machines.
%package bridge %files
Summary: Cockpit bridge server-side component %{_docdir}/%{name}/AUTHORS
Obsoletes: %{name}-daemon < 0.48-2 %{_docdir}/%{name}/COPYING
Requires: polkit %{_docdir}/%{name}/README.md
%dir %{_datadir}/%{name}
%description bridge %{_datadir}/appdata/cockpit.appdata.xml
The Cockpit bridge component installed server side and runs commands on the %{_datadir}/applications/cockpit.desktop
system on behalf of the web based user interface. %{_datadir}/pixmaps/cockpit.png
%doc %{_mandir}/man1/cockpit.1.gz
%package doc
Summary: Cockpit deployment and developer guide
%description doc
The Cockpit Deployment and Developer Guide shows sysadmins how to
deploy Cockpit on their machines as well as helps developers who want to
embed or extend Cockpit.
%package pcp
Summary: Cockpit PCP integration
Requires: %{name}-bridge = %{version}-%{release}
Requires: pcp
%description pcp
Cockpit support for reading PCP metrics and loading PCP archives.
%package ws
Summary: Cockpit Web Service
Requires: glib-networking
Requires: openssl
Requires: glib2 >= 2.37.4
Requires: libssh >= %{libssh_version}
Obsoletes: cockpit-selinux-policy <= 0.83
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
%description ws
The Cockpit Web Service listens on the network, and authenticates users.
%prep %prep
%setup -q %setup -q
@ -182,23 +154,23 @@ echo '{ "linguas": null, "machine-limit": 5 }' > %{buildroot}%{_datadir}/%{name}
echo '%dir %{_datadir}/%{name}/base1' > base.list echo '%dir %{_datadir}/%{name}/base1' > base.list
find %{buildroot}%{_datadir}/%{name}/base1 -type f >> base.list find %{buildroot}%{_datadir}/%{name}/base1 -type f >> base.list
echo '%dir %{_datadir}/%{name}/dashboard' >> shell.list echo '%dir %{_datadir}/%{name}/dashboard' >> dashboard.list
find %{buildroot}%{_datadir}/%{name}/dashboard -type f >> shell.list find %{buildroot}%{_datadir}/%{name}/dashboard -type f >> dashboard.list
echo '%dir %{_datadir}/%{name}/realmd' >> shell.list echo '%dir %{_datadir}/%{name}/realmd' >> system.list
find %{buildroot}%{_datadir}/%{name}/realmd -type f >> shell.list find %{buildroot}%{_datadir}/%{name}/realmd -type f >> system.list
echo '%dir %{_datadir}/%{name}/tuned' >> shell.list echo '%dir %{_datadir}/%{name}/tuned' >> system.list
find %{buildroot}%{_datadir}/%{name}/tuned -type f >> shell.list find %{buildroot}%{_datadir}/%{name}/tuned -type f >> system.list
echo '%dir %{_datadir}/%{name}/shell' >> shell.list echo '%dir %{_datadir}/%{name}/shell' >> system.list
find %{buildroot}%{_datadir}/%{name}/shell -type f >> shell.list find %{buildroot}%{_datadir}/%{name}/shell -type f >> system.list
echo '%dir %{_datadir}/%{name}/systemd' >> shell.list echo '%dir %{_datadir}/%{name}/systemd' >> system.list
find %{buildroot}%{_datadir}/%{name}/systemd -type f >> shell.list find %{buildroot}%{_datadir}/%{name}/systemd -type f >> system.list
echo '%dir %{_datadir}/%{name}/users' >> shell.list echo '%dir %{_datadir}/%{name}/users' >> system.list
find %{buildroot}%{_datadir}/%{name}/users -type f >> shell.list find %{buildroot}%{_datadir}/%{name}/users -type f >> system.list
echo '%dir %{_datadir}/%{name}/sosreport' > sosreport.list echo '%dir %{_datadir}/%{name}/sosreport' > sosreport.list
find %{buildroot}%{_datadir}/%{name}/sosreport -type f >> sosreport.list find %{buildroot}%{_datadir}/%{name}/sosreport -type f >> sosreport.list
@ -256,9 +228,9 @@ sed -i '/\.map\(\.gz\)\?$/d' *.list
tar -C %{buildroot}/usr/src/debug -cf - . | tar -C %{buildroot} -xf - tar -C %{buildroot}/usr/src/debug -cf - . | tar -C %{buildroot} -xf -
rm -rf %{buildroot}/usr/src/debug rm -rf %{buildroot}/usr/src/debug
# On RHEL subscriptions, networkmanager, selinux, and sosreport are part of the shell package # On RHEL subscriptions, networkmanager, selinux, and sosreport are part of the system package
%if 0%{?rhel} %if 0%{?rhel}
cat subscriptions.list sosreport.list networkmanager.list selinux.list >> shell.list cat subscriptions.list sosreport.list networkmanager.list selinux.list >> system.list
%endif %endif
%find_lang %{name} %find_lang %{name}
@ -275,15 +247,18 @@ cat subscriptions.list sosreport.list networkmanager.list selinux.list >> shell.
cat debug.partial >> %{_builddir}/%{?buildsubdir}/debugfiles.list \ cat debug.partial >> %{_builddir}/%{?buildsubdir}/debugfiles.list \
%{nil} %{nil}
%files # -------------------------------------------------------------------------------
%{_docdir}/%{name}/AUTHORS # Sub-packages
%{_docdir}/%{name}/COPYING
%{_docdir}/%{name}/README.md %package bridge
%dir %{_datadir}/%{name} Summary: Cockpit bridge server-side component
%{_datadir}/appdata/cockpit.appdata.xml Obsoletes: %{name}-daemon < 0.48-2
%{_datadir}/applications/cockpit.desktop Requires: glib-networking
%{_datadir}/pixmaps/cockpit.png Requires: polkit
%doc %{_mandir}/man1/cockpit.1.gz
%description bridge
The Cockpit bridge component installed server side and runs commands on the
system on behalf of the web based user interface.
%files bridge -f base.list %files bridge -f base.list
%{_datadir}/%{name}/base1/bundle.min.js.gz %{_datadir}/%{name}/base1/bundle.min.js.gz
@ -292,12 +267,56 @@ cat subscriptions.list sosreport.list networkmanager.list selinux.list >> shell.
%attr(4755, -, -) %{_libexecdir}/cockpit-polkit %attr(4755, -, -) %{_libexecdir}/cockpit-polkit
%{_libdir}/security/pam_reauthorize.so %{_libdir}/security/pam_reauthorize.so
%package doc
Summary: Cockpit deployment and developer guide
%description doc
The Cockpit Deployment and Developer Guide shows sysadmins how to
deploy Cockpit on their machines as well as helps developers who want to
embed or extend Cockpit.
%files doc %files doc
%exclude %{_docdir}/%{name}/AUTHORS %exclude %{_docdir}/%{name}/AUTHORS
%exclude %{_docdir}/%{name}/COPYING %exclude %{_docdir}/%{name}/COPYING
%exclude %{_docdir}/%{name}/README.md %exclude %{_docdir}/%{name}/README.md
%{_docdir}/%{name} %{_docdir}/%{name}
%package machines
Summary: Cockpit user interface for virtual machines
Requires: %{name}-bridge >= %{required_base}
Requires: %{name}-system >= %{required_base}
Requires: libvirt
Requires: libvirt-client
%description machines
The Cockpit components for managing virtual machines.
%files machines -f machines.list
%package ostree
Summary: Cockpit user interface for rpm-ostree
# Requires: Uses new translations functionality
Requires: %{name}-bridge > 124
Requires: %{name}-system > 124
%if 0%{?fedora} > 0 && 0%{?fedora} < 24
Requires: rpm-ostree >= 2015.10-1
%else
Requires: /usr/libexec/rpm-ostreed
%endif
%description ostree
The Cockpit components for managing software updates for ostree based systems.
%files ostree -f ostree.list
%package pcp
Summary: Cockpit PCP integration
Requires: %{name}-bridge = %{version}-%{release}
Requires: pcp
%description pcp
Cockpit support for reading PCP metrics and loading PCP archives.
%files pcp %files pcp
%{_libexecdir}/cockpit-pcp %{_libexecdir}/cockpit-pcp
%{_localstatedir}/lib/pcp/config/pmlogconf/tools/cockpit %{_localstatedir}/lib/pcp/config/pmlogconf/tools/cockpit
@ -308,69 +327,22 @@ cat subscriptions.list sosreport.list networkmanager.list selinux.list >> shell.
# be out of sync with reality. # be out of sync with reality.
/usr/share/pcp/lib/pmlogger condrestart /usr/share/pcp/lib/pmlogger condrestart
%files ws -f %{name}.lang %package dashboard
%doc %{_mandir}/man5/cockpit.conf.5.gz Summary: Cockpit SSH remoting and dashboard
%doc %{_mandir}/man8/cockpit-ws.8.gz Requires: libssh >= %{libssh_version}
%doc %{_mandir}/man8/remotectl.8.gz Requires: cockpit-ws = %{version}-%{release}
%doc %{_mandir}/man8/pam_ssh_add.8.gz Provides: cockpit-ssh = %{version}-%{release}
%config(noreplace) %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/pam.d/cockpit %description dashboard
%{_unitdir}/cockpit.service Cockpit support for remoting to other servers, bastion hosts, and a basic dashboard
%{_unitdir}/cockpit.socket
%{_prefix}/lib/firewalld/services/cockpit.xml %files dashboard -f dashboard.list
%{_sbindir}/remotectl
%{_libdir}/security/pam_ssh_add.so
%{_libexecdir}/cockpit-ws
%{_libexecdir}/cockpit-stub
%{_libexecdir}/cockpit-ssh %{_libexecdir}/cockpit-ssh
%attr(4750, root, cockpit-ws) %{_libexecdir}/cockpit-session
%attr(775, -, wheel) %{_localstatedir}/lib/%{name}
%{_datadir}/%{name}/static
%{_datadir}/%{name}/branding
%pre ws %post dashboard
getent group cockpit-ws >/dev/null || groupadd -r cockpit-ws
getent passwd cockpit-ws >/dev/null || useradd -r -g cockpit-ws -d / -s /sbin/nologin -c "User for cockpit-ws" cockpit-ws
%post ws
%systemd_post cockpit.socket
# firewalld only partially picks up changes to its services files without this
test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
# HACK: Until policy changes make it downstream # HACK: Until policy changes make it downstream
# https://bugzilla.redhat.com/show_bug.cgi?id=1381331 # https://bugzilla.redhat.com/show_bug.cgi?id=1381331
test -f %{_bindir}/chcon && chcon -t cockpit_ws_exec_t %{_libexecdir}/cockpit-ssh test -f %{_bindir}/chcon && chcon -t cockpit_ws_exec_t %{_libexecdir}/cockpit-ssh
%preun ws
%systemd_preun cockpit.socket
%postun ws
%systemd_postun_with_restart cockpit.socket
%systemd_postun_with_restart cockpit.service
%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
# Optional components (only when soft deps are supported)
%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8
Recommends: NetworkManager-team
%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 %package storaged
Summary: Cockpit user interface for storage, using Storaged Summary: Cockpit user interface for storage, using Storaged
@ -397,35 +369,90 @@ The Cockpit component for managing storage. This package uses Storaged.
%files storaged -f storaged.list %files storaged -f storaged.list
%package ostree %package system
Summary: Cockpit user interface for rpm-ostree Summary: Cockpit admin interface package for configuring and troubleshooting a system
# Requires: Uses new translations functionality BuildArch: noarch
Requires: %{name}-bridge > 124 Requires: %{name}-bridge = %{version}-%{release}
Requires: %{name}-shell > 124 Requires: shadow-utils
%if 0%{?fedora} > 0 && 0%{?fedora} < 24 Requires: grep
Requires: rpm-ostree >= 2015.10-1 Requires: libpwquality
%else Requires: /usr/bin/date
Requires: /usr/libexec/rpm-ostreed Provides: %{name}-assets
Obsoletes: %{name}-assets < 0.32
Provides: %{name}-realmd = %{version}-%{release}
Provides: %{name}-shell = %{version}-%{release}
Obsoletes: %{name}-shell < 127
Provides: %{name}-systemd = %{version}-%{release}
Provides: %{name}-tuned = %{version}-%{release}
Provides: %{name}-users = %{version}-%{release}
%if 0%{?rhel}
Provides: %{name}-networkmanager = %{version}-%{release}
Requires: NetworkManager
# Optional components (only when soft deps are supported)
%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8
Recommends: NetworkManager-team
%endif
Provides: %{name}-selinux = %{version}-%{release}
Provides: %{name}-sosreport = %{version}-%{release}
Provides: %{name}-subscriptions = %{version}-%{release}
Requires: subscription-manager >= 1.13
%endif %endif
%description ostree %description system
The Cockpit components for managing software updates for ostree based systems. This package contains the Cockpit shell and system configuration interfaces.
%files ostree -f ostree.list %files system -f system.list
%package machines %package ws
Summary: Cockpit user interface for virtual machines Summary: Cockpit Web Service
Requires: %{name}-bridge >= %{required_base} Requires: glib-networking
Requires: %{name}-shell >= %{required_base} Requires: openssl
Requires: libvirt Requires: glib2 >= 2.37.4
Requires: libvirt-client Obsoletes: cockpit-selinux-policy <= 0.83
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
%description machines %description ws
The Cockpit components for managing virtual machines. The Cockpit Web Service listens on the network, and authenticates users.
%files machines -f machines.list %files ws -f %{name}.lang
%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
%{_libexecdir}/cockpit-stub
%attr(4750, root, cockpit-ws) %{_libexecdir}/cockpit-session
%attr(775, -, wheel) %{_localstatedir}/lib/%{name}
%{_datadir}/%{name}/static
%{_datadir}/%{name}/branding
# Conditionally built packages below %pre ws
getent group cockpit-ws >/dev/null || groupadd -r cockpit-ws
getent passwd cockpit-ws >/dev/null || useradd -r -g cockpit-ws -d / -s /sbin/nologin -c "User for cockpit-ws" cockpit-ws
%post ws
%systemd_post cockpit.socket
# firewalld only partially picks up changes to its services files without this
test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
%preun ws
%systemd_preun cockpit.socket
%postun ws
%systemd_postun_with_restart cockpit.socket
%systemd_postun_with_restart cockpit.service
# -------------------------------------------------------------------------------
# Conditional Sub-packages
%if 0%{?rhel} == 0 %if 0%{?rhel} == 0
@ -543,12 +570,19 @@ pulls in some necessary packages via dependencies.
%files test-assets %files test-assets
%{_datadir}/%{name}/playground %{_datadir}/%{name}/playground
%{_datadir}/cockpit-test-assets %{_prefix}/lib/cockpit-test-assets
%endif %endif
# The changelog is automatically generated and merged # The changelog is automatically generated and merged
%changelog %changelog
* Wed Jan 18 2017 Stef Walter <<stefw@redhat.com>> - 129-1
- Diagnostic sosreport feature now works on RHEL Atomic again
- The configure script has a --disable-ssh option to toggle libssh dep
- The configure --disable-ws option has been replaced with above.
- Unit tests have been fixed on recent GLib versions
- Several Fedora and Debian packaging fixes
* Wed Dec 14 2016 Stef Walter <<stefw@redhat.com>> - 126-1 * Wed Dec 14 2016 Stef Walter <<stefw@redhat.com>> - 126-1
- Show security scan information about containers - Show security scan information about containers
- Choose whether password is cached and reused on login screen - Choose whether password is cached and reused on login screen

2
sources
View File

@ -1 +1 @@
e22b6225126bff951204c984363e386a cockpit-126.tar.xz SHA512 (cockpit-129.tar.xz) = b9fa59dc92e5fccb21e34801e91fb6901665d4888d57ed31f2d41d932c9b7a6640bf19664a186dfbeb611fb2cfbcb476896cc8899ae4f30475d6787a3ab30c25