jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

haproxy: update to 1.6.3

Browse source
This commit is contained in:
Alessio Sergi 2015-12-31 19:53:53 +01:00
parent d0bc2a2f4a
commit 96c1ceca85
2 changed files with 4 additions and 47 deletions

42
srcpkgs/haproxy/patches/haproxy-1.6.2-libressl.patch
View file

@ -1,42 +0,0 @@
X-Git-Url: http://git.haproxy.org/?p=haproxy-1.6.git;a=blobdiff_plain;f=src%2Fssl_sock.c;h=c67cd5617e3e9c44f8c4af60d72f110b49eb2f1a;hp=3f66af1c50e67a50fbb702641a0562e47c05100b;hb=96414cce6acd7617bcbfedfa0584ebecb5404a30;hpb=bfb76be4076b70aa05db2f5f8ec2c0b0698dd4b0
diff --git src/ssl_sock.c src/ssl_sock.c
index 3f66af1..c67cd56 100644
--- src/ssl_sock.c
+++ src/ssl_sock.c
@@ -714,7 +714,7 @@ out:
#endif
-#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL)
+#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL && !defined LIBRESSL_VERSION_NUMBER)
#define CT_EXTENSION_TYPE 18
@@ -1736,7 +1736,7 @@ static int ssl_sock_load_cert_file(const char *path, struct bind_conf *bind_conf
}
#endif
-#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL)
+#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL && !defined LIBRESSL_VERSION_NUMBER)
if (sctl_ex_index >= 0) {
ret = ssl_sock_load_sctl(ctx, path);
if (ret < 0) {
@@ -5348,7 +5348,7 @@ struct xprt_ops ssl_sock = {
.init = ssl_sock_init,
};
-#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL)
+#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL && !defined LIBRESSL_VERSION_NUMBER)
static void ssl_sock_sctl_free_func(void *parent, void *ptr, CRYPTO_EX_DATA *ad, int idx, long argl, void *argp)
{
@@ -5381,7 +5381,7 @@ static void __ssl_sock_init(void)
SSL_library_init();
cm = SSL_COMP_get_compression_methods();
sk_SSL_COMP_zero(cm);
-#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL)
+#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL && !defined LIBRESSL_VERSION_NUMBER)
sctl_ex_index = SSL_CTX_get_ex_new_index(0, NULL, NULL, NULL, ssl_sock_sctl_free_func);
#endif
sample_register_fetches(&sample_fetch_keywords);

9
srcpkgs/haproxy/template
View file

@ -1,6 +1,6 @@
# Template file for 'haproxy'
pkgname=haproxy
version=1.6.2
version=1.6.3
revision=1
build_style=gnu-makefile
make_build_args="TARGET=linux2628 USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1
@ -13,14 +13,13 @@ make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
makedepends="libressl-devel pcre-devel zlib-devel lua-devel"
short_desc="Reliable, high performance TCP/HTTP load balancer"
maintainer="Eivind Uggedal <eivind@uggedal.com>"
license="GPL-2 LGPL-2.1"
license="GPL-2, LGPL-2.1"
homepage="http://www.haproxy.org"
distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
checksum=bd4a7eee79e1bfd25af59d956bb60e82acbb6f146f3fb3b30636036f4c9548d3
checksum=fd06b45054cde2c69cb3322dfdd8a4bcfc46eb9d0c4b36d20d3ea19d84e338a7
do_build() {
sed -e '/install haproxy-systemd-wrapper/d' -i Makefile
make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
${make_build_args}
}