Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6529 from gladiac1337/feature-haproxy-v1.8.12-updates

Browse source 
haproxy: Update HAProxy patches for v1.8.13 & Update Lua
This commit is contained in:
Hannu Nyman 2018-08-05 20:13:46 +03:00 committed by GitHub
commit d15d1bf871
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
net/haproxy/Makefile
View file

@ -1,6 +1,7 @@
# #
# Copyright (C) 2010-2016 OpenWrt.org # Copyright (C) 2010-2016 OpenWrt.org
# Copyright (C) 2009-2016 Thomas Heil <heil@terminal-consulting.de> # Copyright (C) 2009-2016 Thomas Heil <heil@terminal-consulting.de>
# Copyright (C) 2018 Christian Lachner <gladiac@gmail.com>
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,20 +10,17 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=haproxy PKG_NAME:=haproxy
PKG_VERSION:=1.8.12 PKG_VERSION:=1.8.13
PKG_RELEASE:=00 PKG_RELEASE:=1
PKG_SOURCE:=haproxy-$(PKG_VERSION).tar.gz PKG_SOURCE:=haproxy-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.haproxy.org/download/1.8/src/ PKG_SOURCE_URL:=https://www.haproxy.org/download/1.8/src/
PKG_HASH:=f438a98e657935fa8fad48b98d9029a399e0ad9105cf0e7e8e54365f93d83e9b PKG_HASH:=2bf5dafbb5f1530c0e67ab63666565de948591f8e0ee2a1d3c84c45e738220f1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>, \
Christian Lachner <gladiac@gmail.com>
ifneq ($(PKG_RELEASE),00)
BUILD_VERSION:=-patch$(PKG_RELEASE)
endif
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -34,17 +32,17 @@ define Package/haproxy/Default
URL:=https://www.haproxy.org/ URL:=https://www.haproxy.org/
endef endef
define Download/lua534 define Download/lua535
FILE:=lua-5.3.4.tar.gz FILE:=lua-5.3.5.tar.gz
URL:=https://www.lua.org/ftp/ URL:=https://www.lua.org/ftp/
HASH:=f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c HASH:=0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac
endef endef
define Build/Prepare define Build/Prepare
$(call Build/Prepare/Default) $(call Build/Prepare/Default)
ifeq ($(ENABLE_LUA),y) ifeq ($(ENABLE_LUA),y)
tar -zxvf $(DL_DIR)/lua-5.3.4.tar.gz -C $(PKG_BUILD_DIR) tar -zxvf $(DL_DIR)/lua-5.3.5.tar.gz -C $(PKG_BUILD_DIR)
ln -s $(PKG_BUILD_DIR)/lua-5.3.4 $(PKG_BUILD_DIR)/lua ln -s $(PKG_BUILD_DIR)/lua-5.3.5 $(PKG_BUILD_DIR)/lua
endif endif
endef endef
@ -115,9 +113,9 @@ endif
ifeq ($(ENABLE_LUA),y) ifeq ($(ENABLE_LUA),y)
ADDON+=USE_LUA=1 ADDON+=USE_LUA=1
ADDON+=LUA_LIB_NAME="lua534" ADDON+=LUA_LIB_NAME="lua535"
ADDON+=LUA_INC="$(STAGING_DIR)/lua-5.3.4/include" ADDON+=LUA_INC="$(STAGING_DIR)/lua-5.3.5/include"
ADDON+=LUA_LIB="$(STAGING_DIR)/lua-5.3.4/lib" ADDON+=LUA_LIB="$(STAGING_DIR)/lua-5.3.5/lib"
endif endif
ifeq ($(ENABLE_REGPARM),y) ifeq ($(ENABLE_REGPARM),y)
@ -127,14 +125,14 @@ endif
ifeq ($(ENABLE_LUA),y) ifeq ($(ENABLE_LUA),y)
define Build/Compile/lua define Build/Compile/lua
$(MAKE) TARGET=$(LINUX_TARGET) -C $(PKG_BUILD_DIR)/lua \ $(MAKE) TARGET=$(LINUX_TARGET) -C $(PKG_BUILD_DIR)/lua \
INSTALL_TOP="$(STAGING_DIR)/lua-5.3.4/" \ INSTALL_TOP="$(STAGING_DIR)/lua-5.3.5/" \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS) -lncurses -lreadline" \ LDFLAGS="$(TARGET_LDFLAGS) -lncurses -lreadline" \
LD="$(TARGET_LD)" \ LD="$(TARGET_LD)" \
linux install linux install
mv $(STAGING_DIR)/lua-5.3.4/lib/liblua.a $(STAGING_DIR)/lua-5.3.4/lib/liblua534.a mv $(STAGING_DIR)/lua-5.3.5/lib/liblua.a $(STAGING_DIR)/lua-5.3.5/lib/liblua535.a
endef endef
endif endif
@ -147,7 +145,7 @@ define Build/Compile
SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=165530 " \ SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=165530 " \
USE_LINUX_TPROXY=1 USE_LINUX_SPLICE=1 USE_TFO=1 \ USE_LINUX_TPROXY=1 USE_LINUX_SPLICE=1 USE_TFO=1 \
USE_ZLIB=yes USE_PCRE=1 USE_PCRE_JIT=1 USE_GETADDRINFO=1 \ USE_ZLIB=yes USE_PCRE=1 USE_PCRE_JIT=1 USE_GETADDRINFO=1 \
VERSION="$(PKG_VERSION)$(BUILD_VERSION)" \ VERSION="$(PKG_VERSION)-$(PKG_RELEASE)" \
$(ADDON) \ $(ADDON) \
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
LD="$(TARGET_CC)" \ LD="$(TARGET_CC)" \
@ -165,7 +163,7 @@ define Build/Compile
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
$(MAKE_FLAGS) \ $(MAKE_FLAGS) \
ADDLIB="-lcrypto" \ ADDLIB="-lcrypto" \
VERSION="$(PKG_VERSION)-patch$(PKG_RELEASE)" \ VERSION="$(PKG_VERSION)-$(PKG_RELEASE)" \
halog halog
endef endef
@ -198,7 +196,7 @@ define Package/halog/install
$(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/halog/halog $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/halog/halog $(1)/usr/bin/
endef endef
$(eval $(call Download,lua534)) $(eval $(call Download,lua535))
$(eval $(call BuildPackage,haproxy)) $(eval $(call BuildPackage,haproxy))
$(eval $(call BuildPackage,halog)) $(eval $(call BuildPackage,halog))
$(eval $(call BuildPackage,haproxy-nossl)) $(eval $(call BuildPackage,haproxy-nossl))

2
net/haproxy/get-latest-patches.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
CLONEURL=http://git.haproxy.org/git/haproxy-1.8.git CLONEURL=http://git.haproxy.org/git/haproxy-1.8.git
BASE_TAG=v1.8.12 BASE_TAG=v1.8.13
TMP_REPODIR=tmprepo TMP_REPODIR=tmprepo
PATCHESDIR=patches PATCHESDIR=patches