[arch-commits] Commit in zabbix/trunk (PKGBUILD remove-tests.patch)

[Florian Pritz]

    Date: Tuesday, October 2, 2018 @ 09:52:58
  Author: bluewind
Revision: 335645

upgpkg: zabbix 4.0.0-2

bring back openssl 1.1 patch and make autoreconf work again

Added:
  zabbix/trunk/remove-tests.patch
Modified:
  zabbix/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   14 +++++++++++++-
 remove-tests.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-02 09:25:49 UTC (rev 335644)
+++ PKGBUILD	2018-10-02 09:52:58 UTC (rev 335645)
@@ -4,17 +4,21 @@
 pkgbase=zabbix
 pkgname=(zabbix-server zabbix-agent zabbix-proxy zabbix-frontend-php)
 pkgver=4.0.0
-pkgrel=1
+pkgrel=2
 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})
 
 sha256sums=('5673e106156102aff8c6781a890da6cedfc975cf13d96d8749b4c7126f426bc7'
+            '8e419efc3848b88bf9f05f957c8096af6f5ceb98e06253b1ca9c6993434b9b38'
+            '5b3867907a8b6c3dda57f0658ced184273fa099aef7fcfc3efd312218e5b280f'
             '484fa9969eab61eaf20043ae08e2615c0569982dff869c985f2e2065da698c6a'
             'ef23133aae2340945e621c9725094a3458d9089d3de15f641afcdabdf7c5a39c'
             'c38a871d237b00dd6310dfb02e5a8e1b930e445204e73dde8305bed8baf380ec'
@@ -34,6 +38,14 @@
     -e '/^LogFile=.*/d' \
     -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"
+
+  autoreconf -fi
 }
 
 build() {

Added: remove-tests.patch
===================================================================
--- remove-tests.patch	                        (rev 0)
+++ remove-tests.patch	2018-10-02 09:52:58 UTC (rev 335645)
@@ -0,0 +1,29 @@
+diff -Nur zabbix-4.0.0-orig/configure.ac zabbix-4.0.0/configure.ac
+--- zabbix-4.0.0-orig/configure.ac	2018-10-01 10:36:02.000000000 +0200
++++ zabbix-4.0.0/configure.ac	2018-10-02 11:44:59.818887035 +0200
+@@ -1714,25 +1714,6 @@
+ dnl *                                                               *
+ dnl *****************************************************************
+ 
+-if test -d tests; then
+-	AC_CONFIG_FILES(
+-	tests/Makefile
+-	tests/libs/Makefile
+-	tests/libs/zbxcommon/Makefile
+-	tests/libs/zbxconf/Makefile
+-	tests/libs/zbxdbcache/Makefile
+-	tests/libs/zbxdbhigh/Makefile
+-	tests/libs/zbxhistory/Makefile
+-	tests/libs/zbxjson/Makefile
+-	tests/libs/zbxsysinfo/Makefile
+-	tests/libs/zbxsysinfo/linux/Makefile
+-	tests/libs/zbxsysinfo/common/Makefile
+-	tests/libs/zbxcommshigh/Makefile
+-	tests/libs/zbxalgo/Makefile
+-	)
+-	AC_DEFINE([HAVE_TESTS], [1], ["Define to 1 if tests directory is present"])
+-fi
+-
+ AC_OUTPUT([
+ 	Makefile
+ 	database/Makefile