[packages/nut] Up to 2.8.0.

arekm arekm at pld-linux.org
Fri Jul 22 13:04:55 CEST 2022 

commit 50b474b5f2d9a26fd2f8001d80b9c594590b9484
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Jul 22 13:04:33 2022 +0200

    Up to 2.8.0.

 nut-build.patch                | 11 --------
 nut-client.patch               | 12 ---------
 nut-config.patch               | 18 ++++++-------
 nut-i2c.patch                  | 39 ----------------------------
 nut-upssched-cmd-sysconf.patch | 13 +++++-----
 nut.spec                       | 58 +++++++++++++++++++++++++++---------------
 openssl.patch                  | 33 ------------------------
 systemd-sysconfig.patch        | 46 ++++++++++++++-------------------
 8 files changed, 71 insertions(+), 159 deletions(-)
---
diff --git a/nut.spec b/nut.spec
index f9cd678..00722f3 100644
--- a/nut.spec
+++ b/nut.spec
@@ -13,26 +13,23 @@
 Summary:	Network UPS Tools
 Summary(pl.UTF-8):	Sieciowe narzędzie do UPS-ów
 Name:		nut
-Version:	2.7.4
-Release:	11
+Version:	2.8.0
+Release:	1
 License:	GPL v2+
 Group:		Applications/System
-Source0:	http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz
-# Source0-md5:	3ba53656933d7471f95140b32a5b8d5c
+Source0:	http://www.networkupstools.org/source/2.8/%{name}-%{version}.tar.gz
+# Source0-md5:	7500dd088676bf0913318a87c36e89cd
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}-upsmon.init
 Source4:	%{name}.sysconfig.upsmon
-Patch0:		%{name}-client.patch
+
 Patch1:		%{name}-config.patch
 Patch2:		%{name}-smartdp-load.patch
 Patch3:		%{name}-upssched-cmd-sysconf.patch
 Patch4:		%{name}-matrix.patch
 Patch5:		systemd-sysconfig.patch
 Patch6:		bcmxcp-off-by-one.patch
-Patch7:		%{name}-build.patch
-Patch8:		%{name}-i2c.patch
-Patch9:		openssl.patch
 URL:		http://www.networkupstools.org/
 BuildRequires:	asciidoc >= 8.6.3
 BuildRequires:	autoconf >= 2.60
@@ -44,7 +41,7 @@ BuildRequires:	avahi-devel >= 0.6.30
 BuildRequires:	libltdl-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
-%{?with_usb:BuildRequires:	libusb-compat-devel}
+%{?with_usb:BuildRequires:	libusb-devel}
 BuildRequires:	libwrap-devel
 BuildRequires:	libxml2-progs >= 2
 BuildRequires:	libxslt-progs
@@ -201,16 +198,13 @@ Statyczne biblioteki NUT-a.
 
 %prep
 %setup -q
-%patch0 -p1
+
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
 %build
 %{__libtoolize}
@@ -226,6 +220,7 @@ export CXXFLAGS="%{rpmcxxflags} -std=c++11"
 	--with-htmlpath=%{_datadir}/%{name}/html \
 	--with-statepath=%{_var}/lib/ups \
 	--with-systemdsystemunitdir=%{systemdunitdir} \
+	--with-systemdshutdowndir=%{systemdunitdir}-shutdown \
 	%{?with_usb:--with-udev-dir=/etc/udev} \
 	--with-group=ups \
 	--with-user=ups \
@@ -342,8 +337,9 @@ fi
 %attr(755,root,root) %{_bindir}/upsrw
 %attr(755,root,root) %{_sbindir}/upsd
 %attr(755,root,root) %{_sbindir}/upsdrvctl
+%attr(755,root,root) %{_sbindir}/upsdrvsvcctl
 %attr(755,root,root) /sbin/poweroff-ups
-%attr(755,root,root) %ghost %{_libdir}/libnutscan.so.1
+%attr(755,root,root) %ghost %{_libdir}/libnutscan.so.2
 %attr(755,root,root) %{_libdir}/libnutscan.so.*.*.*
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ups
 %attr(754,root,root) /etc/rc.d/init.d/ups
@@ -351,18 +347,24 @@ fi
 %attr(640,root,ups) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/upsd.conf
 %attr(640,root,ups) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ups.conf
 %attr(640,root,ups) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/upsd.users
-%{systemdunitdir}/nut-driver.service
+%{systemdunitdir}/nut-driver*.service
 %{systemdunitdir}/nut-server.service
+%{systemdunitdir}/nut.target
 %{systemdunitdir}/ups.service
+%{systemdunitdir}/nut-driver-enumerator.path
+%{systemdunitdir}/nut-driver.target
+%attr(755,root,root) %{_prefix}/libexec/nut-driver-enumerator.sh
 %{_mandir}/man5/ups.conf.5*
 %{_mandir}/man5/upsd.conf.5*
 %{_mandir}/man5/upsd.users.5*
+%{_mandir}/man8/nut-driver-enumerator.8*
 %{_mandir}/man8/nut-recorder.8*
 %{_mandir}/man8/nut-scanner.8*
 %{_mandir}/man8/upscmd.8*
 %{_mandir}/man8/upscode2.8*
 %{_mandir}/man8/upsd.8*
 %{_mandir}/man8/upsdrvctl.8*
+%{_mandir}/man8/upsdrvsvcctl.8.*
 %{_mandir}/man8/upslog.8*
 %{_mandir}/man8/upsrw.8*
 %dir %attr(770,root,ups) /var/lib/ups
@@ -398,13 +400,15 @@ fi
 %attr(755,root,root) /lib/nut/mge-shut
 %attr(755,root,root) /lib/nut/mge-utalk
 %attr(755,root,root) /lib/nut/microdowell
+%attr(755,root,root) /lib/nut/microsol-apc
 %{?with_neon:%attr(755,root,root) /lib/nut/netxml-ups}
-%{?with_ipmi:%attr(755,root,root) /lib/nut/nut-ipmipsu}
+%{?with_freeipmi:%attr(755,root,root) /lib/nut/nut-ipmipsu}
+%attr(755,root,root) /lib/nut/nutdrv_siemens-sitop
 %{?with_usb:%attr(755,root,root) /lib/nut/nutdrv_atcl_usb}
 %attr(755,root,root) /lib/nut/nutdrv_qx
-%attr(755,root,root) /lib/nut/oldmge-shut
 %attr(755,root,root) /lib/nut/oneac
 %attr(755,root,root) /lib/nut/optiups
+%attr(755,root,root) /lib/nut/pijuice
 %attr(755,root,root) /lib/nut/powercom
 %{?with_powerman:%attr(755,root,root) /lib/nut/powerman-pdu}
 %attr(755,root,root) /lib/nut/powerpanel
@@ -423,6 +427,8 @@ fi
 %{?with_usb:%attr(755,root,root) /lib/nut/usbhid-ups}
 %attr(755,root,root) /lib/nut/victronups
 %dir %{_datadir}/nut
+%{systemdtmpfilesdir}/nut-common.tmpfiles
+%{_datadir}/augeas/lenses/nut*.aug
 %{_datadir}/nut/cmdvartab
 %{_datadir}/nut/driver.list
 %{_mandir}/man5/nut.conf.5*
@@ -430,6 +436,7 @@ fi
 %{_mandir}/man8/apcsmart.8*
 %{_mandir}/man8/apcsmart-old.8*
 %{_mandir}/man8/apcupsd-ups.8*
+%{_mandir}/man8/asem.8*
 %{_mandir}/man8/bcmxcp.8*
 %{?with_usb:%{_mandir}/man8/bcmxcp_usb.8*}
 %{_mandir}/man8/belkin.8*
@@ -455,13 +462,16 @@ fi
 %{_mandir}/man8/mge-shut.8*
 %{_mandir}/man8/mge-utalk.8*
 %{_mandir}/man8/microdowell.8*
+%{_mandir}/man8/microsol-apc.8*
 %{?with_neon:%{_mandir}/man8/netxml-ups.8*}
-%{?with_ipmi:%{_mandir}/man8/nut-ipmipsu.8*}
+%{?with_freeipmi:%{_mandir}/man8/nut-ipmipsu.8*}
 %{?with_usb:%{_mandir}/man8/nutdrv_atcl_usb.8*}
 %{_mandir}/man8/nutdrv_qx.8*
+%{_mandir}/man8/nutdrv_siemens_sitop.8*
 %{_mandir}/man8/nutupsdrv.8*
 %{_mandir}/man8/oneac.8*
 %{_mandir}/man8/optiups.8*
+%{_mandir}/man8/pijuice.8*
 %{_mandir}/man8/powercom.8*
 %{?with_powerman:%{_mandir}/man8/powerman-pdu.8*}
 %{_mandir}/man8/powerpanel.8*
@@ -477,16 +487,18 @@ fi
 %{?with_usb:%{_mandir}/man8/tripplite_usb.8*}
 %{?with_usb:%{_mandir}/man8/usbhid-ups.8*}
 %{_mandir}/man8/victronups.8*
-%{?with_ipmi:%config(noreplace) %verify(not md5 mtime size) %{_udevrulesdir}/52-nut-ipmipsu.rules}
+%{?with_freeipmi:%config(noreplace) %verify(not md5 mtime size) %{_udevrulesdir}/52-nut-ipmipsu.rules}
 %{?with_usb:%config(noreplace) %verify(not md5 mtime size) %{_udevrulesdir}/62-nut-usbups.rules}
 
 %files common
 %defattr(644,root,root,755)
 %doc AUTHORS MAINTAINERS NEWS README UPGRADING ChangeLog docs
 %dir %{_sysconfdir}
-%attr(755,root,root) %ghost %{_libdir}/libnutclient.so.0
+%attr(755,root,root) %ghost %{_libdir}/libnutclient.so.2
 %attr(755,root,root) %{_libdir}/libnutclient.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libupsclient.so.4
+%attr(755,root,root) %ghost %{_libdir}/libnutclientstub.so.1
+%attr(755,root,root) %{_libdir}/libnutclientstub.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libupsclient.so.6
 %attr(755,root,root) %{_libdir}/libupsclient.so.*.*.*
 
 %files client
@@ -527,13 +539,16 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnutclient.so
+%attr(755,root,root) %{_libdir}/libnutclientstub.so
 %attr(755,root,root) %{_libdir}/libupsclient.so
 %attr(755,root,root) %{_libdir}/libnutscan.so
 %{_pkgconfigdir}/libnutclient.pc
+%{_pkgconfigdir}/libnutclientstub.pc
 %{_pkgconfigdir}/libnutscan.pc
 %{_pkgconfigdir}/libupsclient.pc
 %{_includedir}/nut-scan.h
 %{_includedir}/nutclient.h
+%{_includedir}/nutclientmem.h
 %{_includedir}/nutscan-*.h
 %{_includedir}/parseconf.h
 %{_includedir}/upsclient.h
@@ -546,5 +561,6 @@ fi
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libnutclient.a
+%{_libdir}/libnutclientstub.a
 %{_libdir}/libnutscan.a
 %{_libdir}/libupsclient.a
diff --git a/nut-build.patch b/nut-build.patch
deleted file mode 100644
index 10b2f57..0000000
--- a/nut-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-client.patch b/nut-client.patch
deleted file mode 100644
index 7127715..0000000
--- a/nut-client.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp -x '*.orig' nut-2.7.4.org/clients/Makefile.am nut-2.7.4/clients/Makefile.am
---- nut-2.7.4.org/clients/Makefile.am	2015-12-29 13:08:34.000000000 +0100
-+++ nut-2.7.4/clients/Makefile.am	2021-10-05 21:27:39.927311204 +0200
-@@ -18,7 +18,7 @@ if WITH_CGI
- endif
- 
- bin_PROGRAMS = upsc upslog upsrw upscmd
--dist_bin_SCRIPTS = upssched-cmd
-+dist_sbin_SCRIPTS = upssched-cmd
- sbin_PROGRAMS = upsmon upssched
- lib_LTLIBRARIES = libupsclient.la libnutclient.la
- if WITH_DEV
diff --git a/nut-config.patch b/nut-config.patch
index e60aa73..85d01e8 100644
--- a/nut-config.patch
+++ b/nut-config.patch
@@ -1,29 +1,29 @@
 diff -urNp -x '*.orig' nut-2.7.4.org/clients/upssched-cmd nut-2.7.4/clients/upssched-cmd
 --- nut-2.7.4.org/clients/upssched-cmd	2015-12-29 09:42:34.000000000 +0100
 +++ nut-2.7.4/clients/upssched-cmd	2021-10-05 21:27:40.107312172 +0200
-@@ -14,6 +14,10 @@ case $1 in
+@@ -25,6 +25,10 @@ case $1 in
  	upsgone)
- 		logger -t upssched-cmd "The UPS has been gone for awhile"
+ 		logger -t upssched-cmd "The communication with UPS has been gone for awhile"
  		;;
-+#	EarlyShutdown)
-+#		logger -t upssched-cmd "The UPS is being shutdown by the master"
-+#		/usr/sbin/upsmon -c fsd
-+#		;;
++#      EarlyShutdown)
++#              logger -t upssched-cmd "The UPS is being shutdown by the master"
++#              /usr/sbin/upsmon -c fsd
++#              ;;
  	*)
  		logger -t upssched-cmd "Unrecognized command: $1"
  		;;
 diff -urNp -x '*.orig' nut-2.7.4.org/conf/upsmon.conf.sample.in nut-2.7.4/conf/upsmon.conf.sample.in
 --- nut-2.7.4.org/conf/upsmon.conf.sample.in	2015-12-29 13:08:34.000000000 +0100
 +++ nut-2.7.4/conf/upsmon.conf.sample.in	2021-10-05 21:27:40.107312172 +0200
-@@ -126,7 +126,7 @@ SHUTDOWNCMD "/sbin/shutdown -h +0"
- # information and ideas, see docs/scheduling.txt
+@@ -174,7 +174,7 @@ SHUTDOWNCMD "/sbin/shutdown -h +0"
+ # For more information and ideas, see docs/scheduling.txt
  #
  # Example:
 -# NOTIFYCMD @BINDIR@/notifyme
 +# NOTIFYCMD /usr/sbin/upssched
  
  # --------------------------------------------------------------------------
- # POLLFREQ <n> 
+ # POLLFREQ <n>
 @@ -261,6 +261,12 @@ POWERDOWNFLAG /etc/killpower
  # IGNORE - Don't do anything
  #
diff --git a/nut-i2c.patch b/nut-i2c.patch
deleted file mode 100644
index d7bb025..0000000
--- a/nut-i2c.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- nut-2.7.4/configure.ac.orig	2017-12-03 20:59:45.766861382 +0100
-+++ nut-2.7.4/configure.ac	2017-12-03 21:04:32.550191441 +0100
-@@ -475,14 +475,7 @@
- if test "${nut_with_linux_i2c}" != no; then
-     case ${target_os} in
-         linux* )
--            AC_CHECK_DECLS(
--                [i2c_smbus_read_word_data, i2c_smbus_write_word_data, i2c_smbus_read_block_data],
--                [nut_with_linux_i2c="yes"],
--                [nut_with_linux_i2c="no"],
--                [#include <stdio.h>
--                 #include <linux/i2c-dev.h>
--                ]
--            )
-+            AC_CHECK_LIB([i2c], [i2c_smbus_read_word_data], [nut_with_linux_i2c="yes"], [nut_with_linux_i2c="no"])
-             ;;
-         * )
-             nut_with_linux_i2c="no"
---- nut-2.7.4/drivers/asem.c.orig	2015-12-29 13:08:34.000000000 +0100
-+++ nut-2.7.4/drivers/asem.c	2017-12-03 21:08:50.156855165 +0100
-@@ -35,6 +35,7 @@
- #include <errno.h>
- #include <unistd.h>
- #include <linux/i2c-dev.h>
-+#include <i2c/smbus.h>
- 
- #include "main.h"
- 
---- nut-2.7.4/drivers/Makefile.am.orig	2016-03-08 13:01:11.000000000 +0100
-+++ nut-2.7.4/drivers/Makefile.am	2017-12-03 21:16:08.973516822 +0100
-@@ -225,7 +225,7 @@
- macosx_ups_SOURCES = macosx-ups.c
- 
- # Asem
--asem_LDADD = $(LDADD_DRIVERS)
-+asem_LDADD = $(LDADD_DRIVERS) -li2c
- asem_SOURCES = asem.c
- 
- # nutdrv_qx USB/Serial
diff --git a/nut-upssched-cmd-sysconf.patch b/nut-upssched-cmd-sysconf.patch
index 259d5f6..33e5e33 100644
--- a/nut-upssched-cmd-sysconf.patch
+++ b/nut-upssched-cmd-sysconf.patch
@@ -1,15 +1,14 @@
-diff -urNp -x '*.orig' nut-2.7.4.org/clients/Makefile.am nut-2.7.4/clients/Makefile.am
---- nut-2.7.4.org/clients/Makefile.am	2021-10-05 21:27:40.403980432 +0200
-+++ nut-2.7.4/clients/Makefile.am	2021-10-05 21:27:40.473980806 +0200
-@@ -18,7 +18,7 @@ if WITH_CGI
+--- nut-2.8.0/clients/Makefile.am~	2022-04-27 00:03:35.000000000 +0200
++++ nut-2.8.0/clients/Makefile.am	2022-07-22 12:29:47.429989350 +0200
+@@ -30,7 +30,7 @@ if WITH_CGI
  endif
  
  bin_PROGRAMS = upsc upslog upsrw upscmd
--dist_sbin_SCRIPTS = upssched-cmd
+-dist_bin_SCRIPTS = upssched-cmd
 +dist_sysconf_DATA = upssched-cmd
  sbin_PROGRAMS = upsmon upssched
- lib_LTLIBRARIES = libupsclient.la libnutclient.la
- if WITH_DEV
+ lib_LTLIBRARIES = libupsclient.la
+ if HAVE_CXX11
 diff -urNp -x '*.orig' nut-2.7.4.org/conf/upssched.conf.sample.in nut-2.7.4/conf/upssched.conf.sample.in
 --- nut-2.7.4.org/conf/upssched.conf.sample.in	2021-10-05 21:27:40.403980432 +0200
 +++ nut-2.7.4/conf/upssched.conf.sample.in	2021-10-05 21:27:40.473980806 +0200
diff --git a/openssl.patch b/openssl.patch
deleted file mode 100644
index 5eb0677..0000000
--- a/openssl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- nut-2.7.4/m4/nut_check_libopenssl.m4~	2015-12-29 09:42:34.000000000 +0100
-+++ nut-2.7.4/m4/nut_check_libopenssl.m4	2018-09-18 08:24:37.208213839 +0200
-@@ -58,7 +58,7 @@ if test -z "${nut_have_libopenssl_seen}"
- 
- 	dnl check if openssl is usable
- 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
--	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
-+	AC_CHECK_FUNCS(OPENSSL_init_ssl, [], [nut_have_openssl=no])
- 
- 	if test "${nut_have_openssl}" = "yes"; then
- 		nut_with_ssl="yes"
---- nut-2.7.4/server/netssl.c~	2015-12-29 13:08:34.000000000 +0100
-+++ nut-2.7.4/server/netssl.c	2018-09-18 08:26:46.435444419 +0200
-@@ -387,7 +387,7 @@ void ssl_init(void)
- #ifdef WITH_OPENSSL
- 
- 	SSL_load_error_strings();
--	SSL_library_init();
-+	OPENSSL_init_ssl(0, NULL);
- 
- 	if ((ssl_method = TLSv1_server_method()) == NULL) {
- 		ssl_debug();
---- nut-2.7.4/clients/upsclient.c~	2015-12-29 13:08:34.000000000 +0100
-+++ nut-2.7.4/clients/upsclient.c	2018-09-18 08:27:00.155858201 +0200
-@@ -316,7 +316,7 @@ int upscli_init(int certverify, const ch
- 	
- #ifdef WITH_OPENSSL
- 	
--	SSL_library_init();
-+	OPENSSL_init_ssl(0, NULL);
- 	SSL_load_error_strings();
- 
- 	ssl_method = TLSv1_client_method();
diff --git a/systemd-sysconfig.patch b/systemd-sysconfig.patch
index 1eb43d9..7e516fc 100644
--- a/systemd-sysconfig.patch
+++ b/systemd-sysconfig.patch
@@ -1,36 +1,28 @@
---- nut-2.6.4/scripts/systemd/nut-server.service.in.orig	2012-06-23 23:05:33.638939671 +0200
-+++ nut-2.6.4/scripts/systemd/nut-server.service.in	2012-06-23 23:13:37.038936168 +0200
-@@ -5,7 +5,8 @@
- Before=nut-monitor.service
+--- nut-2.8.0/scripts/systemd/nut-server.service.in~	2022-04-23 13:56:07.000000000 +0200
++++ nut-2.8.0/scripts/systemd/nut-server.service.in	2022-07-22 12:36:28.363322701 +0200
+@@ -19,10 +19,11 @@ PartOf=nut.target
  
  [Service]
--ExecStart=@SBINDIR@/upsd 
-+EnvironmentFile=-/etc/sysconfig/ups
-+ExecStart=@SBINDIR@/upsd $UPSD_OPTIONS
- Type=forking
+ EnvironmentFile=- at CONFPATH@/nut.conf
++EnvironmentFile=-/etc/sysconfig/upsmon
+ SyslogIdentifier=%N
+ # Note: foreground mode by default skips writing a PID file (and
+ # needs Type=simple); can use "-FF" here to create one anyway:
+-ExecStart=@SBINDIR@/upsd -F
++ExecStart=@SBINDIR@/upsd -F $UPSD_OPTIONS
+ ExecReload=@SBINDIR@/upsd -c reload -P $MAINPID
  
  [Install]
---- nut-2.6.4/scripts/systemd/nut-monitor.service.in.orig	2012-05-02 23:35:36.000000000 +0200
-+++ nut-2.6.4/scripts/systemd/nut-monitor.service.in	2012-06-23 23:14:10.582269261 +0200
-@@ -3,7 +3,8 @@
- After=local-fs.target network.target nut-server.service
+--- nut-2.8.0/scripts/systemd/nut-monitor.service.in~	2022-04-23 13:56:07.000000000 +0200
++++ nut-2.8.0/scripts/systemd/nut-monitor.service.in	2022-07-22 12:37:09.636656034 +0200
+@@ -17,8 +17,9 @@ PartOf=nut.target
  
  [Service]
--ExecStart=@SBINDIR@/upsmon
+ EnvironmentFile=- at CONFPATH@/nut.conf
 +EnvironmentFile=-/etc/sysconfig/upsmon
-+ExecStart=@SBINDIR@/upsmon $PROGRAM_ARGS
+ SyslogIdentifier=%N
+-ExecStart=@SBINDIR@/upsmon -F
++ExecStart=@SBINDIR@/upsmon -F $PROGRAM_ARGS
+ ExecReload=@SBINDIR@/upsmon -c reload
  PIDFile=@PIDPATH@/upsmon.pid
- Type=forking
  
---- 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
-@@ -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})
- else
- 	AC_MSG_RESULT(no)
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nut.git/commitdiff/50b474b5f2d9a26fd2f8001d80b9c594590b9484

More information about the pld-cvs-commit mailing list