diff --git a/curl/PKGBUILD b/curl/PKGBUILD index 84e5067..0675be9 100644 --- a/curl/PKGBUILD +++ b/curl/PKGBUILD @@ -11,7 +11,7 @@ pkgname=(curl libcurl-compat libcurl-gnutls) #_tag_name='8_6_0' #pkgver="${_tag_name//_/.}" pkgver=8.7.1 -pkgrel=03 +pkgrel=04 pkgdesc='command line tool and library for transferring data with URLs - w/o ipv6 & zstd' url='https://curl.se' #options=(debug) # uncomment this to produce debug package @@ -23,10 +23,11 @@ checkdepends=('valgrind') #source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.gz"{,.asc} #source=("git+https://github.com/curl/curl.git#tag=${_tag}?signed") source=("git+https://github.com/curl/curl.git#tag=curl-${pkgver//./_}?signed" - '0001-bump-version-to-match-last-tag.patch' - '0002-brotli-and-others-simply-pass-through-0-length-writes.patch') + '0001-bump-version-to-match-last-tag.patch') _backports=( + # content_encoding: brotli and others, pass through 0-length writes + 'b30d694a027eb771c02a3db0dee0ca03ccab7377' ) _reverts=( @@ -50,7 +51,6 @@ prepare() { done patch -Np1 < ../0001-bump-version-to-match-last-tag.patch - patch -Np1 < ../0002-brotli-and-others-simply-pass-through-0-length-writes.patch # no '-DEV' in version, release date from tagged commit... sed -i \ @@ -198,14 +198,12 @@ license=('MIT') validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg - - - sha512sums=('38b55dc916a64a1fd40a8af3e9a694ae918f8efb714430834491ebbe0ceeee4b58ba804afa15da966cbcf9cd7100ce373aed7b2101dff56f742996072caaf09a' - '51df4903eff9f1a15b1317ea4a8ee2b8537f347984f2524f42213b09344cd6109c621a4b81b37d2fcf2027387bb81cf0a744a48e96b86c4e268c43261ff86845' - '6bb9bf70eacef55a91ed0cec5edd8887af9a7ef6e6d819624c6c532360fe1f524aa9b2417496fcdca54e1ede22bc542c6581d420b068b5c24da932ea03426106') + '51df4903eff9f1a15b1317ea4a8ee2b8537f347984f2524f42213b09344cd6109c621a4b81b37d2fcf2027387bb81cf0a744a48e96b86c4e268c43261ff86845') sha256sums=(SKIP - e05b46b3cea5ca4dfa39fdaa5d8f85095e5fc3dda9fc460cfdc002c5d7670357 # 0001-bump-version-to-match-last-tag.patch - 00c2fb9332be11ab6127b99f4748aa8802ce3f0ca94dab7c5fb9ac206daeaff6) # 0002-brotli-and-others-simply-pass-through-0-length-writes.patch + e05b46b3cea5ca4dfa39fdaa5d8f85095e5fc3dda9fc460cfdc002c5d7670357) # 0001-bump-version-to-match-last-tag.patch + +## cd265c27113081eaa2d113a172e9f3e8ac1b928e7fae9cd79f078a2c84173552 curl-8.7.1-04-x86_64.pkg.tar.lz +## 4c5a11c7ef4b03f29a092684151537d1782fc6d5b22929f18bd9eb5a3853bfcb libcurl-compat-8.7.1-04-x86_64.pkg.tar.lz +## 1c3125ba91f3bdcb3a0752770f8d78281f1eb3957683375d1591058d3045bf82 libcurl-gnutls-8.7.1-04-x86_64.pkg.tar.lz -## diff --git a/curl/PKGBUILD-arch b/curl/PKGBUILD-arch index 4ce328b..7e9d692 100644 --- a/curl/PKGBUILD-arch +++ b/curl/PKGBUILD-arch @@ -7,7 +7,7 @@ pkgbase=curl pkgname=(curl libcurl-compat libcurl-gnutls) pkgver=8.7.1 -pkgrel=3 +pkgrel=4 pkgdesc='command line tool and library for transferring data with URLs' arch=('x86_64') url='https://curl.se/' @@ -26,13 +26,13 @@ makedepends=('git' 'patchelf') checkdepends=('valgrind') validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg source=("git+https://github.com/curl/curl.git#tag=curl-${pkgver//./_}?signed" - '0001-bump-version-to-match-last-tag.patch' - '0002-brotli-and-others-simply-pass-through-0-length-writes.patch') + '0001-bump-version-to-match-last-tag.patch') sha512sums=('38b55dc916a64a1fd40a8af3e9a694ae918f8efb714430834491ebbe0ceeee4b58ba804afa15da966cbcf9cd7100ce373aed7b2101dff56f742996072caaf09a' - '51df4903eff9f1a15b1317ea4a8ee2b8537f347984f2524f42213b09344cd6109c621a4b81b37d2fcf2027387bb81cf0a744a48e96b86c4e268c43261ff86845' - '6bb9bf70eacef55a91ed0cec5edd8887af9a7ef6e6d819624c6c532360fe1f524aa9b2417496fcdca54e1ede22bc542c6581d420b068b5c24da932ea03426106') + '51df4903eff9f1a15b1317ea4a8ee2b8537f347984f2524f42213b09344cd6109c621a4b81b37d2fcf2027387bb81cf0a744a48e96b86c4e268c43261ff86845') _backports=( + # content_encoding: brotli and others, pass through 0-length writes + 'b30d694a027eb771c02a3db0dee0ca03ccab7377' ) _reverts=( @@ -56,7 +56,6 @@ prepare() { done patch -Np1 < ../0001-bump-version-to-match-last-tag.patch - patch -Np1 < ../0002-brotli-and-others-simply-pass-through-0-length-writes.patch # no '-DEV' in version, release date from tagged commit... sed -i \ diff --git a/curl/deps b/curl/deps index 591359b..c121555 100644 --- a/curl/deps +++ b/curl/deps @@ -2,7 +2,6 @@ patchelf git autoconf automake -libnghttp3 valgrind