~olbohlen/oi-userland.git

parent: bb5f8fb6 | patch | commit | ignore whitespace

RAC-oi

2024-02-21 cc6eb0a2844a13606f985dfbd83a9c0a6c886d8f

web/haproxy: update to 2.8.6

1 files deleted

1 files added

4 files modified

	components/web/haproxy/Makefile	45 ●●●●● patch \| view \| raw \| blame \| history
	components/web/haproxy/haproxy.p5m	7 ●●●●● patch \| view \| raw \| blame \| history
	components/web/haproxy/manifests/sample-manifest.p5m	3 ●●●●● patch \| view \| raw \| blame \| history
	components/web/haproxy/patches/01-Makefile.patch	13 ●●●●● patch \| view \| raw \| blame \| history
	components/web/haproxy/patches/lua-ld-flags.patch	12 ●●●●● patch \| view \| raw \| blame \| history
	components/web/haproxy/pkg5	6 ●●●●● patch \| view \| raw \| blame \| history

 components/web/haproxy/Makefile

@@ -12,26 +12,26 @@
# Copyright 2016 EveryCity Ltd. All rights reserved.
# Copyright 2016 Adam Stevko. All rights reserved.
# Copyright 2022 Niklas Poslovski
# Copyright 2024 Goetz Fischer, R-A-C. All rights reserved.
#

BUILD_STYLE=        justmake
USE_OPENSSL11=        yes
BUILD_STYLE= justmake
USE_OPENSSL31= yes
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=        haproxy
COMPONENT_FMRI=        web/loadbalancer/haproxy
COMPONENT_VERSION_MJR=    2.7
COMPONENT_VERSION_MNR=  10
COMPONENT_REVISION=  2
COMPONENT_VERSION=    $(COMPONENT_VERSION_MJR).$(COMPONENT_VERSION_MNR)
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:be175dcc1f6ad7ea174262493839bf2e632a3dd7df137dcca4ab882ae00c7490
COMPONENT_ARCHIVE_URL=    https://haproxy.org/download/$(COMPONENT_VERSION_MJR)/src/$(COMPONENT_ARCHIVE)
COMPONENT_CLASSIFICATION=    System/Services
COMPONENT_LICENSE=    HAPROXY
COMPONENT_NAME= haproxy
COMPONENT_FMRI= web/loadbalancer/haproxy
COMPONENT_VERSION_MJR= 2.8
COMPONENT_VERSION_MNR= 6
COMPONENT_VERSION= $(COMPONENT_VERSION_MJR).$(COMPONENT_VERSION_MNR)
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:9fd034368be66880bd86a300c13dc03bc13521ee2654880dddf192785aa28d51
COMPONENT_ARCHIVE_URL= https://www.haproxy.org/download/$(COMPONENT_VERSION_MJR)/src/$(COMPONENT_ARCHIVE)
COMPONENT_CLASSIFICATION= System/Services
COMPONENT_LICENSE= HAPROXY

TEST_TARGET= $(NO_TESTS)
include $(WS_MAKE_RULES)/common.mk
@@ -42,7 +42,6 @@

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

COMPONENT_BUILD_ARGS +=    PREFIX="$(USRDIR)"
COMPONENT_BUILD_ARGS +=    SBINDIR="$(USRSBINDIR)"
COMPONENT_BUILD_ARGS +=    DOCDIR="$(USRDIR)/share/doc/haproxy"
@@ -54,17 +53,19 @@
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 +=    LUA_LIB_NAME=lua5.4
COMPONENT_BUILD_ARGS +=    LUA_INC="$(USRINCDIR)/lua5.4"
COMPONENT_BUILD_ARGS +=    ARCH=64
COMPONENT_BUILD_ARGS += SSL_INC="$(OPENSSL_INCDIR)"
COMPONENT_BUILD_ARGS +=    V=1

ifeq ($(strip $(MACH)),i386)
COMPONENT_BUILD_ARGS +=    CPU=x86_64
else
COMPONENT_BUILD_ARGS +=    CPU=ultrasparc
endif

COMPONENT_INSTALL_ARGS +=    $(COMPONENT_BUILD_ARGS)
COMPONENT_INSTALL_ARGS += $(COMPONENT_BUILD_ARGS)

