Permalink
Browse files

bump: HAProxy 1.5-dev21 (refs #2088)

git-svn-id: file:///var/svn/freetz/trunk@11562 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information...
1 parent c708352 commit 2ad350bba42025f74f5efec5ed2a818474f02ee3 cuma committed Jan 15, 2014
View
@@ -65,7 +65,7 @@ Latest changes:
* gdb 7.6.2
* git 1.8.5.2
* gmp 5.1.3
- * haproxy 1.4.24
+ * HAProxy 1.5-dev21
* haserl 0.9.32
* hplip 3.13.9
* httpry 0.1.7
View
@@ -1,6 +1,16 @@
config FREETZ_PACKAGE_HAPROXY
- bool "HAProxy 1.4.24 (binary only)"
+ bool "HAProxy 1.5-dev21 (binary only)"
select FREETZ_LIB_libcrypt
default n
help
haproxy is a loadbalancer.
+
+config FREETZ_PACKAGE_HAPROXY_WITH_OPENSSL
+ bool "with OpenSSL support"
+ depends on FREETZ_PACKAGE_HAPROXY
+ select FREETZ_LIB_libcrypto
+ select FREETZ_LIB_libssl
+ select FREETZ_OPENSSL_VERSION_PROMPT
+ default n
+ help
+ This option enables SSL support in HAProxy.
View
@@ -1,12 +1,15 @@
-$(call PKG_INIT_BIN, 1.4.24)
+$(call PKG_INIT_BIN, 1.5-dev21)
$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz
-$(PKG)_SOURCE_MD5:=86422620faa9759907563d5e0524b98c
-$(PKG)_SITE:=http://haproxy.1wt.eu/download/1.4/src
+$(PKG)_SOURCE_MD5:=c784f55537c8718ed024b2b725cd3770
+$(PKG)_SITE:=http://haproxy.1wt.eu/download/1.5/src/devel
$(PKG)_BINARY:=$($(PKG)_DIR)/haproxy
$(PKG)_TARGET_BINARY:=$($(PKG)_DEST_DIR)/usr/bin/haproxy
$(PKG)_REBUILD_SUBOPTS += FREETZ_KERNEL_VERSION_2_6_28_MIN
+$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_HAPROXY_WITH_OPENSSL
+
+$(PKG)_DEPENDS_ON += $(if $(FREETZ_PACKAGE_HAPROXY_WITH_OPENSSL),openssl)
$(PKG_SOURCE_DOWNLOAD)
$(PKG_UNPACKED)
@@ -15,6 +18,7 @@ $(PKG_CONFIGURED_NOP)
$($(PKG)_BINARY): $($(PKG)_DIR)/.configured
$(SUBMAKE) -C $(HAPROXY_DIR) \
TARGET=$(if $(FREETZ_KERNEL_VERSION_2_6_28_MIN),linux2628,linux26) \
+ USE_OPENSSL=$(if $(FREETZ_PACKAGE_HAPROXY_WITH_OPENSSL),1) \
CC="$(TARGET_CC)" \
CFLAGS="$(TARGET_CFLAGS) -ffunction-sections -fdata-sections" \
LDFLAGS="-Wl,--gc-sections"
@@ -1,41 +0,0 @@
-From d362dc75f3dfa7062e5c2cb7822ad12ffb755389 Mon Sep 17 00:00:00 2001
-From: Willy Tarreau <w@1wt.eu>
-Date: Thu, 4 Jul 2013 11:44:27 +0200
-Subject: [PATCH 1/2] BUG/MAJOR: http: don't emit the send-name-header when no
- server is available
-
-Lukas Benes reported that http-send-name-header causes a segfault if no
-server is available because we're dereferencing the session's target which
-is NULL. The tiniest reproducer looks like this :
-
- listen foo
- bind :1234
- mode http
- http-send-name-header srv
-
-This obvious fix must be backported to 1.4 which is affected as well.
-(cherry picked from commit 0fc36e3ae99ccbe6de88cf64093f3045e526d088)
----
- src/session.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git src/session.c src/session.c
-index 6211a45..21ecb9f 100644
---- src/session.c
-+++ src/session.c
-@@ -1428,9 +1428,9 @@ resync_stream_interface:
- /* Now we can add the server name to a header (if requested) */
- /* check for HTTP mode and proxy server_name_hdr_name != NULL */
- if ((s->flags & SN_BE_ASSIGNED) &&
-- (s->be->mode == PR_MODE_HTTP) &&
-- (s->be->server_id_hdr_name != NULL)) {
--
-+ (s->be->mode == PR_MODE_HTTP) &&
-+ (s->be->server_id_hdr_name != NULL) &&
-+ (s->srv)) {
- http_send_name_header(&s->txn,
- &s->txn.req,
- s->req,
---
-1.8.1.5
-
@@ -1,37 +0,0 @@
-From 9f2080114f79f64051e17b12957655e26c46bdf0 Mon Sep 17 00:00:00 2001
-From: Willy Tarreau <w@1wt.eu>
-Date: Thu, 4 Jul 2013 12:46:56 +0200
-Subject: [PATCH 2/2] BUG/MEDIUM: http: "option checkcache" fails with the
- no-cache header
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The checkcache option checks for cacheable responses with a set-cookie
-header. Since the response processing code was refactored in 1.3.8
-(commit a15645d4), the check was broken because the no-cache value
-is only checked as no-cache="set-cookie", and not alone.
-
-Thanks to Hervé Commowick for reporting this stupid bug!
-
-The fix should be backported to 1.4 and 1.3.
-(cherry picked from commit 5b15f9004d13b8a7e5e665929cad97a2c0beebd3)
----
- src/proto_http.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git src/proto_http.c src/proto_http.c
-index a63d65d..22a7737 100644
---- src/proto_http.c
-+++ src/proto_http.c
-@@ -7373,6 +7373,7 @@ void check_response_for_cacheability(struct session *t, struct buffer *rtr)
-
- /* OK, so we know that either p2 points to the end of string or to a comma */
- if (((p2 - p1 == 7) && strncasecmp(p1, "private", 7) == 0) ||
-+ ((p2 - p1 == 8) && strncasecmp(p1, "no-cache", 8) == 0) ||
- ((p2 - p1 == 8) && strncasecmp(p1, "no-store", 8) == 0) ||
- ((p2 - p1 == 9) && strncasecmp(p1, "max-age=0", 9) == 0) ||
- ((p2 - p1 == 10) && strncasecmp(p1, "s-maxage=0", 10) == 0)) {
---
-1.8.1.5
-
@@ -1,6 +1,6 @@
--- Makefile
+++ Makefile
-@@ -208,12 +208,10 @@
+@@ -228,11 +228,10 @@
USE_LIBCRYPT = implicit
else
ifeq ($(TARGET),linux26)
@@ -10,7 +10,6 @@
USE_NETFILTER = implicit
USE_POLL = implicit
- USE_EPOLL = implicit
-- USE_SEPOLL = implicit
USE_TPROXY = implicit
USE_LIBCRYPT = implicit
- else
+ USE_FUTEX = implicit

0 comments on commit 2ad350b

Please sign in to comment.