From 62097e0f8be816fd1149c6e150749c8f122ddeed Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 12 May 2022 15:30:33 +0100 Subject: [PATCH 1/5] New upstream stable branch version 1.48.2 --- libguestfs.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index bd95a89..1009f0c 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -47,7 +47,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.48.1 +Version: 1.48.2 Release: 1%{?dist} License: LGPLv2+ @@ -1123,6 +1123,9 @@ rm ocaml/html/.gitignore %changelog +* Thu May 12 2022 Richard W.M. Jones - 1:1.48.2-1 +- New upstream stable branch version 1.48.2 + * Thu Apr 14 2022 Richard W.M. Jones - 1:1.48.1-1 - New upstream stable branch version 1.48.1 diff --git a/sources b/sources index 6f7bd92..c7103a7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.48.1.tar.gz) = 34cad3cb9ebfe2d6294fda8eede873470d75aad2eadc5b245556122a3e09b5d51fc012c0144997b66070feb97fe9613f0f9328a973c30839dae74f446a4a4b3c -SHA512 (libguestfs-1.48.1.tar.gz.sig) = 2addd2767237cc5e00031b68d50d50e0ac6f1da570aefd6e2bba76e919d10f3648802b113bfe99efe9e8c336e96bf6e6e179731d686b09cb5f4bf29f4790ffc0 +SHA512 (libguestfs-1.48.2.tar.gz) = 3cbec961fbed3bfdb2ba6ab240756ffd61fed76be1e754b0286a87e298ba95dae6d7435aa5f5cff84dd2f42aa7576a2f197df83f987f0e44ed4d268f76be5e19 +SHA512 (libguestfs-1.48.2.tar.gz.sig) = 1554d1a911c06fb59cea2e56b845272d1e33056e36b74f9e6507d5cff433340ba3e90b8957dbd706f0f2ea32e45d1dc11f394212a314c5b954677faa66c4c8de From f3ee3b7d21cb7006671a15605974556330275ed6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 21 May 2022 11:13:29 +0100 Subject: [PATCH 2/5] Add upstream patch which helps debugging appliance generation. (cherry picked from commit 4c4ca3eda2970e9284c792ca8144220bd26a81df) --- ...Print-guestfsd.deps-after-generation.patch | 27 +++++++++++++++++++ libguestfs.spec | 10 +++++-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 0001-appliance-Print-guestfsd.deps-after-generation.patch diff --git a/0001-appliance-Print-guestfsd.deps-after-generation.patch b/0001-appliance-Print-guestfsd.deps-after-generation.patch new file mode 100644 index 0000000..619db45 --- /dev/null +++ b/0001-appliance-Print-guestfsd.deps-after-generation.patch @@ -0,0 +1,27 @@ +From b5260d8cd62f93b1cc4faf285bc3b6d8e0168e3b Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sat, 21 May 2022 11:10:29 +0100 +Subject: [PATCH] appliance: Print guestfsd.deps after generation + +Sometimes generating this file fails. To help with debugging these +situatons, print the guestfsd.deps file after it has been generated. +--- + appliance/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/appliance/Makefile.am b/appliance/Makefile.am +index 6dd1df75a6..9a0ba98a06 100644 +--- a/appliance/Makefile.am ++++ b/appliance/Makefile.am +@@ -101,6 +101,8 @@ guestfsd.deps: ../daemon/guestfsd + sort -u > $@.t + rm -f ld.so.cache.txt + mv $@.t $@ ++ @echo "guestfsd.deps:" ++ @cat $@ + + packagelist: packagelist.in Makefile guestfsd.deps + m4 $(PACKAGELIST_CPP_FLAGS) $< | \ +-- +2.35.1 + diff --git a/libguestfs.spec b/libguestfs.spec index 1009f0c..dca3792 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -29,7 +29,7 @@ # If there are patches which touch autotools files, set this to 1. %if !0%{?rhel} -%global patches_touch_autotools %{nil} +%global patches_touch_autotools 1 %else # On RHEL the downstream patches always touch autotools files. %global patches_touch_autotools 1 @@ -48,7 +48,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.48.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ # Build only for architectures that have a kernel @@ -82,6 +82,9 @@ Source7: libguestfs.keyring # Maintainer script which helps with handling patches. Source8: copy-patches.sh +# Upstream patch which helps debugging appliance generation. +Patch1: 0001-appliance-Print-guestfsd.deps-after-generation.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool, gettext-devel %endif @@ -1123,6 +1126,9 @@ rm ocaml/html/.gitignore %changelog +* Sat May 21 2022 Richard W.M. Jones - 1:1.48.2-2 +- Add upstream patch which helps debugging appliance generation. + * Thu May 12 2022 Richard W.M. Jones - 1:1.48.2-1 - New upstream stable branch version 1.48.2 From 37ee41668a7692859f83d4d99a0d457f943cc1ef Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 26 May 2022 12:40:16 +0100 Subject: [PATCH 3/5] New upstream stable branch version 1.48.3 --- ...Print-guestfsd.deps-after-generation.patch | 27 ------------------- libguestfs.spec | 12 ++++----- sources | 4 +-- 3 files changed, 8 insertions(+), 35 deletions(-) delete mode 100644 0001-appliance-Print-guestfsd.deps-after-generation.patch diff --git a/0001-appliance-Print-guestfsd.deps-after-generation.patch b/0001-appliance-Print-guestfsd.deps-after-generation.patch deleted file mode 100644 index 619db45..0000000 --- a/0001-appliance-Print-guestfsd.deps-after-generation.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b5260d8cd62f93b1cc4faf285bc3b6d8e0168e3b Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Sat, 21 May 2022 11:10:29 +0100 -Subject: [PATCH] appliance: Print guestfsd.deps after generation - -Sometimes generating this file fails. To help with debugging these -situatons, print the guestfsd.deps file after it has been generated. ---- - appliance/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/appliance/Makefile.am b/appliance/Makefile.am -index 6dd1df75a6..9a0ba98a06 100644 ---- a/appliance/Makefile.am -+++ b/appliance/Makefile.am -@@ -101,6 +101,8 @@ guestfsd.deps: ../daemon/guestfsd - sort -u > $@.t - rm -f ld.so.cache.txt - mv $@.t $@ -+ @echo "guestfsd.deps:" -+ @cat $@ - - packagelist: packagelist.in Makefile guestfsd.deps - m4 $(PACKAGELIST_CPP_FLAGS) $< | \ --- -2.35.1 - diff --git a/libguestfs.spec b/libguestfs.spec index dca3792..ddce67d 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -29,7 +29,7 @@ # If there are patches which touch autotools files, set this to 1. %if !0%{?rhel} -%global patches_touch_autotools 1 +%global patches_touch_autotools %{nil} %else # On RHEL the downstream patches always touch autotools files. %global patches_touch_autotools 1 @@ -47,8 +47,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.48.2 -Release: 2%{?dist} +Version: 1.48.3 +Release: 1%{?dist} License: LGPLv2+ # Build only for architectures that have a kernel @@ -82,9 +82,6 @@ Source7: libguestfs.keyring # Maintainer script which helps with handling patches. Source8: copy-patches.sh -# Upstream patch which helps debugging appliance generation. -Patch1: 0001-appliance-Print-guestfsd.deps-after-generation.patch - %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool, gettext-devel %endif @@ -1126,6 +1123,9 @@ rm ocaml/html/.gitignore %changelog +* Thu May 26 2022 Richard W.M. Jones - 1:1.48.3-1 +- New upstream stable branch version 1.48.3 + * Sat May 21 2022 Richard W.M. Jones - 1:1.48.2-2 - Add upstream patch which helps debugging appliance generation. diff --git a/sources b/sources index c7103a7..4ddd628 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.48.2.tar.gz) = 3cbec961fbed3bfdb2ba6ab240756ffd61fed76be1e754b0286a87e298ba95dae6d7435aa5f5cff84dd2f42aa7576a2f197df83f987f0e44ed4d268f76be5e19 -SHA512 (libguestfs-1.48.2.tar.gz.sig) = 1554d1a911c06fb59cea2e56b845272d1e33056e36b74f9e6507d5cff433340ba3e90b8957dbd706f0f2ea32e45d1dc11f394212a314c5b954677faa66c4c8de +SHA512 (libguestfs-1.48.3.tar.gz) = d88b7869e6098af1f7748dc2e8163b245ea251fcdf962a71e3735f5a1748c9e87a17be259802da3e0bb13569d7f7233b2c5a554b20a2a7758e1974a30a70b786 +SHA512 (libguestfs-1.48.3.tar.gz.sig) = f372cddfb661727c7e33505b9f038828e8341a229098c089b0b9f2167fc6308045e402cbfea653dfc0bd5343e2c9f9e2757af7923515615ac38430c132620de7 From 84218bf608ffc00dd5c1c3557aa3856dc9f77c76 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 21 Nov 2022 19:23:13 +0000 Subject: [PATCH 4/5] New upstream stable branch version 1.48.5 --- libguestfs.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index ddce67d..d59f4c4 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -47,7 +47,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.48.3 +Version: 1.48.5 Release: 1%{?dist} License: LGPLv2+ @@ -1123,6 +1123,9 @@ rm ocaml/html/.gitignore %changelog +* Mon Nov 21 2022 Richard W.M. Jones - 1:1.48.5-1 +- New upstream stable branch version 1.48.5 + * Thu May 26 2022 Richard W.M. Jones - 1:1.48.3-1 - New upstream stable branch version 1.48.3 diff --git a/sources b/sources index 4ddd628..e69b6a8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.48.3.tar.gz) = d88b7869e6098af1f7748dc2e8163b245ea251fcdf962a71e3735f5a1748c9e87a17be259802da3e0bb13569d7f7233b2c5a554b20a2a7758e1974a30a70b786 -SHA512 (libguestfs-1.48.3.tar.gz.sig) = f372cddfb661727c7e33505b9f038828e8341a229098c089b0b9f2167fc6308045e402cbfea653dfc0bd5343e2c9f9e2757af7923515615ac38430c132620de7 +SHA512 (libguestfs-1.48.5.tar.gz) = 2177f1ba06835073de24a6837fb1150e29334a0c026d9a0c13f7ad1a2f513b04829f1a9791b47ba64d2a82a2aa34d5ff750c652601b34eb7882a918989360e71 +SHA512 (libguestfs-1.48.5.tar.gz.sig) = 51b95fe3ddd732ea83bd711c82361b72770ab6198fc3984f3af7d09923f9725f00f6e6bcbc44bfed3489ccb4aa13b18693a2aeddd6cf4b545ddb983508ee3160 From 1151d10fb3e009bfe3a21331e56a19b3ae237633 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 28 Nov 2022 12:14:38 +0000 Subject: [PATCH 5/5] New upstream stable branch version 1.48.6 --- libguestfs.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index d59f4c4..197a737 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -47,7 +47,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.48.5 +Version: 1.48.6 Release: 1%{?dist} License: LGPLv2+ @@ -1123,6 +1123,9 @@ rm ocaml/html/.gitignore %changelog +* Mon Nov 28 2022 Richard W.M. Jones - 1:1.48.6-1 +- New upstream stable branch version 1.48.6 + * Mon Nov 21 2022 Richard W.M. Jones - 1:1.48.5-1 - New upstream stable branch version 1.48.5 diff --git a/sources b/sources index e69b6a8..21badc6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.48.5.tar.gz) = 2177f1ba06835073de24a6837fb1150e29334a0c026d9a0c13f7ad1a2f513b04829f1a9791b47ba64d2a82a2aa34d5ff750c652601b34eb7882a918989360e71 -SHA512 (libguestfs-1.48.5.tar.gz.sig) = 51b95fe3ddd732ea83bd711c82361b72770ab6198fc3984f3af7d09923f9725f00f6e6bcbc44bfed3489ccb4aa13b18693a2aeddd6cf4b545ddb983508ee3160 +SHA512 (libguestfs-1.48.6.tar.gz) = 7d929db183fbb1d4d1c9159f28871ab4f1bd0be5b3d9fbc5137271666f50c067fd0906674cb1a52c1e070c11a18da4d2aa11bc64ddabda5cac54e72252c6abf2 +SHA512 (libguestfs-1.48.6.tar.gz.sig) = 06abbd6683f7dfb36120ef4f60ad1be7d38443fc2129b5d1f709c708be9ee15353ff6079ff6c1d2eae1409d644db439814ea688257aadbbbebda22f7dfd411c5