COMPONENT_POST_INSTALL_ACTION += ( \
    cd $(@D) && \
@@ -73,9 +74,9 @@

# Auto-generated dependencies
REQUIRED_PACKAGES += library/pcre
REQUIRED_PACKAGES += library/security/openssl-11
REQUIRED_PACKAGES += library/security/openssl-31
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += runtime/lua-53
REQUIRED_PACKAGES += runtime/lua-54
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += system/library

 components/web/haproxy/haproxy.p5m

@@ -36,14 +36,19 @@

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/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
file path=usr/share/doc/haproxy/close-options.txt
file path=usr/share/doc/haproxy/configuration.txt
file path=usr/share/doc/haproxy/cookie-options.txt
file path=usr/share/doc/haproxy/intro.txt
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/peers-v2.0.txt
file path=usr/share/doc/haproxy/peers.txt

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

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

#
# Copyright 2022 <contributor>
# Copyright 2024 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -31,7 +31,6 @@
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
file path=usr/share/doc/haproxy/cookie-options.txt
file path=usr/share/doc/haproxy/intro.txt

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

File was deleted

 components/web/haproxy/patches/lua-ld-flags.patch

New file
@@ -0,0 +1,12 @@
diff -Nuraw haproxy-2.8.6_O/Makefile haproxy-2.8.6/Makefile
--- haproxy-2.8.6_O/Makefile    2024-02-15 14:53:26.000000000 +0100
+++ haproxy-2.8.6/Makefile    2024-02-19 03:26:27.000000000 +0100
@@ -622,7 +622,7 @@
   LUA_INC      := $(firstword $(foreach lib,lua5.4 lua54 lua5.3 lua53 lua,$(call check_lua_inc,$(lib),"/usr/include/")))
 
   check_lua_lib = $(shell echo "int main(){}" | $(CC) -o /dev/null -x c - $(2) -l$(1) 2>/dev/null && echo $(1))
-  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))
 
   # Try to automatically detect the Lua library if not set
   ifeq ($(LUA_LIB_NAME),)

 components/web/haproxy/pkg5

