diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-05-26 14:12:27 -0300 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2019-05-27 06:37:18 +0000 |
| commit | a9f89856eb3576aea42b1549419a415701d1d617 (patch) | |
| tree | cf05ad5fd039615a264f9e7853761bbcffe4ea52 | |
| parent | a238f1d472712703ec2cdbc12a67da246c423257 (diff) | |
| download | aports-a9f89856eb3576aea42b1549419a415701d1d617.tar.bz2 aports-a9f89856eb3576aea42b1549419a415701d1d617.tar.xz | |
main/libevent: upgrade to 2.1.10
| -rw-r--r-- | main/libevent/APKBUILD | 20 | ||||
| -rw-r--r-- | main/libevent/libressl-2.7.patch | 13 |
2 files changed, 12 insertions, 21 deletions
diff --git a/main/libevent/APKBUILD b/main/libevent/APKBUILD index 76a5a1dd8c..8f6f1470ef 100644 --- a/main/libevent/APKBUILD +++ b/main/libevent/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libevent -pkgver=2.1.8 +pkgver=2.1.10 _pkgver=$pkgver-stable -pkgrel=6 +pkgrel=0 pkgdesc="An event notification library" url="http://libevent.org/" arch="all" @@ -11,10 +11,8 @@ license="BSD-3-Clause" options="!check" # regression tests failed depends_dev="python2" makedepends="$depends_dev openssl-dev" -subpackages="$pkgname-dev" -source="https://github.com/$pkgname/$pkgname/releases/download/release-$_pkgver/$pkgname-$_pkgver.tar.gz - libressl-2.7.patch - " +subpackages="$pkgname-static $pkgname-dev" +source="https://github.com/$pkgname/$pkgname/releases/download/release-$_pkgver/$pkgname-$_pkgver.tar.gz" builddir="$srcdir/$pkgname-$_pkgver" # secfixes: @@ -57,5 +55,11 @@ dev() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17 libevent-2.1.8-stable.tar.gz -8f60b9a0b69ea56f44720bfda81ac31f847e8295a8c1d18a81ebe5bf183b12a638e94d07bfe9d4fbc550e3140eeef9b44d83a0b01f18c5f37f9e7625eefadd0b libressl-2.7.patch" +static() { + depends="" + pkgdesc="$pkgdesc (static libraries)" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib +} + +sha512sums="2a449b60c5bba0908f693d3169a2941f0952b462ea18cf3c7a7288cd902592f35a42c76096af502f04259ffce2567233fda3586578c2ac53fbfce6e00d35c086 libevent-2.1.10-stable.tar.gz" diff --git a/main/libevent/libressl-2.7.patch b/main/libevent/libressl-2.7.patch deleted file mode 100644 index ce0c650b02..0000000000 --- a/main/libevent/libressl-2.7.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/openssl-compat.h b/openssl-compat.h -index 69afc71..a6e81ae 100644 ---- a/openssl-compat.h -+++ b/openssl-compat.h -@@ -31,5 +31,8 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char *name) - #define TLS_method SSLv23_method - - #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L -+#define BIO_get_init(b) (b)->init -+#endif - - #endif /* OPENSSL_COMPAT_H */ |