From 5b9683bad062e59e614c3da2faf89e5b162ceebd Mon Sep 17 00:00:00 2001 From: tigro Date: Mon, 22 Jul 2024 16:00:28 +0300 Subject: [PATCH] Remove GOST patches for MSVSphere as it is unsupported by system --- .cockpit.metadata | 2 +- SOURCES/cockpit-inferit-patch.sh | 5 +++++ SPECS/cockpit.spec | 7 +++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.cockpit.metadata b/.cockpit.metadata index c7bb4f0..0c5f284 100644 --- a/.cockpit.metadata +++ b/.cockpit.metadata @@ -1,2 +1,2 @@ -671296c65d88f6c7cc520fcf93d2cab9a8ea1b36 SOURCES/cockpit-310.3.tar.xz a37e1d6ad4b1b25729682c54ab7e4dcdcfd894a7 SOURCES/cockpit.css.gz +e3c77825b38894cbf8261dbddf56affefb431083 SOURCES/cockpit-310.3.tar.xz diff --git a/SOURCES/cockpit-inferit-patch.sh b/SOURCES/cockpit-inferit-patch.sh index 4b8208b..9b50cd1 100755 --- a/SOURCES/cockpit-inferit-patch.sh +++ b/SOURCES/cockpit-inferit-patch.sh @@ -21,6 +21,11 @@ echo "Checkout tag ${_version}" git checkout ${_version} echo "Patching souurces" +# FIXME +# Remove GOST patches for MSVSphere 8 +# As it is unsupported by system +rm ../0001-Added-support-GOST-and-PAM-GOST-profiles-for-crypto-.patch +rm ../0009-Change-chpasswd-to-passwd-to-support-PAM-crypto-algo.patch git am ../000*.patch echo "Fix version in tools/make-dist" diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index 0c03518..90a84e5 100644 --- a/SPECS/cockpit.spec +++ b/SPECS/cockpit.spec @@ -50,8 +50,8 @@ License: LGPL-2.1-or-later URL: https://cockpit-project.org/ Version: 310.3 -Release: 1%{?dist}.inferit -Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz +Release: 1%{?dist}.inferit.1 +Source0: cockpit-%{version}.tar.xz Source1: cockpit.css.gz # in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system}) @@ -786,6 +786,9 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Mon Jul 22 2024 Arkady L. Shane - 310.3-1.inferit.1 +- Remove GOST patches for MSVSphere as it is unsupported by system + * Tue Apr 16 2024 Arkady L. Shane - 310.3-1.inferit - Replace Source0 archive with MSVSphere OS-specific one - Add MSVSphere OS branding