haproxy: Update HAProxy to v1.8.13 & Lua library to v5.3.5

- Update Lua to v5.3.5
- Add myself as co-maintainer
- Update haproxy download URL and hash
- Changed version-output to always print $(PKG_VERSION)-$(PKG_RELEASE)
- Removed all obsolete patches

Signed-off-by: Christian Lachner <[email protected]>

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 7c5a714e028d3395e98ba9c42f9e6bd0dd015cfa..7a90da2400b280ef93771abb707bb24423cb4a57 100644 (file)
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,6 +1,7 @@
 #
 # Copyright (C) 2010-2016 OpenWrt.org
 # Copyright (C) 2009-2016 Thomas Heil <[email protected]>
+# Copyright (C) 2018 Christian Lachner <[email protected]>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,20 +10,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=haproxy
-PKG_VERSION:=1.8.12
-PKG_RELEASE:=00
+PKG_VERSION:=1.8.13
+PKG_RELEASE:=1
 
 PKG_SOURCE:=haproxy-$(PKG_VERSION).tar.gz
 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_LICENSE:=GPL-2.0
-MAINTAINER:=Thomas Heil <[email protected]>
-
-ifneq ($(PKG_RELEASE),00)
-       BUILD_VERSION:=-patch$(PKG_RELEASE)
-endif
+MAINTAINER:=Thomas Heil <[email protected]>, \
+               Christian Lachner <[email protected]>
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -34,17 +32,17 @@ define Package/haproxy/Default
   URL:=https://www.haproxy.org/
 endef
 
-define Download/lua534
-       FILE:=lua-5.3.4.tar.gz
+define Download/lua535
+       FILE:=lua-5.3.5.tar.gz
        URL:=https://www.lua.org/ftp/
-       HASH:=f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c
+       HASH:=0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac
 endef
 
 define Build/Prepare
        $(call Build/Prepare/Default)
 ifeq ($(ENABLE_LUA),y)
-       tar -zxvf $(DL_DIR)/lua-5.3.4.tar.gz -C $(PKG_BUILD_DIR)
-       ln -s $(PKG_BUILD_DIR)/lua-5.3.4 $(PKG_BUILD_DIR)/lua
+       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
 
@@ -115,9 +113,9 @@ endif
 
 ifeq ($(ENABLE_LUA),y)
        ADDON+=USE_LUA=1
-       ADDON+=LUA_LIB_NAME="lua534"
-       ADDON+=LUA_INC="$(STAGING_DIR)/lua-5.3.4/include"
-       ADDON+=LUA_LIB="$(STAGING_DIR)/lua-5.3.4/lib"
+       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)
@@ -127,14 +125,14 @@ 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.4/" \
+               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.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
 endif
 
@@ -147,7 +145,7 @@ define Build/Compile
                SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=165530 " \
                USE_LINUX_TPROXY=1 USE_LINUX_SPLICE=1 USE_TFO=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) \
                CFLAGS="$(TARGET_CFLAGS)" \
                LD="$(TARGET_CC)" \
@@ -165,7 +163,7 @@ define Build/Compile
                DESTDIR="$(PKG_INSTALL_DIR)" \
                $(MAKE_FLAGS) \
                ADDLIB="-lcrypto" \
-               VERSION="$(PKG_VERSION)-patch$(PKG_RELEASE)" \
+               VERSION="$(PKG_VERSION)-$(PKG_RELEASE)" \
                halog
 endef
 
@@ -198,7 +196,7 @@ define Package/halog/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/halog/halog $(1)/usr/bin/
 endef
 
-$(eval $(call Download,lua534))
+$(eval $(call Download,lua535))
 $(eval $(call BuildPackage,haproxy))
 $(eval $(call BuildPackage,halog))
 $(eval $(call BuildPackage,haproxy-nossl))

diff --git a/net/haproxy/get-latest-patches.sh b/net/haproxy/get-latest-patches.sh
index 533b97e80480de716e8310135d5cea5e1303885e..77ed6415aca2da962fb77d9b1136eef817c16fcb 100755 (executable)
--- a/net/haproxy/get-latest-patches.sh
+++ b/net/haproxy/get-latest-patches.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 CLONEURL=http://git.haproxy.org/git/haproxy-1.8.git
-BASE_TAG=v1.8.12
+BASE_TAG=v1.8.13
 TMP_REPODIR=tmprepo
 PATCHESDIR=patches