New upstream development version 2.5.4

(cherry picked from commit 8aab9f5c68fc11366152d0b98676d91544c997d8)
This commit is contained in:
Richard W.M. Jones 2024-04-25 15:23:35 +01:00
parent 328cb530d4
commit aa2997c504
3 changed files with 7 additions and 38 deletions

View File

@ -1,31 +0,0 @@
From 5eeae696b2c56230d5d5fed5c86b7bf2b3942d4e Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Fri, 12 Apr 2024 20:11:50 +0100
Subject: [PATCH] Fix bytecode compilation to output whole exe instead of using
-custom
These binaries are more resistant to being stripped.
Reported-by: Ilya Leoshkevich
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2274708
(cherry picked from guestfs-tools commit c249fd5caca8f1eed439f83e2bb1af46c8a28a27)
---
subdir-rules.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subdir-rules.mk b/subdir-rules.mk
index 78d574a813..e969f357b7 100644
--- a/subdir-rules.mk
+++ b/subdir-rules.mk
@@ -47,7 +47,7 @@ $(top_builddir)/generator/generator:
if !HAVE_OCAMLOPT
MLARCHIVE = cma
-LINK_CUSTOM_OCAMLC_ONLY = -custom
+LINK_CUSTOM_OCAMLC_ONLY = -output-complete-exe
BEST = c
else
MLARCHIVE = cmxa
--
2.44.0

View File

@ -1,2 +1,2 @@
SHA512 (virt-v2v-2.5.3.tar.gz) = 9f6e0618db7c6e57192ad83aeb9f4978935aa387fabe62e952c5ea473fe88973323fb02d43eac615dca33b88590f8a824a3ea761691d273e6853674974c193da
SHA512 (virt-v2v-2.5.3.tar.gz.sig) = c4fc7f3ff201501bdeda1202268da9fa9d393131762a28f38e0addd6397ba2f92a1c4bf811672cac66b54f095293e90a757786f2aec14c2f73da8035403c6b19
SHA512 (virt-v2v-2.5.4.tar.gz) = ea872978eefc9feacb6048bb217449804612e5cc68bfbd1f20e5aaf637ca7ca8be92798ba1cbc1d2d6ddbf6a07628e79beea7db1966150675d9fbda9d4361b7a
SHA512 (virt-v2v-2.5.4.tar.gz.sig) = 02780e8ae0bdff8c5b22b52bdd24d5f9dfa2d808b792abf7f8bcaa8c4e2c12ea52d3f2cd2c64b8a261437db69409f9ea1d12ac182dbc96e2bb5441a434ac7f84

View File

@ -6,8 +6,8 @@
Name: virt-v2v
Epoch: 1
Version: 2.5.3
Release: 2%{?dist}
Version: 2.5.4
Release: 1%{?dist}
Summary: Convert a virtual machine to run on KVM
License: GPL-2.0-or-later AND LGPL-2.0-or-later
@ -23,9 +23,6 @@ Source2: libguestfs.keyring
# Maintainer script which helps with handling patches.
Source3: copy-patches.sh
# Fix bytecode compilation (RHBZ#2274708)
Patch: 0001-Fix-bytecode-compilation-to-output-whole-exe-instead.patch
%if !0%{?rhel}
# libguestfs hasn't been built on i686 for a while since there is no
# kernel built for this architecture any longer and libguestfs rather
@ -300,6 +297,9 @@ done
%changelog
* Thu Apr 25 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.4-1
- New upstream development version 2.5.4
* Fri Apr 12 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.3-2
- Fix bytecode compilation (RHBZ#2274708)