From ceecb7598e6d0271fae316e9742a6fbb6f0115d5 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Mon, 8 Jun 2026 11:46:14 +0200 Subject: [PATCH] Update to upstream release 363.2 Related: RHEL-157464 --- .gitignore | 2 ++ README.packit | 2 +- cockpit.spec | 8 +++++++- packit.yaml | 37 ++++++++++++++++++++++++++++++------- sources | 4 ++-- 5 files changed, 42 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 6e4a7fd..db7042a 100644 --- a/.gitignore +++ b/.gitignore @@ -349,3 +349,5 @@ /cockpit-node-361.tar.xz /cockpit-362.tar.xz /cockpit-node-362.tar.xz +/cockpit-363.2.tar.xz +/cockpit-node-363.2.tar.xz diff --git a/README.packit b/README.packit index eb5cf90..4e76cbe 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.16.0.post1.dev2+ged481c62d. +The file was generated using packit 1.16.0.post1.dev8+g8a0482385. diff --git a/cockpit.spec b/cockpit.spec index 567d97f..3fa7e27 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -55,7 +55,7 @@ Summary: Web Console for Linux servers License: LGPL-2.1-or-later AND GPL-3.0-or-later AND MIT AND CC-BY-SA-3.0 AND BSD-3-Clause URL: https://cockpit-project.org/ -Version: 362 +Version: 363.2 Release: 1%{?dist} Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz Source1: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-node-%{version}.tar.xz @@ -665,6 +665,12 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Mon Jun 08 2026 Packit - 363.2-1 +- packit: Use tars for propose-downstream + +* Thu Jun 04 2026 Python Maint - 362-2 +- Rebuilt for Python 3.15 + * Wed May 20 2026 Packit - 362-1 - Bug fixes and translation updates - Fix arbitrary code execution via specially crafted logs page link (CVE-2026-4802) diff --git a/packit.yaml b/packit.yaml index 5067299..28c880c 100644 --- a/packit.yaml +++ b/packit.yaml @@ -1,4 +1,5 @@ upstream_project_url: https://github.com/cockpit-project/cockpit +issue_repository: https://github.com/cockpit-project/cockpit specfile_path: cockpit.spec actions: # create-archive does not work with multiple sources, so do the spec mangling ourselves @@ -82,18 +83,45 @@ jobs: project: "main-builds" preserve_project: True + # testing changes to this: + # 1. Create a personal COPR, and change owner/project below + # 2. Make a temporary commit that: + # - disables all jobs except "source" from .github/workflows/release.yml + # - drops copr_build/commit, propose_downstream, and bodhi_update from packit.yaml + # - sets upstream_project_url/issue_repository at the top to your fork + # - updates Source0/1: in tools/cockpit.spec to your fork + # 3. Commit your adjustments. Push your changes to your fork's main branch + # 4. Tag and push a release to your fork. Replace the `my` remote with your fork: + # R=362.99; git tag -d $R; git push my :$R; git tag -s -F /tmp/tagmsg $R; git push my -f; git push my $R + # 5. The initial release will fail. Wait for the "packit is requesting + # permissions change" email, and grant it in your COPR's Settings → Permissions + # 6. Iterate (step 3.) and re-tag (step 4). - job: copr_build trigger: release owner: "@cockpit" project: "cockpit-preview" preserve_project: True # Don't rebuild the tarball for official releases (https://github.com/packit/packit-service/issues/1505) - actions: &official_release_actions + actions: + # the PACKIT_* variables are not yet set here; this just needs to create the declared specfile_path + post-upstream-clone: + - cp tools/cockpit.spec . + + fix-spec-file: + # Don't rebuild the tarball for official releases (https://github.com/packit/packit-service/issues/1505) + - bash -c "curl -L --fail -O https://github.com/cockpit-project/${PACKIT_UPSTREAM_PACKAGE_NAME}/releases/download/${PACKIT_PROJECT_VERSION}/${PACKIT_PROJECT_NAME_VERSION}.tar.xz" + - bash -c "curl -L --fail -O https://github.com/cockpit-project/${PACKIT_UPSTREAM_PACKAGE_NAME}/releases/download/${PACKIT_PROJECT_VERSION}/${PACKIT_UPSTREAM_PACKAGE_NAME}-node-${PACKIT_PROJECT_VERSION}.tar.xz" + # Extract the correct spec from the release (with correct Version and NPM Provides:) + - bash -c "tar -xJf cockpit-${PACKIT_PROJECT_VERSION}.tar.xz cockpit-${PACKIT_PROJECT_VERSION}/tools/cockpit.spec --strip-components=2" + + - job: propose_downstream + trigger: release + # Don't rebuild the tarball for official releases (https://github.com/packit/packit-service/issues/1505) + actions: # the PACKIT_* variables are not yet set here; this just needs to create the declared specfile_path post-upstream-clone: - cp tools/cockpit.spec . - # resolve NPM_PROVIDES, but otherwise keep packit's %changelog post-modifications: - | bash -exc ' @@ -103,11 +131,6 @@ jobs: tools/fix-spec "${PACKIT_DOWNSTREAM_REPO:-${PACKIT_UPSTREAM_REPO}}/cockpit.spec" ' - fix-spec-file: "" - - job: propose_downstream - trigger: release - actions: *official_release_actions - dist_git_branches: - fedora-development - fedora-43 diff --git a/sources b/sources index a8b6396..3b84009 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cockpit-362.tar.xz) = bbad36ec1c805a2434210ae1535f0495e76c75fdd14eb7826b42488beda7bc7547a9bdae649c88a756127268ae81d8d45945f4b5d1964fd376f26341e2e38633 -SHA512 (cockpit-node-362.tar.xz) = 0d76ee02098e02bfcb3cf2b6cfb48d68a31b8e84ea7262ab23bdc62d0c5ccc69358bc6cc36bc5b51c64eecfb5ac2a6e3c41bcac74fd797d4c068b403db05f8cc +SHA512 (cockpit-363.2.tar.xz) = 15f6632faf06ddb276da684c19bf34090575b6a5ec9615a51b33a09c1ff2b6114ab5bb7bd83cc29a4cf1714bcd812b0885f433c5ceb8302d015255e552b8cac0 +SHA512 (cockpit-node-363.2.tar.xz) = d6854a0ea92ddc13b492b8fe421e1bc6e5b5d0294d2573398ab321d8ff71ffc0c9efc21b0f530e69029a22364b7226222f11b6eecb863b54f2a2b47a12e9f56a