diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2022-12-27 00:14:59 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2022-12-27 00:50:46 +0000 |
| commit | 7e1f58eff231562a3633dd654a2ba158cf241e49 (patch) | |
| tree | 3dfafc5022d5459b9d8e3f326f6387b7a28319cc | |
| parent | e9ea939bc00ecf49a7bffd4d2253cba2c6726210 (diff) | |
| download | packages-7e1f58eff231562a3633dd654a2ba158cf241e49.tar.gz packages-7e1f58eff231562a3633dd654a2ba158cf241e49.tar.bz2 packages-7e1f58eff231562a3633dd654a2ba158cf241e49.tar.xz packages-7e1f58eff231562a3633dd654a2ba158cf241e49.zip | |
system/nghttp2: Split apps to user/nghttp2-utils
The tools need libraries that should not be pulled into system/.
Additionally, since c-ares needs CMake now, it causes a dep cycle.
Fixes: #936
| -rw-r--r-- | system/nghttp2/APKBUILD | 4 | ||||
| -rw-r--r-- | user/nghttp2-utils/APKBUILD | 55 |
2 files changed, 57 insertions, 2 deletions
diff --git a/system/nghttp2/APKBUILD b/system/nghttp2/APKBUILD index 8f9e55404..830a4231f 100644 --- a/system/nghttp2/APKBUILD +++ b/system/nghttp2/APKBUILD @@ -9,7 +9,7 @@ arch="all" options="!check" # Requires cunit, which we don't currently ship license="MIT" depends="" -makedepends="c-ares-dev libev-dev libxml2-dev openssl-dev zlib-dev" +makedepends="" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="https://github.com/tatsuhiro-t/$pkgname/releases/download/v$pkgver/nghttp2-$pkgver.tar.xz" @@ -30,7 +30,7 @@ build() { --without-neverbleed \ --without-jemalloc \ --disable-python-bindings \ - --enable-app + --enable-lib-only make } diff --git a/user/nghttp2-utils/APKBUILD b/user/nghttp2-utils/APKBUILD new file mode 100644 index 000000000..519f85aec --- /dev/null +++ b/user/nghttp2-utils/APKBUILD @@ -0,0 +1,55 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Síle Ekaterin Liszka <sheila@adelielinux.org> +pkgname=nghttp2-tools +pkgver=1.47.0 +pkgrel=0 +pkgdesc="Experimental HTTP/2 client, server and proxy" +url="https://nghttp2.org/" +arch="all" +license="MIT" +depends="nghttp2=$pkgver-r$pkgrel" +checkdepends="cunit-dev" +makedepends="c-ares-dev jansson-dev libev-dev libxml2-dev openssl-dev zlib-dev" +subpackages="$pkgname-doc" +source="https://github.com/tatsuhiro-t/nghttp2/releases/download/v$pkgver/nghttp2-$pkgver.tar.xz" +builddir="$srcdir/nghttp2-$pkgver" + +# secfixes: +# 1.41.0-r0: +# - CVE-2020-11080 + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + --disable-static \ + --without-neverbleed \ + --without-jemalloc \ + --disable-python-bindings \ + --enable-app \ + --disable-shared + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install + + # duplicate of -doc + rm -rf "$pkgdir"/usr/share/doc + # duplicate of -dev + rm -rf "$pkgdir"/usr/include + rm -rf "$pkgdir"/usr/lib + # duplicate of nghttp2 + rm -rf "$pkgdir"/usr/share/nghttp2 +} + +sha512sums="ad6266a15789fec966db6be8ac0b9ee6cca257a3bb91fdd34a58acf0e472643a571941b5974d16c98f6ac5bfa6a03c4b70a6dff222fb0cd50909178b7e94ce48 nghttp2-1.47.0.tar.xz" |