From 9e84357fecef5cf87919607de99022ea27cf6da3 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Fri, 27 Sep 2024 17:10:55 +0200
Subject: [PATCH] Mock release v5.8

./releng/generate-release-notes --use-version 5.8
/usr/bin/tito tag --use-version=5.8
---
 .tito/packages/mock                           |  2 +-
 docs/Release-Notes-5.8.md                     | 23 +++++++++++++++++++
 docs/index.md                                 |  1 +
 mock/mock.spec                                |  7 +++++-
 .../chroot-scan-permissions.bugfix            |  2 --
 .../chroot-scan-util-do.bugfix                |  3 ---
 .../chroot_scan_resultdir.bugfix              |  3 ---
 7 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 docs/Release-Notes-5.8.md
 delete mode 100644 releng/release-notes-next/chroot-scan-permissions.bugfix
 delete mode 100644 releng/release-notes-next/chroot-scan-util-do.bugfix
 delete mode 100644 releng/release-notes-next/chroot_scan_resultdir.bugfix

diff --git a/.tito/packages/mock b/.tito/packages/mock
index 6cccbd8fe..f993edcec 100644
--- a/.tito/packages/mock
+++ b/.tito/packages/mock
@@ -1 +1 @@
-5.7-1 mock/
+5.8-1 mock/
diff --git a/docs/Release-Notes-5.8.md b/docs/Release-Notes-5.8.md
new file mode 100644
index 000000000..3fb701483
--- /dev/null
+++ b/docs/Release-Notes-5.8.md
@@ -0,0 +1,23 @@
+---
+layout: default
+title: Release Notes - Mock 5.8
+---
+
+## [Release 5.8](https://rpm-software-management.github.io/mock/Release-Notes-5.8) - 2024-09-27
+
+
+### Bugfixes
+
+- Mock v5.7 introduced a regression in the `chroot_scan` plugin that prevented the
+  result directory from being created properly. This issue has been
+  [fixed][PR#1472] - and is the major reason for doing v5.8 bugfix release.
+
+- The ownership of the tarball provided by `chroot_scan` (when `write_tar =
+  True`) has been corrected, ensuring the file is no longer root-owned.
+
+- The `chroot_scan` plugin now consistently uses the `util.do` method instead of
+  custom `subprocess.call` calls.  This ensures that the `mock --verbose` output
+  properly displays the commands (like `cp`, or `tar`) being executed.
+
+
+[PR#1472]: https://github.com/rpm-software-management/mock/pull/1472
diff --git a/docs/index.md b/docs/index.md
index f1cb0caa0..472968bc5 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -69,6 +69,7 @@ Versions in Linux distributions:
 
 
 ## Release Notes
+* [5.8](Release-Notes-5.8) - Bug-fixed regression in `chroot_scan` plugin.
 * [5.7 and Configs 41.3](Release-Notes-5.7) - Support for isolated builds added.  DNF4 = DNF.  Option `--scrub-all-chroots` added.
 * [Configs 41.1 (and 41.2)](Release-Notes-Configs-41.1) - EL7 configs EOL. F38 EOL. F41 branched.
 * [Configs 40.6](Release-Notes-Configs-40.6) - CentOS Stream 10 uses mirrored repositories.
diff --git a/mock/mock.spec b/mock/mock.spec
index d231b7a72..337ff5a64 100644
--- a/mock/mock.spec
+++ b/mock/mock.spec
@@ -6,7 +6,7 @@
 
 Summary: Builds packages inside chroots
 Name: mock
-Version: 5.7
+Version: 5.8
 Release: 1%{?dist}
 License: GPL-2.0-or-later
 # Source is created by
@@ -313,6 +313,11 @@ pylint-3 py/mockbuild/ py/*.py py/mockbuild/plugins/* || :
 %config(noreplace) %{_sysusersdir}/mock.conf
 
 %changelog
+* Fri Sep 27 2024 Pavel Raiskup <praiskup@redhat.com> 5.8-1
+- chroot_scan: make sure the tarball is owned by non-priv user
+- chroot_scan: use util.do to display command in --verbose
+- chroot_scan: correctly create the result directory
+
 * Thu Sep 26 2024 Pavel Raiskup <praiskup@redhat.com> 5.7-1
 - hermetic: new mode to do fully-offline builds
 - new --scrub-all-chroots option
diff --git a/releng/release-notes-next/chroot-scan-permissions.bugfix b/releng/release-notes-next/chroot-scan-permissions.bugfix
deleted file mode 100644
index ef97387b3..000000000
--- a/releng/release-notes-next/chroot-scan-permissions.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-The ownership of the `chroot_scan` plugin "output tarball" (when `write_tar =
-True`) has been corrected, ensuring the file is no longer root-owned.
diff --git a/releng/release-notes-next/chroot-scan-util-do.bugfix b/releng/release-notes-next/chroot-scan-util-do.bugfix
deleted file mode 100644
index 31704a452..000000000
--- a/releng/release-notes-next/chroot-scan-util-do.bugfix
+++ /dev/null
@@ -1,3 +0,0 @@
-The `chroot_scan` plugin now consistently uses the `util.do` method instead of
-custom `subprocess.call` calls.  This ensures that the `mock --verbose` output
-properly displays the commands (like `cp`, or `tar`) being executed.
diff --git a/releng/release-notes-next/chroot_scan_resultdir.bugfix b/releng/release-notes-next/chroot_scan_resultdir.bugfix
deleted file mode 100644
index 6c172b65f..000000000
--- a/releng/release-notes-next/chroot_scan_resultdir.bugfix
+++ /dev/null
@@ -1,3 +0,0 @@
-Mock v5.7 introduced a regression in the `chroot_scan` plugin that prevented the
-result directory from being created properly. This issue has been
-[fixed][PR#1472].