diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index a7798ce3..6dc1f206 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy -PKG_VERSION:=3.0.0 +PKG_VERSION:=2.8.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://www.haproxy.org/download/3.0/src -PKG_HASH:=5aad97416216d2cd9dd212eb674839c40cd387f60fbc4b13d7ea3f1e5664a814 +PKG_SOURCE_URL:=https://www.haproxy.org/download/2.8/src +PKG_HASH:=3f5459c5a58e0b343a32eaef7ed5bed9d3fc29d8aa9e14b36c92c969fc2a60d9 PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner @@ -46,7 +46,7 @@ endef define Package/haproxy $(call Package/haproxy/Default) TITLE+=with SSL support - DEPENDS+= +libpcre2 +libltdl +zlib +libpthread +liblua5.3 +libopenssl +libncurses +libreadline +libatomic + DEPENDS+= +libpcre +libltdl +zlib +libpthread +liblua5.3 +libopenssl +libncurses +libreadline +libatomic VARIANT:=ssl endef @@ -59,7 +59,7 @@ define Package/haproxy-nossl $(call Package/haproxy/Default) TITLE+=without SSL support VARIANT:=nossl - DEPENDS+= +libpcre2 +libltdl +zlib +libpthread +liblua5.3 +libatomic + DEPENDS+= +libpcre +libltdl +zlib +libpthread +liblua5.3 +libatomic CONFLICTS:=haproxy endef @@ -83,8 +83,6 @@ endif ifeq ($(BUILD_VARIANT),ssl) ADDON+=USE_OPENSSL=1 ADDON+=ADDLIB="-lcrypto -lm" - ADDON+=USE_QUIC=1 - ADDON+=USE_QUIC_OPENSSL_COMPAT=1 endif define Build/Compile @@ -94,7 +92,7 @@ define Build/Compile PCREDIR="$(STAGING_DIR)/usr/" \ USE_LUA=1 LUA_LIB_NAME="lua5.3" LUA_INC="$(STAGING_DIR)/usr/include/lua5.3" LUA_LIB="$(STAGING_DIR)/usr/lib" \ SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=165530" \ - USE_ZLIB=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_PTHREAD_PSHARED=1 USE_LIBATOMIC=1 USE_PROMEX=1 \ + USE_ZLIB=1 USE_PCRE=1 USE_PCRE_JIT=1 USE_PTHREAD_PSHARED=1 USE_LIBATOMIC=1 USE_PROMEX=1 \ VERSION="$(PKG_VERSION)" SUBVERS="-$(PKG_RELEASE)" \ VERDATE="$(shell date -d @$(SOURCE_DATE_EPOCH) '+%Y/%m/%d')" IGNOREGIT=1 \ $(ADDON) \ diff --git a/net/haproxy/get-latest-patches.sh b/net/haproxy/get-latest-patches.sh index c5b766cb..dc1451ff 100755 --- a/net/haproxy/get-latest-patches.sh +++ b/net/haproxy/get-latest-patches.sh @@ -1,7 +1,7 @@ #!/bin/sh -CLONEURL=https://git.haproxy.org/git/haproxy-3.0.git -BASE_TAG=v3.0.0 +CLONEURL=https://git.haproxy.org/git/haproxy-2.8.git +BASE_TAG=v2.8.5 TMP_REPODIR=tmprepo PATCHESDIR=patches @@ -24,4 +24,3 @@ done rm -rf "${TMP_REPODIR}" printf "finished\n" -