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 <gladiac@gmail.com>
This commit is contained in:
Christian Lachner
2019-12-22 10:18:07 +01:00
parent ef82bba488
commit 02985327b8
3 changed files with 3 additions and 15 deletions
@@ -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