From 2b48e2e5f0c0251ab10733e9e57266c8d01c0a38 Mon Sep 17 00:00:00 2001 From: archana25-ms Date: Mon, 10 Feb 2025 12:15:22 +0000 Subject: [PATCH 1/2] Upgrade: virt-p2v version to 1.42.4 --- SPECS-EXTENDED/virt-p2v/libguestfs.keyring | Bin 0 -> 2823 bytes .../virt-p2v/virt-p2v-1.42.4.tar.gz.sig | 17 +++ .../virt-p2v/virt-p2v.signatures.json | 3 +- SPECS-EXTENDED/virt-p2v/virt-p2v.spec | 110 ++++++++++++------ 4 files changed, 93 insertions(+), 37 deletions(-) create mode 100644 SPECS-EXTENDED/virt-p2v/libguestfs.keyring create mode 100644 SPECS-EXTENDED/virt-p2v/virt-p2v-1.42.4.tar.gz.sig diff --git a/SPECS-EXTENDED/virt-p2v/libguestfs.keyring b/SPECS-EXTENDED/virt-p2v/libguestfs.keyring new file mode 100644 index 0000000000000000000000000000000000000000..bb3eb5537b7c398a10b7e2b26ca00af011d1a73e GIT binary patch literal 2823 zcma*oXEYm(0><$qB7$nPViakqqNG)u+FR_sQdc{DRukabMCqKo^wCkug~Y-bN=ZdDzIiUZ#$40(0^!V6(C-KH79?s=m3cGghyAo z1|dJMm+eiM>Vb)QYy4I#;Xu&Z^B~&YVZ!Whl6YA`T0fY9jOhHw z+Y;*35;Jx(8F=n(3o5j*bNOr3S) zCOp0NiMsuh^>)x<=&*u##pa25u9;{ZZc=y@%)4CE$a$A}A*UQGOC-D04;}dULUfuV z)^qc0R62lhwbK5pAcC9hk{LK2KJQ&jd|seog-6NxEVm_4X)8y7DYjWwHK2eI$lRku zmeq4z0zkjTs4a++z4bu{k^$N0>0MkG^k~>}tQQd>eap=1)cK}mGM_yYhtaPw3u{n! zU9d7X%GZbXT!~-iaePA-_ZF&Sz{>(|!tON<`4C)es{n-Uesd{GoD$><>+YS*e%6$X zv}81ZQEu&BDa*m|%?xc}K? ztXy1dUpQFtxVqa*MT11aG(ZsGE-C15Js>6$2qig`j06Osg@VW_D8Y0f5+LX{5JVpY zpdhDC^oaLZsK??x8DJOWJSw`FnKV|{5~fVJ%k`yWLJxgLVDcRdn^Wa_F@huK2}*V{VwcRgyv*)4g2Qgt1JGlabiOx*7Fj?B<+5~s41Ba znTns*;eGgN*mTv0;L>wfxeCI*{K-s;9kSV!?`oEYYHR#>`F5iO`ZuDJL%yslOO9&w zhbbHM^ngdugCnWhKqq{uTHT9qS(fk}s?L44SS*-LzWFNMdJ_cZV+Pj}Fc0 z$z?*yD| z^ee!4Z%nhXNm_MKw>GfR!|#AT7wI=d8;#FBd0Dn`;z*2sFEnNL=50xc+d7>-sr4hc z1H^ZFsD|Tz3VZsuG#PhW4A#n%$Hvw9zllAj{C|nDDp3Q9IoOo59u_f15UB-d(i^Ft zm}W~GSou3Y2Zae}aUVFWKJ)XZ-FcZ)f7}5VNSmEBezlPwny+1V!c|G1q2)yJu^>SU zBG(uFdMTFhV(LalnV(s$P>l{I_IXET&d9&(TxDa{R*NCzcuMf&q78elSLN9YIaoM7X!j3`9@_C^pJ@OJh;qD77 z`}&Nz_D*Iq6f;t7?Bqxowet8!npZ$`6NXiVD@~AY_g*>B){{F>D1? zN$g|68|pA_wcr~kt)JAUlnukx>iU8KA)f_4{X1&=@-!^E^P8QCNsCiKiUK_F>Xsli+q$Z*{a2b32CMwb3D{%D_`*E!rm9<3xmVE)l89dYVw5nlryxm zap55S(@vrBI7zH^ydCt_O(Ugr9>qJgQm;i{)`fD?)7n|Jj)=c?=qu9x3%|TVwl?!x z?-#a4>J7h7(TrYP9;;VFFnL~q)11l=W{2zM0PM_#^G-;w9~Y(6gf0(xy$5NJB{8G) z2_PZQC}tF@|I|RCJ_Ct6H6l-=E50j$d5Ku9&`{QVe8Z;T+VX2372^TDbVX-o_tL$y zfM36H?e10e)+AoUd;Ar?$c*rS7DBr*maRLN9n|78-|^BE1bP6RW%uVWO+Eh#-^#2q zU1o2OGeEnJe`vc1&bKa=PK5K>MrUoy*4Di*xQ~Hr8YK=ae$S@5;A6m-C*^N>H6QiE z+Z~%eGDDNK_vktjC^nxMUEXZReG3G^_uml$%lONCD~B)o&u@Ar}fQG5;T#E%^U88SI<&z@~yy|THGE%E1PbI z?F^r&ZTiw{?xi@{*DAy6C4z2C)^HACOJ!QTq)OKNiy$F_ao^+$ziBa!`o*phmK_>s za)NY_nGb%M+@h1zb zdfh2x>9W=SlC19X_yB5T8jPIITr(IuajP65y|~iU>niq=mN|NI*0)B&ixQw`dlhcIFP)G9WnV`}K3C{4m}cRO<&1vJ^K5DAVUo*Z<@ zunwMvxU0NO;ORRnw0-LRLg3}q^7?BlO`eOGFQ3pD@ literal 0 HcmV?d00001 diff --git a/SPECS-EXTENDED/virt-p2v/virt-p2v-1.42.4.tar.gz.sig b/SPECS-EXTENDED/virt-p2v/virt-p2v-1.42.4.tar.gz.sig new file mode 100644 index 00000000000..0e881c86183 --- /dev/null +++ b/SPECS-EXTENDED/virt-p2v/virt-p2v-1.42.4.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmcp+1MRHHJpY2hAYW5u +ZXhpYS5vcmcACgkQkXOPc+G3aKDukBAAp8bca3qdFPIBqnxrCuFnZJYkrugTKbvV +5dakRj1dVNr1aX3DnvgBVhKmJyp2r0WpvvCkCBoZqiJsYI3Y9FvCRP36l47FB2zC +Vn0P3eItCfqiheuFuwU6f7uDcTpHHCcsV3RWPQBZd/HOdXghZCn7KbCj+yUQiVvI +nRhpJ5yNgybDsKV41p3uXEIIwOOy6O8gQCFgV1iLmmKS0yVSIy4udLqM5KE2KuKM +nPlc5FwHl1Ou/H7INtmQ8EGpiVemyBmgkAu8JE2BJHp7JUTruAUjaHs6zmnayCrx +ojfXcxSlBBLSrKwUBW4WzhkzRqbiPJ/NFwkyTnOVhMyu0maehnaZMr7LWL57kSb7 +NPNzIDL6zVaJO2CikgELSSn3jzzTntnRgHkLFgfqt54oPhp3RzT95uYqu+8sgx24 +VihQWEgM+kvfgqpIuYEzrExL2bA+xdqlc2ppIx0o7l1spi1Zvh9zgG5u+7Fhx9cs +5tuIk2oKwhr6YbRkkvViJt66MKlJA1aHGrqCT34yvuBG7O3u11aP1QruN30kU2aI +CJ6bDZwz6InQ2+mbxH+te6PgDcFLtXMhCFp8UcNNtvy/ddxfRniOLUzYSMC2uhpd +uTakFDG4q8rQtc6rwC6jewxEV2eNmyKKnEU1P5pmLrV/wUqwH/QGH7prm+Mpz+vX +2NKaPyyZS74= +=/YcD +-----END PGP SIGNATURE----- diff --git a/SPECS-EXTENDED/virt-p2v/virt-p2v.signatures.json b/SPECS-EXTENDED/virt-p2v/virt-p2v.signatures.json index d982d7c87bb..8a98f171ddc 100644 --- a/SPECS-EXTENDED/virt-p2v/virt-p2v.signatures.json +++ b/SPECS-EXTENDED/virt-p2v/virt-p2v.signatures.json @@ -1,5 +1,6 @@ { "Signatures": { - "virt-p2v-1.42.0.tar.gz": "b1164bde6658646f11e8ff0da36fe5acbedde3445cc8424110c08fc144564e20" + "libguestfs.keyring": "de74373a15bd572ad74f276ee063d2cefa915470863829c0dda6af488d6315d8", + "virt-p2v-1.42.4.tar.gz": "20ff7bec5ed630ae1928da026e6e6e471e8eb1869222762fd9ab4681975b98c5" } } diff --git a/SPECS-EXTENDED/virt-p2v/virt-p2v.spec b/SPECS-EXTENDED/virt-p2v/virt-p2v.spec index e91e58071a4..76e8b705ba4 100644 --- a/SPECS-EXTENDED/virt-p2v/virt-p2v.spec +++ b/SPECS-EXTENDED/virt-p2v/virt-p2v.spec @@ -8,9 +8,9 @@ Distribution: Azure Linux Summary: Convert a physical machine to run on KVM Name: virt-p2v -Version: 1.42.0 -Release: 6%{?dist} -License: GPLv2+ and LGPLv2+ +Version: 1.42.4 +Release: 2%{?dist} +License: GPL-2.0-or-later AND LGPL-2.0-or-later # virt-p2v works only on x86_64 at the moment. It requires porting # to properly detect the hardware on other architectures, and furthermore @@ -18,48 +18,41 @@ License: GPLv2+ and LGPLv2+ ExclusiveArch: x86_64 # Source and patches. -URL: http://libguestfs.org/ -Source0: http://download.libguestfs.org/%{name}/%{name}-%{version}.tar.gz +URL: https://libguestfs.org/ +Source0: https://download.libguestfs.org/%{name}/%{name}-%{version}.tar.gz +Source1: https://download.libguestfs.org/%{name}/%{name}-%{version}.tar.gz.sig + +Source2: libguestfs.keyring # Basic build requirements. +BuildRequires: make BuildRequires: gcc BuildRequires: perl(Pod::Simple) BuildRequires: perl(Pod::Man) BuildRequires: perl(List::MoreUtils) BuildRequires: /usr/bin/pod2text BuildRequires: libxml2-devel -BuildRequires: pcre-devel -BuildRequires: bash-completion +BuildRequires: pcre2-devel +BuildRequires: bash-completion-devel BuildRequires: xz BuildRequires: gtk3-devel BuildRequires: dbus-devel BuildRequires: m4 +BuildRequires: gnupg2 # Test suite requirements. -BuildRequires: /usr/bin/qemu-nbd - -# https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries#Packages_granted_exceptions -Provides: bundled(gnulib) - +BuildRequires: nbdkit Requires: gawk Requires: gzip # virt-p2v-make-disk runs virt-builder: -Requires: libguestfs-tools-c +Requires: libguestfs # virt-p2v-make-kickstart runs strip: Requires: binutils -# Migrate from the old virt-p2v-maker: -Provides: virt-p2v-maker = %{version}-%{release} -Obsoletes: virt-p2v-maker < 1.41.5 - -# The bash completion for p2v were shipped with the others of libguestfs: -Obsoletes: libguestfs-bash-completion < 1.41.5 - - %description Virt-p2v converts (virtualizes) physical machines so they can be run as virtual machines under KVM. @@ -73,16 +66,15 @@ To convert virtual machines from other hypervisors, see virt-v2v. %prep -%setup -q -%autopatch -p1 +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +%autosetup -p1 %build %configure \ - --with-extra="fedora=%{fedora},release=%{release}" \ - --disable-gnulib-tests + --with-extra="fedora=%{fedora},release=%{release}" -make V=1 %{?_smp_mflags} +%make_build %check @@ -94,16 +86,17 @@ fi %install -make DESTDIR=$RPM_BUILD_ROOT install +%make_install # Delete the development man pages. rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-building.1* rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-hacking.1* rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-release-notes.1* + %files %doc README -%license COPYING COPYING.LIB +%license COPYING %{_bindir}/virt-p2v-make-disk %{_bindir}/virt-p2v-make-kickstart %{_bindir}/virt-p2v-make-kiwi @@ -117,18 +110,63 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/p2v-release-notes.1* %changelog -* Tue Sep 26 2023 Pawel Winogrodzki - 1.42.0-6 -- Removing 'exit' calls from the '%%check' section. - -* Fri Jan 21 2022 Pawel Winogrodzki - 1.42.0-5 +* Fri Jan 31 2025 Archana Shettigar - 1.42.4-2 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- Remove epoch - Removing in-spec verification of source tarballs. - License verified. +- Removing 'exit' calls from the '%%check' section. -* Thu Oct 28 2021 Muhammad Falak - 1.42.0-4 -- Remove epoch +* Tue Nov 05 2024 Richard W.M. Jones - 1:1.42.4-1 +- New upstream version 1.42.4 + +* Sat Jul 20 2024 Fedora Release Engineering - 1:1.42.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Mar 25 2024 Richard W.M. Jones - 1:1.42.3-6 +- Use %%{bash_completions_dir} macro +- BR bash-completion-devel (new in Rawhide) + +* Sat Jan 27 2024 Fedora Release Engineering - 1:1.42.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 1:1.42.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jun 05 2023 Richard W.M. Jones - 1:1.42.3-3 +- Migrated to SPDX license + +* Sat Jan 21 2023 Fedora Release Engineering - 1:1.42.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Oct 11 2022 Richard W.M. Jones - 1:1.42.3-1 +- New upstream release 1.42.3 + +* Wed Aug 03 2022 Richard W.M. Jones - 1:1.42.2-1 +- New upstream release 1.42.2 +- Uses PCRE2 instead of PCRE. +- Remove Obsolete/Provides etc used for upgrades from Fedora 31. +- libguestfs-tools-c was renamed to guestfs-tools in Fedora 34. + +* Sat Jul 23 2022 Fedora Release Engineering - 1:1.42.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue May 10 2022 Richard W.M. Jones - 1:1.42.1-1 +- New upstream release 1.42.1 +- gnulib removed upstream. +- Some specfile modernization. + +* Sat Jan 22 2022 Fedora Release Engineering - 1:1.42.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1:1.42.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1:1.42.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild -* Fri Oct 15 2021 Pawel Winogrodzki - 1:1.42.0-3 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Wed Jul 29 2020 Fedora Release Engineering - 1:1.42.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild * Fri Jan 31 2020 Fedora Release Engineering - 1:1.42.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 78320179c1938bbc440d2b981a3f1a65b37d0752 Mon Sep 17 00:00:00 2001 From: archana25-ms Date: Mon, 10 Feb 2025 18:10:01 +0000 Subject: [PATCH 2/2] Updating cgmanifest.json file --- SPECS-EXTENDED/virt-p2v/virt-p2v.signatures.json | 5 +++-- cgmanifest.json | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/SPECS-EXTENDED/virt-p2v/virt-p2v.signatures.json b/SPECS-EXTENDED/virt-p2v/virt-p2v.signatures.json index 8a98f171ddc..b23139457b8 100644 --- a/SPECS-EXTENDED/virt-p2v/virt-p2v.signatures.json +++ b/SPECS-EXTENDED/virt-p2v/virt-p2v.signatures.json @@ -1,6 +1,7 @@ { "Signatures": { "libguestfs.keyring": "de74373a15bd572ad74f276ee063d2cefa915470863829c0dda6af488d6315d8", - "virt-p2v-1.42.4.tar.gz": "20ff7bec5ed630ae1928da026e6e6e471e8eb1869222762fd9ab4681975b98c5" + "virt-p2v-1.42.4.tar.gz": "20ff7bec5ed630ae1928da026e6e6e471e8eb1869222762fd9ab4681975b98c5", + "virt-p2v-1.42.4.tar.gz.sig": "0c16c68cb98f14041087bbd8aa7d42ef40f81144d6877123099b30f5ca9cd776" } -} +} \ No newline at end of file diff --git a/cgmanifest.json b/cgmanifest.json index 4677d2e58ba..177ccd26b8d 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -29566,8 +29566,8 @@ "type": "other", "other": { "name": "virt-p2v", - "version": "1.42.0", - "downloadUrl": "http://download.libguestfs.org/virt-p2v/virt-p2v-1.42.0.tar.gz" + "version": "1.42.4", + "downloadUrl": "http://download.libguestfs.org/virt-p2v/virt-p2v-1.42.4.tar.gz" } } },