diff options
| author | Dmitry Sivachenko <demon@FreeBSD.org> | 2018-09-20 12:45:16 +0000 |
|---|---|---|
| committer | Dmitry Sivachenko <demon@FreeBSD.org> | 2018-09-20 12:45:16 +0000 |
| commit | 12019eaf827f05256fa58755f86cd71721e9eaef (patch) | |
| tree | 89d25b095d9945166063fc8743604458bc68e09c /net/haproxy | |
| parent | c03ecabe9180ba60c088aaffb16418134d1cd905 (diff) | |
| download | ports-12019eaf827f05256fa58755f86cd71721e9eaef.tar.gz ports-12019eaf827f05256fa58755f86cd71721e9eaef.zip | |
Update to version 1.8.14.
PR: 231475
Submitted by: David King <king.c.david@googlemail.com>
Notes
Notes:
svn path=/head/; revision=480168
Diffstat (limited to 'net/haproxy')
| -rw-r--r-- | net/haproxy/Makefile | 3 | ||||
| -rw-r--r-- | net/haproxy/distinfo | 6 | ||||
| -rw-r--r-- | net/haproxy/files/patch-fix-outofbounds | 60 |
3 files changed, 4 insertions, 65 deletions
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 53ab69e58e8e..0810dce884d1 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= haproxy -DISTVERSION= 1.8.13 -PORTREVISION= 1 +DISTVERSION= 1.8.14 CATEGORIES= net www MASTER_SITES= http://www.haproxy.org/download/1.8/src/ diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo index f2ab92919a5d..318fe3323a8b 100644 --- a/net/haproxy/distinfo +++ b/net/haproxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532977852 -SHA256 (haproxy-1.8.13.tar.gz) = 2bf5dafbb5f1530c0e67ab63666565de948591f8e0ee2a1d3c84c45e738220f1 -SIZE (haproxy-1.8.13.tar.gz) = 2063046 +TIMESTAMP = 1537447373 +SHA256 (haproxy-1.8.14.tar.gz) = b17e402578be85e58af7a3eac99b1f675953bea9f67af2e964cf8bdbd1bd3fdf +SIZE (haproxy-1.8.14.tar.gz) = 2070813 diff --git a/net/haproxy/files/patch-fix-outofbounds b/net/haproxy/files/patch-fix-outofbounds deleted file mode 100644 index 424ab013f15c..000000000000 --- a/net/haproxy/files/patch-fix-outofbounds +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/include/common/hpack-tbl.h b/include/common/hpack-tbl.h -index ffa866b..385f386 100644 ---- include/common/hpack-tbl.h -+++ include/common/hpack-tbl.h -@@ -155,7 +155,7 @@ static inline const struct hpack_dte *hpack_get_dte(const struct hpack_dht *dht, - } - - /* returns non-zero if <idx> is valid for table <dht> */ --static inline int hpack_valid_idx(const struct hpack_dht *dht, uint16_t idx) -+static inline int hpack_valid_idx(const struct hpack_dht *dht, uint32_t idx) - { - return idx < dht->used + HPACK_SHT_SIZE; - } -@@ -181,7 +181,7 @@ static inline struct ist hpack_get_value(const struct hpack_dht *dht, const stru - } - - /* takes an idx, returns the associated name */ --static inline struct ist hpack_idx_to_name(const struct hpack_dht *dht, int idx) -+static inline struct ist hpack_idx_to_name(const struct hpack_dht *dht, uint32_t idx) - { - const struct hpack_dte *dte; - -@@ -196,7 +196,7 @@ static inline struct ist hpack_idx_to_name(const struct hpack_dht *dht, int idx) - } - - /* takes an idx, returns the associated value */ --static inline struct ist hpack_idx_to_value(const struct hpack_dht *dht, int idx) -+static inline struct ist hpack_idx_to_value(const struct hpack_dht *dht, uint32_t idx) - { - const struct hpack_dte *dte; - -diff --git a/src/hpack-dec.c b/src/hpack-dec.c -index dfbcaff..99d40f9 100644 ---- src/hpack-dec.c -+++ src/hpack-dec.c -@@ -110,7 +110,7 @@ static inline int hpack_idx_to_phdr(uint32_t idx) - * allocated there. In case of allocation failure, returns a string whose - * pointer is NULL. - */ --static inline struct ist hpack_alloc_string(struct chunk *store, int idx, struct ist in) -+static inline struct ist hpack_alloc_string(struct chunk *store, uint32_t idx, struct ist in) - { - struct ist out; - -diff --git a/src/hpack-tbl.c b/src/hpack-tbl.c -index 9d6b764..e2d4426 100644 ---- src/hpack-tbl.c -+++ src/hpack-tbl.c -@@ -113,7 +113,7 @@ static inline unsigned int hpack_dht_get_tail(const struct hpack_dht *dht) - /* dump the whole dynamic header table */ - static void hpack_dht_dump(const struct hpack_dht *dht) - { -- int i; -+ unsigned int i; - unsigned int slot; - char name[4096], value[4096]; - --- -1.7.12.1 - |