diff options
| author | Zach van Rijn <me@zv.io> | 2021-11-07 17:20:18 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2021-11-07 17:20:18 +0000 |
| commit | 5b7fdab13bde1f85f838e34199dcf551e6ea6f76 (patch) | |
| tree | 1a970980f607a132b3bd324721b727277edb8850 | |
| parent | 818b68caae7c3a484f6f5011805690973a7d8dff (diff) | |
| parent | d045b5bca8cd983b9512fd45e19d2c5770323a32 (diff) | |
| download | packages-5b7fdab13bde1f85f838e34199dcf551e6ea6f76.tar.gz packages-5b7fdab13bde1f85f838e34199dcf551e6ea6f76.tar.bz2 packages-5b7fdab13bde1f85f838e34199dcf551e6ea6f76.tar.xz packages-5b7fdab13bde1f85f838e34199dcf551e6ea6f76.zip | |
Merge branch 'move/nghttp2' into 'master'
Move nghttp2 for HTTP/2 support in system/curl
See merge request adelie/packages!637
| -rw-r--r-- | system/c-ares/APKBUILD (renamed from user/c-ares/APKBUILD) | 0 | ||||
| -rw-r--r-- | system/curl/APKBUILD | 7 | ||||
| -rw-r--r-- | system/libev/APKBUILD (renamed from user/libev/APKBUILD) | 2 | ||||
| -rw-r--r-- | system/libev/libev-4.11-Add-pkgconfig-support.patch (renamed from user/libev/libev-4.11-Add-pkgconfig-support.patch) | 0 | ||||
| -rw-r--r-- | system/nghttp2/APKBUILD (renamed from user/nghttp2/APKBUILD) | 6 |
5 files changed, 8 insertions, 7 deletions
diff --git a/user/c-ares/APKBUILD b/system/c-ares/APKBUILD index 564b70ce9..564b70ce9 100644 --- a/user/c-ares/APKBUILD +++ b/system/c-ares/APKBUILD diff --git a/system/curl/APKBUILD b/system/curl/APKBUILD index 363b37de1..ecacc3a47 100644 --- a/system/curl/APKBUILD +++ b/system/curl/APKBUILD @@ -4,13 +4,13 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=curl pkgver=7.79.1 -pkgrel=0 +pkgrel=1 pkgdesc="A URL retrival utility and library" url="https://curl.haxx.se" arch="all" license="MIT" depends="ca-certificates" -makedepends_build="perl" +makedepends_build="perl nghttp2" makedepends_host="zlib-dev openssl-dev libssh2-dev" makedepends="$makedepends_build $makedepends_host" source="https://curl.haxx.se/download/$pkgname-$pkgver.tar.xz" @@ -103,7 +103,8 @@ build() { --without-libidn2 \ --disable-ldap \ --with-pic \ - --with-openssl + --with-openssl \ + --with-nghttp2 make } diff --git a/user/libev/APKBUILD b/system/libev/APKBUILD index 65eac2c9f..ac936cd8f 100644 --- a/user/libev/APKBUILD +++ b/system/libev/APKBUILD @@ -1,5 +1,5 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> -# Maintainer: +# Maintainer: Síle Ekaterin Liszka <sheila@adelielinux.org> pkgname=libev pkgver=4.33 pkgrel=0 diff --git a/user/libev/libev-4.11-Add-pkgconfig-support.patch b/system/libev/libev-4.11-Add-pkgconfig-support.patch index 8c478caee..8c478caee 100644 --- a/user/libev/libev-4.11-Add-pkgconfig-support.patch +++ b/system/libev/libev-4.11-Add-pkgconfig-support.patch diff --git a/user/nghttp2/APKBUILD b/system/nghttp2/APKBUILD index 063bc9b0f..a1f7c74c6 100644 --- a/user/nghttp2/APKBUILD +++ b/system/nghttp2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: +# Maintainer: Síle Ekaterin Liszka <sheila@adelielinux.org> pkgname=nghttp2 -pkgver=1.41.0 +pkgver=1.46.0 pkgrel=0 pkgdesc="Experimental HTTP/2 client, server and proxy" url="https://nghttp2.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c92e8022ccc876fa311f21bc5bf5af75feff8232efb56a4b2ab198031e974d15b67c16c046188cc76552f75a1b2e7115925d6ce1e42d6f94ae482fe69727466d nghttp2-1.41.0.tar.xz" +sha512sums="fcf3573bcc421705190c7cf0e3230f6f3028b669cb2976d29cfeb73e706deaae91ce60d0a615472e3f296454049ea5798f1e8defdd260a98895e94fea6a7a16b nghttp2-1.46.0.tar.xz" |