[packages/nut] - up to 2.7.4

Fri Jul 28 12:08:40 CEST 2017

commit 8cf75cf67a20eb6a674b7103cce9da9f5086364e
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Jul 28 12:08:32 2017 +0200

    - up to 2.7.4

 nut-build.patch         | 11 +++++++++++
 nut-config.patch        | 16 ++--------------
 nut.spec                | 12 +++++++-----
 systemd-sysconfig.patch |  5 ++---
 4 files changed, 22 insertions(+), 22 deletions(-)
---

diff --git a/nut.spec b/nut.spec
index a8cad66..e32c48e 100644
--- a/nut.spec
+++ b/nut.spec
@@ -10,12 +10,12 @@
 Summary:	Network UPS Tools
 Summary(pl.UTF-8):	Sieciowe narzędzie do UPS-ów
 Name:		nut
-Version:	2.7.2
-Release:	4
+Version:	2.7.4
+Release:	1
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz
-# Source0-md5:	c3568b42e058cfc385b46d25140dced4
+# Source0-md5:	3ba53656933d7471f95140b32a5b8d5c
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}-upsmon.init
@@ -27,6 +27,7 @@ Patch3:		%{name}-upssched-cmd-sysconf.patch
 Patch4:		%{name}-matrix.patch
 Patch5:		systemd-sysconfig.patch
 Patch6:		bcmxcp-off-by-one.patch
+Patch7:		%{name}-build.patch
 URL:		http://www.networkupstools.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -184,6 +185,7 @@ Plik wynikowy oraz nagłówek służące do tworzenia klientów NUT-a.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -233,7 +235,7 @@ for i in $RPM_BUILD_ROOT%{_sysconfdir}/*.sample; do
 	mv -f $i ${i%.sample}
 done
 
-%{!?with_usb:rm -f $RPM_BUILD_ROOT%{_udevrulesdir}/52-nut-usbups.rules}
+%{!?with_usb:rm -f $RPM_BUILD_ROOT%{_udevrulesdir}/62-nut-usbups.rules}
 
 cat > $RPM_BUILD_ROOT/sbin/poweroff-ups << EOF
 #!/bin/sh
@@ -451,7 +453,7 @@ fi
 %{?with_usb:%{_mandir}/man8/tripplite_usb.8*}
 %{?with_usb:%{_mandir}/man8/usbhid-ups.8*}
 %{_mandir}/man8/victronups.8*
-%{?with_usb:%config(noreplace) %verify(not md5 mtime size) %{_udevrulesdir}/52-nut-usbups.rules}
+%{?with_usb:%config(noreplace) %verify(not md5 mtime size) %{_udevrulesdir}/62-nut-usbups.rules}
 %config(noreplace) %verify(not md5 mtime size) %{_udevrulesdir}/52-nut-ipmipsu.rules
 
 %files common
diff --git a/nut-build.patch b/nut-build.patch
new file mode 100644
index 0000000..10b2f57
--- /dev/null
+++ b/nut-build.patch
@@ -0,0 +1,11 @@
+--- nut-2.7.4/tools/nut-scanner/Makefile.am~	2015-12-29 13:08:34.000000000 +0100
++++ nut-2.7.4/tools/nut-scanner/Makefile.am	2017-07-28 12:01:22.623458373 +0200
+@@ -15,7 +15,7 @@ libnutscan_la_SOURCES = scan_nut.c scan_
+ 			../../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
+ 
diff --git a/nut-config.patch b/nut-config.patch
index f655eec..7efbc4e 100644
--- a/nut-config.patch
+++ b/nut-config.patch
@@ -1,15 +1,3 @@
-diff -Nuard nut-2.0.1.orig/conf/upsmon.conf nut-2.0.1/conf/upsmon.conf
---- nut-2.0.1.orig/conf/upsmon.conf	2004-10-26 11:50:12.410074640 +0200
-+++ nut-2.0.1/conf/upsmon.conf.sample	2004-10-26 11:51:12.681911928 +0200
-@@ -27,7 +27,7 @@
- #
- # This user should not have write access to upsmon.conf.
- #
--# RUN_AS_USER nut
-+# RUN_AS_USER ups
- 
- # --------------------------------------------------------------------------
- # MONITOR <system> <powervalue> <username> <password> ("master"|"slave")
 diff -Nuard nut-2.0.1.orig/conf/upssched.conf nut-2.0.1/conf/upssched.conf
 --- nut-2.0.1.orig/conf/upssched.conf	2004-10-26 11:50:12.410074640 +0200
 +++ nut-2.0.1/conf/upssched.conf.sample.in	2004-10-26 11:50:23.295419816 +0200
@@ -52,12 +40,12 @@ diff -Nuard nut-2.0.1.orig/conf/upssched.conf nut-2.0.1/conf/upssched.conf
 +# AT COMMBAD * START-TIMER upsgone 10
 +# AT COMMOK * CANCEL-TIMER upsgone
 --- nut-2.2.0/conf/upsmon.conf.sample.orig	2007-07-26 11:15:08.152047877 +0000
-+++ nut-2.2.0/conf/upsmon.conf.sample	2007-07-26 11:17:20.131913520 +0000
++++ nut-2.2.0/conf/upsmon.conf.sample.in	2007-07-26 11:17:20.131913520 +0000
 @@ -126,7 +126,7 @@
  # information and ideas, see pager.txt in the docs directory.
  #
  # Example:
--# NOTIFYCMD /usr/local/ups/bin/notifyme
+-# NOTIFYCMD @BINDIR@/notifyme
 +# NOTIFYCMD /usr/sbin/upssched
  
  # --------------------------------------------------------------------------
diff --git a/systemd-sysconfig.patch b/systemd-sysconfig.patch
index 2f543dc..1eb43d9 100644
--- a/systemd-sysconfig.patch
+++ b/systemd-sysconfig.patch
@@ -24,14 +24,13 @@
  
 --- nut-2.6.5/configure.ac~	2012-08-06 14:37:36.000000000 +0200
 +++ nut-2.6.5/configure.ac	2013-01-13 12:42:30.807862312 +0100
-@@ -986,9 +986,8 @@
+@@ -1066,7 +1066,7 @@ dnl Override installation directory, wit
  dnl prefix. This is needed for 'distcheck*' targets, otherwise
  dnl files will try to get intalled to the actual system directories
  if test -n "${systemdsystemunitdir}"; then
 -	systemdsystemshutdowndir="${libdir}/systemd/system-shutdown"
 +	systemdsystemshutdowndir="/lib/systemd/system-shutdown"
  	AC_MSG_RESULT(using ${systemdsystemunitdir})
--	systemdsystemunitdir="`echo ${systemdsystemunitdir} | sed 's/\/lib/\${libdir}/'`"
  else
  	AC_MSG_RESULT(no)
- fi
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nut.git/commitdiff/8cf75cf67a20eb6a674b7103cce9da9f5086364e

