diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 01c65a3..0000000 --- a/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -nut-2.4.3.tar.gz -/nut-2.6.0.tar.gz -/nut-2.6.1.tar.gz -/nut-2.6.2.tar.gz -/nut-2.6.3.tar.gz -/nut-2.6.4.tar.gz -/nut-2.6.5.tar.gz -/nut-2.7.1.tar.gz -/nut-2.7.2.tar.gz -/nut-2.7.3.tar.gz -/nut-2.7.4.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a72aec0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel8-playground decommissioned : https://pagure.io/epel/issue/136 diff --git a/libs.sh b/libs.sh deleted file mode 100644 index a6ca8a8..0000000 --- a/libs.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -for l in libavahi-client libfreeipmi libusb libnetsnmp libneon -do - rp="" - for p in /usr/lib64 /lib64 /usr/lib /lib - do - if [ -f ${p}/${l}.so ] - then - fn=$( readlink ${p}/${l}.so ) - mfn=${fn%.so.*}.so - sfn=${fn##*.so.} - tfn=$mfn - while [ $tfn = ${l}.so ] || [ ! -f ${p}/${tfn} -a -n "$sfn" ] - do - tfn=${tfn}.${sfn%%.*} - sfn=${sfn#*.} - done - if [ -f ${p}/${tfn} ] - then - rp=${tfn} - else - rp=${fn} - fi - break - fi - done - echo "#define $( echo "$l" | tr '[a-z]-' '[A-Z]_')_PATH \"$rp\"" -done - -VINFO=$(sed -e '/version-info/!d' -e 's/#.*$//' -e 's/^.*-version-info//' -e 's/[[:space:]]//g' clients/Makefile) -echo "#define LIBUPSCLIENT_PATH \"libupsclient.so.$(( ${VINFO%%:*}-${VINFO##*:} ))\"" diff --git a/nut-2.6.3-tmpfiles.patch b/nut-2.6.3-tmpfiles.patch deleted file mode 100644 index 0b45e1c..0000000 --- a/nut-2.6.3-tmpfiles.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up nut-2.7.4/scripts/systemd/nut-driver.service.in.tmpfiles nut-2.7.4/scripts/systemd/nut-driver.service.in ---- nut-2.7.4/scripts/systemd/nut-driver.service.in.tmpfiles 2016-08-11 16:58:00.759001400 +0200 -+++ nut-2.7.4/scripts/systemd/nut-driver.service.in 2016-08-11 16:58:38.619248466 +0200 -@@ -4,6 +4,7 @@ After=local-fs.target network.target - StopWhenUnneeded=yes - - [Service] -+ExecStartPre=-/usr/bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/nut-client.conf - ExecStart=@SBINDIR@/upsdrvctl start - ExecStop=@SBINDIR@/upsdrvctl stop - Type=forking -diff -up nut-2.7.4/scripts/systemd/nut-monitor.service.in.tmpfiles nut-2.7.4/scripts/systemd/nut-monitor.service.in ---- nut-2.7.4/scripts/systemd/nut-monitor.service.in.tmpfiles 2015-12-29 09:42:34.000000000 +0100 -+++ nut-2.7.4/scripts/systemd/nut-monitor.service.in 2016-08-11 16:57:48.121918934 +0200 -@@ -3,6 +3,7 @@ Description=Network UPS Tools - power de - After=local-fs.target network.target nut-server.service - - [Service] -+ExecStartPre=-/usr/bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/nut-client.conf - ExecStart=@SBINDIR@/upsmon - PIDFile=@PIDPATH@/upsmon.pid - Type=forking diff --git a/nut-2.6.5-dlfix.patch b/nut-2.6.5-dlfix.patch deleted file mode 100644 index f93b5ea..0000000 --- a/nut-2.6.5-dlfix.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up nut-2.7.4/tools/nut-scanner/scan_avahi.c.dlfix nut-2.7.4/tools/nut-scanner/scan_avahi.c -diff -up nut-2.7.4/tools/nut-scanner/scan_ipmi.c.dlfix nut-2.7.4/tools/nut-scanner/scan_ipmi.c -diff -up nut-2.7.4/tools/nut-scanner/scan_nut.c.dlfix nut-2.7.4/tools/nut-scanner/scan_nut.c -diff -up nut-2.7.4/tools/nut-scanner/scan_snmp.c.dlfix nut-2.7.4/tools/nut-scanner/scan_snmp.c -diff -up nut-2.7.4/tools/nut-scanner/scan_usb.c.dlfix nut-2.7.4/tools/nut-scanner/scan_usb.c -diff -up nut-2.7.4/tools/nut-scanner/scan_xml_http.c.dlfix nut-2.7.4/tools/nut-scanner/scan_xml_http.c ---- nut-2.7.4/tools/nut-scanner/scan_xml_http.c.dlfix 2016-03-08 13:01:11.000000000 +0100 -+++ nut-2.7.4/tools/nut-scanner/scan_xml_http.c 2016-03-12 00:23:02.554826665 +0100 -@@ -37,7 +37,6 @@ - #include - - /* dynamic link library stuff */ --static char * libname = "libneon"; - static lt_dlhandle dl_handle = NULL; - static const char *dl_error = NULL; - -@@ -102,7 +101,7 @@ int nutscan_load_neon_library(const char - - return 1; - err: -- fprintf(stderr, "Cannot load XML library (%s) : %s. XML search disabled.\n", libname, dl_error); -+ fprintf(stderr, "Cannot load XML library (%s) : %s. XML search disabled.\n", libname_path, dl_error); - dl_handle = (void *)1; - lt_dlexit(); - return 0; diff --git a/nut-2.6.5-foreground.patch b/nut-2.6.5-foreground.patch deleted file mode 100644 index 4064b86..0000000 --- a/nut-2.6.5-foreground.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff -up nut-2.7.1/clients/upsmon.c.foreground nut-2.7.1/clients/upsmon.c ---- nut-2.7.1/clients/upsmon.c.foreground 2013-07-26 21:41:10.000000000 +0200 -+++ nut-2.7.1/clients/upsmon.c 2014-02-27 11:39:58.158784578 +0100 -@@ -1645,6 +1645,7 @@ static void help(const char *progname) - printf(" - reload: reread configuration\n"); - printf(" - stop: stop monitoring and exit\n"); - printf(" -D raise debugging level\n"); -+ printf(" -F run in foreground, do not daemonize\n"); - printf(" -h display this help\n"); - printf(" -K checks POWERDOWNFLAG, sets exit code to 0 if set\n"); - printf(" -p always run privileged (disable privileged parent)\n"); -@@ -1859,7 +1860,7 @@ static void check_parent(void) - int main(int argc, char *argv[]) - { - const char *prog = xbasename(argv[0]); -- int i, cmd = 0, checking_flag = 0; -+ int i, cmd = 0, checking_flag = 0, foreground = 0; - - printf("Network UPS Tools %s %s\n", prog, UPS_VERSION); - -@@ -1870,7 +1871,7 @@ int main(int argc, char *argv[]) - - run_as_user = xstrdup(RUN_AS_USER); - -- while ((i = getopt(argc, argv, "+Dhic:f:pu:VK46")) != -1) { -+ while ((i = getopt(argc, argv, "+DFhic:f:pu:VK46")) != -1) { - switch (i) { - case 'c': - if (!strncmp(optarg, "fsd", strlen(optarg))) -@@ -1887,6 +1888,9 @@ int main(int argc, char *argv[]) - case 'D': - nut_debug_level++; - break; -+ case 'F': -+ foreground = 1; -+ break; - case 'f': - free(configfile); - configfile = xstrdup(optarg); -@@ -1962,9 +1966,9 @@ int main(int argc, char *argv[]) - exit(EXIT_FAILURE); - } - -- if (nut_debug_level < 1) { -+ if (!foreground && nut_debug_level < 1) { - background(); -- } else { -+ } else if (nut_debug_level >= 1) { - upsdebugx(1, "debug level is '%d'", nut_debug_level); - } - -diff -up nut-2.7.1/scripts/systemd/nut-monitor.service.in.foreground nut-2.7.1/scripts/systemd/nut-monitor.service.in ---- nut-2.7.1/scripts/systemd/nut-monitor.service.in.foreground 2014-02-27 11:39:58.141784438 +0100 -+++ nut-2.7.1/scripts/systemd/nut-monitor.service.in 2014-02-27 11:39:58.152784529 +0100 -@@ -4,9 +4,8 @@ After=local-fs.target network.target nut - - [Service] - ExecStartPre=-/usr/bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/nut-client.conf --ExecStart=@SBINDIR@/upsmon --PIDFile=@PIDPATH@/upsmon.pid --Type=forking -+ExecStart=@SBINDIR@/upsmon -F -+Type=simple - - [Install] - WantedBy=multi-user.target -diff -up nut-2.7.1/scripts/systemd/nut-server.service.in.foreground nut-2.7.1/scripts/systemd/nut-server.service.in ---- nut-2.7.1/scripts/systemd/nut-server.service.in.foreground 2013-07-26 21:41:11.000000000 +0200 -+++ nut-2.7.1/scripts/systemd/nut-server.service.in 2014-02-27 11:39:58.152784529 +0100 -@@ -5,8 +5,8 @@ Requires=nut-driver.service - Before=nut-monitor.service - - [Service] --ExecStart=@SBINDIR@/upsd --Type=forking -+ExecStart=@SBINDIR@/upsd -F -+Type=simple - - [Install] - WantedBy=multi-user.target -diff -up nut-2.7.1/server/upsd.c.foreground nut-2.7.1/server/upsd.c ---- nut-2.7.1/server/upsd.c.foreground 2013-07-26 21:41:11.000000000 +0200 -+++ nut-2.7.1/server/upsd.c 2014-02-27 11:39:58.153784537 +0100 -@@ -827,6 +827,7 @@ static void help(const char *progname) - printf(" - reload: reread configuration files\n"); - printf(" - stop: stop process and exit\n"); - printf(" -D raise debugging level\n"); -+ printf(" -F run in foreground, do not daemonize\n"); - printf(" -h display this help\n"); - printf(" -r chroots to \n"); - printf(" -q raise log level threshold\n"); -@@ -890,7 +891,7 @@ void check_perms(const char *fn) - - int main(int argc, char **argv) - { -- int i, cmd = 0; -+ int i, cmd = 0, foreground = 0; - char *chroot_path = NULL; - const char *user = RUN_AS_USER; - struct passwd *new_uid = NULL; -@@ -906,7 +907,7 @@ int main(int argc, char **argv) - - printf("Network UPS Tools %s %s\n", progname, UPS_VERSION); - -- while ((i = getopt(argc, argv, "+h46p:qr:i:fu:Vc:D")) != -1) { -+ while ((i = getopt(argc, argv, "+hF46p:qr:i:fu:Vc:D")) != -1) { - switch (i) { - case 'h': - help(progname); -@@ -944,6 +945,10 @@ int main(int argc, char **argv) - nut_debug_level++; - break; - -+ case 'F': -+ foreground = 1; -+ break; -+ - case '4': - opt_af = AF_INET; - break; -@@ -1031,7 +1036,7 @@ int main(int argc, char **argv) - /* handle upsd.users */ - user_load(); - -- if (!nut_debug_level) { -+ if (!nut_debug_level && !foreground) { - background(); - writepid(pidfn); - } else { diff --git a/nut-2.6.5-quickfix.patch b/nut-2.6.5-quickfix.patch deleted file mode 100644 index aa11fe6..0000000 --- a/nut-2.6.5-quickfix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up nut-2.7.3/configure.ac.quickfix nut-2.7.3/configure.ac ---- nut-2.7.3/configure.ac.quickfix 2015-04-23 12:05:21.219228670 +0200 -+++ nut-2.7.3/configure.ac 2015-04-23 12:05:21.230228646 +0200 -@@ -1065,7 +1065,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) diff --git a/nut-2.6.5-rmpidf.patch b/nut-2.6.5-rmpidf.patch deleted file mode 100644 index 3041c6d..0000000 --- a/nut-2.6.5-rmpidf.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -up nut-2.7.1/clients/upsmon.c.rmpidf nut-2.7.1/clients/upsmon.c ---- nut-2.7.1/clients/upsmon.c.rmpidf 2014-02-27 11:41:09.139369295 +0100 -+++ nut-2.7.1/clients/upsmon.c 2014-02-27 11:41:09.145369344 +0100 -@@ -2027,6 +2027,7 @@ int main(int argc, char *argv[]) - - upslogx(LOG_INFO, "Signal %d: exiting", exit_flag); - upsmon_cleanup(); -+ cleanpid(prog); - - exit(EXIT_SUCCESS); - } -diff -up nut-2.7.1/common/common.c.rmpidf nut-2.7.1/common/common.c ---- nut-2.7.1/common/common.c.rmpidf 2013-11-20 20:53:31.000000000 +0100 -+++ nut-2.7.1/common/common.c 2014-02-27 11:41:09.146369353 +0100 -@@ -229,6 +229,20 @@ void writepid(const char *name) - umask(mask); - } - -+/* remove pid file */ -+void cleanpid(const char *name) -+{ -+ char fn[SMALLBUF]; -+ -+ /* use full path if present, else build filename in PIDPATH */ -+ if (*name == '/') -+ snprintf(fn, sizeof(fn), "%s", name); -+ else -+ snprintf(fn, sizeof(fn), "%s/%s.pid", PIDPATH, name); -+ -+ unlink(fn); -+} -+ - /* open pidfn, get the pid, then send it sig */ - int sendsignalfn(const char *pidfn, int sig) - { -diff -up nut-2.7.1/include/common.h.rmpidf nut-2.7.1/include/common.h ---- nut-2.7.1/include/common.h.rmpidf 2013-11-20 20:53:31.000000000 +0100 -+++ nut-2.7.1/include/common.h 2014-02-27 11:41:09.146369353 +0100 -@@ -70,6 +70,9 @@ void chroot_start(const char *path); - /* write a pid file - is a full pathname *or* just the program name */ - void writepid(const char *name); - -+/* remove pid file */ -+void cleanpid(const char *name); -+ - /* send a signal to another running process */ - int sendsignal(const char *progname, int sig); - -diff -up nut-2.7.1/server/upsd.c.rmpidf nut-2.7.1/server/upsd.c ---- nut-2.7.1/server/upsd.c.rmpidf 2014-02-27 11:41:09.146369353 +0100 -+++ nut-2.7.1/server/upsd.c 2014-02-27 11:42:03.715818754 +0100 -@@ -1050,6 +1050,7 @@ int main(int argc, char **argv) - ssl_cleanup(); - - upslogx(LOG_INFO, "Signal %d: exiting", exit_flag); -+ if (*pidfn) cleanpid(pidfn); - return EXIT_SUCCESS; - } - diff --git a/nut-2.6.5-unreachable.patch b/nut-2.6.5-unreachable.patch deleted file mode 100644 index 3c9db41..0000000 --- a/nut-2.6.5-unreachable.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up nut-2.6.5/scripts/python/app/NUT-Monitor.unreachable nut-2.6.5/scripts/python/app/NUT-Monitor ---- nut-2.6.5/scripts/python/app/NUT-Monitor.unreachable 2012-07-31 19:38:56.000000000 +0200 -+++ nut-2.6.5/scripts/python/app/NUT-Monitor 2013-01-07 18:04:26.532531441 +0100 -@@ -674,6 +674,11 @@ class interface : - self.gui_status_notification( _("Device '%s' not found on server") % self.__current_ups, "warning.png" ) - return - -+ if not self.__ups_handler.CheckUPSAvailable( self.__current_ups ): -+ self.gui_status_message( _("UPS '{0}' is not reachable").format( self.__current_ups ) ) -+ self.gui_status_notification( _("UPS '{0}' is not reachable").format( self.__current_ups ), "warning.png" ) -+ return -+ - self.__connected = True - self.__widgets["ups_connect"].hide() - self.__widgets["ups_disconnect"].show() -diff -up nut-2.6.5/scripts/python/module/PyNUT.py.unreachable nut-2.6.5/scripts/python/module/PyNUT.py ---- nut-2.6.5/scripts/python/module/PyNUT.py.unreachable 2012-07-31 19:38:56.000000000 +0200 -+++ nut-2.6.5/scripts/python/module/PyNUT.py 2013-01-07 17:41:26.548440712 +0100 -@@ -158,6 +158,20 @@ available vars. - - return( ups_vars ) - -+ def CheckUPSAvailable( self, ups="") : -+ """ Check whether UPS is reachable -+ -+Just tries to contact UPS with safe command. -+The result is True (rechable) or False (unreachable) -+ """ -+ self.__srv_handler.write( "LIST CMD %s\n" % ups ) -+ result = self.__srv_handler.read_until( "\n" ) -+ if result != "BEGIN LIST CMD %s\n" % ups : -+ return False -+ -+ self.__srv_handler.read_until( "END LIST CMD %s\n" % ups ) -+ return True -+ - def GetUPSCommands( self, ups="" ) : - """ Get all available commands for the specified UPS - diff --git a/nut-2.7.4-cloexec.patch b/nut-2.7.4-cloexec.patch deleted file mode 100644 index 1061e17..0000000 --- a/nut-2.7.4-cloexec.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- nut-2.7.4/common/parseconf.c.cloexec 2018-12-07 15:56:22.989381441 -0800 -+++ nut-2.7.4/common/parseconf.c 2018-12-07 16:48:33.912337591 -0800 -@@ -83,6 +83,7 @@ - #include - #include - #include -+#include - - #include "parseconf.h" - -@@ -443,6 +444,9 @@ - return 0; - } - -+ /* prevent fd leaking to child processes */ -+ fcntl(fileno(ctx->f), F_SETFD, FD_CLOEXEC); -+ - return 1; /* OK */ - } - ---- nut-2.7.4/clients/upsmon.c.cloexec 2018-12-07 16:22:42.185376803 -0800 -+++ nut-2.7.4/clients/upsmon.c 2018-12-07 17:18:44.662093479 -0800 -@@ -24,6 +24,8 @@ - #include - #include - #include -+#include -+#include - - #include "upsclient.h" - #include "upsmon.h" -@@ -1432,6 +1434,9 @@ - /* we're definitely connected now */ - setflag(&ups->status, ST_CONNECTED); - -+ /* prevent connection leaking to NOTIFYCMD */ -+ fcntl(upscli_fd(&ups->conn), F_SETFD, FD_CLOEXEC); -+ - /* now try to authenticate to upsd */ - - ret = do_upsd_auth(ups); -@@ -1715,6 +1720,9 @@ - } - - close(pipefd[0]); -+ -+ /* prevent pipe leaking to NOTIFYCMD */ -+ fcntl(pipefd[1], F_SETFD, FD_CLOEXEC); - } - - static void delete_ups(utype_t *target) ---- nut-2.7.4/clients/upssched.c.cloexec 2018-12-07 17:09:13.081914570 -0800 -+++ nut-2.7.4/clients/upssched.c 2018-12-07 18:28:54.380512191 -0800 -@@ -46,6 +46,8 @@ - #include - #include - #include -+#include -+#include - - #include "upssched.h" - #include "timehead.h" -@@ -297,6 +299,9 @@ - if (ret < 0) - fatal_with_errno(EXIT_FAILURE, "listen(%d, %d) failed", fd, US_LISTEN_BACKLOG); - -+ /* don't leak socket to CMDSCRIPT */ -+ fcntl(fd, F_SETFD, FD_CLOEXEC); -+ - return fd; - } - -@@ -370,6 +375,9 @@ - return; - } - -+ /* don't leak connection to CMDSCRIPT */ -+ fcntl(acc, F_SETFD, FD_CLOEXEC); -+ - /* enable nonblocking I/O */ - - ret = fcntl(acc, F_GETFL, 0); diff --git a/nut-client.tmpfiles b/nut-client.tmpfiles deleted file mode 100644 index 8db0516..0000000 --- a/nut-client.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -D /var/run/nut 0770 root nut - diff --git a/nut.spec b/nut.spec deleted file mode 100644 index e937742..0000000 --- a/nut.spec +++ /dev/null @@ -1,1085 +0,0 @@ -%global _hardened_build 1 - -#TODO: split nut-client so it does not require python -%global nut_uid 57 -%global nut_gid 57 - -%global cgidir /var/www/nut-cgi-bin -%global piddir /var/run/nut -%global modeldir /usr/sbin -# powerman is retired on Fedora, therefore disable it by default -%bcond_with powerman - -Summary: Network UPS Tools -Name: nut -Version: 2.7.4 -Release: 24%{?dist} -License: GPLv2+ and GPLv3+ -Url: http://www.networkupstools.org/ -Source: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz -Source3: nut-client.tmpfiles -Source4: libs.sh -Patch1: nut-2.6.3-tmpfiles.patch - -#quick fix. TODO: fix it properly -Patch3: nut-2.6.5-quickfix.patch -Patch5: nut-2.6.5-dlfix.patch -Patch7: nut-2.6.5-foreground.patch -Patch8: nut-2.6.5-unreachable.patch -Patch9: nut-2.6.5-rmpidf.patch -Patch10: nut-2.7.4-cloexec.patch - -Requires(pre): shadow-utils systemd-udev -Requires(post): coreutils systemd -Requires(preun): systemd -Requires(postun): coreutils systemd -Obsoletes: nut-hal < 2.6.0-7 - -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: avahi-devel -BuildRequires: cppunit-devel -BuildRequires: dbus-glib-devel -BuildRequires: desktop-file-utils -BuildRequires: elfutils-devel -BuildRequires: fontconfig-devel -BuildRequires: freeipmi-devel -BuildRequires: freetype-devel -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: gd-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: libtool -BuildRequires: libtool-ltdl-devel -BuildRequires: libX11-devel -BuildRequires: libXpm-devel -BuildRequires: neon-devel -BuildRequires: net-snmp-devel -BuildRequires: netpbm-devel -BuildRequires: nss-devel -BuildRequires: openssl-devel -BuildRequires: pkgconfig -%if %{with powerman} -BuildRequires: powerman-devel -%endif -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: /usr/bin/pathfix.py - -%ifnarch s390 s390x -BuildRequires: libusb-devel -%endif - -ExcludeArch: s390 s390x - -%global restart_flag /var/run/%{name}/%{name}-restart-after-rpm-install - -%description -These programs are part of a developing project to monitor the assortment -of UPSes that are found out there in the field. Many models have serial -ports of some kind that allow some form of state checking. This -capability has been harnessed where possible to allow for safe shutdowns, -live status tracking on web pages, and more. - -%package client -Summary: Network UPS Tools client monitoring utilities -Requires(post): systemd -Requires(preun): systemd -Requires(pre): shadow-utils systemd-udev -Requires: pygtk2, pygtk2-libglade -#only for python and gui part -#Requires: - -%description client -This package includes the client utilities that are required to monitor a -ups that the client host has access to, but where the UPS is physically -attached to a different computer on the network. - -%package cgi -Summary: CGI utilities for the Network UPS Tools -Requires: %{name}-client = %{version}-%{release} webserver -Requires(pre): shadow-utils udev - -%description cgi -This package includes CGI programs for accessing UPS status via a web -browser. - -%package xml -Summary: XML UPS driver for the Network UPS Tools -Requires: %{name}-client = %{version}-%{release} - -%description xml -This package adds the netxml-ups driver, that allows NUT to monitor a XML -capable UPS. - -%package devel -Summary: Development files for NUT Client -Requires: %{name}-client = %{version}-%{release} webserver openssl-devel - -%description devel -This package contains the development header files and libraries -necessary to develop NUT client applications. - -%prep -%setup -q -%patch1 -p1 -b .tmpfiles -%patch3 -p1 -b .quickfix -%patch5 -p1 -b .dlfix -%patch7 -p1 -b .foreground -%patch8 -p1 -b .unreachable -%patch9 -p1 -b .rmpidf -%patch10 -p1 -b .cloexec - -sed -i 's|=NUT-Monitor|=nut-monitor|' scripts/python/app/nut-monitor.desktop -sed -i 's|env python|env python2|' scripts/python/app/NUT-Monitor -sed -i "s|sys.argv\[0\]|'%{_datadir}/%{name}/nut-monitor/nut-monitor'|" scripts/python/app/NUT-Monitor -sed -i 's|LIBSSL_LDFLAGS|LIBSSL_LIBS|' lib/libupsclient-config.in -sed -i 's|LIBSSL_LDFLAGS|LIBSSL_LIBS|' lib/libupsclient.pc.in - -# Fix python shbangs -pathfix.py -pni "%{__python2} %{py2_shbang_opts}" scripts/python scripts/python/app/NUT-Monitor - -# workaround for multilib conflicts - caused by patch changing modification time of scripts -find . -mtime -1 -print0 | xargs -0 touch --reference %{SOURCE0} - -%build -autoreconf -i -# prevent assignment of default value, it would break configure's tests -export LDFLAGS="-Wl,-z,now" -%configure \ - --with-all \ -%if %{without powerman} - --without-powerman \ -%endif - --with-libltdl \ - --with-nss \ - --without-wrap \ - --with-cgi \ - --datadir=%{_datadir}/%{name} \ - --with-user=%{name} \ - --with-group=dialout \ - --with-statepath=%{piddir} \ - --with-pidpath=%{piddir} \ - --with-altpidpath=%{piddir} \ - --sysconfdir=%{_sysconfdir}/ups \ - --with-cgipath=%{cgidir} \ - --with-drvpath=%{modeldir} \ - --with-systemdsystemunitdir=%{_unitdir} \ - --with-pkgconfig-dir=%{_libdir}/pkgconfig \ - --disable-static \ - --with-udev-dir=%{_usr}/lib/udev \ - --libdir=%{_libdir} -# --with-doc # does not work in 2.7.1 - -sh %{SOURCE4} >>include/config.h - -#remove rpath -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -%make_build LDFLAGS="%{__global_ldflags}" - -%install -mkdir -p %{buildroot}%{modeldir} \ - %{buildroot}%{_sysconfdir}/udev/rules.d \ - %{buildroot}%{_sysconfdir}/ups \ - %{buildroot}%{piddir} \ - %{buildroot}%{_localstatedir}/lib/ups \ - %{buildroot}%{_libexecdir} - -%make_install - -%if 0%{?fedora} || 0%{?rhel} > 6 - install -p -D -m 644 %{SOURCE3} %{buildroot}%{_tmpfilesdir}/nut-client.conf -%endif - -rm -rf %{buildroot}%{_prefix}/html -rm -f %{buildroot}%{_libdir}/*.la -rm -rf docs/man -find docs/ -name 'Makefile*' -delete - -pushd conf; -%make_install -for file in %{buildroot}%{_sysconfdir}/ups/*.sample -do - mv $file %{buildroot}%{_sysconfdir}/ups/`basename $file .sample` -done -popd - -#fix collision with virtualbox -#mv %{buildroot}/%{_usr}/lib/udev/rules.d/52-nut-usbups.rules %{buildroot}/%{_usr}/lib/udev/rules.d/62-nut-usbups.rules -mv %{buildroot}/%{_usr}/lib/udev/rules.d/52-nut-ipmipsu.rules %{buildroot}/%{_usr}/lib/udev/rules.d/62-nut-ipmipsu.rules - -# fix encoding -for fe in ./docs/cables/powerware.txt -do - iconv -f iso-8859-1 -t utf-8 <$fe >$fe.new - touch -r $fe $fe.new - mv -f $fe.new $fe -done - -# install PyNUT -install -p -D -m 644 scripts/python/module/PyNUT.py %{buildroot}%{python2_sitelib}/PyNUT.py -# install nut-monitor -mkdir -p %{buildroot}%{_datadir}/nut/nut-monitor/pixmaps -install -p -m 755 scripts/python/app/NUT-Monitor %{buildroot}%{_datadir}/nut/nut-monitor/nut-monitor -install -p -m 644 scripts/python/app/gui-1.3.glade %{buildroot}%{_datadir}/nut/nut-monitor -install -p -m 644 scripts/python/app/pixmaps/* %{buildroot}%{_datadir}/nut/nut-monitor/pixmaps/ -install -p -D scripts/python/app/nut-monitor.png %{buildroot}%{_datadir}/pixmaps/nut-monitor.png -desktop-file-install --dir=%{buildroot}%{_datadir}/applications scripts/python/app/nut-monitor.desktop -ln -s %{_datadir}/nut/nut-monitor/nut-monitor %{buildroot}%{_bindir}/nut-monitor - -%pre -/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} \ - -s /bin/false -r -d %{_localstatedir}/lib/ups %{name} 2> /dev/null || : -/usr/sbin/usermod -G dialout %{name} - -# do not let upsmon run during upgrade rhbz#916472 -# phase 1: stop upsmon before upsd changes -if [ "$1" = "2" ]; then - rm -f %restart_flag - /bin/systemctl is-active nut-monitor.service >/dev/null 2>&1 && touch %restart_flag ||: - /bin/systemctl stop nut-monitor.service >/dev/null 2>&1 -fi - - -%post -/sbin/ldconfig -udevadm control --reload ||: -%systemd_post nut-driver.service nut-server.service - -%preun -%systemd_preun nut-driver.service nut-server.service - -%postun -/sbin/ldconfig -%systemd_postun_with_restart nut-driver.service nut-server.service - -%pre client -/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} \ - -s /bin/false -r -d %{_localstatedir}/lib/ups %{name} 2> /dev/null || : -/usr/sbin/usermod -G dialout %{name} - -%pre cgi -/usr/sbin/useradd -c "Network UPS Tools" -u %{nut_uid} \ - -s /bin/false -r -d %{_localstatedir}/lib/ups %{name} 2> /dev/null || : -/usr/sbin/usermod -G dialout %{name} - -%post client -/sbin/ldconfig -%systemd_post nut-monitor.service - -%preun client -%systemd_preun nut-monitor.service - -%postun client -/sbin/ldconfig -%systemd_postun_with_restart nut-monitor.service - -%posttrans -# phase 2: start upsmon again -if [ -e %restart_flag ]; then - /bin/systemctl restart nut-monitor.service >/dev/null 2>&1 || : - rm -f %restart_flag -else - # maybe we did not stop it - if we reinstalled just nut-client - /bin/systemctl try-restart nut-monitor.service >/dev/null 2>&1 || : -fi - -%files -%license COPYING LICENSE-GPL2 LICENSE-GPL3 -%doc ChangeLog AUTHORS MAINTAINERS README docs UPGRADING INSTALL NEWS -%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/nut.conf -%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/ups.conf -%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.conf -%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.users -%attr(644,root,root) %{_usr}/lib/udev/rules.d/62-nut-usbups.rules -%attr(644,root,root) %{_usr}/lib/udev/rules.d/62-nut-ipmipsu.rules -%{modeldir}/* -%exclude %{modeldir}/netxml-ups -%{_unitdir}/nut-driver.service -%{_unitdir}/nut-server.service -%{_sbindir}/upsd -%{_bindir}/nut-scanner -%{_bindir}/upslog -%{_libdir}/libnutscan.so.* -%{_datadir}/%{name}/cmdvartab -%{_datadir}/%{name}/driver.list -%{_mandir}/man5/nut.conf.5.gz -%{_mandir}/man5/ups.conf.5.gz -%{_mandir}/man5/upsd.conf.5.gz -%{_mandir}/man5/upsd.users.5.gz -%{_mandir}/man8/al175.8.gz -%{_mandir}/man8/apcsmart.8.gz -%{_mandir}/man8/apcsmart-old.8.gz -%{_mandir}/man8/apcupsd-ups.8.gz -%{_mandir}/man8/bcmxcp.8* -%{_mandir}/man8/bcmxcp_usb.8.gz -%{_mandir}/man8/belkin.8.gz -%{_mandir}/man8/bestfcom.8.gz -%{_mandir}/man8/belkinunv.8.gz -%{_mandir}/man8/bestfortress.8.gz -%{_mandir}/man8/bestups.8.gz -%{_mandir}/man8/bestuferrups.8.gz -%{_mandir}/man8/blazer_ser.8.gz -%{_mandir}/man8/blazer_usb.8.gz -%{_mandir}/man8/clone.8.gz -%{_mandir}/man8/dummy-ups.8.gz -%{_mandir}/man8/everups.8.gz -%{_mandir}/man8/etapro.8.gz -%{_mandir}/man8/gamatronic.8.gz -%{_mandir}/man8/genericups.8.gz -%{_mandir}/man8/isbmex.8.gz -%{_mandir}/man8/ivtscd.8.gz -%{_mandir}/man8/liebert.8.gz -%{_mandir}/man8/liebert-esp2.8.gz -%{_mandir}/man8/masterguard.8.gz -%{_mandir}/man8/metasys.8.gz -%{_mandir}/man8/microdowell.8.gz -%{_mandir}/man8/mge-utalk.8.gz -%{_mandir}/man8/mge-shut.8.gz -%{_mandir}/man8/nutupsdrv.8.gz -%{_mandir}/man8/nutdrv_atcl_usb.8.gz -%{_mandir}/man8/nut-ipmipsu.8.gz -%{_mandir}/man8/nut-recorder.8.gz -%{_mandir}/man8/nut-scanner.8.gz -%{_mandir}/man8/nutdrv_qx.8.gz -%{_mandir}/man8/oneac.8.gz -%{_mandir}/man8/optiups.8.gz -%{_mandir}/man8/powercom.8.gz -%if %{with powerman} -%{_mandir}/man8/powerman-pdu.8.gz -%endif -%{_mandir}/man8/powerpanel.8.gz -%{_mandir}/man8/rhino.8.gz -%{_mandir}/man8/richcomm_usb.8.gz -%{_mandir}/man8/riello_ser.8.gz -%{_mandir}/man8/riello_usb.8.gz -%{_mandir}/man8/safenet.8.gz -%{_mandir}/man8/snmp-ups.8.gz -%{_mandir}/man8/solis.8* -%{_mandir}/man8/tripplite.8.gz -%{_mandir}/man8/tripplite_usb.8.gz -%{_mandir}/man8/tripplitesu.8.gz -%{_mandir}/man8/victronups.8.gz -%{_mandir}/man8/upscode2.8* -%{_mandir}/man8/upsd.8.gz -%{_mandir}/man8/upsdrvctl.8.gz -%{_mandir}/man8/upslog.8.gz -%{_mandir}/man8/usbhid-ups.8.gz - -%files client -%license COPYING LICENSE-GPL2 LICENSE-GPL3 -%dir %{_sysconfdir}/ups -%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsmon.conf -%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upssched.conf -%if 0%{?fedora} || 0%{?rhel} > 6 - %{_tmpfilesdir}/nut-client.conf -%endif -%dir %attr(750,nut,nut) %{_localstatedir}/lib/ups -# upsmon.pid is written as root, so root needs access for now -%ghost %attr(770,root,nut) %{piddir} -%{_bindir}/upsc -%{_bindir}/upscmd -%{_bindir}/upsrw -%{_sbindir}/upsmon -%{_sbindir}/upssched -%{_bindir}/upssched-cmd -%{_unitdir}/nut-monitor.service -/lib/systemd/system-shutdown/nutshutdown -%{_libdir}/libupsclient.so.* -%{_libdir}/libnutclient.so.* -%{_mandir}/man5/upsmon.conf.5.gz -%{_mandir}/man5/upssched.conf.5.gz -%{_mandir}/man8/upsc.8.gz -%{_mandir}/man8/upscmd.8.gz -%{_mandir}/man8/upsrw.8.gz -%{_mandir}/man8/upsmon.8.gz -%{_mandir}/man8/upssched.8.gz -%{_bindir}/nut-monitor -%{python2_sitelib}/PyNUT.* -%{_datadir}/nut -%{_datadir}/pixmaps/nut-monitor.png -%{_datadir}/applications/nut-monitor.desktop - -%files cgi -%config(noreplace) %attr(644,root,root) %{_sysconfdir}/ups/hosts.conf -%config(noreplace) %attr(600,nut,root) %{_sysconfdir}/ups/upsset.conf -%config(noreplace) %attr(644,root,root) %{_sysconfdir}/ups/upsstats.html -%config(noreplace) %attr(644,root,root) %{_sysconfdir}/ups/upsstats-single.html -%{cgidir}/ -%{_mandir}/man5/hosts.conf.5.gz -%{_mandir}/man5/upsstats.html.5.gz -%{_mandir}/man5/upsset.conf.5.gz -%{_mandir}/man8/upsimage.cgi.8.gz -%{_mandir}/man8/upsstats.cgi.8.gz -%{_mandir}/man8/upsset.cgi.8.gz - -%files xml -%{modeldir}/netxml-ups -%doc %{_mandir}/man8/netxml-ups.8.gz - -%files devel -%{_includedir}/* -%{_mandir}/man3/upscli* -%{_mandir}/man3/nutscan* -%{_mandir}/man3/nutclient* -%{_mandir}/man3/libnutclient* -%{_libdir}/libupsclient.so -%{_libdir}/libnutclient.so -%{_libdir}/libnutscan.so -%{_libdir}/pkgconfig/libupsclient.pc -%{_libdir}/pkgconfig/libnutclient.pc -%{_libdir}/pkgconfig/libnutscan.pc - -%changelog -* Thu Jul 25 2019 Fedora Release Engineering - 2.7.4-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Mar 25 2019 Michal Hlavinka - 2.7.4-23 -- add missing requirements for nut monitor -- fix file descriptor leak for notifycmd - -* Fri Feb 01 2019 Fedora Release Engineering - 2.7.4-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Oct 16 2018 Orion Poplawski - 2.7.4-21 -- Cleanup and modernize spec -- Fix ownership/permissions of /var/run/nut (bug #1584330, #1580082) -- Fix python shbangs - -* Sun Oct 14 2018 Peter Robinson 2.7.4-20 -- Updates dependencies, modernise spec, use %%license -- Python build fixes - -* Tue Jul 24 2018 Adam Williamson - 2.7.4-19 -- Rebuild for new net-snmp - -* Fri Jul 13 2018 Fedora Release Engineering - 2.7.4-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Apr 17 2018 Xavier Bachelot - 2.7.4-17 -- Remove unrecognized configure option --without-hal -- Explicitely disable tcpwrapper support -- Remove unneeded CRLF EOL fix -- Add BR: cppunit-devel - -* Wed Mar 07 2018 Michal Hlavinka - 2.7.4-16 -- add gcc buildrequire - -* Wed Feb 14 2018 Iryna Shcherbina - 2.7.4-15 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Thu Feb 08 2018 Fedora Release Engineering - 2.7.4-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Nov 07 2017 Igor Gnatenko - 2.7.4-13 -- Remove old crufty coreutils requires - -* Wed Aug 30 2017 Michal Hlavinka - 2.7.4-12 -- rebuild for freeipmi update - -* Thu Aug 03 2017 Fedora Release Engineering - 2.7.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.7.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Jun 22 2017 Michal Hlavinka - 2.7.4-9 -- enable nss crypto (#1463071) - -* Wed May 24 2017 Michal Hlavinka - 2.7.4-8 -- fix location of tmpfiles.d in service files (#1399602) - -* Sat Feb 11 2017 Fedora Release Engineering - 2.7.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 01 2017 Sandro Mani - 2.7.4-6 -- Rebuild (libwebp) - -* Fri Nov 11 2016 Michal Hlavinka - 2.7.4-5 -- use %%_tmpfilesdir macro (#1394009) - -* Thu Sep 15 2016 Till Maas - 2.7.4-4 -- Disable powerman support, powerman was retired on Fedora - -* Thu Aug 11 2016 Michal Hlavinka - 2.7.4-3 -- make sure tmpfiles creation is executped before ups driver (#1365904,#1349362) - -* Tue Jul 19 2016 Fedora Release Engineering - 2.7.4-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Sat Mar 12 2016 Michal Hlavinka - 2.7.4-1 -- nut updated to 2.7.4 - -* Thu Feb 04 2016 Fedora Release Engineering - 2.7.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Dec 05 2015 Kalev Lember - 2.7.3-6 -- Rebuilt for libfreeipmi soname bump - -* Tue Dec 1 2015 Tom Callaway - 2.7.3-5 -- rebuild for libvpx 1.5.0 - -* Wed Jun 17 2015 Fedora Release Engineering - 2.7.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 2.7.3-3 -- Rebuilt for GCC 5 C++11 ABI change - -* Tue Apr 28 2015 Michal Hlavinka - 2.7.3-2 -- start nut driver before the daemon - -* Thu Apr 23 2015 Michal Hlavinka - 2.7.3-1 -- nut updated to 2.7.3 - -* Mon Apr 6 2015 Tom Callaway - 2.7.2-4 -- rebuild against libvpx 1.4.0 - -* Sun Aug 17 2014 Fedora Release Engineering - 2.7.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 2.7.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Apr 22 2014 Michal Hlavinka - 2.7.2-1 -- nut updated to 2.7.2 - -* Thu Apr 17 2014 Michal Hlavinka - 2.7.1-4 -- fix multilib issue (#831429) - -* Thu Mar 06 2014 Michal Hlavinka - 2.7.1-3 -- fix path of nut-driver executable (#1072076) -- fix location of udev rules - -* Thu Mar 06 2014 Michal Hlavinka - 2.7.1-2 -- fix undefined references in libupsclient (#1071919) - -* Thu Feb 27 2014 Michal Hlavinka - 2.7.1-1 -- nut updated to 2.7.1 - -* Tue Sep 24 2013 Michal Hlavinka - 2.6.5-16 -- rebuilt with updated freeipmi (1.3.2) - -* Tue Sep 03 2013 Michal Hlavinka - 2.6.5-15 -- rebuilt with updated freeipmi - -* Sat Aug 03 2013 Fedora Release Engineering - 2.6.5-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jun 11 2013 Remi Collet - 2.6.5-13 -- rebuild for new GD 2.1.0 - -* Mon Apr 22 2013 Michal Hlavinka - 2.6.5-12 -- do not let upsmon run during update (#916472) -- make binaries hardened (#955157) - -* Thu Feb 28 2013 Michal Hlavinka - 2.6.5-11 -- clean pid file on exit (#916468) - -* Thu Feb 14 2013 Fedora Release Engineering - 2.6.5-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 21 2013 Adam Tkac - 2.6.5-9 -- rebuild due to "jpeg8-ABI" feature drop - -* Mon Jan 07 2013 Michal Hlavinka - 2.6.5-8 -- do not traceback when ups is not reachable - -* Fri Dec 21 2012 Adam Tkac - 2.6.5-7 -- rebuild against new libjpeg - -* Fri Sep 14 2012 Michal Hlavinka - 2.6.5-6 -- use new systemd macros (#857416) - -* Tue Sep 11 2012 Michal Hlavinka - 2.6.5-5 -- add support for foreground mode - -* Tue Sep 11 2012 Michal Hlavinka - 2.6.5-4 -- do not forget to restart nut-driver.service in postun - -* Thu Sep 06 2012 Michal Hlavinka - 2.6.5-3 -- do not depend on devel files (#838139) - -* Mon Sep 03 2012 Michal Hlavinka - 2.6.5-2 -- rebuilt with updated freeipmi - -* Fri Aug 10 2012 Michal Hlavinka - 2.6.5-1 -- nut updated to 2.6.5 - -* Fri Jul 20 2012 Fedora Release Engineering - 2.6.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jun 14 2012 Michal Hlavinka - 2.6.4-1 -- nut updated to 2.6.4 - -* Thu May 31 2012 Michal Hlavinka - 2.6.3-4 -- fix heap-based buffer overflow due improper processing of non-printable - characters in random network data (CVE-2012-2944) - -* Mon May 28 2012 Michal Hlavinka - 2.6.3-3 -- bump release nubmer to fix upgrade path - -* Mon Apr 16 2012 Michal Hlavinka - 2.6.3-2 -- do not forget to create /var/run/nut before starting service (#812825) - -* Thu Jan 05 2012 Michal Hlavinka - 2.6.3-1 -- nut updated to 2.6.3 - -* Tue Dec 06 2011 Adam Jackson - 2.6.2-2 -- Rebuild for new libpng - -* Fri Sep 16 2011 Michal Hlavinka - 2.6.2-1 -- nut updated to 2.6.2 - -* Tue Aug 16 2011 Michal Hlavinka - 2.6.1-4 -- update requirements of packages - -* Fri Jul 22 2011 Michal Hlavinka - 2.6.1-3 -- add initial support for systemd - -* Fri Jul 08 2011 Michal Hlavinka - 2.6.1-2 -- rebuilt for net-snmp update - -* Tue Jun 07 2011 Michal Hlavinka - 2.6.1-1 -- nut updated to 2.6.1 - -* Thu Apr 21 2011 Michal Hlavinka - 2.6.0-8 -- fix usb report reading (#698512) - -* Thu Apr 21 2011 Michal Hlavinka - 2.6.0-7 -- nut-hal should be obsoleted to prevent broken dependency in yum - -* Wed Apr 20 2011 Michal Hlavinka - 2.6.0-6 -- standard dependency adds udev, but we need it for %%pre script - -* Wed Apr 20 2011 Michal Hlavinka - 2.6.0-5 -- drop hal support, it was removed from rawhide - -* Mon Mar 28 2011 Michal Hlavinka - 2.6.0-4 -- fix list of ssl libraries in libupsclient.pc - -* Mon Feb 21 2011 Michal Hlavinka - 2.6.0-3 -- add nut-monitor (gui) to client sub-package - -* Tue Feb 08 2011 Fedora Release Engineering - 2.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jan 17 2011 Michal Hlavinka - 2.6.0-1 -- nut updated to 2.6.0 -- fixed reading of reports bigger than 8 bytes - -* Fri Nov 26 2010 Michal Hlavinka - 2.4.3-9 -- use %%ghost for /var/run/nut (#656645) - -* Fri Nov 05 2010 Michal Hlavinka - 2.4.3-8 -- rebuild because libraries were updated - -* Wed Sep 29 2010 jkeating - 2.4.3-7 -- Rebuilt for gcc bug 634757 - -* Fri Sep 17 2010 Michal Hlavinka - 2.4.3-6 -- fix inconsitent name of upsdrvctl in init script (#633116) - -* Mon Jul 26 2010 Michal Hlavinka - 2.4.3-5 -- fix crash when port= is ommited (#616375) -- fix issue where nut fails to restart because it did not finished termination - yet and old instance blocks devices (#193058) - -* Wed Jul 07 2010 Michal Hlavinka - 2.4.3-4 -- follow licensing guideline update - -* Fri Mar 26 2010 Michal Hlavinka - 2.4.3-3 -- replace BUS with SUBSYSTEMS in udev rules (#573806) - -* Tue Mar 23 2010 Michal Hlavinka - 2.4.3-2 -- reduced size of buffer to maximum size supported by low-speed USB devices -- fixes #575334 - -* Wed Feb 24 2010 Michal Hlavinka - 2.4.3-1 -- cyberpower driver was replaced by the powerpanel driver -- general USB support has been vastly improved, including many bug - fixes, new features and devices -- the virtual driver has been renamed to 'clone' -- the UPower (previously known as DeviceKit-power) rules file is now - generated by NUT -- a lot of new devices supported - -* Thu Nov 05 2009 Michal Hlavinka - 2.4.1-9 -- spec cleanup - -* Fri Aug 21 2009 Tomas Mraz - 2.4.1-8 -- rebuilt with new openssl - -* Sat Jul 25 2009 Fedora Release Engineering - 2.4.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed May 20 2009 Michal Hlavinka - 2.4.1-6 -- fix coexistence with virtualbox (#488368) - -* Wed May 20 2009 Michal Hlavinka - 2.4.1-5 -- add requires for hal (#501687) - -* Fri Apr 17 2009 Michal Hlavinka - 2.4.1-4 -- change group even for existing nut user (#495999) - -* Tue Apr 14 2009 Michal Hlavinka - 2.4.1-3 -- udev changed group from uucp to dialout, follow the change (#494020) - -* Wed Feb 25 2009 Fedora Release Engineering - 2.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Feb 17 2009 Michal Hlavinka 2.4.1-1 -- update to 2.4.1 -- added support for microdowell ups - -* Mon Feb 16 2009 Michal Hlavinka 2.4.0-1 -- update to new stable branch 2.4 - -* Sat Jan 17 2009 Tomas Mraz 2.2.2-6 -- rebuild with new openssl - -* Thu Dec 18 2008 Michal Hlavinka 2.2.2-5 -- remove rpath, fix libtool - -* Wed Dec 17 2008 Michal Hlavinka 2.2.2-4 -- fix #476850 - tripplite_usb driver segfaults when UPS on battery - -* Mon Sep 15 2008 Tomas Smetana 2.2.2-3 -- fix #461374 - add missing udev rules - -* Mon Aug 25 2008 Tomas Smetana 2.2.2-2 -- fix requirements in spec file -- build a separate hal package - -* Mon May 12 2008 Tomas Smetana 2.2.2-1 -- new upstream version - -* Tue Feb 12 2008 Tomas Smetana 2.2.1-3 -- fix compilation error with new glibc headers - -* Tue Feb 12 2008 Tomas Smetana 2.2.1-2 -- rebuild (gcc-4.3) - -* Wed Jan 09 2008 Tomas Smetana 2.2.1-1 -- new upstream version - -* Wed Dec 05 2007 Tomas Smetana 2.2.0-6.2 -- rebuild - -* Thu Nov 29 2007 Tomas Smetana 2.2.0-6.1 -- init script update, fix a typo - -* Wed Nov 28 2007 Tomas Smetana 2.2.0-6 -- fix forgotten bug in init script -- do not hardcode the uucp group in udev patch - -* Tue Nov 27 2007 Tomas Smetana 2.2.0-5 -- fix udev rules and hal information files -- fix init script - -* Wed Sep 19 2007 Tomas Smetana 2.2.0-4 -- fix manpages encodings -- run ldconfig after client (un)install -- fix HAL support - -* Thu Sep 06 2007 Tomas Smetana 2.2.0-3 -- fix wrong libssl flags in devel, fix devel package dependencies - -* Wed Aug 15 2007 Tomas Smetana 2.2.0-2 -- fix #249028 - usb udev rules -- update initscript and sysconfig file -- fix calls to open() for compatibility with the new glibc - -* Fri Jul 13 2007 Tomas Smetana 2.2.0-1.1 -- rebuild - -* Fri Jul 13 2007 Tomas Smetana 2.2.0-1 -- new upstream version (Resolves: #248074) -- initscripts update -- spec file cleanup - -* Mon May 07 2007 Arnaud Quette 2.1.0-1 -- update to 2.1.0 development tree -- HAL, ... - -* Mon Mar 26 2007 Than Ngo 2.0.5-3 -- cleanup - -* Tue Jan 23 2007 Karsten Hopp 2.0.5-2 -- rename fatal to fatal_with_errno in ipv6 patch -- fix filelist - -* Tue Jan 23 2007 Karsten Hopp 2.0.5-1 -- update to 2.0.5 - -* Wed Nov 29 2006 Karsten Hopp 2.0.4-2 -- rebuild with new net-snmp-libs -- disable nut-2.0.1-bad.patch, not required - -* Tue Nov 21 2006 Than Ngo - 2.0.4-1 -- add IPv6 support, thanks to Dan KopeƄek (#198394) - -* Wed Jul 12 2006 Jesse Keating - 2.0.3-2.1 -- rebuild - -* Tue May 16 2006 Than Ngo 2.0.3-2 -- fix #191914, BR fontconfig-devel for cgi - -* Mon Apr 24 2006 Than Ngo 2.0.3-1 -- update to 2.0.3 -- drop nut-2.0.2-buffer.patch, it's included in new upstream -- add udev rule #189674, #187105 - -* Fri Feb 10 2006 Jesse Keating - 2.0.2-6.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 2.0.2-6.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Tue Jan 03 2006 Radek Vokal 2.0.2-6 -- rebuilt against new libnetsnmp - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Wed Nov 23 2005 Than Ngo 2.0.2-5 -- fix for modular X - -* Wed Nov 09 2005 Than Ngo 2.0.2-4 -- rebuilt - -* Mon Nov 07 2005 Than Ngo 2.0.2-3 -- rebuilt - -* Thu Nov 03 2005 Than Ngo 2.0.2-2 -- rebuilt against new libnetsnmp - -* Wed Jul 20 2005 Than Ngo 2.0.2-1 -- fix compiler warnings #156027 -- fix pid issue #159450 -- fix wrong ownership and permissions #159449, #141123 -- update to 2.0.2 - -* Thu Mar 10 2005 Than Ngo 2.0.1-1 -- 2.0.1 -- fix uninit local variable, #131773 - -* Wed Dec 08 2004 Than Ngo 2.0.0-7 -- don't requires libusb-devel on s390/s390x -- add %%{release} in buildroot - -* Thu Nov 25 2004 Miloslav Trmac - 2.0.0-6 -- Convert newhidups.8 to UTF-8 - -* Tue Oct 05 2004 Than Ngo 2.0.0-5 -- more buildrequires -- don't build on s390/s390x - -* Thu Aug 26 2004 Nalin Dahyabhai 2.0.0-4 -- fix syntax error in -client postun scriptlet (#131040) - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Mon May 10 2004 Than Ngo 2.0.0-2 -- fixed permission problem, bug #122867 - -* Fri Apr 02 2004 Than Ngo 2.0.0-1 -- 2.0.0 - -* Sat Feb 14 2004 Than Ngo 1.4.1-3 -- add some missing drivers - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Wed Feb 11 2004 Than Ngo 1.4.1-1 -- 1.4.1 -- fixed permission problem (bug #115290) - -* Wed Sep 24 2003 Mike McLean 1.4.0-3 -- fixed 'nut' user problem with nut-cgi (bug#104872) - -* Mon Sep 15 2003 Than Ngo 1.4.0-2 -- added missing hidups driver (bug #104412) - -* Tue Sep 09 2003 Than Ngo 1.4.0-1 -- 1.4.0 -- fixed permission problem (bug #103023) -- fixed rpm file list (bug #90848) -- added support multiple drivers, thanks to Gilbert E. Detillieux (bug #79465) - -* Thu Jun 26 2003 Than Ngo 1.2.2-3 -- Add variable to ups sysconfig file for upsd (bug #97900) - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Wed May 7 2003 Than Ngo 1.2.2-1 -- 1.2.2 - -* Tue May 06 2003 Phil Knirsch 1.2.0-7 -- Bumped release and rebuilt because of new gd version. - -* Thu Feb 13 2003 Than Ngo 1.2.0-6 -- build with correct userid #84199 -- fix directory permission - -* Tue Feb 11 2003 Than Ngo 1.2.0-5 -- add user nut, bug #81500 -- fix permission issue, bug #81524, #83997 -- own /etc/ups, bug #73959 - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Wed Jan 8 2003 Thomas Woerner 1.2.0-3 -- added html templates for cgi scripts (#78532) -- added hidups driver (#80334) - -* Wed Dec 18 2002 Dan Walsh 1.2.0-2 -- Fix service description - -* Wed Nov 6 2002 han Ngo 1.2.0-1 -- update to 1.2.0 - -* Mon Nov 4 2002 Than Ngo 1.00-1 -- update to 1.00 - -* Wed Jul 31 2002 Than Ngo 0.45.4-5 -- Fixed wrong CMDSCRIPT (bug #69817) - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Sun Jun 02 2002 Than Ngo 0.45.4-3 -- fix forced shutdown (bug #65824, #60516) -- enable hidups driver -- add missing manages (bug #65188) - -* Thu May 23 2002 Tim Powers -- automated rebuild - -* Tue Feb 26 2002 Than Ngo 0.45.4-1 -- update to 0.45.4 - -* Wed Jan 09 2002 Tim Powers -- automated rebuild - -* Fri Dec 14 2001 Than Ngo 0.45.3-1 -- update to 0.45.2 -- fix bug #57417 - -* Tue Nov 27 2001 Than Ngo 0.45.2-1 -- update to 0.45.2 -- clean up some patch files for 0.45.2 - -* Tue Jul 24 2001 Than Ngo 0.45.0-3 -- fix build dependencies (bug #49858) - -* Fri Jul 6 2001 Than Ngo 0.45.0-2 -- rebuild - -* Wed Jun 13 2001 Than Ngo -- update to 0.45.0 -- add some patches from alane@geeksrus.net (bug #44361, #44363) - -* Sun Apr 22 2001 Than Ngo -- add all available UPS drivers (Bug #36937) - -* Fri Apr 13 2001 Than Ngo -- update to 0.44.3 (Bug #35255) - -* Fri Feb 9 2001 Than Ngo -- fixed typo (Bug #26535) - -* Tue Feb 6 2001 Trond Eivind Glomsrd -- Fix some of the i18n -- make it exit cleanly if not configured - -* Fri Jan 26 2001 Than Ngo -- initscript internationalisation - -* Thu Jan 11 2001 Than Ngo -- fixed init script error (bug #23525) - -* Sat Oct 21 2000 Than Ngo -- update to 0.44.1 - -* Tue Aug 01 2000 Than Ngo -- rebuilt with Michael changes - -* Mon Jul 31 2000 Michael Stefaniuc -- changed /etc/sysconfig/ups to adress the changes in 0.44.0 -- moved /etc/sysconfig/ups to the server package -- changed the initscript -- small config file patch - -* Fri Jul 28 2000 Than Ngo -- fixed initscripts so that condrestart doesn't return 1 when the test fails - -* Mon Jul 24 2000 Than Ngo -- nut CGIs is disable as default (Bug #14282) - -* Tue Jul 18 2000 Than Ngo -- update to 0.44.0 -- inits back to rc.d/init.d, using service to fire them up - -* Wed Jul 12 2000 Than Ngo -- fix initscript and specfile, it should work with 6.x and 7.x -- add --with-statepath and --sysconfdir to %%configure (thanks Michael) - -* Sat Jul 08 2000 Than Ngo -- add Prereq: /etc/init.d - -* Tue Jun 27 2000 Than Ngo -- don't prereq, only require initscripts - -* Mon Jun 26 2000 Than Ngo -- /etc/rc.d/init.d -> /etc/init.d -- prereq initscripts >= 5.20 - -* Fri Jun 16 2000 Bill Nottingham -- don't run by default - -* Mon Jun 12 2000 Preston Brown -- adopted for Winston. Use our new path macros. -- change nocgi pkg to a cgi pkg (inclusive rather than exclusive). -- new init script - -* Sat May 06 2000 (0.43.2-1) -- Updated Package to new release - -* Thu Jan 20 2000 (0.42.2-1) -- Updated package to new release -- Dropped bestups patch since that is fixed in 0.42.2 - -* Sat Dec 18 1999 (0.42.1-4) -- Package now uses chkconfig - -* Sat Dec 18 1999 (0.42.1-3) -- applied an improved patch to deal with the - bestups string length issue. - -* Sat Dec 11 1999 (0.42.1-1) -- fixed string length in bestups.c line 279. -- upgraded package to 0.42.1 from 0.42.0 - -* Mon Dec 6 1999 (0.42.0-8) -- added requirement of nut-client for nut. - -* Mon Dec 6 1999 (0.42.0-7) -- removed overlapping files between the nut and nut-client rpms - -* Tue Nov 23 1999 (0.42.0-6) -- stop ups before uninstalling - -* Tue Nov 23 1999 (0.42.0-5) -- build against gd 1.6.3 - -* Wed Nov 03 1999 (0.42.0-4) -- Initial build of nut (well almost). -- Removed chmod from the make file so that the package - does not have to be built as root..... diff --git a/sources b/sources deleted file mode 100644 index b1483aa..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -3ba53656933d7471f95140b32a5b8d5c nut-2.7.4.tar.gz diff --git a/ups.init b/ups.init deleted file mode 100644 index fab3c92..0000000 --- a/ups.init +++ /dev/null @@ -1,147 +0,0 @@ -#! /bin/bash -# -# ups: Starts the Network UPS Tools -# -# chkconfig: - 26 74 -# description: Network UPS Tools is a collection of programs which provide a common \ -# interface for monitoring and administering UPS hardware. -# processname: upsd -# config: /etc/ups/ -# config: /etc/sysconfig/ups -# -### BEGIN INIT INFO -# Provides: ups -# Required-Start: $syslog $network $named -# Required-Stop: $local_fs -# Default-Stop: 0 1 6 -# Short-Description: Starts the Network UPS tools -# Description: Network UPS Tools is a collection of programs which provide a common \ -# interface for monitoring and administering UPS hardware. -### END INIT INFO - -# Source function library. -if [ -f /etc/init.d/functions ]; then - . /etc/init.d/functions -elif [ -f /etc/rc.d/init.d/functions ]; then - . /etc/rc.d/init.d/functions -else - exit 0 -fi - -# Get config. -if [ -f /etc/sysconfig/ups ]; then - . /etc/sysconfig/ups -else - SERVER="no" -fi - -start() { - if [ "$SERVER" = "yes" ]; then - echo -n $"Starting UPS driver controller: " - daemon /sbin/upsdrvctl start > /dev/null 2>&1 && success || failure - RETVAL=$? - echo - - prog="upsd" - echo -n $"Starting $prog: " - daemon /usr/sbin/upsd $UPSD_OPTIONS > /dev/null 2>&1 && success || failure - if [ "$RETVAL" = 0 ]; then - RETVAL=$? - fi - echo - - echo -n $"Starting UPS monitor (master): " - daemon --pidfile /var/run/nut/upsmon.pid /usr/sbin/upsmon > /dev/null 2>&1 && success || failure - if [ "$RETVAL" = 0 ]; then - RETVAL=$? - fi - echo - else - echo -n $"Starting UPS monitor (slave): " - daemon --pidfile /var/run/nut/upsmon.pid /usr/sbin/upsmon > /dev/null 2>&1 && success || failure - echo - fi - - [ "$RETVAL" = 0 ] && touch /var/lock/subsys/ups -} - -stop() { - echo -n $"Stopping UPS monitor: " - killproc -p /var/run/nut/upsmon.pid upsmon - echo - - if [ "$SERVER" = "yes" ]; then - prog="upsd" - echo -n $"Stopping $prog: " - killproc upsd > /dev/null 2>&1 && success || failure - RETVAL=$? - echo - - echo -n $"Shutting down UPS driver controller: " - /sbin/upsdrvctl stop > /dev/null 2>&1 && success || failure - if [ "$RETVAL" = 0 ]; then - RETVAL=$? - fi - echo - fi - [ "$RETVAL" = 0 ] && rm -f /var/lock/subsys/ups -} - -restart() { - stop - waitmore=5 - while [ -n "$(ls /var/run/nut/)" -a $waitmore -ge 1 ] - do - sleep 1 - waitmore=$((waitmore-1)) - done - start -} - -reload() { - # FIXME: upsd and upsmon always return 0 - # => can't tell if reload was successful - if [ "$SERVER" = "yes" ]; then - action "Reloading upsd:" /usr/sbin/upsd -c reload - RETVAL=$? - fi - action "Reloading upsmon:" /usr/sbin/upsmon -c reload - if [ "$RETVAL" = 0 ]; then - RETVAL=$? - fi -} - -# See how we are called. -case "$1" in - start) - start ;; - - stop) - stop ;; - - restart) - restart ;; - - try-restart) - [ -f /var/lock/subsys/ups ] && restart || : - ;; - - reload) - reload ;; - - force-reload) - restart ;; - - status) - if [ "$SERVER" = "yes" ]; then - status upsd - fi - status upsmon - ;; - - *) - echo $"Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status}" - RETVAL=3 -esac - -exit $RETVAL diff --git a/ups.sysconfig b/ups.sysconfig deleted file mode 100644 index 58f4f28..0000000 --- a/ups.sysconfig +++ /dev/null @@ -1,8 +0,0 @@ -# If the UPS is locally attached set it to "yes" -SERVER=yes -# Any options to pass to upsd -UPSD_OPTIONS= -# This *must* be the same as in /etc/ups/upsmon.conf -POWERDOWNFLAG=/etc/killpower -# -# [End]