From 411a0bc7bbea5677767dfe5eaef071313ed10c48 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Thu, 25 Aug 2022 21:41:37 +0300 Subject: [PATCH] upg gnupg grub nss --- gnupg/PKGBUILD | 25 +++++++++++++------------ gnupg/PKGBUILD-arch | 19 +++++++++++++------ gnupg/time | 10 ++++------ grub/PKGBUILD | 4 ++-- grub/PKGBUILD-arch | 4 ++-- grub/deps | 2 ++ nss/PKGBUILD | 6 +++--- nss/PKGBUILD-arch | 4 ++-- nss/note | 1 - 9 files changed, 41 insertions(+), 34 deletions(-) diff --git a/gnupg/PKGBUILD b/gnupg/PKGBUILD index c4c5037..effadb9 100644 --- a/gnupg/PKGBUILD +++ b/gnupg/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=gnupg -pkgver=2.2.36 +pkgver=2.2.37 pkgrel=01 pkgdesc='Complete and free implementation of the OpenPGP standard w/o systemd' url='https://www.gnupg.org/' @@ -21,10 +21,8 @@ optdepends=('libldap: gpg2keys_ldap' 'libusb-compat: scdaemon' 'pcsclite: scdaemon') +# options=('debug') ### uncomment this line to have the debug pkg produced source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig} - # https://bugs.archlinux.org/task/74423 https://dev.gnupg.org/T5935 - 'gnupg-2.2.35-scd-dont-inhibit-ssh-authentication.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=e8fb8e2b3e66d5ea8a3dc90afdc14611abf2c3da' -# 'gnupg-2.2.35-revert_14de7b1e5904e78fcbe413a82d0f19b750bd8830.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=3192939a10df17cb9666773ed8888627f6d16b8d' 'drop-import-clean.patch' 'avoid-beta-warning.patch') @@ -41,11 +39,11 @@ prepare() { msg2 "Applying patch $src..." patch -Np1 < "../$src" done - + # improve reproducibility rm doc/gnupg.info* - - ./autogen.sh + + ./autogen.sh } build() { @@ -67,6 +65,9 @@ check() { } package() { + local units=({dirmngr,gpg-agent{,-{browser,extra,ssh}}}.socket) + + local unit cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install ln -s gpg "${pkgdir}"/usr/bin/gpg2 @@ -77,16 +78,16 @@ package() { #---- license gpg-key sha256sums ---- #license=('GPL') -license=(BSD custom CC0 GPL2 GPL3 LGPL3 LGPL2.1 MIT) # 2.35.1-02 +#license=(BSD custom CC0 GPL2 GPL3 LGPL3 LGPL2.1 MIT) # 2.35.1-02 +license=(BSD custom custom:CC0 GPL2 GPL3 LGPL3 LGPL2.1 MIT) # 2.37 validpgpkeys=(5B80C5754298F0CB55D8ED6ABCEF7E294B092E28 # Andre Heinecke (Release Signing Key) 6DAA6E64A76D2840571B4902528897B826403ADA # Werner Koch (dist signing 2020) AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD # Niibe Yutaka (GnuPG Release Key) 02F38DFF731FF97CB039A1DA549E695E905BA208) # GnuPG.com (Release Signing Key 2021) -sha256sums=(bdfe783810fceca9703b9e811817acca63ee9ef0174e616598e8ea6590aa4c9c # gnupg-2.2.36.tar.bz2 - a7d448073756203f90e54f74b0ef31dbb0f3b4a25e63367a59165c9966fbb23b # gnupg-2.2.36.tar.bz2.sig - 1b7611a24e813429e56a7d0855c59d33109cb1b59b3586a3dd35935909a493e5 # gnupg-2.2.35-scd-dont-inhibit-ssh-authentication.patch -# 00aa4897f11900f67e161f538c5322f2f9e65dc5675a760fd298d43d33a259d7 # gnupg-2.2.35-revert_14de7b1e5904e78fcbe413a82d0f19b750bd8830.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=3192939a10df17cb9666773ed8888627f6d16b8d +sha256sums=(95f8928b4a21890658660c2c10db63a765286864612e7581932b5c3d16aca871 # gnupg-2.2.37.tar.bz2 + b4ceaf0f0be7d718b73cf2b5a748a87c36a1277a54e0e02bd7f9f345d4fe7525 # gnupg-2.2.37.tar.bz2.sig 02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc # drop-import-clean.patch 22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d) # avoid-beta-warning.patch + diff --git a/gnupg/PKGBUILD-arch b/gnupg/PKGBUILD-arch index 1071e21..e3071c0 100644 --- a/gnupg/PKGBUILD-arch +++ b/gnupg/PKGBUILD-arch @@ -1,3 +1,4 @@ +# Maintainer: David Runge # Maintainer: Levente Polyak # Maintainer: Lukas Fleischer # Contributor: Gaetan Bisson @@ -6,11 +7,11 @@ # Contributor: Judd Vinet pkgname=gnupg -pkgver=2.2.36 +pkgver=2.2.37 pkgrel=1 pkgdesc='Complete and free implementation of the OpenPGP standard' url='https://www.gnupg.org/' -license=(BSD custom CC0 GPL2 GPL3 LGPL3 LGPL2.1 MIT) +license=(BSD custom custom:CC0 GPL2 GPL3 LGPL3 LGPL2.1 MIT) arch=('x86_64') checkdepends=('openssh') makedepends=('libldap' 'libusb-compat' 'pcsclite') @@ -31,14 +32,11 @@ validpgpkeys=( ) source=( "https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig} - # https://bugs.archlinux.org/task/74423 https://dev.gnupg.org/T5935 - 'gnupg-2.2.35-scd-dont-inhibit-ssh-authentication.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=e8fb8e2b3e66d5ea8a3dc90afdc14611abf2c3da' 'drop-import-clean.patch' 'avoid-beta-warning.patch' ) -sha256sums=('bdfe783810fceca9703b9e811817acca63ee9ef0174e616598e8ea6590aa4c9c' +sha256sums=('95f8928b4a21890658660c2c10db63a765286864612e7581932b5c3d16aca871' 'SKIP' - '1b7611a24e813429e56a7d0855c59d33109cb1b59b3586a3dd35935909a493e5' '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc' '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d') @@ -80,6 +78,10 @@ check() { } package() { + local units=({dirmngr,gpg-agent{,-{browser,extra,ssh}}}.socket) + local socket_target_dir="$pkgdir/usr/lib/systemd/user/sockets.target.wants/" + local unit + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install ln -s gpg "${pkgdir}"/usr/bin/gpg2 @@ -87,6 +89,11 @@ package() { install -Dm 644 doc/examples/systemd-user/*.* -t "${pkgdir}/usr/lib/systemd/user" install -Dm 644 COPYING.{CC0,other} -t "${pkgdir}/usr/share/licenses/$pkgname/" + + install -vdm 755 "$socket_target_dir" + for unit in "${units[@]}"; do + ln -sv "../$unit" "$socket_target_dir$unit" + done } # vim: ts=2 sw=2 et: diff --git a/gnupg/time b/gnupg/time index d575b5b..c844513 100644 --- a/gnupg/time +++ b/gnupg/time @@ -1,8 +1,6 @@ -real 2m10.814s -user 3m20.120s -sys 0m11.589s -real 2m9.926s -user 3m20.311s -sys 0m11.537s +real 3m16.596s +user 2m33.403s +sys 0m9.805s + diff --git a/grub/PKGBUILD b/grub/PKGBUILD index 930c3dd..0e9797d 100644 --- a/grub/PKGBUILD +++ b/grub/PKGBUILD @@ -20,8 +20,8 @@ _GRUB_EMU_BUILD="0" pkgname='grub' pkgdesc='GNU GRand Unified Bootloader (2)' epoch=2 -_commit='0c6c1aff2a86a69ae74e1207bca2ff95303cbf43' -_pkgver=2.06.r297.g0c6c1aff2 +_commit='d9b4638c50b16d4722e66d334e2c1a674b4a45cc' +_pkgver=2.06.r322.gd9b4638c5 _unifont_ver='14.0.04' pkgver=${_pkgver/-/} pkgrel=01 diff --git a/grub/PKGBUILD-arch b/grub/PKGBUILD-arch index d8f151b..f39dd2b 100644 --- a/grub/PKGBUILD-arch +++ b/grub/PKGBUILD-arch @@ -18,8 +18,8 @@ _GRUB_EMU_BUILD="0" pkgname='grub' pkgdesc='GNU GRand Unified Bootloader (2)' epoch=2 -_commit='0c6c1aff2a86a69ae74e1207bca2ff95303cbf43' -_pkgver=2.06.r297.g0c6c1aff2 +_commit='d9b4638c50b16d4722e66d334e2c1a674b4a45cc' +_pkgver=2.06.r322.gd9b4638c5 _unifont_ver='14.0.04' pkgver=${_pkgver/-/} pkgrel=1 diff --git a/grub/deps b/grub/deps index 37b4da8..69bb546 100644 --- a/grub/deps +++ b/grub/deps @@ -15,3 +15,5 @@ automake bison os-prober + + diff --git a/nss/PKGBUILD b/nss/PKGBUILD index 498c59c..594def6 100644 --- a/nss/PKGBUILD +++ b/nss/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=nss pkgname=(nss ca-certificates-mozilla) pkgver=3.82 -pkgrel=01 +pkgrel=02 pkgdesc="Network Security Services - zstd mandatory here!" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" @@ -32,10 +32,10 @@ prepare() { build() { cd certs - ../certdata2pem.py + python ../certdata2pem.py cd .. - ./bundle.sh + sh ./bundle.sh cd nss ./build.sh \ diff --git a/nss/PKGBUILD-arch b/nss/PKGBUILD-arch index 6660113..454ff18 100644 --- a/nss/PKGBUILD-arch +++ b/nss/PKGBUILD-arch @@ -3,7 +3,7 @@ pkgbase=nss pkgname=(nss ca-certificates-mozilla) -pkgver=3.81 +pkgver=3.82 pkgrel=1 pkgdesc="Network Security Services" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" @@ -12,7 +12,7 @@ license=(MPL GPL) depends=('nspr>=4.34' sqlite zlib sh 'p11-kit>=0.23.19') makedepends=(perl python gyp mercurial) options=(debug) -_revision=01d45a3c6d270940f4514cebdeed150f972b4f2b +_revision=dba0f1c0f2388f75f345ba188cbb99cf04ded59f source=("hg+https://hg.mozilla.org/projects/nss#revision=$_revision" certdata2pem.py bundle.sh) sha256sums=('SKIP' diff --git a/nss/note b/nss/note index 48bb7bd..866fb1a 100644 --- a/nss/note +++ b/nss/note @@ -25,4 +25,3 @@ fail to build or break will using. Just what I think and find, I report for us to share in the near future. -