forked from cockpit/cockpit
temporary remove pam_oath, so we can update factory/15.6
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=194
This commit is contained in:
Git OBS Bridge
parent
c9f440fd0a
commit
515e11446a
@ -9,11 +9,6 @@ Sat Aug 7 09:37:00 UTC 2024 - pallas wept <pallaswept@proton.me>
|
||||
|
||||
- Recommend cockpit-packagekit if zypper is installed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 7 09:36:58 UTC 2024 - Jan Zerebecki <jan.suse@zerebecki.de>
|
||||
|
||||
- load pam_oath for optional TOTP for authentication
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 31 08:23:43 UTC 2024 - Adam Majer <adam.majer@suse.de>
|
||||
|
||||
|
||||
@ -8,4 +8,3 @@ password include common-password
|
||||
session required pam_loginuid.so
|
||||
session optional pam_keyinit.so force revoke
|
||||
session include common-session
|
||||
auth [user_unknown=ignore success=ok] pam_oath.so usersfile=${HOME}/.pam_oath_usersfile window=20 digits=6
|
||||
|
||||
92
cockpit.spec
92
cockpit.spec
@ -1,32 +1,22 @@
|
||||
#
|
||||
# spec file for package cockpit
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (C) 2014-2020 Red Hat, Inc.
|
||||
#
|
||||
# Cockpit is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU Lesser General Public License as published by
|
||||
# the Free Software Foundation; either version 2.1 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Cockpit is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# Lesser General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public License
|
||||
# along with Cockpit; If not, see <http://www.gnu.org/licenses/>.
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
#
|
||||
# This file is maintained at the following location:
|
||||
# https://github.com/cockpit-project/cockpit/blob/main/tools/cockpit.spec
|
||||
#
|
||||
# If you are editing this file in another location, changes will likely
|
||||
# be clobbered the next time an automated release is done.
|
||||
#
|
||||
# Check first cockpit-devel@lists.fedorahosted.org
|
||||
#
|
||||
|
||||
# earliest base that the subpackages work on; this is still required as long as
|
||||
# we maintain the basic/optional split, then it can be replaced with just %{version}.
|
||||
%define required_base 266
|
||||
|
||||
# we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly
|
||||
@ -123,24 +113,25 @@ ExcludeArch: %{ix86}
|
||||
%endif
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: pkgconfig(gio-unix-2.0)
|
||||
BuildRequires: pkgconfig(json-glib-1.0)
|
||||
BuildRequires: pkgconfig(polkit-agent-1) >= 0.105
|
||||
BuildRequires: pam-devel
|
||||
|
||||
BuildRequires: autoconf automake
|
||||
BuildRequires: make
|
||||
BuildRequires: /usr/bin/python3
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: gettext >= 0.21
|
||||
BuildRequires: libssh-devel >= 0.8.5
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: glib-networking
|
||||
BuildRequires: gnutls-devel >= 3.4.3
|
||||
BuildRequires: libssh-devel >= 0.8.5
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: make
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: sed
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: pkgconfig(krb5) >= 1.11
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: glib-networking
|
||||
BuildRequires: sed
|
||||
|
||||
BuildRequires: glib2-devel >= 2.50.0
|
||||
# this is for runtimedir in the tls proxy ace21c8879
|
||||
@ -149,12 +140,12 @@ BuildRequires: pkgconfig(libsystemd) >= 235
|
||||
BuildRequires: distribution-release
|
||||
%if %{build_pcp}
|
||||
BuildRequires: libpcp-devel
|
||||
BuildRequires: pcp-devel
|
||||
BuildRequires: libpcp3
|
||||
BuildRequires: libpcp_import1
|
||||
BuildRequires: pcp-devel
|
||||
%endif
|
||||
BuildRequires: openssh
|
||||
BuildRequires: distribution-logos
|
||||
BuildRequires: openssh
|
||||
BuildRequires: wallpaper-branding
|
||||
# needed for /var/lib/pcp directory ownership
|
||||
BuildRequires: pcp
|
||||
@ -162,11 +153,11 @@ BuildRequires: pcp
|
||||
%if %{build_pcp}
|
||||
BuildRequires: pcp-libs-devel
|
||||
%endif
|
||||
BuildRequires: openssh-clients
|
||||
BuildRequires: docbook-style-xsl
|
||||
BuildRequires: openssh-clients
|
||||
%endif
|
||||
BuildRequires: krb5-server
|
||||
BuildRequires: gdb
|
||||
BuildRequires: krb5-server
|
||||
|
||||
# For documentation
|
||||
BuildRequires: xmlto
|
||||
@ -179,15 +170,15 @@ BuildRequires: selinux-policy-devel
|
||||
|
||||
# for rebuilding nodejs bits
|
||||
BuildRequires: npm
|
||||
BuildRequires: sassc
|
||||
BuildRequires: local-npm-registry
|
||||
BuildRequires: sassc
|
||||
|
||||
# This is the "cockpit" metapackage. It should only
|
||||
# Require, Suggest or Recommend other cockpit-xxx subpackages
|
||||
|
||||
Requires: cockpit-bridge
|
||||
Requires: cockpit-ws
|
||||
Requires: cockpit-system
|
||||
Requires: cockpit-ws
|
||||
|
||||
# Optional components
|
||||
Recommends: (cockpit-storaged if udisks2)
|
||||
@ -471,18 +462,17 @@ troubleshooting, interactive command-line sessions, and more.
|
||||
%{_datadir}/pixmaps/cockpit.png
|
||||
%doc %{_mandir}/man1/cockpit.1.gz
|
||||
|
||||
|
||||
%package bridge
|
||||
Summary: Cockpit bridge server-side component
|
||||
Requires: glib-networking
|
||||
Provides: cockpit-ssh = %{version}-%{release}
|
||||
# 233 dropped jquery.js, pages started to bundle it (commit 049e8b8dce)
|
||||
Conflicts: cockpit-dashboard < 233
|
||||
Conflicts: cockpit-docker < 233
|
||||
Conflicts: cockpit-networkmanager < 233
|
||||
Conflicts: cockpit-storaged < 233
|
||||
Conflicts: cockpit-system < 233
|
||||
Conflicts: cockpit-tests < 233
|
||||
Conflicts: cockpit-docker < 233
|
||||
|
||||
%description bridge
|
||||
The Cockpit bridge component installed server side and runs commands on the
|
||||
@ -516,9 +506,9 @@ Requires: cockpit-bridge >= %{version}-%{release}
|
||||
%if !0%{?suse_version}
|
||||
Requires: shadow-utils
|
||||
%endif
|
||||
Requires: grep
|
||||
Requires: /usr/bin/pwscore
|
||||
Requires: /usr/bin/date
|
||||
Requires: /usr/bin/pwscore
|
||||
Requires: grep
|
||||
Provides: cockpit-shell = %{version}-%{release}
|
||||
Provides: cockpit-systemd = %{version}-%{release}
|
||||
Provides: cockpit-tuned = %{version}-%{release}
|
||||
@ -529,9 +519,9 @@ Requires: NetworkManager >= 1.6
|
||||
Requires: kexec-tools
|
||||
Requires: sos
|
||||
Requires: sudo
|
||||
Recommends: /usr/bin/kdumpctl
|
||||
Recommends: PackageKit
|
||||
Recommends: setroubleshoot-server >= 3.3.3
|
||||
Recommends: /usr/bin/kdumpctl
|
||||
Suggests: NetworkManager-team
|
||||
Provides: cockpit-kdump = %{version}-%{release}
|
||||
Provides: cockpit-networkmanager = %{version}-%{release}
|
||||
@ -553,8 +543,8 @@ This package contains the Cockpit shell and system configuration interfaces.
|
||||
%package ws
|
||||
Summary: Cockpit Web Service
|
||||
Requires: glib-networking
|
||||
Requires: openssl
|
||||
Requires: glib2 >= 2.50.0
|
||||
Requires: openssl
|
||||
%if 0%{?with_selinux}
|
||||
Requires: (selinux-policy >= %{_selinux_policy_version} if selinux-policy-%{selinuxtype})
|
||||
Requires(post): (policycoreutils if selinux-policy-%{selinuxtype})
|
||||
@ -566,7 +556,6 @@ Suggests: sssd-dbus >= 2.6.2
|
||||
%if 0%{?suse_version}
|
||||
Requires(pre): permissions
|
||||
Requires: distribution-logos
|
||||
Requires: pam_oath
|
||||
Requires: wallpaper-branding
|
||||
%endif
|
||||
# for cockpit-desktop
|
||||
@ -755,9 +744,9 @@ sosreport tool.
|
||||
|
||||
%package networkmanager
|
||||
Summary: Cockpit user interface for networking, using NetworkManager
|
||||
Requires: NetworkManager >= 1.6
|
||||
Requires: cockpit-bridge >= %{required_base}
|
||||
Requires: cockpit-shell >= %{required_base}
|
||||
Requires: NetworkManager >= 1.6
|
||||
Conflicts: cockpit-wicked
|
||||
# Optional components
|
||||
Recommends: NetworkManager-team
|
||||
@ -795,22 +784,22 @@ utility setroubleshoot to diagnose and resolve SELinux issues.
|
||||
|
||||
%package -n cockpit-storaged
|
||||
Summary: Cockpit user interface for storage, using udisks
|
||||
Requires: %{__python3}
|
||||
Requires: cockpit-shell >= %{required_base}
|
||||
Requires: udisks2 >= 2.9
|
||||
Requires: %{__python3}
|
||||
%if 0%{?suse_version}
|
||||
Requires: libudisks2-0_lvm2 >= 2.9
|
||||
Requires: libudisks2-0_btrfs >= 2.9
|
||||
Requires: libudisks2-0_lvm2 >= 2.9
|
||||
Recommends: multipath-tools
|
||||
Requires: python3-dbus-python
|
||||
%else
|
||||
Recommends: udisks2-lvm2 >= 2.9
|
||||
Recommends: udisks2-iscsi >= 2.9
|
||||
Recommends: udisks2-lvm2 >= 2.9
|
||||
%if ! 0%{?rhel}
|
||||
Recommends: udisks2-btrfs >= 2.9
|
||||
%endif
|
||||
Recommends: device-mapper-multipath
|
||||
Recommends: clevis-luks
|
||||
Recommends: device-mapper-multipath
|
||||
Requires: python3-dbus
|
||||
%endif
|
||||
BuildArch: noarch
|
||||
@ -871,8 +860,8 @@ systemctl reload-or-try-restart pmlogger
|
||||
%package -n cockpit-packagekit
|
||||
Summary: Cockpit user interface for packages
|
||||
BuildArch: noarch
|
||||
Requires: cockpit-bridge >= %{required_base}
|
||||
Requires: PackageKit
|
||||
Requires: cockpit-bridge >= %{required_base}
|
||||
Recommends: python3-tracer
|
||||
# HACK: https://bugzilla.redhat.com/show_bug.cgi?id=1800468
|
||||
Requires: polkit
|
||||
@ -883,5 +872,4 @@ via PackageKit.
|
||||
|
||||
%files -n cockpit-packagekit -f packagekit.list
|
||||
|
||||
# The changelog is automatically generated and merged
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user