upg archlinux-keyring gpgme less xz

This commit is contained in:
joborun linux 2023-05-05 17:18:25 +03:00
parent 3ea249ac1d
commit 901cdad2cd
14 changed files with 203 additions and 61 deletions

View file

@ -6,11 +6,10 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=archlinux-keyring
_tag='4910f7835c9786342a3c93d66383dbbc9c1395df' # git rev-parse ${pkgver}
pkgver=20230320
_tag='892c8954ad1dc3f77e71b3ffef84cb5c1200c906' # git rev-parse ${pkgver}
pkgver=20230504
pkgrel=01
pkgdesc='Arch Linux PGP keyring'
arch=(any)
url='https://gitlab.archlinux.org/archlinux/archlinux-keyring/'
install=$pkgname.install
groups=(base)
@ -40,7 +39,9 @@ package() {
rm -rf $pkgdir/archlinux-keyring-wkd-sync.service
}
#---- license gpg-key sha256sums ----
#---- arch license gpg-key & sha256sums ----
arch=(x86_64)
license=(GPL3)
@ -54,4 +55,5 @@ validpgpkeys=('02FD1C7A934E614545849F19A6234074498E9CEE' # Christian Hesse <ewo
sha256sums=(SKIP)
## 76de029a5c524356909322cc79610b461af7e2f6fea1e61fc1af83fe9b08fd83 archlinux-keyring-20230320-01-any.pkg.tar.lz
## 8b49097c1b26eaaa544c397a61b3ad4c7c81d45e81d89772fd8023ca5c5cdb0a archlinux-keyring-20230504-01-x86_64.pkg.tar.lz

View file

@ -2,8 +2,8 @@
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
pkgname=archlinux-keyring
_tag='4910f7835c9786342a3c93d66383dbbc9c1395df' # git rev-parse ${pkgver}
pkgver=20230320
_tag='892c8954ad1dc3f77e71b3ffef84cb5c1200c906' # git rev-parse ${pkgver}
pkgver=20230504
pkgrel=1
pkgdesc='Arch Linux PGP keyring'
arch=('any')

View file

@ -6,20 +6,23 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgbase=gpgme
pkgname=(gpgme qgpgme python-gpgme)
#pkgname=(gpgme qgpgme-qt5 qgpgme-qt6 python-gpgme)
pkgname=(gpgme python-gpgme qgpgme)
pkgver=1.20.0
pkgrel=02
pkgrel=03
pkgdesc="A C wrapper library for GnuPG"
#options=('debug') ## uncomment this to have the debug pkg produced
url='https://www.gnupg.org/related_software/gpgme/'
makedepends=('gnupg' 'libgpg-error' 'python' 'python-setuptools' 'python-build' 'python-installer' 'python-setuptools' 'python-wheel' 'qt5-base' 'swig')
makedepends=('gnupg' 'libgpg-error' 'python' 'python-setuptools' 'python-build' 'python-installer' 'python-setuptools' 'python-wheel' 'swig' 'qt5-base')
source=("https://www.gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2"{,.sig})
# # joborun: it is not supported but Arch is forcing it to support both qt5&6
# # get the qt pkgs from Arch then because we would rather live without Qt than allow it to penetrate deeper
# # QT's licensing shouldn't be perceived as free any more, Arch tries to support unsupported qt5 and qt6
# # Arch note below:
#prepare() {
# cd ${pkgbase}-${pkgver}
#
# patch -Np1 -i ../0001-python-3-10.patch
# patch -Np1 -i ../0002-python-setup.patch
## Building qt5 and qt6 bindings in the same source tree is not supported
# cp -r ${pkgbase}-${pkgver}{,-qt6}
#}
build() {
@ -35,7 +38,7 @@ build() {
(
# use a PEP517 workflow to get a reproducible Python package
# NOTE: top_builddir is required so that the build takes place against local gpgme, not system gpgme
cd lang/python/
cd lang/python/
top_builddir="$srcdir/$pkgbase-$pkgver" python -m build --wheel --no-isolation
)
@ -72,7 +75,8 @@ package_gpgme() {
package_qgpgme() {
pkgdesc="Qt bindings for GPGme"
depends=('gpgme' 'qt5-base')
provides=('qgpgme-qt5')
conflicts=('qgpgme-qt5')
cd ${pkgbase}-${pkgver}/lang/qt
make DESTDIR="${pkgdir}" install
@ -98,6 +102,7 @@ validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist sig
sha256sums=(25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750 # gpgme-1.20.0.tar.bz2
f32a7e1c6c132ca06dde763b243ab0f4055fb360ced1761829c7dc8b38528db6) # gpgme-1.20.0.tar.bz2.sig
## 75ca574cfdf8eec1fd5203abaad9fb9ae07c8688bc004d371b0ffee2b1c4bfd5 gpgme-1.20.0-02-x86_64.pkg.tar.lz
## 9ff2071e98044e3029ac9c39063e3745b1907ba66189585337d015754bbf0f09 python-gpgme-1.20.0-02-x86_64.pkg.tar.lz
## acd00138853aab10b1874fbaca6095c414566f3ca21cb9449e84dac0bce91a6e qgpgme-1.20.0-02-x86_64.pkg.tar.lz
## 8e42d5e48d46fa5b421ac2a8c62c75c074a1eb92798a4ee1c50572eff77af393 gpgme-1.20.0-03-x86_64.pkg.tar.lz
## baebbe004fa495fea3ebea586af85d4509d3c782da4ddced5233888c1dc4fda0 python-gpgme-1.20.0-03-x86_64.pkg.tar.lz
## 3e68c606a394b039971d04e2d3474100b51dd6aec6d84704c29d31d35764deb9 qgpgme-1.20.0-03-x86_64.pkg.tar.lz

View file

@ -0,0 +1,115 @@
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Roman Kyrylych <roman@archlinux.org>
# Contributor: Sarah Hay <sarah@archlinux.org>
pkgbase=gpgme
pkgname=(gpgme qgpgme-qt5 qgpgme-qt6 python-gpgme)
pkgver=1.20.0
pkgrel=3
pkgdesc='A C wrapper library for GnuPG'
arch=('x86_64')
url='https://www.gnupg.org/related_software/gpgme/'
license=('LGPL')
makedepends=(
'gnupg'
'libgpg-error'
'python'
'python-build'
'python-installer'
'python-setuptools'
'python-wheel'
'qt5-base'
'qt6-base'
'swig'
)
validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020)
'AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD') # Niibe Yutaka (GnuPG Release Key)
source=("https://www.gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2"{,.sig})
sha256sums=('25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750'
'SKIP')
prepare() {
# Building qt5 and qt6 bindings in the same source tree is not supported
cp -r ${pkgbase}-${pkgver}{,-qt6}
}
build() {
cd ${pkgbase}-${pkgver}
./configure \
--prefix=/usr \
--disable-fd-passing \
--disable-static \
--disable-gpgsm-test
make
(
# use a PEP517 workflow to get a reproducible Python package
# NOTE: top_builddir is required so that the build takes place against local gpgme, not system gpgme
cd lang/python/
top_builddir="$srcdir/$pkgbase-$pkgver" python -m build --wheel --no-isolation
)
cd ../${pkgbase}-${pkgver}-qt6
./configure \
--prefix=/usr \
--disable-fd-passing \
--disable-static \
--disable-gpgsm-test \
--enable-languages=cpp,qt6
make
}
check() {
cd ${pkgbase}-${pkgver}
# this test fails with gnupg (FS#66572)
sed -i 's#"t-keylist-secret",##' tests/json/t-json.c
make check
}
package_gpgme() {
depends=('libgpg-error' 'gnupg>=2')
options+=('!emptydirs')
provides=('libgpgme.so'
'libgpgmepp.so')
cd ${pkgbase}-${pkgver}
make DESTDIR="${pkgdir}" install
# split qgpgme
rm -r "${pkgdir}"/usr/lib/{cmake/QGpgme/,libqgpgme.*}
rm -r "${pkgdir}"/usr/lib/python*
}
package_qgpgme-qt5() {
pkgdesc="Qt5 bindings for GPGme"
depends=('gpgme' 'qt5-base')
provides=('qgpgme')
replaces=('qgpgme')
cd ${pkgbase}-${pkgver}/lang/qt
make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}"/usr/include
}
package_qgpgme-qt6() {
pkgdesc="Qt6 bindings for GPGme"
depends=('gpgme' 'qt6-base')
cd ${pkgbase}-${pkgver}-qt6/lang/qt
make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}"/usr/include
}
package_python-gpgme() {
pkgdesc="Python bindings for GPGme"
depends=('gpgme' 'python')
cd ${pkgbase}-${pkgver}/lang/python
python -m installer --destdir="$pkgdir" dist/*.whl
}

View file

@ -1,10 +1,10 @@
qt5-base
python
swig
python-setuptools
python-build
python-installer
python-wheel
python-typing_extensions
qt5-base

View file

@ -1,5 +1,6 @@
real 2m47.365s
user 4m52.646s
sys 0m17.204s
real 6m25.064s
user 5m12.691s
sys 0m17.841s

View file

@ -6,20 +6,28 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=less
pkgver=608
pkgrel=02
pkgver=633
pkgrel=01
epoch=1
pkgdesc='A terminal based program for viewing text files'
arch=('x86_64')
url='https://www.greenwoodsoftware.com/less/'
depends=('glibc' 'ncurses' 'pcre2')
source=("https://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz"
"$pkgname-$pkgver.tar.gz.sig::https://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.sig"
less-CVE-2022-46663.patch::https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c.patch)
"$pkgname-$pkgver.tar.gz.sig::https://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.sig")
prepare() {
cd $pkgname-$pkgver
patch -Np1 < ../less-CVE-2022-46663.patch
# patch -Np1 < ../less-CVE-2022-46663.patch
# apply patch from the source array (should be a pacman feature)
local src
for src in "${source[@]}"; do
src="${src%%::*}"
src="${src##*/}"
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
done
}
build() {
@ -33,15 +41,15 @@ package() {
make DESTDIR="$pkgdir" install
}
#---- license gpg-key sha256sums ----
#---- arch license gpg-key & sha256sums ----
arch=(x86_64)
license=('GPL3')
validpgpkeys=('AE27252BD6846E7D6EAE1DD6F153A7C833235259') # Mark Nudelman
sha256sums=(a69abe2e0a126777e021d3b73aa3222e1b261f10e64624d41ec079685a6ac209 # less-608.tar.gz
471e673031cc2112422f3827b3ea2e32b619e5b25b1d81b284fe6df6cda2b1b4 # less-608.tar.gz.sig
3862ce1d6ee0aacefe75274f04afc00a38474d4cf2f6be96feb6aaa226c9bd98) # less-CVE-2022-46663.patch
## ec60d23c84e6733d49feec2c6cc5eea495a631659e972530f110548fcf0d3f52 less-1:608-02-x86_64.pkg.tar.lz
sha256sums=(2f201d64b828b88af36dfe6cfdba3e0819ece2e446ebe6224813209aaefed04f # less-633.tar.gz
08707590b9d350f66394430960971c776f48649c2d2b175f9b8f23acbde551f7) # less-633.tar.gz.sig
## 5dea7d3f876493a9dbfa27a5c5a3976d4d83c180e3ccd18af47b98bf722b225b less-1:633-01-x86_64.pkg.tar.lz

View file

@ -3,8 +3,8 @@
# Contributor: judd <jvinet@zeroflux.org>
pkgname=less
pkgver=608
pkgrel=2
pkgver=633
pkgrel=1
epoch=1
pkgdesc='A terminal based program for viewing text files'
license=('GPL3')
@ -13,15 +13,21 @@ url='https://www.greenwoodsoftware.com/less/'
depends=('glibc' 'ncurses' 'pcre2')
validpgpkeys=('AE27252BD6846E7D6EAE1DD6F153A7C833235259') # Mark Nudelman
source=("https://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz"
"$pkgname-$pkgver.tar.gz.sig::https://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.sig"
less-CVE-2022-46663.patch::https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c.patch)
sha256sums=('a69abe2e0a126777e021d3b73aa3222e1b261f10e64624d41ec079685a6ac209'
'SKIP'
'3862ce1d6ee0aacefe75274f04afc00a38474d4cf2f6be96feb6aaa226c9bd98')
"$pkgname-$pkgver.tar.gz.sig::https://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.sig")
sha256sums=('2f201d64b828b88af36dfe6cfdba3e0819ece2e446ebe6224813209aaefed04f'
'SKIP')
prepare() {
cd $pkgname-$pkgver
patch -Np1 < ../less-CVE-2022-46663.patch
# apply patch from the source array (should be a pacman feature)
local src
for src in "${source[@]}"; do
src="${src%%::*}"
src="${src##*/}"
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
done
}
build() {

View file

@ -1,4 +1,6 @@
real 0m6.563s
user 0m11.448s
sys 0m1.094s
real 0m10.895s
user 0m9.819s
sys 0m1.579s

View file

@ -6,7 +6,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=xz
pkgver=5.4.2
pkgver=5.4.3
pkgrel=01
pkgdesc='Library and command line tools for XZ and LZMA compressed files'
url='https://tukaani.org/xz/'
@ -52,11 +52,11 @@ arch=(x86_64)
license=('GPL' 'LGPL' 'custom')
validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620') # Lasse Collin <lasse.collin@tukaani.org>
validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620' # Lasse Collin <lasse.collin@tukaani.org>
'22D465F2B4C173803B20C6DE59FCF207FEA7F445') # Jia Tan <jiat0218@gmail.com>
sha256sums=(87947679abcf77cc509d8d1b474218fd16b72281e2797360e909deaee1ac9d05 # xz-5.4.2.tar.gz
49b48fe20a7620c6d688e6633ae055bf27d987dcc89d55bafcc148256cdca37a) # xz-5.4.2.tar.gz.sig
## a52aeed0c582a827023b979de05faf341cf5793067d3fdbbfa17b6790525403d xz-5.4.2-01-x86_64.pkg.tar.lz
sha256sums=(1c382e0bc2e4e0af58398a903dd62fff7e510171d2de47a1ebe06d1528e9b7e9 # xz-5.4.3.tar.gz
177dcccf425a106fe1ac8f05f3c403069adf019fc917e523187df2042d01a2f0) # xz-5.4.3.tar.gz.sig
## ae0459489d08b7321e6979a4f926df10744f188cf14416cf92ca6e2e5f2e08e1 xz-5.4.3-01-x86_64.pkg.tar.lz

