haproxy: update to 1.7.9 and ship as 64-bit

Adam Števko

2017-11-19 35e0d5f96b8c8a5b37f40fe694af353144e64882

haproxy: update to 1.7.9 and ship as 64-bit

 components/web/haproxy/Makefile

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

COMPONENT_NAME=        haproxy
COMPONENT_FMRI=        web/loadbalancer/haproxy
COMPONENT_VERSION_MJR=    1.6
COMPONENT_VERSION_MNR=  12
COMPONENT_VERSION_MJR=    1.7
COMPONENT_VERSION_MNR=  9
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:9bdf2bf855991dc4e0bf9b1ba2b1a322fc23f188aab1c8f0162131c32d699ee2
COMPONENT_ARCHIVE_HASH=    sha256:1072337e54fa188dc6e0cfe3ba4c2200b07082e321cbfe5a0882d85d54db068e
COMPONENT_ARCHIVE_URL=    http://haproxy.1wt.eu/download/$(COMPONENT_VERSION_MJR)/src/$(COMPONENT_ARCHIVE)
COMPONENT_LICENSE=    HAPROXY
COMPONENT_LICENSE_FILE=    $(COMPONENT_NAME).license
@@ -36,26 +36,25 @@
COMPONENT_PRE_BUILD_ACTION+= \
    $(CLONEY) $(SOURCE_DIR) $(@D)

CFLAGS+= -I/usr/include/lua5.3

COMPONENT_BUILD_ARGS+=    CC=$(CC)
COMPONENT_BUILD_ARGS+=    CC="$(CC)"
COMPONENT_BUILD_ARGS+=    CFLAGS="$(CFLAGS)"
COMPONENT_BUILD_ARGS+=    LDFLAGS="$(LDFLAGS)"

COMPONENT_BUILD_ARGS+=    PREFIX=$(USRDIR)
COMPONENT_BUILD_ARGS+=    SBINDIR=$(USRSBINDIR)
COMPONENT_BUILD_ARGS+=    DOCDIR=$(USRDIR)/share/doc/haproxy
COMPONENT_BUILD_ARGS+=    PREFIX="$(USRDIR)"
COMPONENT_BUILD_ARGS+=    SBINDIR="$(USRSBINDIR)"
COMPONENT_BUILD_ARGS+=    DOCDIR="$(USRDIR)/share/doc/haproxy"
COMPONENT_BUILD_ARGS+=    TARGET=solaris
COMPONENT_BUILD_ARGS+=    USE_OPENSSL=1
COMPONENT_BUILD_ARGS+=    USE_ZLIB=1
COMPONENT_BUILD_ARGS+=    USE_PCRE=1
COMPONENT_BUILD_ARGS+=    USE_REGPARM=1
COMPONENT_BUILD_ARGS+=    USE_PCRE_JIT=1
COMPONENT_BUILD_ARGS+=    PCRE_INC=$(USRINCDIR)/pcre
COMPONENT_BUILD_ARGS+=    PCRE_INC="$(USRINCDIR)/pcre"
COMPONENT_BUILD_ARGS+=    USE_LUA=1
COMPONENT_BUILD_ARGS+=    LUA_LIB_NAME=lua5.3
COMPONENT_BUILD_ARGS+=    ARCH=32
COMPONENT_BUILD_ARGS+=     CPU=i686
COMPONENT_BUILD_ARGS+=    LUA_INC="$(USRINCDIR)/lua5.3"
COMPONENT_BUILD_ARGS+=    ARCH=64
COMPONENT_BUILD_ARGS+=     CPU=x86_64

COMPONENT_INSTALL_ARGS+=    $(COMPONENT_BUILD_ARGS)

@@ -64,9 +63,9 @@
    $(GMAKE) $(COMPONENT_BUILD_ARGS) && \
    $(CP) halog $(PROTOUSRSBINDIR) )

build:        $(BUILD_32)
build:        $(BUILD_64)

install:    $(INSTALL_32)
install:    $(INSTALL_64)

REQUIRED_PACKAGES += library/pcre
REQUIRED_PACKAGES += library/security/openssl

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

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

#
# Copyright 2016 <contributor>
# Copyright 2017 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -24,6 +24,10 @@

file path=usr/sbin/halog
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/SPOE.txt
file path=usr/share/doc/haproxy/WURFL-device-detection.txt
file path=usr/share/doc/haproxy/architecture.txt
file path=usr/share/doc/haproxy/close-options.txt
file path=usr/share/doc/haproxy/configuration.txt
@@ -32,6 +36,7 @@
file path=usr/share/doc/haproxy/linux-syn-cookies.txt
file path=usr/share/doc/haproxy/lua.txt
file path=usr/share/doc/haproxy/management.txt
file path=usr/share/doc/haproxy/netscaler-client-ip-insertion-protocol.txt
file path=usr/share/doc/haproxy/network-namespaces.txt
file path=usr/share/doc/haproxy/proxy-protocol.txt
file path=usr/share/man/man1/haproxy.1