gnupg2: Upgrade gnupg2 to 2.4.7 (#14070)

KavyaSree2610 · Kavya Sree Kaitepalli · web-flow · commit a38d95d67c0a · 2025-06-30T10:15:35.000+05:30
Co-authored-by: Kavya Sree Kaitepalli &lt;kkaitepalli@microsoft.com&gt;
diff --git a/SPECS/gnupg2/gnupg2.signatures.json b/SPECS/gnupg2/gnupg2.signatures.json
@@ -1,5 +1,5 @@
 {
-  "Signatures": {
-    "gnupg-2.4.4.tar.bz2": "67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6"
-  }
-}
+ "Signatures": {
+  "gnupg-2.4.7.tar.bz2": "7b24706e4da7e0e3b06ca068231027401f238102c41c909631349dcc3b85eb46"
+ }
+}
diff --git a/SPECS/gnupg2/gnupg2.spec b/SPECS/gnupg2/gnupg2.spec
@@ -1,7 +1,7 @@
 Summary:        OpenPGP standard implementation used for encrypted communication and data storage.
 Name:           gnupg2
-Version:        2.4.4
-Release:        2%{?dist}
+Version:        2.4.7
+Release:        1%{?dist}
 License:        BSD and CC0 and GPLv2+ and LGPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -15,10 +15,10 @@ BuildRequires:  npth-devel >= 1.2
 BuildRequires:  libassuan-devel >= 2.5.0
 BuildRequires:  libksba-devel >= 1.3.4
 BuildRequires:  libgcrypt-devel > 1.9.1
-BuildRequires:  libgpg-error-devel >= 1.46
+BuildRequires:  libgpg-error-devel >= 1.48
 Requires:       libksba > 1.3.4
 Requires:       libgcrypt >= 1.9.1
-Requires:       libgpg-error >= 1.46
+Requires:       libgpg-error >= 1.48
 Requires:       npth >= 1.2
 Requires:       libassuan >= 2.5.0
 Requires:       pinentry
@@ -63,6 +63,9 @@ These are the additional language files of gnupg2
 %make_build
 
 %install
+ln -sf gpg2.1 doc/gpg.1
+ln -sf gpgv2.1 doc/gpgv.1
+
 %make_install
 
 pushd %{buildroot}%{_bindir}
