diff --git a/haproxy/Makefile b/haproxy/Makefile index aa8728319..1ca330a54 100644 --- a/haproxy/Makefile +++ b/haproxy/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy -PKG_VERSION:=2.6.2 +PKG_VERSION:=2.6.4 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.haproxy.org/download/2.6/src -PKG_HASH:=f9b7dc06e02eb13b5d94dc66e0864a714aee2af9dfab10fa353ff9f1f52c8202 +PKG_HASH:=f07d67ada2ff3a999fed4e34459c0489536331a549665ac90cb6a8df91f4a289 PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner diff --git a/haproxy/get-latest-patches.sh b/haproxy/get-latest-patches.sh index 0302dd4ce..abf4a75c5 100755 --- a/haproxy/get-latest-patches.sh +++ b/haproxy/get-latest-patches.sh @@ -1,7 +1,7 @@ #!/bin/sh CLONEURL=https://git.haproxy.org/git/haproxy-2.6.git -BASE_TAG=v2.6.2 +BASE_TAG=v2.6.4 TMP_REPODIR=tmprepo PATCHESDIR=patches diff --git a/v2raya/patches/100-compat-v5.patch b/v2raya/patches/100-compat-v5.patch index 2bd10eeec..ef358c944 100644 --- a/v2raya/patches/100-compat-v5.patch +++ b/v2raya/patches/100-compat-v5.patch @@ -8,3 +8,14 @@ "--config=" + asset.GetV2rayConfigPath(), } if confdir := asset.GetV2rayConfigDirPath(); confdir != "" { +--- a/core/v2ray/where/where.go ++++ b/core/v2ray/where/where.go +@@ -41,7 +41,7 @@ func GetV2rayServiceVersion() (variant V + if err != nil || len(v2rayPath) <= 0 { + return Unknown, "", fmt.Errorf("cannot find v2ray executable binary") + } +- out, err := exec.Command(v2rayPath, "-version").Output() ++ out, err := exec.Command(v2rayPath, "version").Output() + var fields []string + if fields = strings.Fields(strings.TrimSpace(string(out))); len(fields) < 2 { + return Unknown, "", fmt.Errorf("cannot parse version of v2ray")