Changeset 36337


Ignore:
Timestamp:
2013-04-15T16:38:07+02:00 (5 years ago)
Author:
heil
Message:

package: haproxy

  • update to 1.4.23
    • (CVE-2013-1912)
    • fixup for consistent hash
    • refresh accept-proxy patch
Location:
packages/net/haproxy
Files:
1 added
43 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • packages/net/haproxy/Makefile

    r36190 r36337  
    1010 
    1111PKG_NAME:=haproxy 
    12 PKG_VERSION:=1.4.22 
    13 PKG_RELEASE:=43 
     12PKG_VERSION:=1.4.23 
     13PKG_RELEASE:=03 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1616PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.4/src 
    17 PKG_MD5SUM:=a0b007c76f6a78524f3b3dd5e704979c 
     17PKG_MD5SUM:=6535d5e58037ada4b58b439cebe03c79 
    1818 
    1919include $(INCLUDE_DIR)/package.mk 
     
    3838 
    3939define Build/Compile 
    40         $(MAKE) TARGET=linux28 -C $(PKG_BUILD_DIR) \ 
     40        $(MAKE) TARGET=linux2628 -C $(PKG_BUILD_DIR) \ 
    4141                DESTDIR="$(PKG_INSTALL_DIR)" \ 
    4242                CC="$(TARGET_CC)" \ 
  • packages/net/haproxy/patches/001-haproxy-1.4.x-sendproxy.patch

    r35091 r36337  
    11--- a/doc/configuration.txt 
    22+++ b/doc/configuration.txt 
    3 @@ -1339,6 +1339,7 @@ bind [<address>]:<port_range> [, ...] tr 
     3@@ -1343,6 +1343,7 @@ bind [<address>]:<port_range> [, ...] tr 
    44 bind [<address>]:<port_range> [, ...] id <id> 
    55 bind [<address>]:<port_range> [, ...] name <name> 
     
    99   May be used in sections :   defaults | frontend | listen | backend 
    1010                                   no   |    yes   |   yes  |   no 
    11 @@ -1419,6 +1420,19 @@ bind [<address>]:<port_range> [, ...] de 
     11@@ -1423,6 +1424,19 @@ bind [<address>]:<port_range> [, ...] de 
    1212                   with front firewalls which would see an established 
    1313                   connection while the proxy will only see it in SYN_RECV. 
     
    2929   commas. The frontend will then listen on all of these addresses. There is no 
    3030   fixed limit to the number of addresses and ports which can be listened on in 
    31 @@ -1429,8 +1443,10 @@ bind [<address>]:<port_range> [, ...] de 
     31@@ -1433,8 +1447,10 @@ bind [<address>]:<port_range> [, ...] de 
    3232         listen http_proxy 
    3333             bind :80,:443 
     
    4141  
    4242 bind-process [ all | odd | even | <number 1-32> ] ... 
    43 @@ -7231,7 +7247,9 @@ marked with a star ('*') after the field 
     43@@ -7237,7 +7253,9 @@ marked with a star ('*') after the field 
    4444  
    4545 Detailed fields description : 
     
    5252   - "client_port" is the TCP port of the client which initiated the connection. 
    5353  
    54 @@ -7404,7 +7422,9 @@ with a star ('*') after the field name b 
     54@@ -7410,7 +7428,9 @@ with a star ('*') after the field name b 
    5555  
    5656 Detailed fields description : 
     
    179179                        err_code |= ERR_ALERT | ERR_FATAL; 
    180180                        goto out; 
    181 @@ -5732,6 +5742,9 @@ out_uri_auth_compat: 
     181@@ -5726,6 +5736,9 @@ out_uri_auth_compat: 
    182182                        listener->handler = process_session; 
    183183                        listener->analysers |= curproxy->fe_req_ana; 
     
    393393--- a/src/proto_http.c 
    394394+++ b/src/proto_http.c 
    395 @@ -4127,7 +4127,8 @@ void http_end_txn_clean_session(struct s 
     395@@ -4156,7 +4156,8 @@ void http_end_txn_clean_session(struct s 
    396396        if (s->rep->lr >= s->rep->data + s->rep->size) 
    397397                s->rep->lr -= s->req->size; 
     
    403403  
    404404        http_silent_debug(__LINE__, s); 
    405 @@ -7670,7 +7671,6 @@ void http_reset_txn(struct session *s) 
     405@@ -7739,7 +7740,6 @@ void http_reset_txn(struct session *s) 
    406406        http_init_txn(s); 
    407407  
     
    413413--- a/src/session.c 
    414414+++ b/src/session.c 
    415 @@ -1055,6 +1055,12 @@ resync_stream_interface: 
     415@@ -1071,6 +1071,12 @@ resync_stream_interface: 
    416416                        while (ana_list && max_loops--) { 
    417417                                /* Warning! ensure that analysers are always placed in ascending order! */ 
Note: See TracChangeset for help on using the changeset viewer.