pool/nut
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 718280 from home:mgerstner:branches:hardware

Browse Source 
Okay, this time it should be right. The remaining build error was there before
...

- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by
  firewalld, see [1].

OBS-URL: https://build.opensuse.org/request/show/718280
OBS-URL: https://build.opensuse.org/package/show/hardware/nut?expand=0&rev=86
This commit is contained in:
Tomáš Chvátal 2019-07-24 14:08:52 +00:00 committed by Git OBS Bridge
parent 9d2ebcb160
commit df267f35fa
3 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nut.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jul 24 13:25:06 UTC 2019 - matthias.gerstner@suse.com
- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by
firewalld, see [1].
-------------------------------------------------------------------
Tue Nov 27 09:19:23 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>

17
nut.firewall.in
View File

@ -1,17 +0,0 @@
## Name: Network UPS Tools
## Description: Opens ports for remote UPS signalling for Network UPS Tools.
# space separated list of allowed TCP ports
TCP="@PORT@"
# space separated list of allowed UDP ports
UDP="@PORT@"
# space separated list of allowed RPC services
RPC=""
# space separated list of allowed IP protocols
IP=""
# space separated list of allowed UDP broadcast ports
BROADCAST=""

13
nut.spec
View File

@ -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 @@ Group: Hardware/UPS
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
@ -167,7 +166,7 @@ interface for monitoring and administering UPS hardware.
%prep
%setup -q
cp -a %{SOURCE2} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
cp -a %{SOURCE2} %{SOURCE6} %{SOURCE7} .
%patch0
%patch3
%patch7 -p1
@ -207,11 +206,6 @@ autoreconf -fvi
# 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 +221,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
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 +293,6 @@ udevadm trigger --subsystem-match=usb --property-match=DEVTYPE=usb_device
%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