[arch-commits] Commit in zabbix/trunk (2 files)

[Florian Pritz]

    Date: Saturday, November 3, 2018 @ 16:10:44
  Author: bluewind
Revision: 337779

upgpkg: zabbix 4.0.1-1

upstream update

Modified:
  zabbix/trunk/PKGBUILD
Deleted:
  zabbix/trunk/patch_set_max_version_tls12_for_30.patch

------------------------------------------+
 PKGBUILD                                 |   11 +-----
 patch_set_max_version_tls12_for_30.patch |   51 -----------------------------
 2 files changed, 3 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-03 13:05:48 UTC (rev 337778)
+++ PKGBUILD	2018-11-03 16:10:44 UTC (rev 337779)
@@ -3,21 +3,19 @@
 
 pkgbase=zabbix
 pkgname=(zabbix-server zabbix-agent zabbix-proxy zabbix-frontend-php)
-pkgver=4.0.0
-pkgrel=3
+pkgver=4.0.1
+pkgrel=1
 arch=(x86_64)
 url='https://www.zabbix.com/'
 license=(GPL)
 makedepends=(postgresql-libs libxml2 unixodbc net-snmp libmariadbclient libldap libevent)
 source=(https://downloads.sourceforge.net/sourceforge/zabbix/zabbix-${pkgver}.tar.gz
-        patch_set_max_version_tls12_for_30.patch
 		remove-tests.patch
         zabbix-agent.{service,sysusers,tmpfiles}
 	zabbix-server{-mysql,-pgsql}.service zabbix-server.{sysusers,tmpfiles}
 	zabbix-proxy{-sqlite,-mysql,-pgsql}.service zabbix-proxy.{sysusers,tmpfiles})
 
-sha512sums=('f9938be2ca1b422c548c34e9eae096e72f331d281c03d541809f05f7fa208e7cf892f95afadb5f9ff07b2a0c9ed5c33ba2a4d1a97a155765ba054a0a6e386eac'
-            'f462858026417e0e95efc64a07838674c2eebac88ac83af8dfe7d13a3f3a8a5060c89e3420e7ba02a33a2c4eb3ec47d9af13fa8e5eca45c2a4eca40c8aa92951'
+sha512sums=('431cb75c62c64e0907cccad6633fe07a66fbaaf8595ca33add6de98a3f79832dd87c23ddaffada796a67055cbdef6d2e5d9c6427498518080205d5ddcd5fbdca'
             '259872d1cf2bea21a00ead981aa595ca9df64bd3698ec0cf257d812862b9ccab58b9e06f53ed2dacc7eb10260aa878edf593ba3e2425347b7d221dddf2134b64'
             '8c1fa2676bc0ef91bc39ec5f97b4d3ba5c365d063420455a3785121a54e120bc5afeacde42a48f4509c115f940dcc3b6c2f43044a7fbfb421182fc93b22a2444'
             '3ab3ac1acc7e35c8896157aef601ebc30815237ac5252cbd0c1ecb26eeaf9eccf5c49938ae8c85bb79a6f95f607f082f6b80ed660829599ec03aa626cca6d3dc'
@@ -39,9 +37,6 @@
     -e 's/# LogType=file/LogType=system/' \
     conf/zabbix_{agentd,proxy,server}.conf
 
-  # Temporary fix for compatibility with openssl 1.1.1 https://support.zabbix.com/browse/ZBX-14856
-  patch -p0 -i "$srcdir/patch_set_max_version_tls12_for_30.patch"
-
   # remove tests from configure.ac because that part makes automake fail
   patch -p1 -i "$srcdir/remove-tests.patch"
 

Deleted: patch_set_max_version_tls12_for_30.patch
===================================================================
--- patch_set_max_version_tls12_for_30.patch	2018-11-03 13:05:48 UTC (rev 337778)
+++ patch_set_max_version_tls12_for_30.patch	2018-11-03 16:10:44 UTC (rev 337779)
@@ -1,51 +0,0 @@
-Index: src/libs/zbxcrypto/tls.c
-===================================================================
---- src/libs/zbxcrypto/tls.c	(revision 85017)
-+++ src/libs/zbxcrypto/tls.c	(working copy)
-@@ -127,6 +127,7 @@
- #define TLS_client_method				TLSv1_2_client_method
- #define SSL_CTX_get_ciphers(ciphers)			((ciphers)->cipher_list)
- #define SSL_CTX_set_min_proto_version(ctx, TLSv)	1
-+#define SSL_CTX_set_max_proto_version(ctx, TLSv)	1
- 
- static int	OPENSSL_init_ssl(int opts, void *settings)
- {
-@@ -3131,8 +3132,11 @@
- 		if (NULL == (ctx_cert = SSL_CTX_new(method)))
- 			goto out_method;
- 
--		if (1 != SSL_CTX_set_min_proto_version(ctx_cert, TLS1_2_VERSION))
-+		if (1 != SSL_CTX_set_min_proto_version(ctx_cert, TLS1_2_VERSION) ||
-+				1 != SSL_CTX_set_max_proto_version(ctx_cert, TLS1_2_VERSION))
-+		{
- 			goto out_method;
-+		}
- 	}
- 
- 	/* Create context for PSK-only authentication. PSK can come from configuration file (in proxy, agentd) */
-@@ -3142,8 +3146,11 @@
- 		if (NULL == (ctx_psk = SSL_CTX_new(method)))
- 			goto out_method;
- 
--		if (1 != SSL_CTX_set_min_proto_version(ctx_psk, TLS1_2_VERSION))
-+		if (1 != SSL_CTX_set_min_proto_version(ctx_psk, TLS1_2_VERSION) ||
-+				1 != SSL_CTX_set_max_proto_version(ctx_psk, TLS1_2_VERSION))
-+		{
- 			goto out_method;
-+		}
- 	}
- 
- 	/* Sometimes we need to be ready for both certificate and PSK whichever comes in. Set up a universal context */
-@@ -3153,8 +3160,11 @@
- 		if (NULL == (ctx_all = SSL_CTX_new(method)))
- 			goto out_method;
- 
--		if (1 != SSL_CTX_set_min_proto_version(ctx_all, TLS1_2_VERSION))
-+		if (1 != SSL_CTX_set_min_proto_version(ctx_all, TLS1_2_VERSION) ||
-+				1 != SSL_CTX_set_max_proto_version(ctx_all, TLS1_2_VERSION))
-+		{
- 			goto out_method;
-+		}
- 	}
- 
- 	/* 'TLSCAFile' parameter (in zabbix_server.conf, zabbix_proxy.conf, zabbix_agentd.conf) */