Released version 1.5.13 with the following main changes : - BUG/MINOR: check: fix tcpcheck error message - CLEANUP: deinit: remove codes for cleaning p->block_rules - DOC: Update doc about weight, act and bck fields in the statistics - MINOR: ssl: add a destructor to free allocated SSL ressources - BUG/MEDIUM: ssl: fix tune.ssl.default-dh-param value being overwritten - MEDIUM: ssl: replace standards DH groups with custom ones - BUG/MINOR: debug: display (null) in place of "meth" - BUG/MINOR: cfgparse: fix typo in 'option httplog' error message - BUG/MEDIUM: cfgparse: segfault when userlist is misused - BUG/MEDIUM: stats: properly initialize the scope before dumping stats - BUG/MEDIUM: http: don't forward client shutdown without NOLINGER except for tunnels - CLEANUP: checks: fix double usage of cur / current_step in tcp-checks - BUG/MEDIUM: checks: do not dereference head of a tcp-check at the end - CLEANUP: checks: simplify the loop processing of tcp-checks - BUG/MAJOR: checks: always check for end of list before proceeding - BUG/MEDIUM: checks: do not dereference a list as a tcpcheck struct - BUG/MEDIUM: peers: apply a random reconnection timeout - BUG/MINOR: ssl: fix smp_fetch_ssl_fc_session_id - MEDIUM: init: don't stop proxies in parent process when exiting - MINOR: peers: store the pointer to the signal handler - MEDIUM: peers: unregister peers that were never started - MEDIUM: config: propagate the table's process list to the peers sections - MEDIUM: init: stop any peers section not bound to the correct process - MEDIUM: config: validate that peers sections are bound to exactly one process - MAJOR: peers: allow peers section to be used with nbproc > 1 - DOC: relax the peers restriction to single-process - CLEANUP: config: fix misleading information in error message. - MINOR: config: report the number of processes using a peers section in the error case - BUG/MEDIUM: config: properly compute the default number of processes for a proxy 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.13
|
|
PKG_RELEASE:=00
|
|
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:=30cf07875ecae4fd6c4c309627afa8f1
|
|
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))
|