From 3d7b8647dc20f052533886150ec575b2a696c95e Mon Sep 17 00:00:00 2001 From: Christian Lachner Date: Sun, 22 Dec 2019 10:18:07 +0100 Subject: [PATCH] haproxy: Update HAProxy to v2.0.12 - Update haproxy download URL and hash - Remove @neheb's obsolete-ssl patch as it was upstreamed, see: (http://git.haproxy.org/?p=haproxy-2.0.git;a=commit;h=6445d988ec8def9d0f80de0eda9c5763d39facc1) Signed-off-by: Christian Lachner --- net/haproxy/Makefile | 4 ++-- net/haproxy/get-latest-patches.sh | 2 +- .../patches/001-OPENWRT-openssl-deprecated.patch | 12 ------------ 3 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 net/haproxy/patches/001-OPENWRT-openssl-deprecated.patch diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 6d42b5c640..c7cc9c24cc 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy -PKG_VERSION:=2.0.11 +PKG_VERSION:=2.0.12 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.haproxy.org/download/2.0/src -PKG_HASH:=31b2b025922d726fabfccc5b054e2d412c80cef027a2456bde7fdf7f307d18d4 +PKG_HASH:=7fcf5adb21cd78c4161902f9fcc8d7fc97e1562319a992cbda884436ca9602fd PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner diff --git a/net/haproxy/get-latest-patches.sh b/net/haproxy/get-latest-patches.sh index ca7706c358..a76aa332fd 100755 --- a/net/haproxy/get-latest-patches.sh +++ b/net/haproxy/get-latest-patches.sh @@ -1,7 +1,7 @@ #!/bin/sh CLONEURL=https://git.haproxy.org/git/haproxy-2.0.git -BASE_TAG=v2.0.11 +BASE_TAG=v2.0.12 TMP_REPODIR=tmprepo PATCHESDIR=patches diff --git a/net/haproxy/patches/001-OPENWRT-openssl-deprecated.patch b/net/haproxy/patches/001-OPENWRT-openssl-deprecated.patch deleted file mode 100644 index 541077e238..0000000000 --- a/net/haproxy/patches/001-OPENWRT-openssl-deprecated.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 -- 2.30.2