From 5da0a2b91019d3aeed0d06d913f1c3ae7527c7d3 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 9 Dec 2022 19:54:24 +0100 Subject: [PATCH] Zabbix patch for building zabbix-{server,proxy} packages --- fedora/SPECS/cjose.spec | 8 ++++++-- fedora/SPECS/zabbix-spec.patch | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 fedora/SPECS/zabbix-spec.patch diff --git a/fedora/SPECS/cjose.spec b/fedora/SPECS/cjose.spec index 36c3a28..45a4969 100644 --- a/fedora/SPECS/cjose.spec +++ b/fedora/SPECS/cjose.spec @@ -11,7 +11,7 @@ Patch1: concatkdf.patch BuildRequires: gcc BuildRequires: doxygen -BuildRequires: openssl-devel +BuildRequires: openssl1.1-devel BuildRequires: jansson-devel BuildRequires: check-devel @@ -62,7 +62,11 @@ make check || (cat test/test-suite.log; exit 1) %changelog -* Fri May 25 2021 Daniel Steiner +* Fri Nov 25 2022 Daniel Steiner +- OpenSSL requirement is 1.1 not 3.0 +- First build for Fedora 37. + +* Fri May 28 2021 Daniel Steiner - First build for Fedora 34. * Sat Oct 31 2020 Daniel Steiner diff --git a/fedora/SPECS/zabbix-spec.patch b/fedora/SPECS/zabbix-spec.patch new file mode 100644 index 0000000..1cad99f --- /dev/null +++ b/fedora/SPECS/zabbix-spec.patch @@ -0,0 +1,24 @@ +--- zabbix.spec.orig 2022-12-09 19:48:39.002443430 +0100 ++++ zabbix.spec 2022-12-09 19:48:48.360384315 +0100 +@@ -77,6 +77,21 @@ + %{!?build_selinux_policy: %global build_selinux_policy 1} + %endif + ++# overwrites: ++%global build_frontend 1 ++%global build_agent2 1 ++%global build_agent 1 ++%global build_web_service 1 ++%global build_java_gateway 1 ++%global build_with_mysql 1 ++%global build_with_pgsql 1 ++%global build_with_sqlite 1 ++%global build_server 1 ++%global build_proxy 1 ++BuildRequires: mysql-connector-odbc postgresql-odbc unixODBC unixODBC-devel ++BuildRequires: libssh2-devel net-snmp-devel postgresql-server-devel ++# end owerwrite ++ + # FIXME: Building debuginfo is broken on RHEL 5 & 8. Disabled for now. + %if 0%{?rhel} <= 5 || 0%{?rhel} >= 8 + %define debug_package %{nil}