From fdaa55a9181a2716954797c8d3f1090bf2620fb9 Mon Sep 17 00:00:00 2001 From: Christian Lachner Date: Sun, 2 Feb 2020 11:09:32 +0100 Subject: haproxy: Update HAProxy to v2.1.2 - Major version jump from v2.0 to v2.1 - Update haproxy download URL and hash - Add new patches (see https://www.haproxy.org/bugs/bugs-2.1.2.html) - Stop building LUA 5.3 in the haproxy build-process and use liblua5.3 as a dependency instead Signed-off-by: Christian Lachner --- net/haproxy/Makefile | 44 ++++++-------------------------------------- 1 file changed, 6 insertions(+), 38 deletions(-) (limited to 'net/haproxy/Makefile') diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index c7cc9c24c..e8e63515c 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy -PKG_VERSION:=2.0.12 +PKG_VERSION:=2.1.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://www.haproxy.org/download/2.0/src -PKG_HASH:=7fcf5adb21cd78c4161902f9fcc8d7fc97e1562319a992cbda884436ca9602fd +PKG_SOURCE_URL:=https://www.haproxy.org/download/2.1/src +PKG_HASH:=6079b08a8905ade5a9a2835ead8963ee10a855d8508a85efb7181eea2d310b77 PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner @@ -33,18 +33,8 @@ define Package/haproxy/Default URL:=https://www.haproxy.org/ endef -define Download/lua535 - FILE:=lua-5.3.5.tar.gz - URL:=https://www.lua.org/ftp/ - HASH:=0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac -endef - define Build/Prepare $(call Build/Prepare/Default) -ifeq ($(ENABLE_LUA),y) - tar -zxvf $(DL_DIR)/lua-5.3.5.tar.gz -C $(PKG_BUILD_DIR) - ln -s $(PKG_BUILD_DIR)/lua-5.3.5 $(PKG_BUILD_DIR)/lua -endif endef define Package/haproxy/Default/conffiles @@ -56,7 +46,7 @@ define Package/haproxy/Default/description endef define Package/haproxy - DEPENDS+= +libpcre +libltdl +zlib +libpthread +libopenssl +libncurses +libreadline +libatomic + DEPENDS+= +libpcre +libltdl +zlib +libpthread +liblua5.3 +libopenssl +libncurses +libreadline +libatomic TITLE+= (with SSL support) VARIANT:=ssl $(call Package/haproxy/Default) @@ -74,7 +64,7 @@ endef define Package/haproxy-nossl TITLE+= (without SSL support) VARIANT:=nossl - DEPENDS+= +libpcre +libltdl +zlib +libpthread +libatomic + DEPENDS+= +libpcre +libltdl +zlib +libpthread +liblua5.3 +libatomic TITLE+= (without SSL support) $(call Package/haproxy/Default) endef @@ -106,37 +96,16 @@ ifeq ($(BUILD_VARIANT),ssl) ADDON+=ADDLIB="-lcrypto -lm " endif -ifeq ($(ENABLE_LUA),y) - ADDON+=USE_LUA=1 - ADDON+=LUA_LIB_NAME="lua535" - ADDON+=LUA_INC="$(STAGING_DIR)/lua-5.3.5/include" - ADDON+=LUA_LIB="$(STAGING_DIR)/lua-5.3.5/lib" -endif - ifeq ($(ENABLE_REGPARM),y) ADDON+=USE_REGPARM=1 endif -ifeq ($(ENABLE_LUA),y) -define Build/Compile/lua - $(MAKE) TARGET=$(LINUX_TARGET) -C $(PKG_BUILD_DIR)/lua \ - INSTALL_TOP="$(STAGING_DIR)/lua-5.3.5/" \ - CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS) -lncurses -lreadline" \ - LD="$(TARGET_LD)" \ - linux install - - mv $(STAGING_DIR)/lua-5.3.5/lib/liblua.a $(STAGING_DIR)/lua-5.3.5/lib/liblua535.a -endef -endif - define Build/Compile - $(call Build/Compile/lua) $(MAKE) TARGET=$(LINUX_TARGET) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ CC="$(TARGET_CC)" \ PCREDIR="$(STAGING_DIR)/usr/" \ + USE_LUA=1 LUA_LIB_NAME="lua5.3" LUA_INC="$(STAGING_DIR)/usr/include/lua5.3" LUA_LIB="$(STAGING_DIR)/usr/lib" \ SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=165530" \ USE_LINUX_TPROXY=1 USE_LINUX_SPLICE=1 USE_TFO=1 USE_NS=1 \ USE_ZLIB=1 USE_PCRE=1 USE_PCRE_JIT=1 USE_GETADDRINFO=1 \ @@ -191,7 +160,6 @@ define Package/halog/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/halog/halog $(1)/usr/bin/ endef -$(eval $(call Download,lua535)) $(eval $(call BuildPackage,haproxy)) $(eval $(call BuildPackage,halog)) $(eval $(call BuildPackage,haproxy-nossl)) -- cgit v1.2.3