Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package syslog-ng for openSUSE:Factory checked in at 2024-10-11 17:02:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syslog-ng (Old) and /work/SRC/openSUSE:Factory/.syslog-ng.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "syslog-ng" Fri Oct 11 17:02:34 2024 rev:133 rq:1207024 version:4.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/syslog-ng/syslog-ng.changes 2024-10-10 22:11:15.457720275 +0200 +++ /work/SRC/openSUSE:Factory/.syslog-ng.new.19354/syslog-ng.changes 2024-10-11 17:02:44.775753574 +0200 @@ -8,0 +9,8 @@ +Thu Sep 26 14:27:29 UTC 2024 - Fridrich Strba <[email protected]> + +- Added patch: + * syslog-ng-reproducible-jar-mtime.patch + + Use SOURCE_DATE_EPOCH for reproducible jar mtime + + Applied if building with Java >= 17 + +------------------------------------------------------------------- New: ---- syslog-ng-reproducible-jar-mtime.patch BETA DEBUG BEGIN: New:- Added patch: * syslog-ng-reproducible-jar-mtime.patch + Use SOURCE_DATE_EPOCH for reproducible jar mtime BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslog-ng.spec ++++++ --- /var/tmp/diff_new_pack.Y3Kqw4/_old 2024-10-11 17:02:46.707835415 +0200 +++ /var/tmp/diff_new_pack.Y3Kqw4/_new 2024-10-11 17:02:46.715835754 +0200 @@ -99,6 +99,7 @@ Source2: syslog-ng.conf.default Source3: syslog-ng.service Source4: syslog-ng-service-prepare +Patch0: syslog-ng-reproducible-jar-mtime.patch BuildRequires: bison BuildRequires: flex BuildRequires: gcc-c++ @@ -144,7 +145,10 @@ BuildRequires: libdbi-devel %endif %if %{with java} +BuildRequires: autoconf +BuildRequires: automake BuildRequires: java-devel >= 1.8 +BuildRequires: libtool %endif %if %{with python} BuildRequires: python3-PyYAML @@ -378,6 +382,12 @@ %prep %setup -q -n syslog-ng-%{version} +%if %{with java} +# The "--date" option was added into jar in OpenJDK 17 +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0} +%patch -P 0 -p1 +%endif +%endif # fill out placeholders in the config, # systemd service and prepare script. for file in \ @@ -400,7 +410,9 @@ # touch -r lib/cfg-grammar.y lib/merge-grammar.py %build -#autoreconf -fi +%if %{with java} +autoreconf -fi +%endif ## ## build #################################################### ## ++++++ syslog-ng-reproducible-jar-mtime.patch ++++++ --- syslog-ng-4.8.0/modules/java/Makefile.am 2024-09-26 14:12:20.123899971 +0200 +++ syslog-ng-4.8.0/modules/java/Makefile.am 2024-09-26 14:17:32.826283221 +0200 @@ -50,7 +50,8 @@ java-binaries: $(SYSLOG_NG_CORE_JAR) $(SYSLOG_NG_CORE_JAR): $(JAVA_CLASS_FILES) $(SYSLOG_NG_CORE_LIBS_DIR) - $(AM_V_GEN)$(JAR) cvf $(SYSLOG_NG_CORE_JAR) -C $(SYSLOG_NG_CORE_CLASSES_DIR) . + $(AM_V_GEN)$(JAR) --date="$$(date -u -d @$${SOURCE_DATE_EPOCH:-$$(date +%s)} +%Y-%m-%dT%H:%M:%SZ)" \ + --create --verbose --file=$(SYSLOG_NG_CORE_JAR) -C $(SYSLOG_NG_CORE_CLASSES_DIR) . $(SYSLOG_NG_CORE_LIBS_DIR) $(SYSLOG_NG_CORE_CLASSES_DIR) $(SYSLOG_NG_CORE_PACKAGE_DIR) $(JAVA_BUILDDIR): mkdir -p $@