@@ -2,9 +2,9 @@
    "dependencies": [
        "SUNWcs",
        "library/pcre",
        "library/security/openssl-11",
        "library/security/openssl-31",
        "library/zlib",
        "runtime/lua-53",
        "runtime/lua-54",
        "shell/ksh93",
        "system/library",
        "system/library/math"
@@ -13,4 +13,4 @@
        "web/loadbalancer/haproxy"
    ],
    "name": "haproxy"
}
}

			@@ -12,26 +12,26 @@
			# Copyright 2016 EveryCity Ltd. All rights reserved.
			# Copyright 2016 Adam Stevko. All rights reserved.
			# Copyright 2022 Niklas Poslovski
			# Copyright 2024 Goetz Fischer, R-A-C. All rights reserved.
			#

			BUILD_STYLE= justmake
			USE_OPENSSL11= yes
			BUILD_STYLE= justmake
			USE_OPENSSL31= yes
			include ../../../make-rules/shared-macros.mk

			COMPONENT_NAME= haproxy
			COMPONENT_FMRI= web/loadbalancer/haproxy
			COMPONENT_VERSION_MJR= 2.7
			COMPONENT_VERSION_MNR= 10
			COMPONENT_REVISION= 2
			COMPONENT_VERSION= $(COMPONENT_VERSION_MJR).$(COMPONENT_VERSION_MNR)
			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:be175dcc1f6ad7ea174262493839bf2e632a3dd7df137dcca4ab882ae00c7490
			COMPONENT_ARCHIVE_URL= https://haproxy.org/download/$(COMPONENT_VERSION_MJR)/src/$(COMPONENT_ARCHIVE)
			COMPONENT_CLASSIFICATION= System/Services
			COMPONENT_LICENSE= HAPROXY
			COMPONENT_NAME= haproxy
			COMPONENT_FMRI= web/loadbalancer/haproxy
			COMPONENT_VERSION_MJR= 2.8
			COMPONENT_VERSION_MNR= 6
			COMPONENT_VERSION= $(COMPONENT_VERSION_MJR).$(COMPONENT_VERSION_MNR)
			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:9fd034368be66880bd86a300c13dc03bc13521ee2654880dddf192785aa28d51
			COMPONENT_ARCHIVE_URL= https://www.haproxy.org/download/$(COMPONENT_VERSION_MJR)/src/$(COMPONENT_ARCHIVE)
			COMPONENT_CLASSIFICATION= System/Services
			COMPONENT_LICENSE= HAPROXY

			TEST_TARGET= $(NO_TESTS)
			include $(WS_MAKE_RULES)/common.mk
			@@ -42,7 +42,6 @@

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

			COMPONENT_BUILD_ARGS += PREFIX="$(USRDIR)"
			COMPONENT_BUILD_ARGS += SBINDIR="$(USRSBINDIR)"
			COMPONENT_BUILD_ARGS += DOCDIR="$(USRDIR)/share/doc/haproxy"
			@@ -54,17 +53,19 @@
			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 += LUA_LIB_NAME=lua5.4
			COMPONENT_BUILD_ARGS += LUA_INC="$(USRINCDIR)/lua5.4"
			COMPONENT_BUILD_ARGS += ARCH=64
			COMPONENT_BUILD_ARGS += SSL_INC="$(OPENSSL_INCDIR)"
			COMPONENT_BUILD_ARGS += V=1

			ifeq ($(strip $(MACH)),i386)
			COMPONENT_BUILD_ARGS += CPU=x86_64
			else
			COMPONENT_BUILD_ARGS += CPU=ultrasparc
			endif

			COMPONENT_INSTALL_ARGS += $(COMPONENT_BUILD_ARGS)
			COMPONENT_INSTALL_ARGS += $(COMPONENT_BUILD_ARGS)

			COMPONENT_POST_INSTALL_ACTION += ( \
			cd $(@D) && \
			@@ -73,9 +74,9 @@

			# Auto-generated dependencies
			REQUIRED_PACKAGES += library/pcre
			REQUIRED_PACKAGES += library/security/openssl-11
			REQUIRED_PACKAGES += library/security/openssl-31
			REQUIRED_PACKAGES += library/zlib
			REQUIRED_PACKAGES += runtime/lua-53
			REQUIRED_PACKAGES += runtime/lua-54
			REQUIRED_PACKAGES += shell/ksh93
			REQUIRED_PACKAGES += SUNWcs
			REQUIRED_PACKAGES += system/library

			@@ -36,14 +36,19 @@

			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/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
			file path=usr/share/doc/haproxy/close-options.txt
			file path=usr/share/doc/haproxy/configuration.txt
			file path=usr/share/doc/haproxy/cookie-options.txt
			file path=usr/share/doc/haproxy/intro.txt
			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/peers-v2.0.txt
			file path=usr/share/doc/haproxy/peers.txt

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

			#
			# Copyright 2022 <contributor>
			# Copyright 2024 <contributor>
			#

			set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			@@ -31,7 +31,6 @@
			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
			file path=usr/share/doc/haproxy/cookie-options.txt
			file path=usr/share/doc/haproxy/intro.txt

New file
			@@ -0,0 +1,12 @@
			diff -Nuraw haproxy-2.8.6_O/Makefile haproxy-2.8.6/Makefile
			--- haproxy-2.8.6_O/Makefile 2024-02-15 14:53:26.000000000 +0100
			+++ haproxy-2.8.6/Makefile 2024-02-19 03:26:27.000000000 +0100
			@@ -622,7 +622,7 @@
			LUA_INC := $(firstword $(foreach lib,lua5.4 lua54 lua5.3 lua53 lua,$(call check_lua_inc,$(lib),"/usr/include/")))

			check_lua_lib = $(shell echo "int main(){}" \| $(CC) -o /dev/null -x c - $(2) -l$(1) 2>/dev/null && echo $(1))
			- 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))

			# Try to automatically detect the Lua library if not set
			ifeq ($(LUA_LIB_NAME),)

			@@ -2,9 +2,9 @@
			"dependencies": [
			"SUNWcs",
			"library/pcre",
			"library/security/openssl-11",
			"library/security/openssl-31",
			"library/zlib",
			"runtime/lua-53",
			"runtime/lua-54",
			"shell/ksh93",
			"system/library",
			"system/library/math"
			@@ -13,4 +13,4 @@
			"web/loadbalancer/haproxy"
			],
			"name": "haproxy"
			}
			}