@@ -90,6 +93,7 @@ ln -s $(pwd)/bin/gpg $(pwd)/bin/gpg2
 %{_mandir}/man1/*
 %{_mandir}/man7/*
 %{_mandir}/man8/*
+%{_mandir}/manh/*
 %{_infodir}/gnupg*
 %{_libexecdir}/*
 %{_datadir}/gnupg/*
@@ -101,6 +105,9 @@ ln -s $(pwd)/bin/gpg $(pwd)/bin/gpg2
 %defattr(-,root,root)
 
 %changelog
+* Mon Jun 23 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 2.4.7-1
+- Upgrade to version 2.4.7
+
 * Tue May 07 2024 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.4.4-2
 - Disabled keyboxd.
 
diff --git a/SPECS/libgpg-error/libgpg-error.signatures.json b/SPECS/libgpg-error/libgpg-error.signatures.json
@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "libgpg-error-1.47.tar.bz2": "9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb"
+  "libgpg-error-1.48.tar.bz2": "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f"
  }
-}
+}
diff --git a/SPECS/libgpg-error/libgpg-error.spec b/SPECS/libgpg-error/libgpg-error.spec
@@ -1,6 +1,6 @@
 Summary:        libgpg-error
 Name:           libgpg-error
-Version:        1.47
+Version:        1.48
 Release:        1%{?dist}
 License:        GPLv2+
 URL:            https://gnupg.org/
@@ -75,6 +75,9 @@ make %{?_smp_mflags} check
 %defattr(-,root,root)
 
 %changelog
+* Mon Jun 23 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 1.48-1
+- Upgrade to version 1.48 to support gnupg2
+
 * Fri Nov 10 2023 Andrew Phelps <anphel@microsoft.com> - 1.47-1
 - Upgrade to version 1.47
 
diff --git a/cgmanifest.json b/cgmanifest.json
@@ -4600,8 +4600,8 @@
         "type": "other",
         "other": {
           "name": "gnupg2",
-          "version": "2.4.4",
-          "downloadUrl": "https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.4.tar.bz2"
+          "version": "2.4.7",
+          "downloadUrl": "https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.7.tar.bz2"
         }
       }
     },
@@ -9621,8 +9621,8 @@
         "type": "other",
         "other": {
           "name": "libgpg-error",
-          "version": "1.47",
-          "downloadUrl": "https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.47.tar.bz2"
+          "version": "1.48",
+          "downloadUrl": "https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.48.tar.bz2"
         }
       }
     },
diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
@@ -221,15 +221,15 @@ tdnf-devel-3.5.8-7.azl3.aarch64.rpm
 tdnf-plugin-repogpgcheck-3.5.8-7.azl3.aarch64.rpm
 libassuan-2.5.6-1.azl3.aarch64.rpm
 libassuan-devel-2.5.6-1.azl3.aarch64.rpm
-libgpg-error-1.47-1.azl3.aarch64.rpm
+libgpg-error-1.48-1.azl3.aarch64.rpm
 libgcrypt-1.10.2-1.azl3.aarch64.rpm
 libksba-1.6.4-1.azl3.aarch64.rpm
 libksba-devel-1.6.4-1.azl3.aarch64.rpm
 libxslt-1.1.43-1.azl3.aarch64.rpm
 npth-1.6-4.azl3.aarch64.rpm
 pinentry-1.2.1-1.azl3.aarch64.rpm
-gnupg2-2.4.4-2.azl3.aarch64.rpm
-gnupg2-lang-2.4.4-2.azl3.aarch64.rpm
+gnupg2-2.4.7-1.azl3.aarch64.rpm
+gnupg2-lang-2.4.7-1.azl3.aarch64.rpm
 gpgme-1.23.2-2.azl3.aarch64.rpm
 azurelinux-repos-shared-3.0-5.azl3.noarch.rpm
 azurelinux-repos-3.0-5.azl3.noarch.rpm
diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
@@ -221,15 +221,15 @@ tdnf-devel-3.5.8-7.azl3.x86_64.rpm
 tdnf-plugin-repogpgcheck-3.5.8-7.azl3.x86_64.rpm
 libassuan-2.5.6-1.azl3.x86_64.rpm
 libassuan-devel-2.5.6-1.azl3.x86_64.rpm
-libgpg-error-1.47-1.azl3.x86_64.rpm
+libgpg-error-1.48-1.azl3.x86_64.rpm
 libgcrypt-1.10.2-1.azl3.x86_64.rpm
 libksba-1.6.4-1.azl3.x86_64.rpm
 libksba-devel-1.6.4-1.azl3.x86_64.rpm
 libxslt-1.1.43-1.azl3.x86_64.rpm
 npth-1.6-4.azl3.x86_64.rpm
 pinentry-1.2.1-1.azl3.x86_64.rpm
-gnupg2-2.4.4-2.azl3.x86_64.rpm
-gnupg2-lang-2.4.4-2.azl3.x86_64.rpm
+gnupg2-2.4.7-1.azl3.x86_64.rpm
+gnupg2-lang-2.4.7-1.azl3.x86_64.rpm
 gpgme-1.23.2-2.azl3.x86_64.rpm
 azurelinux-repos-shared-3.0-5.azl3.noarch.rpm
 azurelinux-repos-3.0-5.azl3.noarch.rpm
diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt
@@ -140,9 +140,9 @@ glibc-tools-2.38-11.azl3.aarch64.rpm
 gmp-6.3.0-1.azl3.aarch64.rpm
 gmp-debuginfo-6.3.0-1.azl3.aarch64.rpm
 gmp-devel-6.3.0-1.azl3.aarch64.rpm
-gnupg2-2.4.4-2.azl3.aarch64.rpm
-gnupg2-debuginfo-2.4.4-2.azl3.aarch64.rpm
-gnupg2-lang-2.4.4-2.azl3.aarch64.rpm
+gnupg2-2.4.7-1.azl3.aarch64.rpm
+gnupg2-debuginfo-2.4.7-1.azl3.aarch64.rpm
+gnupg2-lang-2.4.7-1.azl3.aarch64.rpm
 gperf-3.1-5.azl3.aarch64.rpm
 gperf-debuginfo-3.1-5.azl3.aarch64.rpm
 gpgme-1.23.2-2.azl3.aarch64.rpm
@@ -194,10 +194,10 @@ libgcrypt-debuginfo-1.10.2-1.azl3.aarch64.rpm
 libgcrypt-devel-1.10.2-1.azl3.aarch64.rpm
 libgomp-13.2.0-7.azl3.aarch64.rpm
 libgomp-devel-13.2.0-7.azl3.aarch64.rpm
-libgpg-error-1.47-1.azl3.aarch64.rpm
-libgpg-error-debuginfo-1.47-1.azl3.aarch64.rpm
-libgpg-error-devel-1.47-1.azl3.aarch64.rpm
-libgpg-error-lang-1.47-1.azl3.aarch64.rpm
+libgpg-error-1.48-1.azl3.aarch64.rpm
+libgpg-error-debuginfo-1.48-1.azl3.aarch64.rpm
+libgpg-error-devel-1.48-1.azl3.aarch64.rpm
+libgpg-error-lang-1.48-1.azl3.aarch64.rpm
 libksba-1.6.4-1.azl3.aarch64.rpm
 libksba-debuginfo-1.6.4-1.azl3.aarch64.rpm
 libksba-devel-1.6.4-1.azl3.aarch64.rpm
diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt
@@ -147,9 +147,9 @@ glibc-tools-2.38-11.azl3.x86_64.rpm
 gmp-6.3.0-1.azl3.x86_64.rpm
 gmp-debuginfo-6.3.0-1.azl3.x86_64.rpm
 gmp-devel-6.3.0-1.azl3.x86_64.rpm
-gnupg2-2.4.4-2.azl3.x86_64.rpm
-gnupg2-debuginfo-2.4.4-2.azl3.x86_64.rpm
-gnupg2-lang-2.4.4-2.azl3.x86_64.rpm
+gnupg2-2.4.7-1.azl3.x86_64.rpm
+gnupg2-debuginfo-2.4.7-1.azl3.x86_64.rpm
+gnupg2-lang-2.4.7-1.azl3.x86_64.rpm
 gperf-3.1-5.azl3.x86_64.rpm
 gperf-debuginfo-3.1-5.azl3.x86_64.rpm
 gpgme-1.23.2-2.azl3.x86_64.rpm
@@ -202,10 +202,10 @@ libgcrypt-debuginfo-1.10.2-1.azl3.x86_64.rpm
 libgcrypt-devel-1.10.2-1.azl3.x86_64.rpm
 libgomp-13.2.0-7.azl3.x86_64.rpm
 libgomp-devel-13.2.0-7.azl3.x86_64.rpm
-libgpg-error-1.47-1.azl3.x86_64.rpm
-libgpg-error-debuginfo-1.47-1.azl3.x86_64.rpm
-libgpg-error-devel-1.47-1.azl3.x86_64.rpm
-libgpg-error-lang-1.47-1.azl3.x86_64.rpm
+libgpg-error-1.48-1.azl3.x86_64.rpm
+libgpg-error-debuginfo-1.48-1.azl3.x86_64.rpm
+libgpg-error-devel-1.48-1.azl3.x86_64.rpm
+libgpg-error-lang-1.48-1.azl3.x86_64.rpm
 libksba-1.6.4-1.azl3.x86_64.rpm
 libksba-debuginfo-1.6.4-1.azl3.x86_64.rpm
 libksba-devel-1.6.4-1.azl3.x86_64.rpm

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"Signatures": {`
`3`		`- "libgpg-error-1.47.tar.bz2": "9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb"`
	`3`	`+ "libgpg-error-1.48.tar.bz2": "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f"`
`4`	`4`	`}`
`5`		`-}`
	`5`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4600,8 +4600,8 @@`
`4600`	`4600`	`"type": "other",`
`4601`	`4601`	`"other": {`
`4602`	`4602`	`"name": "gnupg2",`
`4603`		`- "version": "2.4.4",`
`4604`		`- "downloadUrl": "https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.4.tar.bz2"`
	`4603`	`+ "version": "2.4.7",`
	`4604`	`+ "downloadUrl": "https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.7.tar.bz2"`
`4605`	`4605`	`}`
`4606`	`4606`	`}`
`4607`	`4607`	`},`
`@@ -9621,8 +9621,8 @@`
`9621`	`9621`	`"type": "other",`
`9622`	`9622`	`"other": {`
`9623`	`9623`	`"name": "libgpg-error",`
`9624`		`- "version": "1.47",`
`9625`		`- "downloadUrl": "https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.47.tar.bz2"`
	`9624`	`+ "version": "1.48",`
	`9625`	`+ "downloadUrl": "https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.48.tar.bz2"`
`9626`	`9626`	`}`
`9627`	`9627`	`}`
`9628`	`9628`	`},`