diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 3728eef58..50cd3dedd 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy -PKG_VERSION:=2.0.14 +PKG_VERSION:=2.0.15 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.haproxy.org/download/2.0/src -PKG_HASH:=552a708b8b6efd0f241f5d9fd7ad4168d37ce17cdb6dcb6239c2e519f0a63c75 +PKG_HASH:=6e21c6b92d4035ee006ef18e25f396d7e71552a6d3a1e075fa9fe59d89eaaeee PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner diff --git a/net/haproxy/get-latest-patches.sh b/net/haproxy/get-latest-patches.sh index ba8d3613c..8e50192fb 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-2.0.git -BASE_TAG=v2.0.14 +BASE_TAG=v2.0.15 TMP_REPODIR=tmprepo PATCHESDIR=patches diff --git a/net/haproxy/patches/000-BUG-MINOR-protocol_buffer-Wrong-maximum-shifting.patch b/net/haproxy/patches/000-BUG-MINOR-protocol_buffer-Wrong-maximum-shifting.patch deleted file mode 100644 index b8abc949b..000000000 --- a/net/haproxy/patches/000-BUG-MINOR-protocol_buffer-Wrong-maximum-shifting.patch +++ /dev/null @@ -1,58 +0,0 @@ -commit 41bf8a4314953769a11b0c09cbac8cc194e3923a -Author: Frédéric Lécaille -Date: Thu Apr 2 14:24:31 2020 +0200 - - BUG/MINOR: protocol_buffer: Wrong maximum shifting. - - This patch fixes a bad stop condition when decoding a protocol buffer variable integer - whose maximum lenghts are 10, shifting a uint64_t value by more than 63. - - Thank you to Ilya for having reported this issue. - - Must be backported to 2.1 and 2.0. - - (cherry picked from commit 876ed55d9b8d0c298b6cac1003ec365a19bf7aad) - Signed-off-by: Willy Tarreau - (cherry picked from commit c7a203a6c75e4efff5f3d5d675d925f11b47dba1) - Signed-off-by: Willy Tarreau - -diff --git a/include/proto/protocol_buffers.h b/include/proto/protocol_buffers.h -index 69f0bdf8..0426d83d 100644 ---- a/include/proto/protocol_buffers.h -+++ b/include/proto/protocol_buffers.h -@@ -158,7 +158,7 @@ protobuf_varint(uint64_t *val, unsigned char *pos, size_t len) - - shift += 7; - /* The maximum length in bytes of a 64-bit encoded value is 10. */ -- if (shift > 70) -+ if (shift > 63) - return 0; - } - -@@ -194,7 +194,7 @@ protobuf_decode_varint(uint64_t *val, unsigned char **pos, size_t *len) - - shift += 7; - /* The maximum length in bytes of a 64-bit encoded value is 10. */ -- if (shift > 70) -+ if (shift > 63) - return 0; - } - -@@ -227,7 +227,7 @@ protobuf_skip_varint(unsigned char **pos, size_t *len, size_t vlen) - - shift += 7; - /* The maximum length in bytes of a 64-bit encoded value is 10. */ -- if (shift > 70) -+ if (shift > 63) - return 0; - } - -@@ -263,7 +263,7 @@ protobuf_varint_getlen(unsigned char *pos, size_t len) - - shift += 7; - /* The maximum length in bytes of a 64-bit encoded value is 10. */ -- if (shift > 70) -+ if (shift > 63) - return -1; - } - diff --git a/net/haproxy/patches/001-OPENWRT-add-uclibc-support.patch b/net/haproxy/patches/000-OPENWRT-add-uclibc-support.patch similarity index 100% rename from net/haproxy/patches/001-OPENWRT-add-uclibc-support.patch rename to net/haproxy/patches/000-OPENWRT-add-uclibc-support.patch