haproxy: bump to 2.0.3

grueni

2019-07-29 a6776b6a0f3aabca8430f12fa62e432e5fd2b03d

haproxy: bump to 2.0.3

 components/web/haproxy/Makefile

@@ -17,14 +17,14 @@

COMPONENT_NAME=        haproxy
COMPONENT_FMRI=        web/loadbalancer/haproxy
COMPONENT_VERSION_MJR=    1.8
COMPONENT_VERSION_MNR=  16
COMPONENT_VERSION_MJR=    2.0
COMPONENT_VERSION_MNR=  3
COMPONENT_VERSION=    $(COMPONENT_VERSION_MJR).$(COMPONENT_VERSION_MNR)
COMPONENT_PROJECT_URL=    http://www.haproxy.org/
COMPONENT_SUMMARY=    A reliable, high performance TCP/HTTP load balancer
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH=    sha256:5401e4ad243d9e403621e389ec3605d8d43241affe0b72f0b15c0db8a7a3653f
COMPONENT_ARCHIVE_HASH=    sha256:aac1ff3e5079997985b6560f46bf265447d0cd841f11c4d77f15942c9fe4b770
COMPONENT_ARCHIVE_URL=    http://haproxy.1wt.eu/download/$(COMPONENT_VERSION_MJR)/src/$(COMPONENT_ARCHIVE)
COMPONENT_CLASSIFICATION=    System/Services
COMPONENT_LICENSE=    HAPROXY

 components/web/haproxy/haproxy.p5m

@@ -46,6 +46,8 @@
file path=usr/share/doc/haproxy/peers-v2.0.txt
file path=usr/share/doc/haproxy/peers.txt
file path=usr/share/doc/haproxy/proxy-protocol.txt
file path=usr/share/doc/haproxy/regression-testing.txt
file path=usr/share/doc/haproxy/seamless_reload.txt
file path=usr/share/man/man1/haproxy.1

dir path=var/haproxy owner=haproxy group=haproxy mode=0750

 components/web/haproxy/manifests/sample-manifest.p5m

@@ -10,7 +10,7 @@
#

#
# Copyright 2017 <contributor>
# Copyright 2018 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -26,6 +26,7 @@
file path=usr/sbin/haproxy
file path=usr/share/doc/haproxy/51Degrees-device-detection.txt
file path=usr/share/doc/haproxy/DeviceAtlas-device-detection.txt
file path=usr/share/doc/haproxy/SOCKS4.protocol.txt
file path=usr/share/doc/haproxy/SPOE.txt
file path=usr/share/doc/haproxy/WURFL-device-detection.txt
file path=usr/share/doc/haproxy/architecture.txt
@@ -41,4 +42,6 @@
file path=usr/share/doc/haproxy/peers-v2.0.txt
file path=usr/share/doc/haproxy/peers.txt
file path=usr/share/doc/haproxy/proxy-protocol.txt
file path=usr/share/doc/haproxy/regression-testing.txt
file path=usr/share/doc/haproxy/seamless_reload.txt
file path=usr/share/man/man1/haproxy.1

 components/web/haproxy/patches/01-Makefile.patch

New file
@@ -0,0 +1,13 @@
diff --git a/haproxy-2.0.3/Makefile.old b/haproxy-2.0.3/Makefile
index a9c65c594..36ce7dd0e 100644
--- a/Makefile
+++ b/Makefile
@@ -525,7 +525,7 @@ check_lua_lib = $(shell echo "int main(){}" | $(CC) -o /dev/null -x c - $(2) -l$
 check_lua_inc = $(shell if [ -d $(2)$(1) ]; then echo $(2)$(1); fi;)
 
 OPTIONS_CFLAGS  += $(if $(LUA_INC),-I$(LUA_INC))
-LUA_LD_FLAGS := -Wl,$(if $(EXPORT_SYMBOL),$(EXPORT_SYMBOL),--export-dynamic) $(if $(LUA_LIB),-L$(LUA_LIB))
+LUA_LD_FLAGS := $(if $(LUA_LIB),-L$(LUA_LIB))
 ifeq ($(LUA_LIB_NAME),)
 # Try to automatically detect the Lua library
 LUA_LIB_NAME := $(firstword $(foreach lib,lua5.3 lua53 lua,$(call check_lua_lib,$(lib),$(LUA_LD_FLAGS))))

 components/web/haproxy/patches/Makefile.patch

File was deleted