Accepting request 1204181 from server:monitoring:zabbix

OBS-URL: https://build.opensuse.org/request/show/1204181
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zabbix?expand=0&rev=30
This commit is contained in:
Ana Guerrero 2024-09-29 16:09:55 +00:00 committed by Git OBS Bridge
commit 85c0a113a7
3 changed files with 29 additions and 2 deletions

View File

@ -0,0 +1,12 @@
diff -urEbwB zabbix-6.0.33.orig/src/zabbix_java/Makefile.am zabbix-6.0.33/src/zabbix_java/Makefile.am
--- zabbix-6.0.33.orig/src/zabbix_java/Makefile.am 2024-09-26 21:55:13.116258283 +0200
+++ zabbix-6.0.33/src/zabbix_java/Makefile.am 2024-09-26 21:58:05.924204894 +0200
@@ -18,7 +18,7 @@
$(ZJG): class src/com/zabbix/gateway/*.java
$(JAVAC) -d class/src -classpath $(LIB) src/com/zabbix/gateway/*.java
- $(JAR) cf $(ZJG) -C class/src .
+ $(JAR) --date="$$(date -u -d @$${SOURCE_DATE_EPOCH:-$$(date +%s)} +%Y-%m-%dT%H:%M:%SZ)" --create --file=$(ZJG) -C class/src .
test: class
echo "badger useruser" > tests/com/zabbix/gateway/jmx_test_beans/jmxremote.password

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Sep 26 20:26:42 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* zabbix-reproducible-jar-mtime.patch
+ Use SOURCE_DATE_EPOCH for reproducible jar mtime
+ Applied if building with Java >= 17
-------------------------------------------------------------------
Fri Sep 20 07:11:45 UTC 2024 - Boris Manojlovic <boris@steki.net>

View File

@ -42,7 +42,9 @@ Source14: zabbix-java-gateway.service
Source15: README-SSL.SUSE
Source16: system-user-zabbix.conf
# PATCH-FIX-OPENSUSE zabbix-6.0.12-netsnmp-fixes.patch fix for removed md5 auth protocol
Patch3: zabbix-6.0.12-netsnmp-fixes.patch
Patch0: zabbix-6.0.12-netsnmp-fixes.patch
# PATCH-FIX-OPENSUSE zabbix-reproducible-jar-mtime.patch reproducible jar mtime with openjdk17+
Patch1: zabbix-reproducible-jar-mtime.patch
BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel
BuildRequires: autoconf
@ -269,7 +271,12 @@ BuildArch: noarch
Zabbix users and groups required by zabbix packages
%prep
%autosetup -p0 -n zabbix-%{version}
%setup -n zabbix-%{version}
%patch -P 0 -p0
# The "--date" option was added into jar in OpenJDK 17
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0}
%patch -P 1 -p1
%endif
cp %{SOURCE6} .
# fix source & config files to respect adapted names