* update serf to 1.3.10-1

This commit is contained in:
Alexander Baldeck 2024-01-10 15:16:35 +01:00
parent 9408a12964
commit 149fc7afbf
2 changed files with 8 additions and 35 deletions

View File

@ -3,30 +3,25 @@
# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
pkgname=serf
pkgver=1.3.9
pkgrel=8
pkgver=1.3.10
pkgrel=1
pkgdesc="High-performance asynchronous HTTP client library"
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
url="https://serf.apache.org"
license=('Apache')
depends=('apr-util')
makedepends=('scons')
source=(https://www.apache.org/dist/serf/${pkgname}-${pkgver}.tar.bz2{,.asc}
scons-python3.patch
openssl3-ERR_GET_FUNC.patch
openssl3-BIO_ctrl.patch)
validpgpkeys=('C236283C970D2C3CFEEB4936BF35CF0078383142')
sha256sums=('549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc'
source=(https://downloads.apache.org/serf/${pkgname}-${pkgver}.tar.bz2{,.asc}
openssl3-ERR_GET_FUNC.patch)
validpgpkeys=('C236283C970D2C3CFEEB4936BF35CF0078383142'
'E7B2A7F4EC28BE9FF8B38BA4B64FFF1209F9FA74')
sha256sums=('be81ef08baa2516ecda76a77adf7def7bc3227eeb578b9a33b45f7b41dc064e6'
'SKIP'
'363732546098b4c9415eb5d38b595d04c660c6324a34159768d334507b7d241f'
'15026f5ce219d2222dbdb6dcbb8911f3c8fbe0cedf3a2ec2ff434dde8d7fb9be'
'bf30b79aff5b058ba3852930dad4e5c16fc2e2d76810ca80e6e22e3c8121cff6')
'15026f5ce219d2222dbdb6dcbb8911f3c8fbe0cedf3a2ec2ff434dde8d7fb9be')
prepare() {
cd $pkgname-$pkgver
patch -p1 -i ../scons-python3.patch
patch -p1 -i ../openssl3-ERR_GET_FUNC.patch
patch -p1 -i ../openssl3-BIO_ctrl.patch
}
build() {

View File

@ -1,22 +0,0 @@
https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-bio-ctrl.patch
https://bugs.gentoo.org/805161
https://issues.apache.org/jira/projects/SERF/issues/SERF-198
--- a/buckets/ssl_buckets.c
+++ b/buckets/ssl_buckets.c
@@ -407,7 +407,7 @@ static int bio_bucket_destroy(BIO *bio)
static long bio_bucket_ctrl(BIO *bio, int cmd, long num, void *ptr)
{
- long ret = 1;
+ long ret = 0;
switch (cmd) {
default:
@@ -415,6 +415,7 @@ static long bio_bucket_ctrl(BIO *bio, int cmd, long num, void *ptr)
break;
case BIO_CTRL_FLUSH:
/* At this point we can't force a flush. */
+ ret = 1;
break;
case BIO_CTRL_PUSH:
case BIO_CTRL_POP: