From c6d01d803fdfdd617da508a0f567d8166ac200a9 Mon Sep 17 00:00:00 2001 From: Ed Reel Date: Thu, 28 Nov 2024 13:23:20 -0600 Subject: [PATCH] Update gnupg and dependencies (#10822) Gnupg 2.4.6 => 2.4.7 Gnutls 2.8.7.1 => 2.8.8 Npth 1.7 => 1.8 --- manifest/armv7l/g/gnutls.filelist | 2 +- manifest/armv7l/n/npth.filelist | 4 ++-- manifest/i686/g/gnutls.filelist | 2 +- manifest/i686/n/npth.filelist | 4 ++-- manifest/x86_64/g/gnutls.filelist | 2 +- manifest/x86_64/n/npth.filelist | 4 ++-- packages/gnupg.rb | 17 ++++++----------- packages/gnutls.rb | 12 ++++++------ packages/npth.rb | 14 +++++++------- 9 files changed, 28 insertions(+), 33 deletions(-) diff --git a/manifest/armv7l/g/gnutls.filelist b/manifest/armv7l/g/gnutls.filelist index 2585b11e4..945acfd2f 100644 --- a/manifest/armv7l/g/gnutls.filelist +++ b/manifest/armv7l/g/gnutls.filelist @@ -33,7 +33,7 @@ /usr/local/lib/libgnutls.la /usr/local/lib/libgnutls.so /usr/local/lib/libgnutls.so.30 -/usr/local/lib/libgnutls.so.30.40.1 +/usr/local/lib/libgnutls.so.30.40.2 /usr/local/lib/libgnutlsxx.la /usr/local/lib/libgnutlsxx.so /usr/local/lib/libgnutlsxx.so.30 diff --git a/manifest/armv7l/n/npth.filelist b/manifest/armv7l/n/npth.filelist index 9f95a6012..3c6ad5b53 100644 --- a/manifest/armv7l/n/npth.filelist +++ b/manifest/armv7l/n/npth.filelist @@ -1,7 +1,7 @@ -/usr/local/bin/npth-config /usr/local/include/npth.h /usr/local/lib/libnpth.la /usr/local/lib/libnpth.so /usr/local/lib/libnpth.so.0 -/usr/local/lib/libnpth.so.0.1.2 +/usr/local/lib/libnpth.so.0.3.0 +/usr/local/lib/pkgconfig/npth.pc /usr/local/share/aclocal/npth.m4 diff --git a/manifest/i686/g/gnutls.filelist b/manifest/i686/g/gnutls.filelist index 2585b11e4..945acfd2f 100644 --- a/manifest/i686/g/gnutls.filelist +++ b/manifest/i686/g/gnutls.filelist @@ -33,7 +33,7 @@ /usr/local/lib/libgnutls.la /usr/local/lib/libgnutls.so /usr/local/lib/libgnutls.so.30 -/usr/local/lib/libgnutls.so.30.40.1 +/usr/local/lib/libgnutls.so.30.40.2 /usr/local/lib/libgnutlsxx.la /usr/local/lib/libgnutlsxx.so /usr/local/lib/libgnutlsxx.so.30 diff --git a/manifest/i686/n/npth.filelist b/manifest/i686/n/npth.filelist index 9f95a6012..3c6ad5b53 100644 --- a/manifest/i686/n/npth.filelist +++ b/manifest/i686/n/npth.filelist @@ -1,7 +1,7 @@ -/usr/local/bin/npth-config /usr/local/include/npth.h /usr/local/lib/libnpth.la /usr/local/lib/libnpth.so /usr/local/lib/libnpth.so.0 -/usr/local/lib/libnpth.so.0.1.2 +/usr/local/lib/libnpth.so.0.3.0 +/usr/local/lib/pkgconfig/npth.pc /usr/local/share/aclocal/npth.m4 diff --git a/manifest/x86_64/g/gnutls.filelist b/manifest/x86_64/g/gnutls.filelist index 8e69bd3cc..a5430f8fd 100644 --- a/manifest/x86_64/g/gnutls.filelist +++ b/manifest/x86_64/g/gnutls.filelist @@ -33,7 +33,7 @@ /usr/local/lib64/libgnutls.la /usr/local/lib64/libgnutls.so /usr/local/lib64/libgnutls.so.30 -/usr/local/lib64/libgnutls.so.30.40.1 +/usr/local/lib64/libgnutls.so.30.40.2 /usr/local/lib64/libgnutlsxx.la /usr/local/lib64/libgnutlsxx.so /usr/local/lib64/libgnutlsxx.so.30 diff --git a/manifest/x86_64/n/npth.filelist b/manifest/x86_64/n/npth.filelist index f8bbac732..5b5ec90d0 100644 --- a/manifest/x86_64/n/npth.filelist +++ b/manifest/x86_64/n/npth.filelist @@ -1,7 +1,7 @@ -/usr/local/bin/npth-config /usr/local/include/npth.h /usr/local/lib64/libnpth.la /usr/local/lib64/libnpth.so /usr/local/lib64/libnpth.so.0 -/usr/local/lib64/libnpth.so.0.1.2 +/usr/local/lib64/libnpth.so.0.3.0 +/usr/local/lib64/pkgconfig/npth.pc /usr/local/share/aclocal/npth.m4 diff --git a/packages/gnupg.rb b/packages/gnupg.rb index a4270ae4f..d316e0830 100644 --- a/packages/gnupg.rb +++ b/packages/gnupg.rb @@ -3,18 +3,18 @@ require 'buildsystems/autotools' class Gnupg < Autotools description 'GnuPG is a complete and free implementation of the OpenPGP standard as defined by RFC4880 (also known as PGP).' homepage 'https://gnupg.org/' - version '2.4.6' + version '2.4.7' license 'GPL-2' compatibility 'all' source_url "https://gnupg.org/ftp/gcrypt/gnupg/gnupg-#{version}.tar.bz2" - source_sha256 '95acfafda7004924a6f5c901677f15ac1bda2754511d973bb4523e8dd840e17a' + source_sha256 '7b24706e4da7e0e3b06ca068231027401f238102c41c909631349dcc3b85eb46' binary_compression 'tar.zst' binary_sha256({ - aarch64: '11f64f2bf8d36d22c4b12de99a5dba2e9eb471a897d2a124a7082a75569f3ce7', - armv7l: '11f64f2bf8d36d22c4b12de99a5dba2e9eb471a897d2a124a7082a75569f3ce7', - i686: '772375004996c7cb5837f9f0ed54d107b201db9dd099fec3c9b7ab2ee8cba9b8', - x86_64: '5915ea7434e4a720737832fd6a21fea46baa996c2c34bab4feba437f044b971d' + aarch64: '358da660d1034cd0486210638a35bd0334531555650634351695541940e207da', + armv7l: '358da660d1034cd0486210638a35bd0334531555650634351695541940e207da', + i686: '03f99a147bd90de24241fe2319e4137729167959e6b00d227a7b1b3d85f874f2', + x86_64: 'e3c31805bf60a2503ab6df58ae96ebf7c22accd63d7e1fdd3bb4159ff2d4fc09' }) depends_on 'bzip2' # R @@ -39,9 +39,4 @@ class Gnupg < Autotools --with-readline' run_tests - - def self.patch - downloader 'https://files.gnupg.net/file/data/zy2tsxkydxq4okdhxj4p/PHID-FILE-cnig3h7b4hnrmr5efbh2/file', '7beaf4c72dc91a885fb088f7c1ef043ab49f230666727bcf2609954d722aba36', 'unistd.patch' - system 'patch -Np1 -i unistd.patch' - end end diff --git a/packages/gnutls.rb b/packages/gnutls.rb index ca5ef5fd9..1fc366009 100644 --- a/packages/gnutls.rb +++ b/packages/gnutls.rb @@ -3,18 +3,18 @@ require 'buildsystems/autotools' class Gnutls < Autotools description 'GnuTLS is a secure communications library implementing the SSL, TLS and DTLS protocols and technologies around them.' homepage 'https://gnutls.org/' - version '3.8.7.1' + version '3.8.8' license 'GPL-3' compatibility 'all' source_url "https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-#{version}.tar.xz" - source_sha256 '9ca0ddaccce28a74fa18d738744190afb3b0daebef74e6ad686bf7bef99abd60' + source_sha256 'ac4f020e583880b51380ed226e59033244bc536cad2623f2e26f5afa2939d8fb' binary_compression 'tar.zst' binary_sha256({ - aarch64: '477db98c4c932da937920888b0a6e4cb3859113cd2414013d202a0fada2585e7', - armv7l: '477db98c4c932da937920888b0a6e4cb3859113cd2414013d202a0fada2585e7', - i686: '04ae5e17c1055201bf4d897b4beff5201ad4a1e95ee66555b009630381016848', - x86_64: 'e4c4e9b6373f51a480c6b13787bfa6392f91959ada44cb1d2f3fb252cf6eccf3' + aarch64: 'c8701d58b98064f28e3483a0437de774f8457cd1922ce72ab6d51b273a1cd771', + armv7l: 'c8701d58b98064f28e3483a0437de774f8457cd1922ce72ab6d51b273a1cd771', + i686: '98ddf3fe0313c215f0e769b6c2f2d65f33a7ecb9709db946826c8d142a5c5b81', + x86_64: '05593f2162c5f8bc21f9b6f7ec8b3957eb9b6e18bef262cbe52192b95315e4b1' }) depends_on 'brotli' # R diff --git a/packages/npth.rb b/packages/npth.rb index 1ff61a138..d2898c509 100644 --- a/packages/npth.rb +++ b/packages/npth.rb @@ -3,18 +3,18 @@ require 'buildsystems/autotools' class Npth < Autotools description 'nPth is a library to provide the GNU Pth API and thus a non-preemptive threads implementation.' homepage 'https://www.gnupg.org/related_software/npth/index.html' - version '1.7' + version '1.8' license 'LGPL-2.1+' compatibility 'all' - source_url 'https://www.gnupg.org/ftp/gcrypt/npth/npth-1.6.tar.bz2' - source_sha256 '1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1' + source_url "https://www.gnupg.org/ftp/gcrypt/npth/npth-#{version}.tar.bz2" + source_sha256 '8bd24b4f23a3065d6e5b26e98aba9ce783ea4fd781069c1b35d149694e90ca3e' binary_compression 'tar.zst' binary_sha256({ - aarch64: '53670d54a7d4e88a6899d1868ffba42b1d50d0865c826f144485818537e1baf4', - armv7l: '53670d54a7d4e88a6899d1868ffba42b1d50d0865c826f144485818537e1baf4', - i686: '561238e45c64d003c14603c094d65351690e32390918d09a1bf25f40f8ee8b49', - x86_64: 'a1f2db1d9476a48bb49014cede645b17ae65fd9d289062d74d040e3092d0764b' + aarch64: '72af97e008ec176fd89b3f041437469ccaf89d37189cd8e506bc4691a67fbb96', + armv7l: '72af97e008ec176fd89b3f041437469ccaf89d37189cd8e506bc4691a67fbb96', + i686: '8c6ea35dc2cfa6f6ab6e1062d793b6a3b55dc6584f234b03a20b2d5ec32d6849', + x86_64: '3d89fce64d6f9b33f4bbf3d1a23ad300862a7561632c0cd9850c27df605abf33' }) depends_on 'glibc' # R