Compare commits
No commits in common. "c8-stream-rhel" and "a8-beta-stream-rhel" have entirely different histories.
c8-stream-
...
a8-beta-st
25
SOURCES/1000-Add-AlmaLinux-detection.patch
Normal file
25
SOURCES/1000-Add-AlmaLinux-detection.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 3b01a0e630c2e0ccc08b78544dcfd35e6a948b07 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <andrew.lukoshko@gmail.com>
|
||||
Date: Fri, 8 Apr 2022 16:09:38 +0000
|
||||
Subject: [PATCH] Add AlmaLinux detection
|
||||
|
||||
---
|
||||
m4/guestfs-appliance.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/m4/guestfs-appliance.m4 b/m4/guestfs-appliance.m4
|
||||
index b0a6ab4..66eef8a 100644
|
||||
--- a/m4/guestfs-appliance.m4
|
||||
+++ b/m4/guestfs-appliance.m4
|
||||
@@ -105,7 +105,7 @@ AC_ARG_WITH([distro],
|
||||
( . /etc/os-release && echo $ID | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@' ) >&AS_MESSAGE_LOG_FD
|
||||
DISTRO="`. /etc/os-release && echo $ID | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@'`"
|
||||
AS_CASE([$DISTRO],
|
||||
- [FEDORA | RHEL | CENTOS],[DISTRO=REDHAT],
|
||||
+ [FEDORA | RHEL | CENTOS | ALMALINUX],[DISTRO=REDHAT],
|
||||
[OPENSUSE* | SLED | SLES],[DISTRO=SUSE],
|
||||
[ARCH],[DISTRO=ARCHLINUX],
|
||||
[OPENMANDRIVA],[DISTRO=OPENMANDRIVA])
|
||||
--
|
||||
2.27.0
|
||||
|
@ -32,7 +32,7 @@ Summary: Access and modify virtual machine disk images
|
||||
Name: libguestfs
|
||||
Epoch: 1
|
||||
Version: 1.44.0
|
||||
Release: 9%{?dist}
|
||||
Release: 9%{?dist}.alma
|
||||
License: LGPLv2+
|
||||
|
||||
ExclusiveArch: x86_64 %{power64} aarch64 s390x
|
||||
@ -74,6 +74,9 @@ Patch0021: 0021-appliance-Use-cpu-mode-maximum-for-cpu-max-on-libvir.patch
|
||||
Patch0022: 0022-lib-Disable-5-level-page-tables-when-using-cpu-max.patch
|
||||
Patch0023: 0023-docs-guestfs-security-document-CVE-2022-2211.patch
|
||||
|
||||
# AlmaLinux detection patch
|
||||
Patch1000: 1000-Add-AlmaLinux-detection.patch
|
||||
|
||||
# Replacement README file.
|
||||
Source4: README-replacement.in
|
||||
|
||||
@ -811,7 +814,10 @@ sed 's/@VERSION@/%{version}/g' < %{SOURCE4} > README
|
||||
ip addr list ||:
|
||||
ip route list ||:
|
||||
if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then
|
||||
extra=
|
||||
# AlmaLinux: avoid permission denied for yum/dnf cache
|
||||
mkdir cachedir
|
||||
sed -e "s|/var/cache/yum|$(pwd)/cachedir|" -e "s|/var/cache/dnf|$(pwd)/cachedir|" /etc/dnf/dnf.conf > yum.conf
|
||||
extra=--with-supermin-packager-config=$(pwd)/yum.conf
|
||||
else
|
||||
mkdir cachedir repo
|
||||
# -n 1 because of RHBZ#980502.
|
||||
@ -1194,10 +1200,12 @@ rm ocaml/html/.gitignore
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Sep 27 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 1:1.44.0-9.alma
|
||||
- Fix build for AlmaLinux
|
||||
|
||||
* Tue Jul 05 2022 Richard W.M. Jones <rjones@redhat.com> - 1:1.44.0-9
|
||||
- Fix CVE-2022-2211 Denial of Service in --key parameter
|
||||
resolves: rhbz#2101280
|
||||
|
||||
* Tue Jun 07 2022 Richard W.M. Jones <rjones@redhat.com> - 1:1.44.0-8
|
||||
- Obsolete old libguestfs-benchmarking subpackage
|
||||
resolves: rhbz#2091597
|
||||
|
Loading…
Reference in New Issue
Block a user