View file

@ -2,7 +2,7 @@
# Contributor: François Charette <firmicus@gmx.net>
pkgname=xz
pkgver=5.4.2
pkgver=5.4.3
pkgrel=1
pkgdesc='Library and command line tools for XZ and LZMA compressed files'
arch=('x86_64')
@ -10,11 +10,12 @@ url='https://tukaani.org/xz/'
license=('GPL' 'LGPL' 'custom')
depends=('sh')
provides=('liblzma.so')
validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620') # Lasse Collin <lasse.collin@tukaani.org>
validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620' # Lasse Collin <lasse.collin@tukaani.org>
'22D465F2B4C173803B20C6DE59FCF207FEA7F445') # Jia Tan <jiat0218@gmail.com>
source=("https://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
sha256sums=('87947679abcf77cc509d8d1b474218fd16b72281e2797360e909deaee1ac9d05'
sha256sums=('1c382e0bc2e4e0af58398a903dd62fff7e510171d2de47a1ebe06d1528e9b7e9'
'SKIP')
sha512sums=('149f980338bea3d66de1ff5994b2b236ae1773135eda68b62b009df0c9dcdf5467f8cb2c06da95a71b6556d60bd3d21f475feced34d5dfdb80ee95416a2f9737'
sha512sums=('aff0fe166af6df4491a6f5df2372cab100b081452461a0e8c6fd65b72af3f250f16c64d9fb8fd309141e9b9ae4e41649f48687cc29e63dd82f27f2eab19b4023'
'SKIP')
build() {

View file

@ -1,2 +1,3 @@

1
xz/key
View file

@ -1 +1,2 @@
gpg -v --recv-key 38EE757D69184620
gpg -v --recv-key 59FCF207FEA7F445

View file

@ -1,6 +1,6 @@
real 0m59.255s
user 0m48.052s
sys 0m7.434s
real 0m51.472s
user 0m47.477s
sys 0m6.624s