Andreas Wacknitz
2023-01-31 fbec703e185833a5ae8b6e8ec71c7c8fb6f0d54f
haproxy: update to 2.7.2 and switch to openssl-1.1

2 files modified
63 ■■■■ changed files
components/web/haproxy/Makefile 61 ●●●● patch | view | raw | blame | history
components/web/haproxy/pkg5 2 ●●● patch | view | raw | blame | history
components/web/haproxy/Makefile
@@ -16,60 +16,61 @@
BUILD_BITS=            64
BUILD_STYLE=        justmake
#USE_OPENSSL11=        yes
USE_OPENSSL11=        yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        haproxy
COMPONENT_FMRI=        web/loadbalancer/haproxy
COMPONENT_VERSION_MJR=    2.6
COMPONENT_VERSION_MNR=  6
COMPONENT_VERSION_MJR=    2.7
COMPONENT_VERSION_MNR=  2
COMPONENT_VERSION=    $(COMPONENT_VERSION_MJR).$(COMPONENT_VERSION_MNR)
COMPONENT_PROJECT_URL=    https://www.haproxy.org/
COMPONENT_SUMMARY=    A reliable, high performance TCP/HTTP load balancer
COMPONENT_PROJECT_URL=    https://www.haproxy.org/
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH=    sha256:d0c80c90c04ae79598b58b9749d53787f00f7b515175e7d8203f2796e6a6594d
COMPONENT_ARCHIVE_HASH=    sha256:63bc6ec0302d0ebbe1fa769c19606640de834ac8cb07447b80799cb563dc0f3f
COMPONENT_ARCHIVE_URL=    https://haproxy.org/download/$(COMPONENT_VERSION_MJR)/src/$(COMPONENT_ARCHIVE)
COMPONENT_CLASSIFICATION=    System/Services
COMPONENT_LICENSE=    HAPROXY
COMPONENT_LICENSE_FILE=    $(COMPONENT_NAME).license
TEST_TARGET=        $(NO_TESTS)
TEST_TARGET= $(NO_TESTS)
include $(WS_MAKE_RULES)/common.mk
COMPONENT_PRE_BUILD_ACTION+= \
    $(CLONEY) $(SOURCE_DIR) $(@D)
CFLAGS += -I$(OPENSSL_INCDIR)
LDFLAGS += -L$(OPENSSL_LIBDIR)
COMPONENT_BUILD_ARGS+=    CC="$(CC)"
COMPONENT_BUILD_ARGS+=    CFLAGS="$(CFLAGS) $(CPP_XPG6MODE)"
COMPONENT_BUILD_ARGS+=    LDFLAGS="$(LDFLAGS)"
COMPONENT_PRE_BUILD_ACTION += $(CLONEY) $(SOURCE_DIR) $(@D)
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+=    USE_LUA=1
COMPONENT_BUILD_ARGS+=    LUA_LIB_NAME=lua5.3
COMPONENT_BUILD_ARGS+=    LUA_INC="$(USRINCDIR)/lua5.3"
COMPONENT_BUILD_ARGS+=    ARCH=64
COMPONENT_BUILD_ARGS+=    CPU=x86_64
COMPONENT_BUILD_ARGS +=    CC="$(CC)"
COMPONENT_BUILD_ARGS +=    CFLAGS="$(CFLAGS) $(CPP_XPG6MODE)"
COMPONENT_BUILD_ARGS +=    LDFLAGS="$(LDFLAGS)"
COMPONENT_INSTALL_ARGS+=    $(COMPONENT_BUILD_ARGS)
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 +=    USE_LUA=1
COMPONENT_BUILD_ARGS +=    LUA_LIB_NAME=lua5.3
COMPONENT_BUILD_ARGS +=    LUA_INC="$(USRINCDIR)/lua5.3"
COMPONENT_BUILD_ARGS +=    ARCH=64
COMPONENT_BUILD_ARGS +=    CPU=x86_64
COMPONENT_POST_INSTALL_ACTION+= ( \
COMPONENT_INSTALL_ARGS +=    $(COMPONENT_BUILD_ARGS)
COMPONENT_POST_INSTALL_ACTION += ( \
    cd $(@D) && \
    $(GMAKE) $(COMPONENT_BUILD_ARGS) admin/halog/halog && \
    $(CP) admin/halog/halog $(PROTOUSRSBINDIR) )
# Auto-generated dependencies
REQUIRED_PACKAGES += library/pcre
REQUIRED_PACKAGES += library/security/openssl
REQUIRED_PACKAGES += library/security/openssl-11
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += runtime/lua-53
REQUIRED_PACKAGES += shell/ksh93
components/web/haproxy/pkg5
@@ -2,7 +2,7 @@
    "dependencies": [
        "SUNWcs",
        "library/pcre",
        "library/security/openssl",
        "library/security/openssl-11",
        "library/zlib",
        "runtime/lua-53",
        "shell/ksh93",