Compare commits
11 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
393aac65a2 | ||
|
|
0c577010f8 | ||
|
|
a95181eec4 | ||
|
|
e51245f2b5 | ||
|
|
8b3ec16975 | ||
|
|
f1e0af4219 | ||
|
|
412da63740 | ||
|
|
097541dc32 | ||
|
|
b7ef114c39 | ||
|
|
26e358b744 | ||
|
|
dee53bd723 |
13 changed files with 490 additions and 536 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
|
@ -7,11 +7,5 @@ nut-2.4.3.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
|
||||
/nut-2.8.0.tar.gz
|
||||
/nut-2.8.1.tar.gz
|
||||
/nut-2.8.2.tar.gz
|
||||
/nut-2.8.2.1.tar.gz
|
||||
/nut-2.8.3.tar.gz
|
||||
/nut-2.8.4.tar.gz
|
||||
|
|
|
|||
2
libs.sh
2
libs.sh
|
|
@ -28,5 +28,5 @@ do
|
|||
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' -e 's/\\//g' clients/Makefile)
|
||||
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##*:} ))\""
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
diff -up nut-2.8.2.1/clients/upsmon.c.rmpidf nut-2.8.2.1/clients/upsmon.c
|
||||
--- nut-2.8.2.1/clients/upsmon.c.rmpidf 2024-07-03 12:18:04.788135176 +0200
|
||||
+++ nut-2.8.2.1/clients/upsmon.c 2024-07-03 12:19:33.164964473 +0200
|
||||
@@ -3309,6 +3309,7 @@ int main(int argc, char *argv[])
|
||||
diff -up nut-2.8.0/clients/upsmon.c.rmpidf nut-2.8.0/clients/upsmon.c
|
||||
--- nut-2.8.0/clients/upsmon.c.rmpidf 2022-04-23 13:56:06.000000000 +0200
|
||||
+++ nut-2.8.0/clients/upsmon.c 2022-05-09 17:22:34.329547283 +0200
|
||||
@@ -2314,6 +2314,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
upslogx(LOG_INFO, "Signal %d: exiting", exit_flag);
|
||||
upsnotify(NOTIFY_STATE_STOPPING, "Signal %d: exiting", exit_flag);
|
||||
upsmon_cleanup();
|
||||
+ cleanpid(prog);
|
||||
|
||||
upsdebugx(1, "Finally exiting due to signal %d", exit_flag);
|
||||
exit(EXIT_SUCCESS);
|
||||
diff -up nut-2.8.2.1/common/common.c.rmpidf nut-2.8.2.1/common/common.c
|
||||
--- nut-2.8.2.1/common/common.c.rmpidf 2024-07-03 12:14:56.000000000 +0200
|
||||
+++ nut-2.8.2.1/common/common.c 2024-07-03 12:18:04.788135176 +0200
|
||||
@@ -1338,6 +1338,20 @@ pid_t parsepid(const char *buf)
|
||||
}
|
||||
diff -up nut-2.8.0/common/common.c.rmpidf nut-2.8.0/common/common.c
|
||||
--- nut-2.8.0/common/common.c.rmpidf 2022-05-09 17:22:34.329547283 +0200
|
||||
+++ nut-2.8.0/common/common.c 2022-05-09 17:26:48.671847245 +0200
|
||||
@@ -358,6 +358,20 @@ pid_t parsepid(const char *buf)
|
||||
return pid;
|
||||
}
|
||||
|
||||
|
|
@ -33,10 +33,10 @@ diff -up nut-2.8.2.1/common/common.c.rmpidf nut-2.8.2.1/common/common.c
|
|||
/* open pidfn, get the pid, then send it sig
|
||||
* returns negative codes for errors, or
|
||||
* zero for a successfully sent signal
|
||||
diff -up nut-2.8.2.1/include/common.h.rmpidf nut-2.8.2.1/include/common.h
|
||||
--- nut-2.8.2.1/include/common.h.rmpidf 2024-07-03 12:14:56.000000000 +0200
|
||||
+++ nut-2.8.2.1/include/common.h 2024-07-03 12:18:04.788135176 +0200
|
||||
@@ -262,6 +262,9 @@ int checkprocname(pid_t pid, const char
|
||||
diff -up nut-2.8.0/include/common.h.rmpidf nut-2.8.0/include/common.h
|
||||
--- nut-2.8.0/include/common.h.rmpidf 2022-05-09 17:22:34.329547283 +0200
|
||||
+++ nut-2.8.0/include/common.h 2022-05-09 17:25:47.439740973 +0200
|
||||
@@ -103,6 +103,9 @@ void chroot_start(const char *path);
|
||||
/* write a pid file - <name> is a full pathname *or* just the program name */
|
||||
void writepid(const char *name);
|
||||
|
||||
|
|
@ -46,13 +46,14 @@ diff -up nut-2.8.2.1/include/common.h.rmpidf nut-2.8.2.1/include/common.h
|
|||
/* parses string buffer into a pid_t if it passes
|
||||
* a few sanity checks; returns -1 on error */
|
||||
pid_t parsepid(const char *buf);
|
||||
diff -up nut-2.8.2.1/server/upsd.c.rmpidf nut-2.8.2.1/server/upsd.c
|
||||
--- nut-2.8.2.1/server/upsd.c.rmpidf 2024-07-03 12:14:56.000000000 +0200
|
||||
+++ nut-2.8.2.1/server/upsd.c 2024-07-03 12:18:04.789135186 +0200
|
||||
@@ -2304,5 +2304,6 @@ int main(int argc, char **argv)
|
||||
upsnotify(NOTIFY_STATE_STOPPING, "Signal %d: exiting", exit_flag);
|
||||
|
||||
diff -up nut-2.8.0/server/upsd.c.rmpidf nut-2.8.0/server/upsd.c
|
||||
--- nut-2.8.0/server/upsd.c.rmpidf 2022-04-23 13:56:07.000000000 +0200
|
||||
+++ nut-2.8.0/server/upsd.c 2022-05-09 17:22:34.330547269 +0200
|
||||
@@ -1515,6 +1515,7 @@ int main(int argc, char **argv)
|
||||
ssl_cleanup();
|
||||
|
||||
upslogx(LOG_INFO, "Signal %d: exiting", exit_flag);
|
||||
+ if (*pidfn) cleanpid(pidfn);
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
|
|
|
|||
40
nut-2.6.5-unreachable.patch
Normal file
40
nut-2.6.5-unreachable.patch
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
diff -up nut-2.8.0/scripts/python/app/NUT-Monitor-py3qt5.in.unreachable nut-2.8.0/scripts/python/app/NUT-Monitor-py3qt5.in
|
||||
--- nut-2.8.0/scripts/python/app/NUT-Monitor-py3qt5.in.unreachable 2022-05-09 17:20:11.629621005 +0200
|
||||
+++ nut-2.8.0/scripts/python/app/NUT-Monitor-py3qt5.in 2022-05-09 17:20:52.674024537 +0200
|
||||
@@ -693,6 +693,11 @@ along with this program. If not, see <h
|
||||
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.8.0/scripts/python/module/PyNUT.py.in.unreachable nut-2.8.0/scripts/python/module/PyNUT.py.in
|
||||
--- nut-2.8.0/scripts/python/module/PyNUT.py.in.unreachable 2022-05-09 17:20:32.100323526 +0200
|
||||
+++ nut-2.8.0/scripts/python/module/PyNUT.py.in 2022-05-09 17:21:35.505402117 +0200
|
||||
@@ -170,6 +170,21 @@ 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
|
||||
|
||||
|
|
@ -1,50 +1,48 @@
|
|||
diff -up nut-2.8.1/configure.ac.piddir-owner nut-2.8.1/configure.ac
|
||||
--- nut-2.8.1/configure.ac.piddir-owner 2023-11-01 09:39:24.267596406 +0100
|
||||
+++ nut-2.8.1/configure.ac 2023-11-01 10:00:35.425987029 +0100
|
||||
@@ -4451,7 +4451,7 @@ AS_IF([test -n "$systemdtmpfilesdir"],
|
||||
|
||||
# See also: https://github.com/networkupstools/nut/wiki/Technicalities:-Work-with-PID-and-state-file-paths#pidpath-altpidpath-statepath
|
||||
# State file (e.g. upsd to driver pipes) and PID file location for NUT:
|
||||
-d @STATEPATH@ 0770 @RUN_AS_USER@ @RUN_AS_GROUP@ - -
|
||||
diff -up nut-2.8.0/configure.ac.piddir-owner nut-2.8.0/configure.ac
|
||||
--- nut-2.8.0/configure.ac.piddir-owner 2022-04-26 18:03:36.000000000 -0400
|
||||
+++ nut-2.8.0/configure.ac 2022-11-30 13:29:58.418038393 -0500
|
||||
@@ -2833,23 +2833,23 @@ AS_IF([test -n "$systemdtmpfilesdir"],
|
||||
[mkdir -p "${TOP_BUILDDIR}"/scripts/systemd
|
||||
cat > "${TOP_BUILDDIR}"/scripts/systemd/nut-common.tmpfiles.in << EOF
|
||||
# State file (e.g. upsd to driver) and pidfile location for NUT:
|
||||
-d @STATEPATH@/nut 0770 @RUN_AS_USER@ @RUN_AS_GROUP@ - -
|
||||
-X @STATEPATH@/nut
|
||||
+d @STATEPATH@ 0770 root @RUN_AS_GROUP@ - -
|
||||
# Default PIPEFN and LOCKFN locations per upssched.conf:
|
||||
d @STATEPATH@/upssched 0770 @RUN_AS_USER@ @RUN_AS_GROUP@ - -
|
||||
X @STATEPATH@
|
||||
@@ -4461,7 +4461,7 @@ EOF
|
||||
[*/run|*/tmp|*/shm], [], dnl Do not intrude into system paths; TODO: add more if appropriate for some Linux distro
|
||||
[cat >> "${TOP_BUILDDIR}"/scripts/systemd/nut-common-tmpfiles.conf.in << EOF
|
||||
# Primarily used by upsmon and upslog, possibly running as root:
|
||||
-d @PIDPATH@ 0770 @RUN_AS_USER@ @RUN_AS_GROUP@ - -
|
||||
+d @PIDPATH@ 0770 root @RUN_AS_GROUP@ - -
|
||||
X @PIDPATH@
|
||||
+X @STATEPATH@
|
||||
EOF
|
||||
])])
|
||||
@@ -4469,14 +4469,14 @@ EOF
|
||||
[cat >> "${TOP_BUILDDIR}"/scripts/systemd/nut-common-tmpfiles.conf.in << EOF
|
||||
# Should be used as upsd and driver PID file location for NUT
|
||||
# (if ALTPIDPATH differs from STATEPATH):
|
||||
-d @ALTPIDPATH@ 0770 @RUN_AS_USER@ @RUN_AS_GROUP@ - -
|
||||
+d @ALTPIDPATH@ 0770 root @RUN_AS_GROUP@ - -
|
||||
X @ALTPIDPATH@
|
||||
AS_IF([test "$STATEPATH" != "$PIDPATH"],
|
||||
[cat >> "${TOP_BUILDDIR}"/scripts/systemd/nut-common.tmpfiles.in << EOF
|
||||
-d @PIDPATH@/nut 0770 @RUN_AS_USER@ @RUN_AS_GROUP@ - -
|
||||
-X @PIDPATH@/nut
|
||||
+d @PIDPATH@ 0770 root @RUN_AS_GROUP@ - -
|
||||
+X @PIDPATH@
|
||||
EOF])
|
||||
AS_IF([test -n "$ALTPIDPATH" && test "$STATEPATH" != "$ALTPIDPATH" && test "$PIDPATH" != "$ALTPIDPATH"],
|
||||
[cat >> "${TOP_BUILDDIR}"/scripts/systemd/nut-common.tmpfiles.in << EOF
|
||||
-d @ALTPIDPATH@/nut 0770 @RUN_AS_USER@ @RUN_AS_GROUP@ - -
|
||||
-X @ALTPIDPATH@/nut
|
||||
+d @ALTPIDPATH@ 0770 root @RUN_AS_GROUP@ - -
|
||||
+X @ALTPIDPATH@
|
||||
EOF])
|
||||
dnl Generally added to support some forks
|
||||
AS_IF([test -n "$ALTSTATEPATH" && test "$STATEPATH" != "$ALTSTATEPATH" && test "$ALTSTATEPATH" != "$ALTPIDPATH" && test "$PIDPATH" != "$ALTSTATEPATH"],
|
||||
[cat >> "${TOP_BUILDDIR}"/scripts/systemd/nut-common-tmpfiles.conf.in << EOF
|
||||
# Some NUT variants also maintain an ALTSTATEPATH:
|
||||
-d @ALTSTATEPATH@ 0770 @RUN_AS_USER@ @RUN_AS_GROUP@ - -
|
||||
[cat >> "${TOP_BUILDDIR}"/scripts/systemd/nut-common.tmpfiles.in << EOF
|
||||
-d @ALTSTATEPATH@/nut 0770 @RUN_AS_USER@ @RUN_AS_GROUP@ - -
|
||||
-X @ALTSTATEPATH@/nut
|
||||
+d @ALTSTATEPATH@ 0770 root @RUN_AS_GROUP@ - -
|
||||
X @ALTSTATEPATH@
|
||||
+X @ALTSTATEPATH@
|
||||
EOF])
|
||||
])
|
||||
diff -up nut-2.8.1/scripts/systemd/nut-common-tmpfiles.conf.in.piddir-owner nut-2.8.1/scripts/systemd/nut-common-tmpfiles.conf.in
|
||||
--- nut-2.8.1/scripts/systemd/nut-common-tmpfiles.conf.in.piddir-owner 2023-10-31 23:05:03.000000000 +0100
|
||||
+++ nut-2.8.1/scripts/systemd/nut-common-tmpfiles.conf.in 2023-11-01 10:03:46.970845553 +0100
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
# See also: https://github.com/networkupstools/nut/wiki/Technicalities:-Work-with-PID-and-state-file-paths#pidpath-altpidpath-statepath
|
||||
# State file (e.g. upsd to driver pipes) and PID file location for NUT:
|
||||
-d @STATEPATH@ 0770 @RUN_AS_USER@ @RUN_AS_GROUP@ - -
|
||||
AC_MSG_RESULT([done])
|
||||
diff -up nut-2.8.0/scripts/systemd/nut-common.tmpfiles.in.piddir-owner nut-2.8.0/scripts/systemd/nut-common.tmpfiles.in
|
||||
--- nut-2.8.0/scripts/systemd/nut-common.tmpfiles.in.piddir-owner 2022-04-26 18:06:27.000000000 -0400
|
||||
+++ nut-2.8.0/scripts/systemd/nut-common.tmpfiles.in 2022-11-30 13:30:11.651106256 -0500
|
||||
@@ -1,5 +1,5 @@
|
||||
# State file (e.g. upsd to driver) and pidfile location for NUT:
|
||||
-d @STATEPATH@/nut 0770 @RUN_AS_USER@ @RUN_AS_GROUP@ - -
|
||||
-X @STATEPATH@/nut
|
||||
-d @PIDPATH@/nut 0770 @RUN_AS_USER@ @RUN_AS_GROUP@ - -
|
||||
-X @PIDPATH@/nut
|
||||
+d @STATEPATH@ 0770 root @RUN_AS_GROUP@ - -
|
||||
# Default PIPEFN and LOCKFN locations per upssched.conf:
|
||||
d @STATEPATH@/upssched 0770 @RUN_AS_USER@ @RUN_AS_GROUP@ - -
|
||||
X @STATEPATH@
|
||||
+X @STATEPATH@
|
||||
+d @PIDPATH@ 0770 root @RUN_AS_GROUP@ - -
|
||||
+X @PIDPATH@
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
diff -up nut-2.8.4-build/nut-2.8.4/drivers/Makefile.am.rhinoname nut-2.8.4-build/nut-2.8.4/drivers/Makefile.am
|
||||
--- nut-2.8.4-build/nut-2.8.4/drivers/Makefile.am.rhinoname 2025-08-14 11:08:48.763700333 +0200
|
||||
+++ nut-2.8.4-build/nut-2.8.4/drivers/Makefile.am 2025-08-14 11:29:43.803846801 +0200
|
||||
@@ -74,7 +74,7 @@ NUTSW_DRIVERLIST = $(NUTSW_DRIVERLIST_DU
|
||||
SERIAL_DRIVERLIST = al175 bcmxcp belkin belkinunv bestfcom \
|
||||
bestfortress bestuferrups bestups etapro everups \
|
||||
gamatronic genericups isbmex liebert liebert-esp2 liebert-gxe masterguard metasys \
|
||||
- mge-utalk microdowell microsol-apc mge-shut nutdrv_hashx oneac optiups powercom powervar_cx_ser rhino \
|
||||
+ mge-utalk microdowell microsol-apc mge-shut nutdrv_hashx oneac optiups powercom powervar_cx_ser nutdrv_rhino \
|
||||
safenet nutdrv_siemens-sitop solis tripplite tripplitesu upscode2 victronups powerpanel \
|
||||
blazer_ser ivtscd apcsmart apcsmart-old riello_ser sms_ser bicker_ser ve-direct
|
||||
if HAVE_LINUX_SERIAL_H
|
||||
@@ -198,8 +198,8 @@ powerpanel_SOURCES = powerpanel.c powerp
|
||||
powerpanel_LDADD = $(LDADD) -lm
|
||||
powervar_cx_ser_SOURCES = powervar_cx_ser.c powervar_cx.c
|
||||
powervar_cx_ser_CFLAGS = $(AM_CFLAGS) -DPVAR_SERIAL=1
|
||||
-rhino_SOURCES = rhino.c
|
||||
-rhino_LDADD = $(LDADD) -lm
|
||||
+nutdrv_rhino_SOURCES = rhino.c
|
||||
+nutdrv_rhino_LDADD = $(LDADD) -lm
|
||||
safenet_SOURCES = safenet.c
|
||||
nutdrv_siemens_sitop_SOURCES = nutdrv_siemens_sitop.c
|
||||
solis_SOURCES = solis.c
|
||||
60
nut-c99-ax_c_printf_null.patch
Normal file
60
nut-c99-ax_c_printf_null.patch
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
Fix several issues with the AX_C_PRINTF_STRING_NULL check:
|
||||
|
||||
Adjust quoting in the AX_C_PRINTF_STRING_NULL definition. Switch to
|
||||
strstr from strcasestr (a GNU extension, requires -D_GNU_SOURCE)
|
||||
and include <string.h> instead of <strings.h>. Add missing braces
|
||||
and parentheses. Use double-quote for string literals.
|
||||
|
||||
Submitted upstream: <https://github.com/networkupstools/nut/pull/1720>
|
||||
|
||||
diff --git a/m4/ax_c_pragmas.m4 b/m4/ax_c_pragmas.m4
|
||||
index 53c1aebf8ea35a1e..14ecd596d3b36573 100644
|
||||
--- a/m4/ax_c_pragmas.m4
|
||||
+++ b/m4/ax_c_pragmas.m4
|
||||
@@ -943,32 +943,32 @@ if test -z "${nut_have_ax_c_printf_string_null_seen}"; then
|
||||
dnl ### To be sure, bolt the language
|
||||
AC_LANG_PUSH([C])
|
||||
|
||||
- AC_CACHE_CHECK([for practical support to pritnf("%s", NULL)],
|
||||
+ AC_CACHE_CHECK([for practical support to printf("%s", NULL)],
|
||||
[ax_cv__printf_string_null],
|
||||
[AX_RUN_OR_LINK_IFELSE(
|
||||
[AC_LANG_PROGRAM([dnl
|
||||
#include <stdio.h>
|
||||
-#include <strings.h>
|
||||
-], [dnl
|
||||
+#include <string.h>
|
||||
+], [[
|
||||
char buf[128];
|
||||
char *s = NULL;
|
||||
int res = snprintf(buf, sizeof(buf), "%s", s);
|
||||
buf[sizeof(buf)-1] = '\0';
|
||||
if (res < 0) {
|
||||
- printf(stderr, "FAILED to snprintf() a NULL string argument");
|
||||
- exit 1;
|
||||
+ fprintf(stderr, "FAILED to snprintf() a NULL string argument\n");
|
||||
+ return 1;
|
||||
}
|
||||
-if (buf[0] == '\0')
|
||||
- printf(stderr, "RETURNED empty string from snprintf() with a NULL string argument");
|
||||
- exit 0;
|
||||
+if (buf[0] == '\0') {
|
||||
+ fprintf(stderr, "RETURNED empty string from snprintf() with a NULL string argument\n");
|
||||
+ return 0;
|
||||
}
|
||||
-if (strcasestr(buf, 'null') == NULL)
|
||||
- printf(stderr, "RETURNED some string from snprintf() with a NULL string argument: '%s'", buf);
|
||||
- exit 0;
|
||||
+if (strstr(buf, "null") == NULL) {
|
||||
+ fprintf(stderr, "RETURNED some string from snprintf() with a NULL string argument: '%s'\n", buf);
|
||||
+ return 0;
|
||||
}
|
||||
-printf(stderr, "SUCCESS: RETURNED a string that contains something like 'null' from snprintf() with a NULL string argument: '%s'", buf);
|
||||
-exit 0;
|
||||
- ])],
|
||||
+fprintf(stderr, "SUCCESS: RETURNED a string that contains something like 'null' from snprintf() with a NULL string argument: '%s'\n", buf);
|
||||
+return 0;
|
||||
+ ]])],
|
||||
[ax_cv__printf_string_null=yes],
|
||||
[ax_cv__printf_string_null=no]
|
||||
)]
|
||||
17
nut-c99-c_attribute.patch
Normal file
17
nut-c99-c_attribute.patch
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
Call the defined foo function instead of the undeclared func function.
|
||||
|
||||
Submitted upstream: <https://github.com/networkupstools/nut/pull/1720>
|
||||
|
||||
diff --git a/m4/ax_c___attribute__.m4 b/m4/ax_c___attribute__.m4
|
||||
index 0e952e7841c35b60..780bc2bb14ac5a78 100644
|
||||
--- a/m4/ax_c___attribute__.m4
|
||||
+++ b/m4/ax_c___attribute__.m4
|
||||
@@ -67,7 +67,7 @@ AC_DEFUN([AX_C___ATTRIBUTE__], [
|
||||
foo(__attribute__ ((unused)) int i) {
|
||||
return;
|
||||
}
|
||||
- ]], [func(1);])],
|
||||
+ ]], [foo(1);])],
|
||||
[ax_cv___attribute__unused_arg=yes],
|
||||
[ax_cv___attribute__unused_arg=no]
|
||||
)
|
||||
1
nut-client.tmpfiles
Normal file
1
nut-client.tmpfiles
Normal file
|
|
@ -0,0 +1 @@
|
|||
D /run/nut 0750 nut nut -
|
||||
597
nut.spec
597
nut.spec
|
|
@ -1,4 +1,6 @@
|
|||
%global _hardened_build 1
|
||||
#global with_python2 0
|
||||
%bcond_with python2
|
||||
|
||||
#TODO: split nut-client so it does not require python
|
||||
%global nut_uid 57
|
||||
|
|
@ -6,33 +8,34 @@
|
|||
|
||||
%global cgidir /var/www/nut-cgi-bin
|
||||
%global piddir /run/nut
|
||||
%global modeldir %{_libexecdir}/%{name}
|
||||
%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.8.4
|
||||
Release: 5%{?dist}
|
||||
License: GPL-2.0-or-later AND GPL-3.0-or-later
|
||||
Version: 2.8.0
|
||||
Release: 2%{?dist}
|
||||
License: GPLv2+ and GPLv3+
|
||||
Url: https://www.networkupstools.org/
|
||||
Source: https://www.networkupstools.org/source/2.8/%{name}-%{version}.tar.gz
|
||||
Source4: libs.sh
|
||||
Patch1: nut-2.6.3-tmpfiles.patch
|
||||
Patch2: nut-2.8.0-piddir-owner.patch
|
||||
|
||||
#quick fix. TODO: fix it properly
|
||||
Patch8: nut-2.6.5-unreachable.patch
|
||||
Patch9: nut-2.6.5-rmpidf.patch
|
||||
Patch13: nut-c99-c_attribute.patch
|
||||
Patch14: nut-c99-ax_c_printf_null.patch
|
||||
Patch15: nut-c99-strdup.patch
|
||||
Patch16: nut-2.8.3-rhinoname.patch
|
||||
|
||||
Requires(pre): shadow-utils
|
||||
Requires(post): coreutils systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): coreutils systemd
|
||||
Recommends: nut-xml
|
||||
Requires: group(dialout)
|
||||
Requires: group(tty)
|
||||
Obsoletes: nut-hal < 2.6.0-7
|
||||
|
||||
BuildRequires: asciidoc
|
||||
BuildRequires: make
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
|
|
@ -48,18 +51,12 @@ BuildRequires: freetype-devel
|
|||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gd-devel
|
||||
BuildRequires: jq
|
||||
%if 0%{?fedora} < 39
|
||||
BuildRequires: libgpiod-devel
|
||||
%endif
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libtool-ltdl-devel
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libXpm-devel
|
||||
BuildRequires: libmodbus-devel
|
||||
BuildRequires: libi2c-devel
|
||||
BuildRequires: neon-devel
|
||||
BuildRequires: net-snmp-devel
|
||||
BuildRequires: netpbm-devel
|
||||
|
|
@ -71,11 +68,11 @@ BuildRequires: powerman-devel
|
|||
%endif
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: /usr/bin/pathfix.py
|
||||
#BuildRequires: systemd-rpm-macros
|
||||
|
||||
%ifnarch s390 s390x
|
||||
BuildRequires: libusb1-devel
|
||||
BuildRequires: libusb-devel
|
||||
%endif
|
||||
|
||||
ExcludeArch: s390 s390x
|
||||
|
|
@ -83,18 +80,22 @@ ExcludeArch: s390 s390x
|
|||
%global restart_flag %{piddir}/%{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
|
||||
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,
|
||||
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: group(dialout)
|
||||
Requires: group(tty)
|
||||
Requires(pre): shadow-utils
|
||||
%if %{with python2}
|
||||
Requires: pygtk2, pygtk2-libglade
|
||||
#only for python and gui part
|
||||
%endif
|
||||
#Requires:
|
||||
|
||||
%description client
|
||||
This package includes the client utilities that are required to monitor a
|
||||
|
|
@ -104,19 +105,12 @@ 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
|
||||
|
||||
%description cgi
|
||||
This package includes CGI programs for accessing UPS status via a web
|
||||
browser.
|
||||
|
||||
%package monitor
|
||||
Summary: Network UPS Tools monitor application
|
||||
BuildRequires: python3-pyqt6
|
||||
|
||||
%description monitor
|
||||
This package contain the Python NUT-Monitor GUI application to
|
||||
monitor a UPS.
|
||||
|
||||
%package xml
|
||||
Summary: XML UPS driver for the Network UPS Tools
|
||||
Requires: %{name}-client = %{version}-%{release}
|
||||
|
|
@ -135,34 +129,25 @@ necessary to develop NUT client applications.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
#patch -P 2 -p1 -b .piddir-owner
|
||||
%patch -P 9 -p1 -b .rmpidf
|
||||
#patch -P 15 -p1
|
||||
%patch -P 16 -p2 -b .rhinoname
|
||||
%patch1 -p1 -b .tmpfiles
|
||||
%patch2 -p1 -b .piddir-owner
|
||||
%patch8 -p1 -b .unreachable
|
||||
%patch9 -p1 -b .rmpidf
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
|
||||
sed -i 's|=NUT-Monitor|=nut-monitor|' scripts/python/app/nut-monitor-py3qt5.desktop
|
||||
sed -i "s|sys.argv\[0\]|'%{_datadir}/%{name}/nut-monitor/nut-monitor'|" scripts/python/app/NUT-Monitor-py3qt5.in
|
||||
sed -i 's|LIBSSL_LDFLAGS|LIBSSL_LIBS|' lib/libupsclient-config.in
|
||||
sed -i 's|LIBSSL_LDFLAGS|LIBSSL_LIBS|' lib/libupsclient.pc.in
|
||||
|
||||
# workaround for multilib conflicts - caused by patch changing modification time of scripts
|
||||
find . -mtime -1 -print0 | xargs -0 touch --reference %{SOURCE0}
|
||||
|
||||
# fix python site packages check
|
||||
sed -i 's|\(PYTHON3\?_SITE_PACKAGES=\)".*"|\1"%{python3_sitelib}"|' m4/nut_check_python.m4
|
||||
|
||||
# Create a sysusers.d config file
|
||||
cat >nut.sysusers.conf <<EOF
|
||||
u nut %{nut_uid} 'Network UPS Tools' %{_localstatedir}/lib/ups /bin/false
|
||||
m nut dialout
|
||||
m nut tty
|
||||
EOF
|
||||
|
||||
%build
|
||||
%if 0%{?fedora}
|
||||
#--without-gpio is not enough to stop it complaining about missing library
|
||||
sed -i 's|with_gpio="[^"]*"|with_gpio="no"|g' configure.ac
|
||||
%endif
|
||||
autoreconf -i
|
||||
export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS"
|
||||
export CXXFLAGS="-std=c++11 $RPM_OPT_FLAGS"
|
||||
# prevent assignment of default value, it would break configure's tests
|
||||
export LDFLAGS="-Wl,-z,now"
|
||||
%configure \
|
||||
|
|
@ -171,14 +156,14 @@ export LDFLAGS="-Wl,-z,now"
|
|||
--without-powerman \
|
||||
%endif
|
||||
--with-libltdl \
|
||||
%if 0%{?el8}
|
||||
%if (0%{?fedora} && 0%{?fedora} < 33) || 0%{?el8}
|
||||
--with-nss \
|
||||
%endif
|
||||
--without-wrap \
|
||||
--without-modbus \
|
||||
--without-linux-i2c \
|
||||
--with-cgi \
|
||||
--with-python=%{python3} \
|
||||
--with-python3=%{python3} \
|
||||
--without-python2 \
|
||||
--with-python3 \
|
||||
--datadir=%{_datadir}/%{name} \
|
||||
--with-user=%{name} \
|
||||
--with-group=dialout \
|
||||
|
|
@ -188,19 +173,14 @@ export LDFLAGS="-Wl,-z,now"
|
|||
--sysconfdir=%{_sysconfdir}/ups \
|
||||
--with-cgipath=%{cgidir} \
|
||||
--with-drvpath=%{modeldir} \
|
||||
%if 0%{?fedora}
|
||||
--without-gpio \
|
||||
%endif
|
||||
--with-systemdsystemunitdir=%{_unitdir} \
|
||||
--with-systemdshutdowndir=/lib/systemd/system-shutdown \
|
||||
--with-pkgconfig-dir=%{_libdir}/pkgconfig \
|
||||
--disable-static \
|
||||
--with-udev-dir=%{_usr}/lib/udev \
|
||||
--libdir=%{_libdir} \
|
||||
--enable-docs-changelog=no
|
||||
--libdir=%{_libdir}
|
||||
# --with-doc # does not work in 2.7.1
|
||||
|
||||
# for rhbz#838139 check if still needed?
|
||||
sh %{SOURCE4} >>include/config.h
|
||||
|
||||
#remove rpath
|
||||
|
|
@ -218,7 +198,7 @@ mkdir -p %{buildroot}%{modeldir} \
|
|||
|
||||
%make_install
|
||||
|
||||
#mv %{buildroot}%{_tmpfilesdir}/nut-common.tmpfiles %{buildroot}%{_tmpfilesdir}/nut-common.conf
|
||||
mv %{buildroot}%{_tmpfilesdir}/nut-common.tmpfiles %{buildroot}%{_tmpfilesdir}/nut-common.conf
|
||||
|
||||
rm -rf %{buildroot}%{_prefix}/html
|
||||
rm -f %{buildroot}%{_libdir}/*.la
|
||||
|
|
@ -226,7 +206,7 @@ rm -rf docs/man
|
|||
rm -rf %{buildroot}%{_datadir}/nut/solaris-init
|
||||
find docs/ -name 'Makefile*' -delete
|
||||
|
||||
pushd conf;
|
||||
pushd conf;
|
||||
%make_install
|
||||
for file in %{buildroot}%{_sysconfdir}/ups/*.sample
|
||||
do
|
||||
|
|
@ -246,125 +226,110 @@ do
|
|||
mv -f $fe.new $fe
|
||||
done
|
||||
|
||||
# rename rhino to nutdrv_rhino to prevent file conflict (rhbz#2367057)
|
||||
mv %{buildroot}%{_mandir}/man8/rhino.8 %{buildroot}%{_mandir}/man8/nutdrv_rhino.8
|
||||
|
||||
# install PyNUT
|
||||
# install PyNUT
|
||||
install -p -D -m 644 scripts/python/module/PyNUT.py %{buildroot}%{python3_sitelib}/PyNUT.py
|
||||
# add lowercase name
|
||||
ln %{buildroot}%{_bindir}/{NUT-Monitor,nut-monitor}
|
||||
# install desktop file
|
||||
mkdir -p %{buildroot}%{_datadir}/applications
|
||||
desktop-file-install \
|
||||
--dir=%{buildroot}%{_datadir}/applications \
|
||||
%{buildroot}%{_datadir}/nut-monitor/app/nut-monitor.desktop
|
||||
# install icons
|
||||
for res in 256x256 48x48 64x64 scalable
|
||||
do
|
||||
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${res}/apps
|
||||
ln %{buildroot}%{_datadir}/nut-monitor/app/icons/${res}/nut-monitor.* \
|
||||
%{buildroot}%{_datadir}/icons/hicolor/${res}/apps/
|
||||
done
|
||||
|
||||
# Setup permissions for pid file
|
||||
touch %{buildroot}/%{piddir}/upsmon.pid
|
||||
chmod 0644 %{buildroot}/%{piddir}/upsmon.pid
|
||||
|
||||
install -m0644 -D nut.sysusers.conf %{buildroot}%{_sysusersdir}/nut.conf
|
||||
# install nut-monitor
|
||||
%if %{with python2}
|
||||
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
|
||||
%endif
|
||||
|
||||
%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,tty %{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 || :
|
||||
/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
|
||||
%systemd_post nut-driver-enumerator.path nut-driver-enumerator.service nut-driver.target nut-server.service nut.target
|
||||
/sbin/ldconfig
|
||||
%systemd_post nut-driver.service nut-server.service
|
||||
|
||||
%preun
|
||||
%systemd_preun nut-driver-enumerator.path nut-driver-enumerator.service nut-driver.target nut-server.service nut.target
|
||||
%systemd_preun nut-driver.service nut-server.service
|
||||
|
||||
%postun
|
||||
%systemd_postun_with_restart nut-driver.target 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,tty %{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,tty %{name}
|
||||
|
||||
%post client
|
||||
%systemd_post nut-monitor.service nut.target
|
||||
/sbin/ldconfig
|
||||
%systemd_post nut-monitor.service
|
||||
|
||||
%preun client
|
||||
%systemd_preun nut-monitor.service nut.target
|
||||
%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
|
||||
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
|
||||
/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 INSTALL NEWS
|
||||
%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}/
|
||||
# dummy-ups requires libupsclient
|
||||
%exclude %{modeldir}/dummy-ups
|
||||
%{modeldir}/*
|
||||
%exclude %{modeldir}/netxml-ups
|
||||
%{_unitdir}/nut-driver-enumerator.path
|
||||
%{_unitdir}/nut-driver-enumerator.service
|
||||
%{_unitdir}/nut-driver-enumerator-daemon-activator.path
|
||||
%{_unitdir}/nut-driver-enumerator-daemon-activator.service
|
||||
%{_unitdir}/nut-driver-enumerator-daemon.service
|
||||
%{_unitdir}/nut-driver@.service
|
||||
%{_unitdir}/nut-driver.target
|
||||
%{_unitdir}/nut-server.service
|
||||
%{_unitdir}/nut.target
|
||||
%{_presetdir}/nut-systemd.preset
|
||||
%{_unitdir}/enphase-monitor@.service
|
||||
%{_unitdir}/nut-logger.service
|
||||
%{_unitdir}/nut-udev-settle.service
|
||||
%{_sbindir}/upsd
|
||||
%{_bindir}/nutconf
|
||||
%{_bindir}/nut-scanner
|
||||
%{_sbindir}/upsdrvctl
|
||||
%{_sbindir}/upsdrvsvcctl
|
||||
%{_bindir}/upslog
|
||||
%{_libdir}/libnutscan.so.*
|
||||
%{_libdir}/libnutconf.so.*
|
||||
%{_libexecdir}/nut-driver-enumerator.sh
|
||||
%{_libexecdir}/sockdebug
|
||||
%{_libexecdir}/enphase-monitor
|
||||
%{_datadir}/augeas/lenses/dist/nut*
|
||||
%{_datadir}/augeas/lenses/dist/tests/test_nut.aug
|
||||
%{_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/nutconf.8.gz
|
||||
|
||||
%{_mandir}/man8/adelsystem_cbi.8.gz
|
||||
%{_mandir}/man8/apc_modbus.8.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/asem.8.gz
|
||||
%{_mandir}/man8/bcmxcp.8*
|
||||
%{_mandir}/man8/bcmxcp_usb.8.gz
|
||||
%{_mandir}/man8/belkin.8.gz
|
||||
|
|
@ -373,38 +338,26 @@ fi
|
|||
%{_mandir}/man8/bestfortress.8.gz
|
||||
%{_mandir}/man8/bestups.8.gz
|
||||
%{_mandir}/man8/bestuferrups.8.gz
|
||||
%{_mandir}/man8/bicker_ser.8.gz
|
||||
%{_mandir}/man8/blazer_ser.8.gz
|
||||
%{_mandir}/man8/blazer_usb.8.gz
|
||||
%{_mandir}/man8/clone.8.gz
|
||||
%{_mandir}/man8/clone-outlet.8.gz
|
||||
%{_mandir}/man8/dummy-ups.8.gz
|
||||
%{_mandir}/man8/everups.8.gz
|
||||
%{_mandir}/man8/etapro.8.gz
|
||||
%{_mandir}/man8/failover.8.gz
|
||||
%{_mandir}/man8/gamatronic.8.gz
|
||||
%{_mandir}/man8/generic_modbus.8.gz
|
||||
%{_mandir}/man8/genericups.8.gz
|
||||
%if 0%{?fedora} < 39
|
||||
%{_mandir}/man8/generic_gpio.8.gz
|
||||
%endif
|
||||
%{_mandir}/man8/hwmon_ina219.8.gz
|
||||
%{_mandir}/man8/huawei-ups2000.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/liebert-gxe.8.gz
|
||||
%{_mandir}/man8/masterguard.8.gz
|
||||
%{_mandir}/man8/metasys.8.gz
|
||||
%{_mandir}/man8/microdowell.8.gz
|
||||
%{_mandir}/man8/microsol-apc.8.gz
|
||||
%{_mandir}/man8/mge-utalk.8.gz
|
||||
%{_mandir}/man8/mge-shut.8.gz
|
||||
%{_mandir}/man8/nhs_ser.8.gz
|
||||
%{_mandir}/man8/nutupsdrv.8.gz
|
||||
%{_mandir}/man8/nutdrv_atcl_usb.8.gz
|
||||
%{_mandir}/man8/nutdrv_hashx.8.gz
|
||||
%{_mandir}/man8/nutdrv_siemens_sitop.8.gz
|
||||
%{_mandir}/man8/nut-driver-enumerator.8.gz
|
||||
%{_mandir}/man8/nut-ipmipsu.8.gz
|
||||
|
|
@ -413,87 +366,65 @@ fi
|
|||
%{_mandir}/man8/nutdrv_qx.8.gz
|
||||
%{_mandir}/man8/oneac.8.gz
|
||||
%{_mandir}/man8/optiups.8.gz
|
||||
%{_mandir}/man8/phoenixcontact_modbus.8.gz
|
||||
%{_mandir}/man8/pijuice.8.gz
|
||||
%{_mandir}/man8/powercom.8.gz
|
||||
%if %{with powerman}
|
||||
%{_mandir}/man8/powerman-pdu.8.gz
|
||||
%endif
|
||||
%{_mandir}/man8/powerpanel.8.gz
|
||||
%{_mandir}/man8/powervar_cx_ser.8.gz
|
||||
%{_mandir}/man8/powervar_cx_usb.8.gz
|
||||
%{_mandir}/man8/nutdrv_rhino.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/sms_ser.8.gz
|
||||
%{_mandir}/man8/snmp-ups.8.gz
|
||||
%{_mandir}/man8/solis.8*
|
||||
%{_mandir}/man8/sockdebug.8.gz
|
||||
%{_mandir}/man8/socomec_jbus.8.gz
|
||||
%{_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/upsdrvsvcctl.8.gz
|
||||
%{_mandir}/man8/upslog.8.gz
|
||||
%{_mandir}/man8/usbhid-ups.8.gz
|
||||
%{_mandir}/man8/victronups.8.gz
|
||||
%{_mandir}/man8/ve-direct.8.gz
|
||||
%{_sysusersdir}/nut.conf
|
||||
|
||||
%files client
|
||||
%license COPYING LICENSE-GPL2 LICENSE-GPL3
|
||||
%dir %{_sysconfdir}/ups
|
||||
%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/nut.conf
|
||||
%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsmon.conf
|
||||
%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upssched.conf
|
||||
%{_tmpfilesdir}/nut-common-tmpfiles.conf
|
||||
%{_tmpfilesdir}/nut-common.conf
|
||||
%dir %attr(750,nut,nut) %{_localstatedir}/lib/ups
|
||||
# upsmon.pid is written as root, so root needs access for now
|
||||
%dir %attr(770,root,dialout) %{piddir}
|
||||
%attr(644,nut,nut) %verify(not size mtime md5) /run/%{name}/upsmon.pid
|
||||
%ghost %attr(770,root,nut) %{piddir}
|
||||
%{_bindir}/upsc
|
||||
%{_bindir}/upscmd
|
||||
%{_bindir}/upslog
|
||||
%{_bindir}/upsrw
|
||||
%{_sbindir}/upsmon
|
||||
%{_sbindir}/upssched
|
||||
%{_bindir}/upssched-cmd
|
||||
# dummy-ups requires libupsclient
|
||||
%{modeldir}/dummy-ups
|
||||
%{_unitdir}/nut-monitor.service
|
||||
# nut-monitor.service also needs nut.target
|
||||
%{_unitdir}/nut.target
|
||||
/lib/systemd/system-shutdown/nutshutdown
|
||||
%{_libdir}/libupsclient.so.*
|
||||
%{_libdir}/libnutclient.so.*
|
||||
%{_libdir}/libnutclientstub.so.*
|
||||
%{_mandir}/man5/nut.conf.5.gz
|
||||
%{_mandir}/man5/upsmon.conf.5.gz
|
||||
%{_mandir}/man5/upssched.conf.5.gz
|
||||
%{_mandir}/man7/nut.7.gz
|
||||
%{_mandir}/man8/upsc.8.gz
|
||||
%{_mandir}/man8/upscmd.8.gz
|
||||
%{_mandir}/man8/upslog.8.gz
|
||||
%{_mandir}/man8/upsrw.8.gz
|
||||
%{_mandir}/man8/upsmon.8.gz
|
||||
%{_mandir}/man8/upssched.8.gz
|
||||
#%%pycached %%{python3_sitelib}/PyNUT.py
|
||||
# use glob list, as %%pycached does not work...
|
||||
%{python3_sitelib}/*
|
||||
%{_datadir}/nut
|
||||
%{_sysusersdir}/nut.conf
|
||||
|
||||
%files monitor
|
||||
%if %{with python2}
|
||||
%{_bindir}/nut-monitor
|
||||
%{_bindir}/NUT-Monitor
|
||||
%{_datadir}/pixmaps/nut-monitor.png
|
||||
%{_datadir}/applications/nut-monitor.desktop
|
||||
%{_datadir}/icons/hicolor/*/apps/nut-monitor.png
|
||||
%{_datadir}/icons/hicolor/scalable/apps/nut-monitor.svg
|
||||
%{_datadir}/nut-monitor/
|
||||
%{_mandir}/man8/NUT-Monitor*.8.gz
|
||||
%pycached %{python3_sitelib}/PyNUT.py
|
||||
%pycached %{python3_sitelib}/test_nutclient.py
|
||||
%endif
|
||||
|
||||
%files cgi
|
||||
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/ups/hosts.conf
|
||||
|
|
@ -521,298 +452,39 @@ fi
|
|||
%{_libdir}/libupsclient.so
|
||||
%{_libdir}/libnutclient.so
|
||||
%{_libdir}/libnutclientstub.so
|
||||
%{_libdir}/libnutconf.so
|
||||
%{_libdir}/libnutscan.so
|
||||
%{_libdir}/pkgconfig/libupsclient.pc
|
||||
%{_libdir}/pkgconfig/libnutclient.pc
|
||||
%{_libdir}/pkgconfig/libnutconf.pc
|
||||
%{_libdir}/pkgconfig/libnutclientstub.pc
|
||||
%{_libdir}/pkgconfig/libnutscan.pc
|
||||
|
||||
%changelog
|
||||
* Sat Dec 06 2025 Orion Poplawski <orion@nwra.com> - 2.8.4-5
|
||||
- Add missing || : to preinstall scriptlet (rhbz#2419644)
|
||||
* Tue Dec 06 2022 Michal Hlavinka <mhlavink@redhat.com> - 2.8.0-2
|
||||
- fix STATEPATH location and creation (#2024651)
|
||||
- merged C99 related changes to configure from fedora
|
||||
- trim changelog
|
||||
|
||||
* Tue Sep 30 2025 Michal Hlavinka <mhlavink@redhat.com> - 2.8.4-4
|
||||
- based on PR#18 by Orion Poplawski
|
||||
- Build NUT-Monitor and ship in separate nut-monitor package (rhbz#2359149)
|
||||
- Move UPS drivers into /usr/libexec/nut
|
||||
* Tue Sep 13 2022 Michal Hlavinka <mhlavink@redhat.com> - 2.8.0-1
|
||||
- update to 2.8.0
|
||||
|
||||
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 2.8.4-3
|
||||
- Rebuilt for Python 3.14.0rc3 bytecode
|
||||
* Tue Jun 02 2020 Michal Hlavinka <mhlavink@redhat.com> - 2.7.4-3
|
||||
- update nut run directories
|
||||
|
||||
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 2.8.4-2
|
||||
- Rebuilt for Python 3.14.0rc2 bytecode
|
||||
|
||||
* Thu Aug 14 2025 Michal Hlavinka <mhlavink@redhat.com> - 2.8.4-1
|
||||
- updated to 2.8.4 (#2387244)
|
||||
|
||||
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 2.8.3-3
|
||||
- Rebuilt for Python 3.14
|
||||
|
||||
* Wed May 21 2025 Michal Hlavinka <mhlavink@redhat.com> - 2.8.3-2
|
||||
- rename rhino to nutdrv_rhino to prevent file conflict (rhbz#2367057)
|
||||
|
||||
* Tue Apr 29 2025 Michal Hlavinka <mhlavink@redhat.com> - 2.8.3-1
|
||||
- updated to 2.8.3 (#2352734)
|
||||
|
||||
* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.8.2.1-5.1.git20240703pr2505
|
||||
- Add sysusers.d config file to allow rpm to create users/groups automatically
|
||||
|
||||
* Wed Jan 29 2025 Michal Hlavinka <mhlavink@redhat.com> - 2.8.2.1-4.1.git20240703pr2505
|
||||
- fix ftbfs, make it build with unified bin/sbin
|
||||
|
||||
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.2.1-3.1.git20240703pr2505
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Fri Nov 15 2024 Orion Poplawski <orion@nwra.com> - 2.8.2.1-2.1.git20240703pr2505
|
||||
- Add BR systemd-devel to enable systemd notification support
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.2.1-1.1.git20240703pr2505
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Wed Jul 03 2024 Michal Hlavinka <mhlavink@redhat.com> - 2.8.2.1-0.1.git20240703pr2505
|
||||
- fix python FTBFS, uses git snapshot as of 20240703 with PR 2505
|
||||
|
||||
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 2.8.2-2
|
||||
- Rebuilt for Python 3.13
|
||||
|
||||
* Wed Apr 03 2024 Michal Hlavinka <mhlavink@redhat.com> - 2.8.2-1
|
||||
- updated to 2.8.2(2272586)
|
||||
|
||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Thu Nov 30 2023 Orion Poplawski <orion@nwra.com> - 2.8.1-2
|
||||
- Re-add nut.target to nut-client (bz#2156504)
|
||||
|
||||
* Wed Nov 01 2023 Michal Hlavinka <mhlavink@redhat.com> - 2.8.1-1
|
||||
- updated to 2.8.1 (#2247337)
|
||||
|
||||
* Tue Oct 10 2023 Michal Hlavinka <mhlavink@redhat.com> - 2.8.0-14
|
||||
- spec cleanup, based on PR#14 by Orion Poplawski
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.0-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 2.8.0-12
|
||||
- Rebuilt for Python 3.12
|
||||
|
||||
* Wed Apr 26 2023 Michal Hlavinka <mhlavink@redhat.com> - 2.8.0-11
|
||||
- update license tag format (SPDX migration) for https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_1
|
||||
|
||||
* Tue Feb 14 2023 Michal Hlavinka <mhlavink@redhat.com> - 2.8.0-10
|
||||
- add nut-xml to nut recommends (#2151810)
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.0-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Wed Jan 04 2023 Michal Hlavinka <mhlavink@redhat.com> - 2.8.0-8
|
||||
- move upslog to nut-client, some small spec file changes (#2156504)
|
||||
|
||||
* Wed Nov 30 2022 Charles R. Anderson <cra@alum.wpi.edu> - 2.8.0-7
|
||||
- use piddir for specifying restart_flag location
|
||||
- use piddir for specifying configure --with-statepath/pidpath/altpidpath
|
||||
- add nut-2.8.0-piddir-owner.patch for upstream tmpfiles config creation to not append /nut and always use owner root
|
||||
- update nut-2.6.3-tmpfiles.patch to use correct tmpfiles config file name
|
||||
- remove unused downstream tmpfiles source and code
|
||||
|
||||
* Sun Nov 27 2022 Florian Weimer <fweimer@redhat.com> - 2.8.0-6
|
||||
- Port configure script to C99
|
||||
|
||||
* Wed Aug 31 2022 Michal Hlavinka <mhlavink@redhat.com> - 2.8.0-5
|
||||
- update pid path
|
||||
|
||||
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.8.0-3
|
||||
- Rebuilt for Python 3.11
|
||||
|
||||
* Tue Jun 07 2022 Michal Hlavinka <mhlavink@redhat.com> - 2.8.0-2
|
||||
- drop unused solaris init script pulling unnecessary dependency
|
||||
|
||||
* Mon May 09 2022 Michal Hlavinka <mhlavink@redhat.com> - 2.8.0-1
|
||||
- updated to 2.8.0
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-44
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Sep 23 2021 Miro Hrončok <mhroncok@redhat.com> - 2.7.4-43
|
||||
- Don't own /usr/lib/python3.X/site-packages
|
||||
|
||||
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2.7.4-42
|
||||
- Rebuilt with OpenSSL 3.0.0
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-41
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Jun 08 2021 Michal Hlavinka <mhlavink@redhat.com> - 2.7.4-40
|
||||
- drop snmp-ups support for DES, as required net-snmp no longer supports it
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2.7.4-39
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.7.4-38
|
||||
- Rebuilt for updated systemd-rpm-macros
|
||||
See https://pagure.io/fesco/issue/2583.
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-37
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Sep 15 2020 Jeff Law <law@redhat.com> - 2.7.4-36
|
||||
- Force C++14 as this code is not C++17 ready
|
||||
|
||||
* Wed Sep 02 2020 Josef Ridky <jridky@redhat.com> - 2.7.4-35
|
||||
- Resolves: #1865077 - FTBFS in Fedora 33
|
||||
- Rebuilt for new release of net-snmp
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-34
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-33
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jun 02 2020 Michal Hlavinka <mhlavink@redhat.com> - 2.7.4-32
|
||||
- nut user needs tty group for wall (#1774591)
|
||||
|
||||
* Tue Jun 02 2020 Michal Hlavinka <mhlavink@redhat.com> - 2.7.4-31
|
||||
- update tmpfiles nut run directory
|
||||
|
||||
* Tue May 26 2020 Orion Poplawski <orion@nwra.com> - 2.7.4-30
|
||||
* Tue May 26 2020 Orion Poplawski <orion@nwra.com> - 2.7.4-2
|
||||
- Drop old udev requires/scriptlet
|
||||
- Add upstream patch for TLS > 1.0 support
|
||||
|
||||
* Tue May 26 2020 Orion Poplawski <orion@nwra.com> - 2.7.4-29
|
||||
- Add upstream patch for OpenSSL 1.1.0 support, enable for Fedora >= 33
|
||||
|
||||
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2.7.4-28
|
||||
- Rebuilt for Python 3.9
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-27
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Oct 04 2019 Michal Hlavinka <mhlavink@redhat.com> - 2.7.4-26
|
||||
- drop pygtk2 requirements
|
||||
|
||||
* Thu Oct 03 2019 Michal Hlavinka <mhlavink@redhat.com> - 2.7.4-25
|
||||
- drop python 2 requirements including nut-monitor app
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Mon Mar 25 2019 Michal Hlavinka <mhlavink@redhat.com> - 2.7.4-23
|
||||
- add missing requirements for nut monitor
|
||||
- fix file descriptor leak for notifycmd
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-22
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Oct 16 2018 Orion Poplawski <orion@nwra.com> - 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 <pbrobinson@fedoraproject.org> 2.7.4-20
|
||||
- Updates dependencies, modernise spec, use %%license
|
||||
- Python build fixes
|
||||
|
||||
* Tue Jul 24 2018 Adam Williamson <awilliam@redhat.com> - 2.7.4-19
|
||||
- Rebuild for new net-snmp
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue Apr 17 2018 Xavier Bachelot <xavier@bachelot.org> - 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 <mhlavink@redhat.com> - 2.7.4-16
|
||||
- add gcc buildrequire
|
||||
|
||||
* Wed Feb 14 2018 Iryna Shcherbina <ishcherb@redhat.com> - 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 <releng@fedoraproject.org> - 2.7.4-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Tue Nov 07 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.7.4-13
|
||||
- Remove old crufty coreutils requires
|
||||
|
||||
* Wed Aug 30 2017 Michal Hlavinka <mhlavink@redhat.com> - 2.7.4-12
|
||||
- rebuild for freeipmi update
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Thu Jun 22 2017 Michal Hlavinka <mhlavink@redhat.com> - 2.7.4-9
|
||||
- enable nss crypto (#1463071)
|
||||
|
||||
* Wed May 24 2017 Michal Hlavinka <mhlavink@redhat.com> - 2.7.4-8
|
||||
- fix location of tmpfiles.d in service files (#1399602)
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Feb 01 2017 Sandro Mani <manisandro@gmail.com> - 2.7.4-6
|
||||
- Rebuild (libwebp)
|
||||
|
||||
* Fri Nov 11 2016 Michal Hlavinka <mhlavink@redhat.com> - 2.7.4-5
|
||||
- use %%_tmpfilesdir macro (#1394009)
|
||||
|
||||
* Thu Sep 15 2016 Till Maas <opensource@till.name> - 2.7.4-4
|
||||
- Disable powerman support, powerman was retired on Fedora
|
||||
|
||||
* Thu Aug 11 2016 Michal Hlavinka <mhlavink@redhat.com> - 2.7.4-3
|
||||
- make sure tmpfiles creation is executped before ups driver (#1365904,#1349362)
|
||||
|
||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7.4-2
|
||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||
|
||||
* Sat Mar 12 2016 Michal Hlavinka <mhlavink@redhat.com> - 2.7.4-1
|
||||
* Tue May 26 2020 Michal Hlavinka <mhlavink@redhat.com> - 2.7.4-1
|
||||
- nut updated to 2.7.4
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.3-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
* Fri May 11 2018 Michal Hlavinka <mhlavink@redhat.com> - 2.7.2-4
|
||||
- rebuilt with updated freeipmi
|
||||
|
||||
* Sat Dec 05 2015 Kalev Lember <klember@redhat.com> - 2.7.3-6
|
||||
- Rebuilt for libfreeipmi soname bump
|
||||
* Mon Feb 23 2015 Michal Hlavinka <mhlavink@redhat.com> - 2.7.2-3
|
||||
- nut driver needs tmpfiles.d too (#1187286)
|
||||
|
||||
* Tue Dec 1 2015 Tom Callaway <spot@fedoraproject.org> - 2.7.3-5
|
||||
- rebuild for libvpx 1.5.0
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.7.3-3
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Tue Apr 28 2015 Michal Hlavinka <mhlavink@redhat.com> - 2.7.3-2
|
||||
- start nut driver before the daemon
|
||||
|
||||
* Thu Apr 23 2015 Michal Hlavinka <mhlavink@redhat.com> - 2.7.3-1
|
||||
- nut updated to 2.7.3
|
||||
|
||||
* Mon Apr 6 2015 Tom Callaway <spot@fedoraproject.org> - 2.7.2-4
|
||||
- rebuild against libvpx 1.4.0
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
* Tue Aug 26 2014 Michal Hlavinka <mhlavink@redhat.com> - 2.7.2-2
|
||||
- build without powerman as it is not available in epel7
|
||||
|
||||
* Tue Apr 22 2014 Michal Hlavinka <mhlavink@redhat.com> - 2.7.2-1
|
||||
- nut updated to 2.7.2
|
||||
|
|
@ -858,3 +530,42 @@ fi
|
|||
* Mon Jan 07 2013 Michal Hlavinka <mhlavink@redhat.com> - 2.6.5-8
|
||||
- do not traceback when ups is not reachable
|
||||
|
||||
* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 2.6.5-7
|
||||
- rebuild against new libjpeg
|
||||
|
||||
* Fri Sep 14 2012 Michal Hlavinka <mhlavink@redhat.com> - 2.6.5-6
|
||||
- use new systemd macros (#857416)
|
||||
|
||||
* Tue Sep 11 2012 Michal Hlavinka <mhlavink@redhat.com> - 2.6.5-5
|
||||
- add support for foreground mode
|
||||
|
||||
* Tue Sep 11 2012 Michal Hlavinka <mhlavink@redhat.com> - 2.6.5-4
|
||||
- do not forget to restart nut-driver.service in postun
|
||||
|
||||
* Thu Sep 06 2012 Michal Hlavinka <mhlavink@redhat.com> - 2.6.5-3
|
||||
- do not depend on devel files (#838139)
|
||||
|
||||
* Mon Sep 03 2012 Michal Hlavinka <mhlavink@redhat.com> - 2.6.5-2
|
||||
- rebuilt with updated freeipmi
|
||||
|
||||
* Fri Aug 10 2012 Michal Hlavinka <mhlavink@redhat.com> - 2.6.5-1
|
||||
- nut updated to 2.6.5
|
||||
|
||||
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Thu Jun 14 2012 Michal Hlavinka <mhlavink@redhat.com> - 2.6.4-1
|
||||
- nut updated to 2.6.4
|
||||
|
||||
* Thu May 31 2012 Michal Hlavinka <mhlavink@redhat.com> - 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 <mhlavink@redhat.com> - 2.6.3-3
|
||||
- bump release nubmer to fix upgrade path
|
||||
|
||||
* Mon Apr 16 2012 Michal Hlavinka <mhlavink@redhat.com> - 2.6.3-2
|
||||
- do not forget to create /var/run/nut before starting service (#812825)
|
||||
|
||||
* Thu Jan 05 2012 Michal Hlavinka <mhlavink@redhat.com> - 2.6.3-1
|
||||
- nut updated to 2.6.3
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (nut-2.8.4.tar.gz) = 0d87c0006608f92ae54f8a500f93d9a81eac1d9abf57f32e7718dd72f265b8293a0b6cdba04c802b81eaf8907b52669c36b47b6875a4377f9752845ac6c5e8fa
|
||||
SHA512 (nut-2.8.0.tar.gz) = 3c413ae54088045a713eb80cf1bdda474f41bb3b67c7c0248aa7a0c4d441dce1ff42627a2735273d7e36892d1f2eeb895220cf28af63fec2fa0c7a267f82d577
|
||||
|
|
|
|||
147
ups.init
Normal file
147
ups.init
Normal file
|
|
@ -0,0 +1,147 @@
|
|||
#! /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
|
||||
8
ups.sysconfig
Normal file
8
ups.sysconfig
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
# 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]
|
||||
Loading…
Add table
Add a link
Reference in a new issue