svn commit: r543442 - in head/net/haproxy: . files

[Dmitry Sivachenko]

Author: demon
Date: Sun Jul 26 08:01:07 2020
New Revision: 543442
URL: https://svnweb.freebsd.org/changeset/ports/543442

Log:
  Update to version 2.2.1.

Added:
  head/net/haproxy/files/patch-include-haproxy-atomic.h   (contents, props changed)
Deleted:
  head/net/haproxy/files/patch-include-common-hathreads.h
Modified:
  head/net/haproxy/Makefile
  head/net/haproxy/distinfo
  head/net/haproxy/pkg-plist

Modified: head/net/haproxy/Makefile
==============================================================================
--- head/net/haproxy/Makefile	Sun Jul 26 07:55:23 2020	(r543441)
+++ head/net/haproxy/Makefile	Sun Jul 26 08:01:07 2020	(r543442)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	haproxy
-DISTVERSION=	2.0.14
+DISTVERSION=	2.2.1
 CATEGORIES=	net www
-MASTER_SITES=	http://www.haproxy.org/download/2.0/src/
+MASTER_SITES=	http://www.haproxy.org/download/2.2/src/
 
 MAINTAINER=	demon at FreeBSD.org
 COMMENT=	Reliable, high performance TCP/HTTP load balancer

Modified: head/net/haproxy/distinfo
==============================================================================
--- head/net/haproxy/distinfo	Sun Jul 26 07:55:23 2020	(r543441)
+++ head/net/haproxy/distinfo	Sun Jul 26 08:01:07 2020	(r543442)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585832617
-SHA256 (haproxy-2.0.14.tar.gz) = 552a708b8b6efd0f241f5d9fd7ad4168d37ce17cdb6dcb6239c2e519f0a63c75
-SIZE (haproxy-2.0.14.tar.gz) = 2651320
+TIMESTAMP = 1595750211
+SHA256 (haproxy-2.2.1.tar.gz) = 536552af1316807c01de727ad3dac84b3a2f5285db32e9bfdfe234e47ff9d124
+SIZE (haproxy-2.2.1.tar.gz) = 2868436

Added: head/net/haproxy/files/patch-include-haproxy-atomic.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/haproxy/files/patch-include-haproxy-atomic.h	Sun Jul 26 08:01:07 2020	(r543442)
@@ -0,0 +1,11 @@
+--- include/haproxy/atomic.h.orig	2018-02-17 18:17:22.219400000 +0000
++++ include/haproxy/atomic.h	2018-02-17 18:18:44.598422000 +0000
+@@ -104,7 +104,7 @@ extern THREAD_LOCAL unsigned long tid_bit; /* The bit 
+ /* TODO: thread: For now, we rely on GCC builtins but it could be a good idea to
+  * have a header file regrouping all functions dealing with threads. */
+ 
+-#if defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)
++#if (defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)) || (defined(__clang__) && defined(__i386__))
+ /* gcc < 4.7 */
+ 
+ #define HA_ATOMIC_ADD(val, i)        __sync_add_and_fetch(val, i)

Modified: head/net/haproxy/pkg-plist
==============================================================================
--- head/net/haproxy/pkg-plist	Sun Jul 26 07:55:23 2020	(r543441)
+++ head/net/haproxy/pkg-plist	Sun Jul 26 08:01:07 2020	(r543442)
@@ -46,6 +46,8 @@ sbin/haproxy
 %%PORTDOCS%%%%DOCSDIR%%/internals/http-cookies.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/http-docs.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/http-parsing.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/htx-api.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/initcalls.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/list.fig
 %%PORTDOCS%%%%DOCSDIR%%/internals/listener-states.fig
 %%PORTDOCS%%%%DOCSDIR%%/internals/listener-states.png
@@ -58,6 +60,7 @@ sbin/haproxy
 %%PORTDOCS%%%%DOCSDIR%%/internals/polling-states.fig
 %%PORTDOCS%%%%DOCSDIR%%/internals/repartition-be-fe-fi.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/sequence.fig
+%%PORTDOCS%%%%DOCSDIR%%/internals/ssl_cert.dia
 %%PORTDOCS%%%%DOCSDIR%%/internals/stats-v2.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/stream-sock-states.fig
 %%PORTDOCS%%%%DOCSDIR%%/intro.txt