[arch-commits] Commit in curl/repos/testing-x86_64 (3 files)

Christian Hesse eworm at archlinux.org
Sat Nov 9 21:36:24 UTC 2019


    Date: Saturday, November 9, 2019 @ 21:36:23
  Author: eworm
Revision: 367298

archrelease: copy trunk to testing-x86_64

Added:
  curl/repos/testing-x86_64/0001-http2-expire-a-timeout-at-end-of-stream.patch
    (from rev 367297, curl/trunk/0001-http2-expire-a-timeout-at-end-of-stream.patch)
  curl/repos/testing-x86_64/PKGBUILD
    (from rev 367297, curl/trunk/PKGBUILD)
Deleted:
  curl/repos/testing-x86_64/PKGBUILD

----------------------------------------------------+
 0001-http2-expire-a-timeout-at-end-of-stream.patch |   26 ++++
 PKGBUILD                                           |  108 ++++++++++---------
 2 files changed, 84 insertions(+), 50 deletions(-)

Copied: curl/repos/testing-x86_64/0001-http2-expire-a-timeout-at-end-of-stream.patch (from rev 367297, curl/trunk/0001-http2-expire-a-timeout-at-end-of-stream.patch)
===================================================================
--- 0001-http2-expire-a-timeout-at-end-of-stream.patch	                        (rev 0)
+++ 0001-http2-expire-a-timeout-at-end-of-stream.patch	2019-11-09 21:36:23 UTC (rev 367298)
@@ -0,0 +1,26 @@
+From 59041f052a5209a3aebb146c01b689424f9f7b04 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel at haxx.se>
+Date: Thu, 17 Oct 2019 14:25:45 +0200
+Subject: http2: expire a timeout at end of stream
+
+To make sure that transfer is being dealt with. Streams without
+Content-Length need a final read to notice the end-of-stream state.
+
+Reported-by: Tom van der Woerdt
+Fixes #4496
+---
+ lib/http2.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/http2.c b/lib/http2.c
+index b5b831b56..c0f29f83e 100644
+--- a/lib/http2.c
++++ b/lib/http2.c
+@@ -848,6 +848,7 @@ static int on_stream_close(nghttp2_session *session, int32_t stream_id,
+     stream->closed = TRUE;
+     httpc = &conn->proto.httpc;
+     drain_this(data_s, httpc);
++    Curl_expire(data_s, 0, EXPIRE_RUN_NOW);
+     httpc->error_code = error_code;
+ 
+     /* remove the entry from the hash as the stream is now gone */

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-09 21:36:21 UTC (rev 367297)
+++ PKGBUILD	2019-11-09 21:36:23 UTC (rev 367298)
@@ -1,50 +0,0 @@
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=curl
-pkgver=7.67.0
-pkgrel=1
-pkgdesc="An URL retrieval utility and library"
-arch=('x86_64')
-url="https://curl.haxx.se"
-license=('MIT')
-depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl' 'libnghttp2'
-         'libidn2' 'libidn2.so')
-provides=('libcurl.so')
-source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc})
-sha512sums=('73365f964df733b5e79d690ba7260a279986a9637ba0026b37cca2eca7ba8e37967251751bdf26de730f6f432713da8b7e0a315e84f1e9dad0e0bfd3d7882f92'
-            'SKIP')
-validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure \
-      --prefix=/usr \
-      --mandir=/usr/share/man \
-      --disable-ldap \
-      --disable-ldaps \
-      --disable-manual \
-      --enable-ipv6 \
-      --enable-versioned-symbols \
-      --enable-threaded-resolver \
-      --with-gssapi \
-      --with-libssh2 \
-      --with-random=/dev/urandom \
-      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" install -C scripts
-
-  # license
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
-}

Copied: curl/repos/testing-x86_64/PKGBUILD (from rev 367297, curl/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-11-09 21:36:23 UTC (rev 367298)
@@ -0,0 +1,58 @@
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=curl
+pkgver=7.67.0
+pkgrel=2
+pkgdesc="An URL retrieval utility and library"
+arch=('x86_64')
+url="https://curl.haxx.se"
+license=('MIT')
+depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl' 'libnghttp2'
+         'libidn2' 'libidn2.so')
+provides=('libcurl.so')
+source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+        '0001-http2-expire-a-timeout-at-end-of-stream.patch')
+sha512sums=('73365f964df733b5e79d690ba7260a279986a9637ba0026b37cca2eca7ba8e37967251751bdf26de730f6f432713da8b7e0a315e84f1e9dad0e0bfd3d7882f92'
+            'SKIP'
+            'b21d53e8b6af37f1ae9deb4ac6dea50a13816f48932d47a1a167664988c0c2db472528d6c6790a782bca765e4edfad84f1452d0af8679d2c66f543e8ec7132ce')
+validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 -R < ../0001-http2-expire-a-timeout-at-end-of-stream.patch
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure \
+      --prefix=/usr \
+      --mandir=/usr/share/man \
+      --disable-ldap \
+      --disable-ldaps \
+      --disable-manual \
+      --enable-ipv6 \
+      --enable-versioned-symbols \
+      --enable-threaded-resolver \
+      --with-gssapi \
+      --with-libssh2 \
+      --with-random=/dev/urandom \
+      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install -C scripts
+
+  # license
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
+}



More information about the arch-commits mailing list