[RELEASE] Released version 1.5.12 Released version 1.5.12 with the following main changes : - BUG/MINOR: ssl: Display correct filename in error message - DOC: Fix L4TOUT typo in documentation - BUG/MEDIUM: Do not consider an agent check as failed on L7 error - BUG/MINOR: pattern: error message missing - BUG/MEDIUM: pattern: some entries are not deleted with case insensitive match - BUG/MEDIUM: buffer: one byte miss in buffer free space check - BUG/MAJOR: http: don't read past buffer's end in http_replace_value - BUG/MEDIUM: http: the function "(req|res)-replace-value" doesn't respect the HTTP syntax - BUG/MEDIUM: peers: correctly configure the client timeout - BUG/MINOR: compression: consider the expansion factor in init - BUG/MEDIUM: http: hdr_cnt would not count any header when called without name - BUG/MEDIUM: listener: don't report an error when resuming unbound listeners - BUG/MEDIUM: init: don't limit cpu-map to the first 32 processes only - BUG/MEDIUM: stream-int: always reset si->ops when si->end is nullified - BUG/MEDIUM: http: remove content-length from chunked messages - DOC: http: update the comments about the rules for determining transfer-length - BUG/MEDIUM: http: do not restrict parsing of transfer-encoding to HTTP/1.1 - BUG/MEDIUM: http: incorrect transfer-coding in the request is a bad request - BUG/MEDIUM: http: remove content-length form responses with bad transfer-encoding - MEDIUM: http: restrict the HTTP version token to 1 digit as per RFC7230 - MEDIUM: http: add option-ignore-probes to get rid of the floods of 408 - BUG/MINOR: config: clear proxy->table.peers.p for disabled proxies - MINOR: stick-table: don't attach to peers in stopped state - MEDIUM: config: initialize stick-tables after peers, not before - MEDIUM: peers: add the ability to disable a peers section - DOC: document option http-ignore-probes - DOC: fix the comments about the meaning of msg->sol in HTTP - BUG/MEDIUM: http: wait for the exact amount of body bytes in wait_for_request_body - BUG/MAJOR: http: prevent risk of reading past end with balance url_param - DOC: update the doc on the proxy protocol Signed-off-by: heil <heil@terminal-consulting.de>
135 lines
3.5 KiB
Makefile
135 lines
3.5 KiB
Makefile
#
|
|
# Copyright (C) 2010-2013 OpenWrt.org
|
|
# Copyright (C) 2009-2014 Thomas Heil <heil@terminal-consulting.de>
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=haproxy
|
|
PKG_VERSION:=1.5.12
|
|
PKG_RELEASE:=01
|
|
PKG_SOURCE:=haproxy-$(PKG_VERSION).tar.gz
|
|
PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.5/src/
|
|
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
|
|
PKG_MD5SUM:=4b94b257f16d88c315716b062b22e48a
|
|
PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
|
|
PKG_LICENSE:=GPL-2.0
|
|
|
|
include $(INCLUDE_DIR)/package.mk
|
|
|
|
define Package/haproxy/Default
|
|
SUBMENU:=Web Servers/Proxies
|
|
SECTION:=net
|
|
CATEGORY:=Network
|
|
TITLE:=The Reliable, High Performance TCP/HTTP Load Balancer
|
|
URL:=http://haproxy.1wt.eu/
|
|
endef
|
|
|
|
define Package/haproxy/Default/conffiles
|
|
/etc/haproxy.cfg
|
|
endef
|
|
|
|
define Package/haproxy/Default/description
|
|
Open source Reliable, High Performance TCP/HTTP Load Balancer.
|
|
endef
|
|
|
|
define Package/haproxy
|
|
DEPENDS+= +libpcre +libltdl +zlib +libpthread +libopenssl
|
|
TITLE+= (with SSL support)
|
|
VARIANT:=ssl
|
|
$(call Package/haproxy/Default)
|
|
endef
|
|
|
|
define Package/haproxy/conffiles
|
|
$(call Package/haproxy/Default/conffiles)
|
|
endef
|
|
|
|
define Package/haproxy/description
|
|
$(call Package/haproxy/Default/description)
|
|
This package is built with SSL support.
|
|
endef
|
|
|
|
define Package/haproxy-nossl
|
|
TITLE+= (without SSL support)
|
|
VARIANT:=nossl
|
|
DEPENDS+= +libpcre +libltdl +zlib +libpthread
|
|
TITLE+= (with SSL support)
|
|
$(call Package/haproxy/Default)
|
|
endef
|
|
|
|
define Package/haproxy-nossl/conffiles
|
|
$(call Package/haproxy/Default/conffiles)
|
|
endef
|
|
|
|
define Package/haproxy-nossl/description
|
|
$(call Package/haproxy/Default/description)
|
|
This package is built without SSL support.
|
|
endef
|
|
|
|
ifeq ($(CONFIG_avr32),y)
|
|
LINUX_TARGET:=linux26
|
|
else
|
|
LINUX_TARGET:=linux2628
|
|
endif
|
|
|
|
ifeq ($(BUILD_VARIANT),ssl)
|
|
USE_OPENSSL=USE_OPENSSL=1
|
|
else
|
|
USE_OPENSSL=
|
|
endif
|
|
|
|
define Build/Compile
|
|
$(MAKE) TARGET=$(LINUX_TARGET) -C $(PKG_BUILD_DIR) \
|
|
DESTDIR="$(PKG_INSTALL_DIR)" \
|
|
CC="$(TARGET_CC)" \
|
|
CFLAGS="$(TARGET_CFLAGS) -fno-align-jumps -fno-align-functions -fno-align-labels -fno-align-loops -pipe -fomit-frame-pointer -fhonour-copts" \
|
|
LD="$(TARGET_CC)" \
|
|
LDFLAGS="$(TARGET_LDFLAGS)" \
|
|
PCREDIR="$(STAGING_DIR)/usr" \
|
|
SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=165530 " \
|
|
USE_LINUX_TPROXY=1 USE_LINUX_SPLICE=1 USE_REGPARM=1 $(USE_OPENSSL) \
|
|
USE_ZLIB=yes USE_PCRE=1 \
|
|
VERSION="$(PKG_VERSION)-patch$(PKG_RELEASE)" \
|
|
install
|
|
|
|
$(MAKE) -C $(PKG_BUILD_DIR)/contrib/halog \
|
|
CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
|
|
OPTIMIZE="" \
|
|
halog
|
|
endef
|
|
|
|
define Package/haproxy/install
|
|
$(INSTALL_DIR) $(1)/usr/sbin
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/haproxy $(1)/usr/sbin/
|
|
$(INSTALL_DIR) $(1)/etc
|
|
$(INSTALL_CONF) ./files/haproxy.cfg $(1)/etc/
|
|
$(INSTALL_DIR) $(1)/etc/init.d
|
|
$(INSTALL_BIN) ./files/haproxy.init $(1)/etc/init.d/haproxy
|
|
$(INSTALL_DIR) $(1)/etc/hotplug.d/net
|
|
$(INSTALL_BIN) ./files/haproxy.hotplug $(1)/etc/hotplug.d/net/90-haproxy
|
|
endef
|
|
|
|
Package/haproxy-nossl/install = $(Package/haproxy/install)
|
|
|
|
define Package/halog
|
|
MENU:=1
|
|
$(call Package/haproxy/Default)
|
|
TITLE+= halog
|
|
DEPENDS:=haproxy
|
|
endef
|
|
|
|
define Package/halog/description
|
|
HAProxy Log Analyzer
|
|
endef
|
|
|
|
define Package/halog/install
|
|
$(INSTALL_DIR) $(1)/usr/bin
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/halog/halog $(1)/usr/bin/
|
|
endef
|
|
|
|
$(eval $(call BuildPackage,haproxy-nossl))
|
|
$(eval $(call BuildPackage,haproxy))
|
|
$(eval $(call BuildPackage,halog))
|