mikelo2 pushed to rpms/shdoc (f38). "Update to 1.2 - Closes rhbz#2227944"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-07-31 21:50:04 UTC
From 6ef4ded01ab5642c31664f844b3c8982f7d410d8 Mon Sep 17 00:00:00 2001
From: Mikel Olasagasti Uranga <mikel(a)olasagasti.info>
Date: Jul 31 2023 21:49:24 +0000
Subject: Update to 1.2 - Closes rhbz#2227944
---
diff --git a/.gitignore b/.gitignore
index a15094b..c163b3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/shdoc-b64998d.tar.gz
/shdoc-1.1.tar.gz
+/shdoc-1.2.tar.gz
diff --git a/shdoc.spec b/shdoc.spec
index 5ad233c..30cdc85 100644
--- a/shdoc.spec
+++ b/shdoc.spec
@@ -1,5 +1,5 @@
Name: shdoc
-Version: 1.1
+Version: 1.2
Release: %autorelease
Summary: Documentation generator for bash/zsh/sh for generating documentation in Markdown
diff --git a/sources b/sources
index 492ebfc..9e3c191 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (shdoc-1.1.tar.gz) = f5dc1be88d21abeb24de6d31a9e5fbc0797283daae3a706513f08d9c3428ec212594359ccc7a043ff7c749d178fa3209e7b88cb326adb0dab2641cacc9a85755
+SHA512 (shdoc-1.2.tar.gz) = 92ae42f9a51b6f09208b3a0877ad1fdb7f0fb0197a6cf4abb7dc268c326bad0aba5d8b631c7b5ea958c207029a8607eecdee0a40ca66d8425d61116caf3215ec
https://src.fedoraproject.org/rpms/shdoc/c/6ef4ded01ab5642c31664f844b3c89...
9Â months, 1Â week
mikelo2 pushed to rpms/shdoc (rawhide). "Update to 1.2 - Closes
rhbz#2227944"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-07-31 21:49:49 UTC
From 6ef4ded01ab5642c31664f844b3c8982f7d410d8 Mon Sep 17 00:00:00 2001
From: Mikel Olasagasti Uranga <mikel(a)olasagasti.info>
Date: Jul 31 2023 21:49:24 +0000
Subject: Update to 1.2 - Closes rhbz#2227944
---
diff --git a/.gitignore b/.gitignore
index a15094b..c163b3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/shdoc-b64998d.tar.gz
/shdoc-1.1.tar.gz
+/shdoc-1.2.tar.gz
diff --git a/shdoc.spec b/shdoc.spec
index 5ad233c..30cdc85 100644
--- a/shdoc.spec
+++ b/shdoc.spec
@@ -1,5 +1,5 @@
Name: shdoc
-Version: 1.1
+Version: 1.2
Release: %autorelease
Summary: Documentation generator for bash/zsh/sh for generating documentation in Markdown
diff --git a/sources b/sources
index 492ebfc..9e3c191 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (shdoc-1.1.tar.gz) = f5dc1be88d21abeb24de6d31a9e5fbc0797283daae3a706513f08d9c3428ec212594359ccc7a043ff7c749d178fa3209e7b88cb326adb0dab2641cacc9a85755
+SHA512 (shdoc-1.2.tar.gz) = 92ae42f9a51b6f09208b3a0877ad1fdb7f0fb0197a6cf4abb7dc268c326bad0aba5d8b631c7b5ea958c207029a8607eecdee0a40ca66d8425d61116caf3215ec
https://src.fedoraproject.org/rpms/shdoc/c/6ef4ded01ab5642c31664f844b3c89...
9Â months, 1Â week
bgurney pushed to rpms/stratisd (f38). "Use patch macro for
serde_derive patch (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-07-31 21:40:13 UTC
From b48ded5422550d90e92c803966e907052bdb6649 Mon Sep 17 00:00:00 2001
From: Bryan Gurney <bgurney(a)redhat.com>
Date: Jul 31 2023 21:39:43 +0000
Subject: Use patch macro for serde_derive patch
Signed-off-by: Bryan Gurney <bgurney(a)redhat.com>
---
diff --git a/stratisd.spec b/stratisd.spec
index 361a82d..36721be 100644
--- a/stratisd.spec
+++ b/stratisd.spec
@@ -5,7 +5,7 @@
Name: stratisd
Version: 3.5.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Daemon that manages block devices to create filesystems
License: (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND MIT AND MPL-2.0 AND (Unlicense OR MIT)
@@ -14,6 +14,7 @@ Source0: %{url}/archive/stratisd-v%{version}/%{name}-%{version}.tar.gz
Source1: %{url}/releases/download/stratisd-v%{version}/%{name}-%{version}-vendor.tar.gz
Source2: %{crates_source}
+Patch0: vendor-serde_derive.patch
ExclusiveArch: %{rust_arches}
%if 0%{?rhel}
@@ -87,7 +88,7 @@ Requires: stratisd
# Rename SOURCE0's top-level directory because it starts with
# stratisd-stratisd-v. GitHub calculates the directory name from the repo name
# + the tag. Extract the upstream crate on top of the extracted GitHub release,
-# overwriting changed files. The primary purpose of thie step is to ensure that
+# overwriting changed files. The primary purpose of this step is to ensure that
# the Cargo.toml that is used in building is the one that is generated by
# cargo-publish and cargo-package, not the file with path dependencies that
# GitHub packs up. Tar the overwritten files back up again into a tar file
@@ -108,7 +109,7 @@ tar --extract --file %{SOURCE1}
# Remove pre-compiled procedural macro, compile from source
rm ./vendor/serde_derive/serde_derive-x86_64-unknown-linux-gnu
-patch -p1 ./vendor-serde_derive.patch
+%patch0 -p1
# Rezip the tarfile
tar --create --gzip --file %{SOURCE1}.newfile ./vendor --remove-files
@@ -206,6 +207,9 @@ a2x -f manpage docs/stratis-dumpmetadata.txt
%{_mandir}/man8/stratis-dumpmetadata.8*
%changelog
+* Mon Jul 31 2023 Bryan Gurney <bgurney(a)redhat.com> - 3.5.8-2
+- Use patch macro for serde_derive patch
+
* Mon Jul 31 2023 Bryan Gurney <bgurney(a)redhat.com> - 3.5.8-1
- Update to 3.5.8
- Patch vendored tarfile to remove executable
https://src.fedoraproject.org/rpms/stratisd/c/b48ded5422550d90e92c803966e...
9Â months, 1Â week
salimma pushed to rpms/python-django-pdb (epel9). "Initial Fedora
package (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-07-31 21:27:57 UTC
From eef42b12a6048f17028963d9836b19d187576f10 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Dec 10 2021 18:10:16 +0000
Subject: Initial Fedora package
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..29eba4c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/django-pdb-0.6.2.tar.gz
diff --git a/python-django-pdb.spec b/python-django-pdb.spec
new file mode 100644
index 0000000..0bea9bb
--- /dev/null
+++ b/python-django-pdb.spec
@@ -0,0 +1,72 @@
+# upstream test project is not in PyPI
+# GitHub does not have the latest release tagged
+# ... and importing fails because it expects some
+# settings set
+%bcond_with tests
+
+%global srcname django-pdb
+
+Name: python-%{srcname}
+Version: 0.6.2
+Release: %autorelease
+Summary: Easier pdb debugging for Django
+License: Public Domain
+URL: https://github.com/tomchristie/django-pdb
+# PyPI tarball doesn't contain some requirements files
+Source0: %{pypi_source %{srcname}}
+
+BuildArch: noarch
+
+BuildRequires: python%{python3_pkgversion}-devel
+BuildRequires: python%{python3_pkgversion}-setuptools
+%if %{with tests}
+# Test dependencies:
+BuildRequires: python3dist(django)
+%endif
+
+%global _description %{expand:
+Adding pdb.set_trace() to your source files every time you want to break into
+pdb sucks.
+
+Don’t do that.
+
+Do this.}
+
+%description %{_description}
+
+
+%package -n python%{python3_pkgversion}-%{srcname}
+Summary: %{summary}
+
+%description -n python%{python3_pkgversion}-%{srcname} %{_description}
+
+
+%prep
+%autosetup -p1 -n %{srcname}-%{version}
+
+
+%generate_buildrequires
+%pyproject_buildrequires
+
+
+%build
+%pyproject_wheel
+
+
+%install
+%pyproject_install
+%pyproject_save_files django_pdb
+
+
+%if %{with tests}
+%check
+%pyproject_check_import
+%endif
+
+
+%files -n python%{python3_pkgversion}-%{srcname} -f %{pyproject_files}
+%doc README.rst
+
+
+%changelog
+%autochangelog
diff --git a/sources b/sources
new file mode 100644
index 0000000..a24935c
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (django-pdb-0.6.2.tar.gz) = 273a426c0b3adea6a599791f67686d43eb226ac5557fbbe80225d4cda8e638b5e513dede8c5cc164e6901a4e73258fed6eedebe4ff4328f53cd77d968cfa3a95
https://src.fedoraproject.org/rpms/python-django-pdb/c/eef42b12a6048f1702...
9Â months, 1Â week
packagerbot pushed to rpms/dummy-test-package-gloster (rawhide).
"Bump release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-07-31 21:26:29 UTC
From f5a3f1fba09988829e91fd60410a3b25116b12ff Mon Sep 17 00:00:00 2001
From: packagerbot <admin(a)fedoraproject.org>
Date: Jul 31 2023 21:26:21 +0000
Subject: Bump release
Signed-off-by: packagerbot <admin(a)fedoraproject.org>
---
diff --git a/dummy-test-package-gloster.spec b/dummy-test-package-gloster.spec
index 321cce6..42f8870 100644
--- a/dummy-test-package-gloster.spec
+++ b/dummy-test-package-gloster.spec
@@ -3,7 +3,7 @@
Name: dummy-test-package-gloster
Version: 0
-Release: 10674%{?dist}
+Release: 10675%{?dist}
Summary: Dummy Test Package called Gloster
License: CC0
URL: http://fedoraproject.org/wiki/DummyTestPackages
@@ -32,6 +32,9 @@ cp -p uuid %{buildroot}%{_datadir}/%{name}
%{_datadir}/%{name}
%changelog
+* Mon Jul 31 2023 packagerbot <admin(a)fedoraproject.org> - 0-10675
+- rebuilt
+
* Mon Jul 31 2023 packagerbot <admin(a)fedoraproject.org> - 0-10674
- rebuilt
https://src.fedoraproject.org/rpms/dummy-test-package-gloster/c/f5a3f1fba...
9Â months, 1Â week
kkeithle pushed to rpms/ceph (eln). "ceph-18.1.3 RC4 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-07-31 21:24:10 UTC
From 86f289024095c3f7b6a13c8722602dc18bfe1349 Mon Sep 17 00:00:00 2001
From: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Jul 31 2023 21:23:59 +0000
Subject: ceph-18.1.3 RC4
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
---
diff --git a/ceph.spec b/ceph.spec
index bf6f2f9..3ce1911 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -205,8 +205,8 @@
# main package definition
#################################################################################
Name: ceph
-Version: 18.1.2
-Release: 0.5%{?dist}
+Version: 18.1.3
+Release: 0.1%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
%endif
@@ -2857,6 +2857,8 @@ exit 0
%endif
%changelog
+* Wed Jul 26 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.1.3-0.1
+- ceph-18.1.3 RC4
* Fri Jul 21 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 2:18.1.2-0.5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
diff --git a/sources b/sources
index 28a286d..bd6664d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ceph-18.1.2.tar.gz) = e197036d2b5d89b987a5b16b7ee2e976c8efaeec52f6e6fa07e419fe43f5d9b313029f4a3d3f2371e97a1fc36e6c63b0af698f7689055328e7de9263fe98f9d8
+SHA512 (ceph-18.1.3.tar.gz) = 4f88d0b85bdda0cafc857ceb6574ea5c80a8695064529397c836c1204b4979f37941540835e4fc90fffdf479632bd5ee8c2ee5a82e9bba873479d190b8b66b95
https://src.fedoraproject.org/rpms/ceph/c/86f289024095c3f7b6a13c8722602dc...
9Â months, 1Â week
pagure pushed to rpms/libblkio (rawhide). "Use vendored dependencies
in RHEL builds (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-07-31 21:18:13 UTC
From b24d95efc808e7763273f15961e759e1528187c7 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Jul 20 2023 16:48:47 +0000
Subject: Use vendored dependencies in RHEL builds
RHEL does not package individual Rust dependencies.
---
diff --git a/.gitignore b/.gitignore
index 77a3bc8..07d495a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/libblkio-v1.2.2.tar.bz2
/libblkio-v1.3.0.tar.bz2
+/libblkio-v1.3.0-vendor.tar.xz
diff --git a/libblkio.spec b/libblkio.spec
index 67a2d4b..19398d6 100644
--- a/libblkio.spec
+++ b/libblkio.spec
@@ -8,15 +8,23 @@ Name: libblkio
Release: 1%{?dist}
URL: %{forgeurl}
Source0: %{forgesource}
+# To create the vendor tarball:
+# tar xf %%{name}-v%%{version}.tar.bz2 ; pushd %%{name}-v%%{version} ; \
+# cargo vendor && tar Jcvf ../%%{name}-v%%{version}-vendor.tar.xz vendor/ ; popd
+Source1: %{name}-v%{version}-vendor.tar.xz
License: (Apache-2.0 OR MIT) AND (Apache-2.0 OR BSD-3-Clause) AND MIT AND BSD-3-Clause AND Unicode-DFS-2016
# Basic build requirements.
BuildRequires: gcc, gcc-c++
BuildRequires: make
BuildRequires: meson
+%if 0%{?rhel}
+BuildRequires: rust-toolset
+%else
BuildRequires: rust-packaging >= 21
BuildRequires: rustfmt
BuildRequires: cargo
+%endif
BuildRequires: python3-docutils
BuildRequires: pkgconf
@@ -29,6 +37,7 @@ BuildRequires: pkgconf
#
# For major version >= 0, we are requiring that the minor version does
# not change.
+%if ! 0%{?rhel}
BuildRequires: (crate(autocfg/default) >= 1.0.0 with crate(autocfg/default) < 2.0.0~)
BuildRequires: (crate(bitflags/default) >= 1.2.0 with crate(bitflags/default) < 2.0.0~)
BuildRequires: (crate(cc/default) >= 1.0.0 with crate(cc/default) < 2.0.0~)
@@ -46,6 +55,7 @@ BuildRequires: (crate(rustix/default) >= 0.36.10 with crate(rustix/default) < 0.
BuildRequires: (crate(syn/default) >= 1.0.0 with crate(syn/default) < 2.0.0~)
BuildRequires: (crate(unicode-ident/default) >= 1.0.0 with crate(unicode-ident/default) < 2.0.0~)
BuildRequires: (crate(virtio-bindings/default) >= 0.2.0 with crate(virtio-bindings/default) < 0.3.0~)
+%endif
%description
@@ -66,7 +76,11 @@ This package contains development tools for %{name}.
%prep
%forgeautosetup -p1
+%if 0%{?rhel}
+%cargo_prep -V 1
+%else
%cargo_prep
+%endif
sed -e 's/--locked//' -i src/cargo-build.sh
diff --git a/sources b/sources
index 00cac6b..af116dc 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (libblkio-v1.3.0.tar.bz2) = 801757326e8ffdcecf70063d4fd72f40002280ca7b3286a953f384c91af4046d7326887e15608e3d30a0143b9a8cb2b61530bfb7cc581b29d55883f1c96e027a
+SHA512 (libblkio-v1.3.0-vendor.tar.xz) = 3f8454e7851c261be3e0e2b3294cbc5894a8453fec4cc870538f78309507abf069269b59c63eb954322e3950397c62342403d264cd82b1a2501cbf384d0a5607
https://src.fedoraproject.org/rpms/libblkio/c/b24d95efc808e7763273f15961e...
9Â months, 1Â week
pagure pushed to rpms/libblkio (rawhide). "Update to 1.3.0"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-07-31 21:18:13 UTC
From ce85e23e0b211f5f3589832ff14c2ce7ae41b2a8 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Jul 20 2023 16:48:47 +0000
Subject: Update to 1.3.0
---
diff --git a/.gitignore b/.gitignore
index f548b31..77a3bc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/libblkio-v1.2.2.tar.bz2
+/libblkio-v1.3.0.tar.bz2
diff --git a/libblkio.spec b/libblkio.spec
index 557b68a..67a2d4b 100644
--- a/libblkio.spec
+++ b/libblkio.spec
@@ -1,14 +1,13 @@
-Version: 1.2.2
+Version: 1.3.0
%global forgeurl https://gitlab.com/libblkio/libblkio
%global tag v%{version}
%forgemeta
Summary: Block device I/O library
Name: libblkio
-Release: 6%{?dist}
+Release: 1%{?dist}
URL: %{forgeurl}
Source0: %{forgesource}
-Patch0: fix-nix-ioctl-feature.patch
License: (Apache-2.0 OR MIT) AND (Apache-2.0 OR BSD-3-Clause) AND MIT AND BSD-3-Clause AND Unicode-DFS-2016
# Basic build requirements.
@@ -31,23 +30,22 @@ BuildRequires: pkgconf
# For major version >= 0, we are requiring that the minor version does
# not change.
BuildRequires: (crate(autocfg/default) >= 1.0.0 with crate(autocfg/default) < 2.0.0~)
-BuildRequires: (crate(bitflags/default) >= 1.0.0 with crate(bitflags/default) < 2.0.0~)
+BuildRequires: (crate(bitflags/default) >= 1.2.0 with crate(bitflags/default) < 2.0.0~)
BuildRequires: (crate(cc/default) >= 1.0.0 with crate(cc/default) < 2.0.0~)
-BuildRequires: (crate(cfg-if/default) >= 1.0.0 with crate(cfg-if/default) < 2.0.0~)
BuildRequires: (crate(concat-idents/default) >= 1.0.0 with crate(concat-idents/default) < 2.0.0~)
BuildRequires: (crate(const-cstr/default) >= 0.3.0 with crate(const-cstr/default) < 0.4.0~)
-BuildRequires: (crate(io-uring/default) >= 0.5.10 with crate(io-uring/default) < 0.6.0~)
+BuildRequires: (crate(io-uring/default) >= 0.6.0 with crate(io-uring/default) < 0.7.0~)
BuildRequires: (crate(lazy_static/default) >= 1.0.0 with crate(lazy_static/default) < 2.0.0~)
BuildRequires: (crate(libc/default) >= 0.2.134 with crate(libc/default) < 0.3.0~)
BuildRequires: (crate(memmap2/default) >= 0.5.7 with crate(memmap2/default) < 0.6.0~)
-BuildRequires: (crate(nix/default) >= 0.24.2 with crate(nix/default) < 0.25.0~)
BuildRequires: (crate(num-traits/default) >= 0.2.15 with crate(num-traits/default) < 0.3.0~)
+BuildRequires: (crate(paste/default) >= 1.0.0 with crate(paste/default) < 2.0.0~)
BuildRequires: (crate(pci-driver/default) >= 0.1.2 with crate(pci-driver/default) < 0.2.0~)
BuildRequires: (crate(proc-macro2/default) >= 1.0.0 with crate(proc-macro2/default) < 2.0.0~)
-BuildRequires: (crate(quote/default) >= 1.0.0 with crate(quote/default) < 2.0.0~)
+BuildRequires: (crate(rustix/default) >= 0.36.10 with crate(rustix/default) < 0.38.0~)
BuildRequires: (crate(syn/default) >= 1.0.0 with crate(syn/default) < 2.0.0~)
BuildRequires: (crate(unicode-ident/default) >= 1.0.0 with crate(unicode-ident/default) < 2.0.0~)
-BuildRequires: (crate(virtio-bindings/default) >= 0.1.0 with crate(virtio-bindings/default) < 0.2.0~)
+BuildRequires: (crate(virtio-bindings/default) >= 0.2.0 with crate(virtio-bindings/default) < 0.3.0~)
%description
@@ -98,6 +96,9 @@ export RUSTFLAGS="%build_rustflags"
%changelog
+* Thu Jul 20 2023 Yaakov Selkowitz <yselkowi(a)redhat.com> - 1.3.0-1
+- Update to 1.3.0
+
* Thu Jul 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
diff --git a/sources b/sources
index f3e1409..00cac6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libblkio-v1.2.2.tar.bz2) = 39fbad8706c2cd3560d27d09fb2c852e622630f5e96709d321e72ff8f2ed621aa948b12da9916fa4d3bc7cc3399afd6e8087479b05a6b38d6049739b6dee7e4b
+SHA512 (libblkio-v1.3.0.tar.bz2) = 801757326e8ffdcecf70063d4fd72f40002280ca7b3286a953f384c91af4046d7326887e15608e3d30a0143b9a8cb2b61530bfb7cc581b29d55883f1c96e027a
https://src.fedoraproject.org/rpms/libblkio/c/ce85e23e0b211f5f3589832ff14...
9Â months, 1Â week
myoung pushed to rpms/xen (f37). "bugfix for x86/AMD: Zenbleed
[XSA-433, CVE-2023-20593]"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-07-31 21:09:19 UTC
From 8f43f4c45b933595a24b180896034fce0b91e8bf Mon Sep 17 00:00:00 2001
From: Michael Young <m.a.young(a)durham.ac.uk>
Date: Jul 31 2023 21:08:57 +0000
Subject: bugfix for x86/AMD: Zenbleed [XSA-433, CVE-2023-20593]
---
diff --git a/xen.spec b/xen.spec
index 28c409c..96a43c7 100644
--- a/xen.spec
+++ b/xen.spec
@@ -55,7 +55,7 @@
Summary: Xen is a virtual machine monitor
Name: xen
Version: 4.16.4
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+ and LGPLv2+ and BSD
URL: http://xen.org/
Source0: https://downloads.xenproject.org/release/xen/%{version}/xen-%{version}.ta...
@@ -112,6 +112,7 @@ Patch44: xsa376.patch
Patch45: xen.gcc12.fixes.patch
Patch46: xen.efi.build.patch
Patch47: xsa433-4.16.patch
+Patch48: xsa433-bugfix.patch
%if %build_qemutrad
@@ -325,6 +326,7 @@ manage Xen virtual machines.
%patch45 -p1
%patch46 -p1
%patch47 -p1
+%patch48 -p1
# qemu-xen-traditional patches
pushd tools/qemu-xen-traditional
@@ -933,6 +935,9 @@ fi
%endif
%changelog
+* Mon Jul 31 2023 Michael Young <m.a.young(a)durham.ac.uk> - 4.16.4-3
+- bugfix for x86/AMD: Zenbleed [XSA-433, CVE-2023-20593]
+
* Wed Jul 26 2023 Michael Young <m.a.young(a)durham.ac.uk> - 4.16.4-2
- x86/AMD: Zenbleed [XSA-433, CVE-2023-20593]
diff --git a/xsa433-bugfix.patch b/xsa433-bugfix.patch
new file mode 100644
index 0000000..8ad4eda
--- /dev/null
+++ b/xsa433-bugfix.patch
@@ -0,0 +1,29 @@
+From: Andrew Cooper <andrew.cooper3(a)citrix.com>
+Subject: x86/amd: Fix DE_CFG truncation in amd_check_zenbleed()
+
+This line:
+
+ val &= ~chickenbit;
+
+ends up truncating val to 32 bits, and turning off various errata workarounds
+in Zen2 systems.
+
+Fixes: f91c5ea97067 ("x86/amd: Mitigations for Zenbleed")
+Signed-off-by: Andrew Cooper <andrew.cooper3(a)citrix.com>
+Reviewed-by: Jan Beulich <jbeulich(a)suse.com>
+
+diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c
+index 3ed06f670491..df2681b7c455 100644
+--- a/xen/arch/x86/cpu/amd.c
++++ b/xen/arch/x86/cpu/amd.c
+@@ -909,8 +909,8 @@ void __init detect_zen2_null_seg_behaviour(void)
+ void amd_check_zenbleed(void)
+ {
+ const struct cpu_signature *sig = &this_cpu(cpu_sig);
+- unsigned int good_rev, chickenbit = (1 << 9);
+- uint64_t val, old_val;
++ unsigned int good_rev;
++ uint64_t val, old_val, chickenbit = (1 << 9);
+
+ /*
+ * If we're virtualised, we can't do family/model checks safely, and
https://src.fedoraproject.org/rpms/xen/c/8f43f4c45b933595a24b180896034fce...
9Â months, 1Â week