Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2019-07-24 20:50:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nut" Wed Jul 24 20:50:51 2019 rev:65 rq:718293 version:2.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/nut/nut.changes 2018-11-28 11:14:13.154829745 +0100 +++ /work/SRC/openSUSE:Factory/.nut.new.4126/nut.changes 2019-07-24 20:50:52.338448738 +0200 @@ -1,0 +2,12 @@ +Wed Jul 24 14:16:00 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Add patch to fix build on TW: + * nutscanner-ftbfs.patch + +------------------------------------------------------------------- +Wed Jul 24 13:25:06 UTC 2019 - [email protected] + +- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by + firewalld, see [1]. + +------------------------------------------------------------------- Old: ---- nut.firewall.in New: ---- nutscanner-ftbfs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nut.spec ++++++ --- /var/tmp/diff_new_pack.lFA9fs/_old 2019-07-24 20:50:54.402448423 +0200 +++ /var/tmp/diff_new_pack.lFA9fs/_new 2019-07-24 20:50:54.446448417 +0200 @@ -1,7 +1,7 @@ # # spec file for package nut # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,7 +42,6 @@ Url: http://www.networkupstools.org/ Source: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz Source2: README.SUSE -Source5: nut.firewall.in Source6: nut.system-sleep Source7: nut.sleep Source8: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz.sig @@ -60,6 +59,7 @@ Patch11: openssl-1_1.patch Patch12: nut-upssched.patch Patch13: reproducible.patch +Patch14: nutscanner-ftbfs.patch BuildRequires: apache2-devel BuildRequires: asciidoc BuildRequires: avahi-devel @@ -167,7 +167,7 @@ %prep %setup -q -cp -a %{SOURCE2} %{SOURCE5} %{SOURCE6} %{SOURCE7} . +cp -a %{SOURCE2} %{SOURCE6} %{SOURCE7} . %patch0 %patch3 %patch7 -p1 @@ -177,6 +177,7 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 sed -i s/@now@/`date -r ChangeLog +%%Y-%%m-%%d`/g docs/docinfo.xml.in sed -i s:%{_prefix}/local/ups/bin:/bin: conf/upssched.conf.sample.in @@ -207,11 +208,6 @@ # does not create reproducible output with parallelism make -j1 -PORT=$(sed -n 's/#define PORT //p' config.log) -if test "$PORT" = 3493 ; then - PORT=nut -fi -sed s/@PORT@/$PORT/ <nut.firewall.in >nut.firewall %install %make_install @@ -227,8 +223,6 @@ install -m 644 scripts/logrotate/nutlogd %{buildroot}%{_sysconfdir}/logrotate.d/nut mkdir -p %{buildroot}%{STATEPATH} rename .sample "" %{buildroot}%{_sysconfdir}/ups/*.sample -mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services -cp nut.firewall %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nut install -d %{buildroot}%{_libexecdir}/systemd/system-sleep install nut.system-sleep %{buildroot}%{_libexecdir}/systemd/system-sleep/%{name}.sh @@ -301,7 +295,6 @@ %exclude %{_mandir}/man8/snmp-ups*.* %dir %{_libexecdir}/ups %{_sbindir}/* -%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nut %{_udevrulesdir}/*.rules %config(noreplace) %{CONFPATH}/hosts.conf %config(noreplace) %attr(600,%{NUT_USER},root) %{CONFPATH}/upsd.conf ++++++ nutscanner-ftbfs.patch ++++++ commit 5d98d5536699222bc93c58c1e6f6df43dc9bfcff Author: Arnaud Quette <[email protected]> Date: Thu Mar 10 14:41:40 2016 +0100 Fix nut-scanner compilation in some environments Following the commits 5187dab (common: add some string-related functions) and e767df5 (common: consolidate some string-related functions), the build rules of nut-scanner were not updated to also use str.c. Since the libcommon.la dependency was still there, some environments managed to build cleanly, while other are failing. Update build dependencies to fix this situation diff --git a/tools/nut-scanner/Makefile.am b/tools/nut-scanner/Makefile.am index 558cb23b..db85c682 100644 --- a/tools/nut-scanner/Makefile.am +++ b/tools/nut-scanner/Makefile.am @@ -14,14 +14,14 @@ libnutscan_la_SOURCES = scan_nut.c scan_ipmi.c \ scan_avahi.c scan_eaton_serial.c nutscan-serial.c \ ../../drivers/serial.c \ ../../drivers/bcmxcp_ser.c \ - ../../common/common.c + ../../common/common.c ../../common/str.c libnutscan_la_LIBADD = $(NETLIBS) $(LIBLTDL_LIBS) libnutscan_la_LDFLAGS = $(SERLIBS) -version-info 1:0:0 libnutscan_la_CFLAGS = -I$(top_srcdir)/clients -I$(top_srcdir)/include $(LIBLTDL_CFLAGS) -I$(top_srcdir)/drivers nut_scanner_SOURCES = nut-scanner.c nut_scanner_CFLAGS = -I$(top_srcdir)/clients -I$(top_srcdir)/include -nut_scanner_LDADD = libnutscan.la ../../common/libcommon.la +nut_scanner_LDADD = libnutscan.la if WITH_SSL libnutscan_la_CFLAGS += $(LIBSSL_CFLAGS)
