upg libnl gnupg
This commit is contained in:
parent
559ec3630d
commit
d0abcb39fe
7 changed files with 118 additions and 84 deletions
|
|
@ -6,8 +6,8 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=gnupg
|
||||
pkgver=2.2.35
|
||||
pkgrel=02
|
||||
pkgver=2.2.36
|
||||
pkgrel=01
|
||||
pkgdesc='Complete and free implementation of the OpenPGP standard w/o systemd'
|
||||
url='https://www.gnupg.org/'
|
||||
arch=('x86_64')
|
||||
|
|
@ -22,28 +22,29 @@ optdepends=('libldap: gpg2keys_ldap'
|
|||
'pcsclite: scdaemon')
|
||||
|
||||
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
|
||||
'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'
|
||||
# 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')
|
||||
|
||||
# install=install ### this was for linking systemd sockets and such crap !!
|
||||
# install=$pkgname.install ### this was for linking systemd sockets and such crap !!
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
patch -p1 -i ../avoid-beta-warning.patch
|
||||
patch -p1 -i ../drop-import-clean.patch
|
||||
|
||||
# https://bugs.archlinux.org/task/74423
|
||||
# https://dev.gnupg.org/T5935
|
||||
patch -p1 -i ../gnupg-2.2.35-scd-dont-inhibit-ssh-authentication.patch
|
||||
# fix issues with signatures in an automated environment (e.g. archlinux-keyring):
|
||||
# https://dev.gnupg.org/T5953
|
||||
patch -Np1 -i ../gnupg-2.2.35-revert_14de7b1e5904e78fcbe413a82d0f19b750bd8830.patch
|
||||
|
||||
# improve reproducibility
|
||||
rm doc/gnupg.info*
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
||||
local src
|
||||
for src in "${source[@]}"; do
|
||||
src="${src%%::*}"
|
||||
src="${src##*/}"
|
||||
[[ $src = *.patch ]] || continue
|
||||
msg2 "Applying patch $src..."
|
||||
patch -Np1 < "../$src"
|
||||
done
|
||||
|
||||
# improve reproducibility
|
||||
rm doc/gnupg.info*
|
||||
|
||||
./autogen.sh
|
||||
}
|
||||
|
||||
|
|
@ -78,16 +79,14 @@ package() {
|
|||
#license=('GPL')
|
||||
license=(BSD custom CC0 GPL2 GPL3 LGPL3 LGPL2.1 MIT) # 2.35.1-02
|
||||
|
||||
validpgpkeys=(
|
||||
'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch (dist sig)
|
||||
'031EC2536E580D8EA286A9F22071B08A33BD3F06' # NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org>
|
||||
'5B80C5754298F0CB55D8ED6ABCEF7E294B092E28' # Andre Heinecke (Release Signing Key)
|
||||
'6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020)
|
||||
'AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD') # Niibe Yutaka (GnuPG Release Key)
|
||||
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=(340bc255938971e6e729b3d9956fa2ef4db8215d77693bf300df2bb302498690 # gnupg-2.2.35.tar.bz2
|
||||
e3c2b9e2ea60eee676f3c51155931d8057119b369f6b587fbc368a8bd2bd8b41 # gnupg-2.2.35.tar.bz2.sig
|
||||
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
|
||||
# 00aa4897f11900f67e161f538c5322f2f9e65dc5675a760fd298d43d33a259d7 # gnupg-2.2.35-revert_14de7b1e5904e78fcbe413a82d0f19b750bd8830.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=3192939a10df17cb9666773ed8888627f6d16b8d
|
||||
02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc # drop-import-clean.patch
|
||||
22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d) # avoid-beta-warning.patch
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
# Contributor: Judd Vinet <jvinet@zeroflux.org>
|
||||
|
||||
pkgname=gnupg
|
||||
pkgver=2.2.35
|
||||
pkgrel=2
|
||||
pkgver=2.2.36
|
||||
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)
|
||||
|
|
@ -17,74 +17,76 @@ makedepends=('libldap' 'libusb-compat' 'pcsclite')
|
|||
depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan' 'pinentry'
|
||||
'bzip2' 'libbz2.so' 'readline' 'libreadline.so' 'gnutls' 'sqlite'
|
||||
'zlib' 'glibc')
|
||||
optdepends=('libldap: gpg2keys_ldap'
|
||||
'libusb-compat: scdaemon'
|
||||
'pcsclite: scdaemon')
|
||||
optdepends=(
|
||||
'libldap: gpg2keys_ldap'
|
||||
'libusb-compat: scdaemon'
|
||||
'pcsclite: scdaemon'
|
||||
)
|
||||
options=('debug')
|
||||
validpgpkeys=(
|
||||
'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch (dist sig)
|
||||
'031EC2536E580D8EA286A9F22071B08A33BD3F06' # NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org>
|
||||
'5B80C5754298F0CB55D8ED6ABCEF7E294B092E28' # Andre Heinecke (Release Signing Key)
|
||||
'6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020)
|
||||
'AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD' # Niibe Yutaka (GnuPG Release Key)
|
||||
'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)
|
||||
)
|
||||
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
|
||||
'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')
|
||||
sha256sums=('340bc255938971e6e729b3d9956fa2ef4db8215d77693bf300df2bb302498690'
|
||||
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'
|
||||
'SKIP'
|
||||
'1b7611a24e813429e56a7d0855c59d33109cb1b59b3586a3dd35935909a493e5'
|
||||
'00aa4897f11900f67e161f538c5322f2f9e65dc5675a760fd298d43d33a259d7'
|
||||
'02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
|
||||
'22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')
|
||||
|
||||
install=install
|
||||
install=$pkgname.install
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
patch -p1 -i ../avoid-beta-warning.patch
|
||||
patch -p1 -i ../drop-import-clean.patch
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
||||
# https://bugs.archlinux.org/task/74423
|
||||
# https://dev.gnupg.org/T5935
|
||||
patch -p1 -i ../gnupg-2.2.35-scd-dont-inhibit-ssh-authentication.patch
|
||||
# fix issues with signatures in an automated environment (e.g. archlinux-keyring):
|
||||
# https://dev.gnupg.org/T5953
|
||||
patch -Np1 -i ../gnupg-2.2.35-revert_14de7b1e5904e78fcbe413a82d0f19b750bd8830.patch
|
||||
local src
|
||||
for src in "${source[@]}"; do
|
||||
src="${src%%::*}"
|
||||
src="${src##*/}"
|
||||
[[ $src = *.patch ]] || continue
|
||||
msg2 "Applying patch $src..."
|
||||
patch -Np1 < "../$src"
|
||||
done
|
||||
|
||||
# improve reproducibility
|
||||
rm doc/gnupg.info*
|
||||
# improve reproducibility
|
||||
rm doc/gnupg.info*
|
||||
|
||||
./autogen.sh
|
||||
./autogen.sh
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--sbindir=/usr/bin \
|
||||
--libexecdir=/usr/lib/gnupg \
|
||||
--enable-maintainer-mode \
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--sbindir=/usr/bin \
|
||||
--libexecdir=/usr/lib/gnupg \
|
||||
--enable-maintainer-mode \
|
||||
|
||||
make
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make check
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make check
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
ln -s gpg "${pkgdir}"/usr/bin/gpg2
|
||||
ln -s gpgv "${pkgdir}"/usr/bin/gpgv2
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
ln -s gpg "${pkgdir}"/usr/bin/gpg2
|
||||
ln -s gpgv "${pkgdir}"/usr/bin/gpgv2
|
||||
|
||||
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 -Dm 644 doc/examples/systemd-user/*.* -t "${pkgdir}/usr/lib/systemd/user"
|
||||
install -Dm 644 COPYING.{CC0,other} -t "${pkgdir}/usr/share/licenses/$pkgname/"
|
||||
}
|
||||
|
||||
# vim: ts=2 sw=2 noet:
|
||||
# vim: ts=2 sw=2 et:
|
||||
|
|
|
|||
31
gnupg/gnupg.install
Normal file
31
gnupg/gnupg.install
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
_global_units() {
|
||||
_units=(dirmngr.socket gpg-agent.socket gpg-agent-{browser,extra,ssh}.socket)
|
||||
_dir=/etc/systemd/user/sockets.target.wants
|
||||
|
||||
case $1 in
|
||||
enable)
|
||||
mkdir -p $_dir
|
||||
for _u in "${_units[@]}"; do
|
||||
ln -sf /usr/lib/systemd/user/$_u $_dir/$_u
|
||||
done
|
||||
;;
|
||||
disable)
|
||||
for _u in "${_units[@]}"; do
|
||||
rm -f $_dir/$_u
|
||||
done
|
||||
rmdir -p --ignore-fail-on-non-empty $_dir
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
post_install() {
|
||||
# See FS#42798 and FS#47371
|
||||
dirmngr </dev/null &>/dev/null
|
||||
|
||||
# Let systemd supervise daemons by default
|
||||
_global_units enable
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
_global_units disable
|
||||
}
|
||||
|
|
@ -1,2 +1,4 @@
|
|||
gpg -v --recv-key 528897B826403ADA
|
||||
gpg --recv-keys E98E9B2D19C6C8BD
|
||||
gpg -v --recv-keys BCEF7E294B092E28 # Andre Heinecke (Release Signing Key)
|
||||
gpg -v --recv-keys 528897B826403ADA # Werner Koch (dist signing 2020)
|
||||
gpg -v --recv-keys E98E9B2D19C6C8BD # Niibe Yutaka (GnuPG Release Key)
|
||||
gpg -v --recv-keys 549E695E905BA208 # GnuPG.com (Release Signing Key 2021)
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=libnl
|
||||
pkgver=3.6.0
|
||||
pkgrel=03
|
||||
pkgver=3.7.0
|
||||
pkgrel=01
|
||||
pkgdesc='Library for applications dealing with netlink sockets'
|
||||
arch=(x86_64)
|
||||
url='https://github.com/thom311/libnl/'
|
||||
|
|
@ -43,6 +43,5 @@ license=(GPL)
|
|||
|
||||
validpgpkeys=('49EA7C670E0850E7419514F629C2366E4DFC5728') # Thomas Haller
|
||||
|
||||
sha256sums=(532155fd011e5a805bd67121b87a01c757e2bb24112ac17e69cb86013b970009 # libnl-3.6.0.tar.gz
|
||||
283da46c27c11e5e9fefe40ab09712770de3e98a4f441f0dd37db19434af2d6a) # libnl-3.6.0.tar.gz.sig
|
||||
|
||||
sha256sums=(9fe43ccbeeea72c653bdcf8c93332583135cda46a79507bfd0a483bb57f65939 # libnl-3.7.0.tar.gz
|
||||
abdf098b3a7802a1e77086e5f92835ad25a2da6a59a05d6a5a086d66a323bffc) # libnl-3.7.0.tar.gz.sig
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Contributor: Thomas Bächler <thomas@archlinux.org>
|
||||
|
||||
pkgname=libnl
|
||||
pkgver=3.6.0
|
||||
pkgrel=3
|
||||
pkgver=3.7.0
|
||||
pkgrel=1
|
||||
pkgdesc='Library for applications dealing with netlink sockets'
|
||||
arch=('x86_64')
|
||||
url='https://github.com/thom311/libnl/'
|
||||
|
|
@ -14,7 +14,7 @@ backup=('etc/libnl/classid'
|
|||
'etc/libnl/pktloc')
|
||||
validpgpkeys=('49EA7C670E0850E7419514F629C2366E4DFC5728') # Thomas Haller
|
||||
source=("https://github.com/thom311/libnl/releases/download/libnl${pkgver//./_}/${pkgname}-${pkgver}.tar.gz"{,.sig})
|
||||
sha256sums=('532155fd011e5a805bd67121b87a01c757e2bb24112ac17e69cb86013b970009'
|
||||
sha256sums=('9fe43ccbeeea72c653bdcf8c93332583135cda46a79507bfd0a483bb57f65939'
|
||||
'SKIP')
|
||||
|
||||
build() {
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
bison
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue