summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorZach van Rijn <me@zv.io>2021-11-07 17:20:18 +0000
committerZach van Rijn <me@zv.io>2021-11-07 17:20:18 +0000
commit5b7fdab13bde1f85f838e34199dcf551e6ea6f76 (patch)
tree1a970980f607a132b3bd324721b727277edb8850 /system
parent818b68caae7c3a484f6f5011805690973a7d8dff (diff)
parentd045b5bca8cd983b9512fd45e19d2c5770323a32 (diff)
downloadpackages-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
Diffstat (limited to 'system')
-rw-r--r--system/c-ares/APKBUILD35
-rw-r--r--system/curl/APKBUILD7
-rw-r--r--system/libev/APKBUILD38
-rw-r--r--system/libev/libev-4.11-Add-pkgconfig-support.patch58
-rw-r--r--system/nghttp2/APKBUILD45
5 files changed, 180 insertions, 3 deletions
diff --git a/system/c-ares/APKBUILD b/system/c-ares/APKBUILD
new file mode 100644
index 000000000..564b70ce9
--- /dev/null
+++ b/system/c-ares/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=c-ares
+pkgver=1.16.1
+pkgrel=0
+pkgdesc="Asynchronous DNS/name resolver library"
+url="https://c-ares.haxx.se/"
+arch="all"
+options="!checkroot"
+license="MIT"
+depends=""
+makedepends=""
+subpackages="$pkgname-doc $pkgname-dev"
+source="https://c-ares.haxx.se/download/$pkgname-$pkgver.tar.gz"
+
+build() {
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --enable-shared
+ make
+}
+
+check() {
+ make -C test check
+}
+
+package() {
+ make -j1 DESTDIR="$pkgdir" install
+}
+
+sha512sums="4ac2a5d5c6da74eb1d6155c4eadc7127ab1b53a8d13caec41bd6172db5417a79f3ab022e77ba37d8b13da6893d7ced5fd8baf5cc3950a4154b4de8743ad31471 c-ares-1.16.1.tar.gz"
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/system/libev/APKBUILD b/system/libev/APKBUILD
new file mode 100644
index 000000000..ac936cd8f
--- /dev/null
+++ b/system/libev/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: Síle Ekaterin Liszka <sheila@adelielinux.org>
+pkgname=libev
+pkgver=4.33
+pkgrel=0
+pkgdesc="Event dispatch library"
+url="http://software.schmorp.de/pkg/libev.html"
+arch="all"
+options="!check" # No test suite.
+license="BSD-2-Clause OR GPL-2.0+"
+makedepends="$depends_dev autoconf automake libtool"
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://dist.schmorp.de/${pkgname}/Attic/${pkgname}-${pkgver}.tar.gz
+ libev-4.11-Add-pkgconfig-support.patch
+ "
+
+prepare() {
+ default_prepare
+ libtoolize --force && aclocal -I m4 && autoheader && autoconf \
+ && automake --add-missing
+}
+
+build() {
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc
+ make
+}
+
+package() {
+ make -j1 DESTDIR="$pkgdir" install
+ rm "$pkgdir"/usr/include/event.h
+}
+
+sha512sums="c662a65360115e0b2598e3e8824cf7b33360c43a96ac9233f6b6ea2873a10102551773cad0e89e738541e75af9fd4f3e3c11cd2f251c5703aa24f193128b896b libev-4.33.tar.gz
+b5bc1b5ed1e605cd45a01adce70c1a97188c0b46a36333f12eccd4407c95d96f18adff90ee8c5733c1783a36b4adc5ef67d6b470104339a1ac5c4539a2a4599e libev-4.11-Add-pkgconfig-support.patch"
diff --git a/system/libev/libev-4.11-Add-pkgconfig-support.patch b/system/libev/libev-4.11-Add-pkgconfig-support.patch
new file mode 100644
index 000000000..8c478caee
--- /dev/null
+++ b/system/libev/libev-4.11-Add-pkgconfig-support.patch
@@ -0,0 +1,58 @@
+From 01d2c386b58afa49567ccc079c963f76dc2e60f3 Mon Sep 17 00:00:00 2001
+From: Mathieu Bridon <bochecha@fedoraproject.org>
+Date: Fri, 8 Feb 2013 15:40:51 +0800
+Subject: [PATCH] Add pkgconfig support
+
+---
+ Makefile.am | 4 ++++
+ configure.ac | 2 +-
+ libev.pc.in | 11 +++++++++++
+ 3 files changed, 16 insertions(+), 1 deletion(-)
+ create mode 100644 libev.pc.in
+
+diff --git a/Makefile.am b/Makefile.am
+index 059305b..9e556c0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,6 +11,10 @@ man_MANS = ev.3
+
+ include_HEADERS = ev.h ev++.h event.h
+
++pkgconfigdir = $(libdir)/pkgconfig
++
++pkgconfig_DATA = libev.pc
++
+ lib_LTLIBRARIES = libev.la
+
+ libev_la_SOURCES = ev.c event.c
+diff --git a/configure.ac b/configure.ac
+index 31d0a25..1af149a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,5 +21,5 @@ AC_PROG_LIBTOOL
+
+ m4_include([libev.m4])
+
+-AC_CONFIG_FILES([Makefile])
++AC_CONFIG_FILES([Makefile libev.pc])
+ AC_OUTPUT
+diff --git a/libev.pc.in b/libev.pc.in
+new file mode 100644
+index 0000000..3b6c636
+--- /dev/null
++++ b/libev.pc.in
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: libev
++Description: High-performance event loop/event model
++Version: @VERSION@
++Libs: -L${libdir} -lev
++Libs.private:
++Cflags: -I${includedir}
+--
+1.8.1
+
diff --git a/system/nghttp2/APKBUILD b/system/nghttp2/APKBUILD
new file mode 100644
index 000000000..a1f7c74c6
--- /dev/null
+++ b/system/nghttp2/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Síle Ekaterin Liszka <sheila@adelielinux.org>
+pkgname=nghttp2
+pkgver=1.46.0
+pkgrel=0
+pkgdesc="Experimental HTTP/2 client, server and proxy"
+url="https://nghttp2.org/"
+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"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
+source="https://github.com/tatsuhiro-t/$pkgname/releases/download/v$pkgver/nghttp2-$pkgver.tar.xz"
+
+# 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
+ make
+}
+
+check() {
+ make check
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="fcf3573bcc421705190c7cf0e3230f6f3028b669cb2976d29cfeb73e706deaae91ce60d0a615472e3f296454049ea5798f1e8defdd260a98895e94fea6a7a16b nghttp2-1.46.0.tar.xz"