upg curl gnupg libinih
This commit is contained in:
parent
b35da7b18b
commit
50affad50d
8 changed files with 55 additions and 83 deletions
|
|
@ -7,22 +7,17 @@
|
|||
|
||||
pkgbase=curl
|
||||
pkgname=(curl libcurl-compat libcurl-gnutls)
|
||||
pkgver=7.82.0
|
||||
pkgrel=03
|
||||
pkgver=7.83.0
|
||||
pkgrel=01
|
||||
pkgdesc='An URL retrieval utility and library - w/o ipv6 & zstd'
|
||||
arch=('x86_64')
|
||||
url='https://curl.haxx.se'
|
||||
#options=(debug)
|
||||
#options=(debug) # uncomment this to produce debug package
|
||||
depends=('ca-certificates' 'brotli' 'libbrotlidec.so' 'krb5' 'libgssapi_krb5.so'
|
||||
'libidn2' 'libidn2.so' 'libnghttp2' 'libpsl' 'libpsl.so' 'libssh2' 'libssh2.so'
|
||||
'openssl' 'zlib')
|
||||
provides=('libcurl.so')
|
||||
|
||||
source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.gz"{,.asc}
|
||||
0001-http2-handle-DONE-called-for-the-paused-stream.patch
|
||||
0002-http-close-the-stream-not-connection-on-time-conditi.patch
|
||||
0003-http2-RST-the-stream-if-we-stop-it-on-our-own-will.patch
|
||||
0004-openssl-fix-CN-check-error-code.patch)
|
||||
source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.gz"{,.asc})
|
||||
|
||||
_configure_options=(
|
||||
--prefix='/usr'
|
||||
|
|
@ -41,16 +36,6 @@ _configure_options=(
|
|||
--with-ca-bundle='/etc/ssl/certs/ca-certificates.crt'
|
||||
)
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgbase}-${pkgver}"
|
||||
# https://github.com/curl/curl/issues/8626
|
||||
patch -Np1 -i ../0001-http2-handle-DONE-called-for-the-paused-stream.patch
|
||||
patch -Np1 -i ../0002-http-close-the-stream-not-connection-on-time-conditi.patch
|
||||
patch -Np1 -i ../0003-http2-RST-the-stream-if-we-stop-it-on-our-own-will.patch
|
||||
# https://github.com/curl/curl/issues/8559
|
||||
patch -Np1 -i ../0004-openssl-fix-CN-check-error-code.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
mkdir build-curl{,-compat,-gnutls}
|
||||
|
||||
|
|
@ -104,10 +89,10 @@ package_libcurl-compat() {
|
|||
|
||||
make -C lib DESTDIR="${pkgdir}" install
|
||||
|
||||
mv "${pkgdir}"/usr/lib/libcurl{,-compat}.so.4.7.0
|
||||
mv "${pkgdir}"/usr/lib/libcurl{,-compat}.so.4.8.0
|
||||
rm "${pkgdir}"/usr/lib/libcurl.{a,so}*
|
||||
for version in 3 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0 4.5.0 4.6.0; do
|
||||
ln -s libcurl-compat.so.4.7.0 "${pkgdir}"/usr/lib/libcurl.so.${version}
|
||||
for version in 3 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0 4.5.0 4.6.0 4.7.0; do
|
||||
ln -s libcurl-compat.so.4.8.0 "${pkgdir}"/usr/lib/libcurl.so.${version}
|
||||
done
|
||||
|
||||
install -dm 0755 "${pkgdir}"/usr/share/licenses
|
||||
|
|
@ -122,10 +107,10 @@ package_libcurl-gnutls() {
|
|||
|
||||
make -C lib DESTDIR="${pkgdir}" install
|
||||
|
||||
mv "${pkgdir}"/usr/lib/libcurl{,-gnutls}.so.4.7.0
|
||||
mv "${pkgdir}"/usr/lib/libcurl{,-gnutls}.so.4.8.0
|
||||
rm "${pkgdir}"/usr/lib/libcurl.{a,so}*
|
||||
for version in 3 4 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0 4.5.0 4.6.0; do
|
||||
ln -s libcurl-gnutls.so.4.7.0 "${pkgdir}"/usr/lib/libcurl-gnutls.so.${version}
|
||||
for version in 3 4 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0 4.5.0 4.6.0 4.7.0; do
|
||||
ln -s libcurl-gnutls.so.4.8.0 "${pkgdir}"/usr/lib/libcurl-gnutls.so.${version}
|
||||
done
|
||||
|
||||
install -dm 0755 "${pkgdir}"/usr/share/licenses
|
||||
|
|
@ -138,10 +123,5 @@ license=('MIT')
|
|||
|
||||
validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
|
||||
|
||||
sha256sums=(910cc5fe279dc36e2cca534172c94364cf3fcf7d6494ba56e6c61a390881ddce # curl-7.82.0.tar.gz
|
||||
c1799877d4d45e733f2c88373d5b6399f169133551e8968f131bb8447e673004 # curl-7.82.0.tar.gz.asc
|
||||
ee63885393f548166e08a85ce20b21b680cd654ecb26594aad4e5d7f3299c496 # 0001-http2-handle-DONE-called-for-the-paused-stream.patch
|
||||
9d93b236d302fc4c8115317139c6d8454d3c76b5ee4767266f8dbcfbf82a61f9 # 0002-http-close-the-stream-not-connection-on-time-conditi.patch
|
||||
d3262ade60f214e2bd7b7cb1b705256e69fc7e79e162cc4b6c59dbf5a1b7b987 # 0003-http2-RST-the-stream-if-we-stop-it-on-our-own-will.patch
|
||||
ad96be99435a85b447681a2aa22b732d9d08814755077f35f9558e73bb6592e3) # 0004-openssl-fix-CN-check-error-code.patch
|
||||
|
||||
sha256sums=(c0e64302a33d2fb79e0fc4e674260a22941e92ee2f11b894bf94d32b8f5531af # curl-7.83.0.tar.gz
|
||||
f6ca16283d7713e38a4210044c9dc06ba6ac1d924a7ed4f47abcf95d626ba365) # curl-7.83.0.tar.gz.asc
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
pkgbase=curl
|
||||
pkgname=(curl libcurl-compat libcurl-gnutls)
|
||||
pkgver=7.82.0
|
||||
pkgrel=3
|
||||
pkgver=7.83.0
|
||||
pkgrel=1
|
||||
pkgdesc='An URL retrieval utility and library'
|
||||
arch=('x86_64')
|
||||
url='https://curl.haxx.se'
|
||||
|
|
@ -17,17 +17,9 @@ depends=('ca-certificates' 'brotli' 'libbrotlidec.so' 'krb5' 'libgssapi_krb5.so'
|
|||
'libidn2' 'libidn2.so' 'libnghttp2' 'libpsl' 'libpsl.so' 'libssh2' 'libssh2.so'
|
||||
'openssl' 'zlib' 'zstd' 'libzstd.so')
|
||||
provides=('libcurl.so')
|
||||
source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.gz"{,.asc}
|
||||
0001-http2-handle-DONE-called-for-the-paused-stream.patch
|
||||
0002-http-close-the-stream-not-connection-on-time-conditi.patch
|
||||
0003-http2-RST-the-stream-if-we-stop-it-on-our-own-will.patch
|
||||
0004-openssl-fix-CN-check-error-code.patch)
|
||||
sha512sums=('d4c4a785876e0d1ba1c1adbe65528d56a8b81fc03ff724e87819cfe51aca60f8a7bf2ac9384f30c3a6bbd28669b2bd3e9a6794737243c836c4902d085a72c474'
|
||||
'SKIP'
|
||||
'0d883c3fc267c4c5d82078e03689db31f83292cb41f3f6fab26d05fa9cbaa77ae75cfd3bbb4f6953bbc4bc9760c54b49bdfdae219cd48af92312abbb1ba70ec6'
|
||||
'422df75880b107a5c457d25ca1488166f5e61cc2876ad0193a742ad6cf4cae5363b0c7bd00cbaf9f49a5e5d503159cb2d2fd3d602abf3935dc3f77f14e9027dc'
|
||||
'394f27e8721c23b82924064df8f72aa33f6e5064d0a3798a59543fd7d9660939437f1a6f45f03370d517edf5d4a218a9d41b4d62e7498d4f520f026da68007b1'
|
||||
'bb2e3d40d65c5c1c07b2623c2d5db11fe232ecf4d9f223ec2bdd8fba32c76c991292b36114b48dd0cad2ed376d127070a65f30fcec7af4b328e4adaab81b4dc1')
|
||||
source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.gz"{,.asc})
|
||||
sha512sums=('ef5a7e03ebff688538bc44d110982a6ace88d847878cb8cfbf1b0b3f5c34ffd116b2423754f23e36792592ae6ccbcd88f32e6e9ba9983c78b92dc866c059b4ba'
|
||||
'SKIP')
|
||||
validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
|
||||
|
||||
_configure_options=(
|
||||
|
|
@ -45,16 +37,6 @@ _configure_options=(
|
|||
--with-ca-bundle='/etc/ssl/certs/ca-certificates.crt'
|
||||
)
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgbase}-${pkgver}"
|
||||
# https://github.com/curl/curl/issues/8626
|
||||
patch -Np1 -i ../0001-http2-handle-DONE-called-for-the-paused-stream.patch
|
||||
patch -Np1 -i ../0002-http-close-the-stream-not-connection-on-time-conditi.patch
|
||||
patch -Np1 -i ../0003-http2-RST-the-stream-if-we-stop-it-on-our-own-will.patch
|
||||
# https://github.com/curl/curl/issues/8559
|
||||
patch -Np1 -i ../0004-openssl-fix-CN-check-error-code.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
mkdir build-curl{,-compat,-gnutls}
|
||||
|
||||
|
|
@ -108,10 +90,10 @@ package_libcurl-compat() {
|
|||
|
||||
make -C lib DESTDIR="${pkgdir}" install
|
||||
|
||||
mv "${pkgdir}"/usr/lib/libcurl{,-compat}.so.4.7.0
|
||||
mv "${pkgdir}"/usr/lib/libcurl{,-compat}.so.4.8.0
|
||||
rm "${pkgdir}"/usr/lib/libcurl.{a,so}*
|
||||
for version in 3 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0 4.5.0 4.6.0; do
|
||||
ln -s libcurl-compat.so.4.7.0 "${pkgdir}"/usr/lib/libcurl.so.${version}
|
||||
for version in 3 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0 4.5.0 4.6.0 4.7.0; do
|
||||
ln -s libcurl-compat.so.4.8.0 "${pkgdir}"/usr/lib/libcurl.so.${version}
|
||||
done
|
||||
|
||||
install -dm 0755 "${pkgdir}"/usr/share/licenses
|
||||
|
|
@ -126,10 +108,10 @@ package_libcurl-gnutls() {
|
|||
|
||||
make -C lib DESTDIR="${pkgdir}" install
|
||||
|
||||
mv "${pkgdir}"/usr/lib/libcurl{,-gnutls}.so.4.7.0
|
||||
mv "${pkgdir}"/usr/lib/libcurl{,-gnutls}.so.4.8.0
|
||||
rm "${pkgdir}"/usr/lib/libcurl.{a,so}*
|
||||
for version in 3 4 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0 4.5.0 4.6.0; do
|
||||
ln -s libcurl-gnutls.so.4.7.0 "${pkgdir}"/usr/lib/libcurl-gnutls.so.${version}
|
||||
for version in 3 4 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0 4.5.0 4.6.0 4.7.0; do
|
||||
ln -s libcurl-gnutls.so.4.8.0 "${pkgdir}"/usr/lib/libcurl-gnutls.so.${version}
|
||||
done
|
||||
|
||||
install -dm 0755 "${pkgdir}"/usr/share/licenses
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=gnupg
|
||||
pkgver=2.2.32
|
||||
pkgrel=03
|
||||
pkgver=2.2.35
|
||||
pkgrel=01
|
||||
pkgdesc='Complete and free implementation of the OpenPGP standard w/o systemd'
|
||||
url='https://www.gnupg.org/'
|
||||
arch=('x86_64')
|
||||
|
|
@ -22,8 +22,9 @@ 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'
|
||||
'drop-import-clean.patch'
|
||||
'avoid-beta-warning.patch')
|
||||
'avoid-beta-warning.patch')
|
||||
|
||||
# install=install ### this was for linking systemd sockets and such crap !!
|
||||
|
||||
|
|
@ -32,6 +33,10 @@ prepare() {
|
|||
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
|
||||
|
||||
# improve reproducibility
|
||||
rm doc/gnupg.info*
|
||||
|
||||
|
|
@ -74,7 +79,8 @@ validpgpkeys=(
|
|||
'6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020)
|
||||
)
|
||||
|
||||
sha256sums=(b2571b35f82c63e7d278aa6a1add0d73453dc14d3f0854be490c844fca7e0614 # gnupg-2.2.32.tar.bz2
|
||||
475e10488f9868f2e03e386929fa2c4d9f14777312ed104fd6958991c33ebe9a # gnupg-2.2.32.tar.bz2.sig
|
||||
sha256sums=(340bc255938971e6e729b3d9956fa2ef4db8215d77693bf300df2bb302498690 # gnupg-2.2.35.tar.bz2
|
||||
f92720c1f80eaf82d1581b857358488ebe3a836eadc4d2e1f4b7b15ddc987e65 # gnupg-2.2.35.tar.bz2.sig
|
||||
1b7611a24e813429e56a7d0855c59d33109cb1b59b3586a3dd35935909a493e5 # gnupg-2.2.35-scd-dont-inhibit-ssh-authentication.patch
|
||||
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.32
|
||||
pkgrel=2
|
||||
pkgver=2.2.35
|
||||
pkgrel=1
|
||||
pkgdesc='Complete and free implementation of the OpenPGP standard'
|
||||
url='https://www.gnupg.org/'
|
||||
license=('GPL')
|
||||
|
|
@ -20,6 +20,7 @@ depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan' 'pinentry'
|
|||
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>
|
||||
|
|
@ -27,10 +28,12 @@ validpgpkeys=(
|
|||
'6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020)
|
||||
)
|
||||
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'
|
||||
'drop-import-clean.patch'
|
||||
'avoid-beta-warning.patch')
|
||||
sha256sums=('b2571b35f82c63e7d278aa6a1add0d73453dc14d3f0854be490c844fca7e0614'
|
||||
sha256sums=('340bc255938971e6e729b3d9956fa2ef4db8215d77693bf300df2bb302498690'
|
||||
'SKIP'
|
||||
'1b7611a24e813429e56a7d0855c59d33109cb1b59b3586a3dd35935909a493e5'
|
||||
'02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
|
||||
'22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')
|
||||
|
||||
|
|
@ -41,6 +44,10 @@ prepare() {
|
|||
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
|
||||
|
||||
# improve reproducibility
|
||||
rm doc/gnupg.info*
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
rm -rvf {src,pkg,gnupg*bz2*}
|
||||
rm -rvf {src,pkg,gnupg*bz2*,gnupg-2.*patch}
|
||||
|
|
|
|||
|
|
@ -4,3 +4,4 @@ gettext
|
|||
libusb-compat
|
||||
pcsclite
|
||||
openssh
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=libinih
|
||||
pkgver=53
|
||||
pkgver=55
|
||||
pkgrel=02
|
||||
pkgdesc='A simple .INI file parser written in C'
|
||||
arch=(x86_64)
|
||||
|
|
@ -14,13 +14,14 @@ url=https://github.com/benhoyt/inih
|
|||
depends=( gcc-libs glibc )
|
||||
makedepends=( git meson )
|
||||
provides=(libinih.so libINIReader.so)
|
||||
_tag=cb55f57d87ae840bd0f65dbe6bd22fa021a873a7
|
||||
#_tag=cb55f57d87ae840bd0f65dbe6bd22fa021a873a7
|
||||
_tag=f7f69c6cff2681d84bae371130b4a018cb2171e6
|
||||
source=(git+https://github.com/benhoyt/inih.git#tag=${_tag})
|
||||
|
||||
prepare() {
|
||||
cd inih
|
||||
git cherry-pick -n 32519ea045670fbd9a057a9c48f77d7b473ce53b
|
||||
}
|
||||
#prepare() {
|
||||
# cd inih
|
||||
# git cherry-pick -n 32519ea045670fbd9a057a9c48f77d7b473ce53b
|
||||
#}
|
||||
|
||||
pkgver() {
|
||||
cd inih
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Contributor: Alberto Oporto Ames <otreblain@gmail.com>
|
||||
|
||||
pkgname=libinih
|
||||
pkgver=53
|
||||
pkgver=55
|
||||
pkgrel=2
|
||||
pkgdesc='A simple .INI file parser written in C'
|
||||
arch=(x86_64)
|
||||
|
|
@ -20,15 +20,10 @@ provides=(
|
|||
libinih.so
|
||||
libINIReader.so
|
||||
)
|
||||
_tag=cb55f57d87ae840bd0f65dbe6bd22fa021a873a7
|
||||
_tag=f7f69c6cff2681d84bae371130b4a018cb2171e6
|
||||
source=(git+https://github.com/benhoyt/inih.git#tag=${_tag})
|
||||
b2sums=(SKIP)
|
||||
|
||||
prepare() {
|
||||
cd inih
|
||||
git cherry-pick -n 32519ea045670fbd9a057a9c48f77d7b473ce53b
|
||||
}
|
||||
|
||||
pkgver() {
|
||||
cd inih
|
||||
git describe --tags | sed 's/^r//'
|
||||
|
|
|
|||
Loading…
Reference in a new issue