From 49382922f804125cd89063bad7b5acb2ec085751 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 27 Jun 2019 00:25:13 -0700 Subject: [PATCH] haproxy: Fix compilation without deprecated OpenSSL APIs It seems there is a mistake in the version I sent upstream. Cleaned up Makefile for consistency between packages. Signed-off-by: Rosen Penev --- net/haproxy/Makefile | 13 +++++++------ net/haproxy/patches/020-openssl-deprecated.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 net/haproxy/patches/020-openssl-deprecated.patch diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 272f0075e..a734cbcb3 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -11,16 +11,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy PKG_VERSION:=2.0.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 -PKG_SOURCE:=haproxy-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://www.haproxy.org/download/2.0/src/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://www.haproxy.org/download/2.0/src PKG_HASH:=fe0a0d69e1091066a91b8d39199c19af8748e0e872961c6fc43c91ec7a28ff20 - PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) -PKG_LICENSE:=GPL-2.0 -MAINTAINER:=Thomas Heil , \ + +PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner +PKG_LICENSE:=GPL-2.0-only +PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk diff --git a/net/haproxy/patches/020-openssl-deprecated.patch b/net/haproxy/patches/020-openssl-deprecated.patch new file mode 100644 index 000000000..541077e23 --- /dev/null +++ b/net/haproxy/patches/020-openssl-deprecated.patch @@ -0,0 +1,12 @@ +--- a/include/common/openssl-compat.h ++++ b/include/common/openssl-compat.h +@@ -217,7 +217,8 @@ static inline int EVP_PKEY_base_id(EVP_PKEY *pkey) + #define TLSEXT_signature_ecdsa 3 + #endif + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x20700000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x20700000L)) + #define X509_getm_notBefore X509_get_notBefore + #define X509_getm_notAfter X509_get_notAfter + #endif