diff --git a/.gitignore b/.gitignore index b466deb..a737052 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,8 @@ nut-2.4.3.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 diff --git a/libs.sh b/libs.sh index 35a736b..641d9ad 100644 --- a/libs.sh +++ b/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/\\$//' -e 's/[[:space:]]//g' clients/Makefile) +VINFO=$(sed -e '/version-info/!d' -e 's/#.*$//' -e 's/^.*-version-info//' -e 's/[[:space:]]//g' -e 's/\\//g' clients/Makefile) echo "#define LIBUPSCLIENT_PATH \"libupsclient.so.$(( ${VINFO%%:*}-${VINFO##*:} ))\"" 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 index 7755382..40365b8 100644 --- a/nut-2.6.5-rmpidf.patch +++ b/nut-2.6.5-rmpidf.patch @@ -1,18 +1,18 @@ -diff -up nut-2.8.1/clients/upsmon.c.rmpidf nut-2.8.1/clients/upsmon.c ---- nut-2.8.1/clients/upsmon.c.rmpidf 2023-11-01 10:10:03.039782733 +0100 -+++ nut-2.8.1/clients/upsmon.c 2023-11-01 10:14:48.824806113 +0100 -@@ -3059,6 +3059,7 @@ int main(int argc, char *argv[]) +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[]) 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.1/common/common.c.rmpidf nut-2.8.1/common/common.c ---- nut-2.8.1/common/common.c.rmpidf 2023-10-30 00:02:33.000000000 +0100 -+++ nut-2.8.1/common/common.c 2023-11-01 10:10:03.040782744 +0100 -@@ -519,6 +519,20 @@ pid_t parsepid(const char *buf) +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) return pid; } @@ -33,10 +33,10 @@ diff -up nut-2.8.1/common/common.c.rmpidf nut-2.8.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.1/include/common.h.rmpidf nut-2.8.1/include/common.h ---- nut-2.8.1/include/common.h.rmpidf 2023-10-24 10:45:21.000000000 +0200 -+++ nut-2.8.1/include/common.h 2023-11-01 10:10:03.040782744 +0100 -@@ -211,6 +211,9 @@ void chroot_start(const char *path); +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 /* write a pid file - is a full pathname *or* just the program name */ void writepid(const char *name); @@ -46,10 +46,10 @@ diff -up nut-2.8.1/include/common.h.rmpidf nut-2.8.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.1/server/upsd.c.rmpidf nut-2.8.1/server/upsd.c ---- nut-2.8.1/server/upsd.c.rmpidf 2023-11-01 10:10:03.040782744 +0100 -+++ nut-2.8.1/server/upsd.c 2023-11-01 10:15:57.176529218 +0100 -@@ -2137,5 +2137,6 @@ int main(int argc, char **argv) +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); ssl_cleanup(); diff --git a/nut-2.6.5-unreachable.patch b/nut-2.6.5-unreachable.patch deleted file mode 100644 index 4166e84..0000000 --- a/nut-2.6.5-unreachable.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 instead of . Add missing braces -and parentheses. Use double-quote for string literals. - -Submitted upstream: - -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 --#include --], [dnl -+#include -+], [[ - 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] - )] diff --git a/nut-c99-c_attribute.patch b/nut-c99-c_attribute.patch deleted file mode 100644 index aff6495..0000000 --- a/nut-c99-c_attribute.patch +++ /dev/null @@ -1,17 +0,0 @@ -Call the defined foo function instead of the undeclared func function. - -Submitted upstream: - -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] - ) diff --git a/nut.spec b/nut.spec index 908465d..dba51af 100644 --- a/nut.spec +++ b/nut.spec @@ -1,5 +1,4 @@ %global _hardened_build 1 -%bcond_with python2 #TODO: split nut-client so it does not require python %global nut_uid 57 @@ -7,14 +6,14 @@ %global cgidir /var/www/nut-cgi-bin %global piddir /run/nut -%global modeldir /usr/sbin +%global modeldir %{_libexecdir}/%{name} # powerman is retired on Fedora, therefore disable it by default %bcond_with powerman Summary: Network UPS Tools Name: nut -Version: 2.8.2 -Release: 1%{?dist} +Version: 2.8.4 +Release: 5%{?dist} License: GPL-2.0-or-later AND GPL-3.0-or-later Url: https://www.networkupstools.org/ Source: https://www.networkupstools.org/source/2.8/%{name}-%{version}.tar.gz @@ -24,14 +23,16 @@ Patch2: nut-2.8.0-piddir-owner.patch #quick fix. TODO: fix it properly Patch9: nut-2.6.5-rmpidf.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 -Obsoletes: nut-hal < 2.6.0-7 +Requires: group(dialout) +Requires: group(tty) +BuildRequires: asciidoc BuildRequires: make BuildRequires: autoconf BuildRequires: automake @@ -47,6 +48,7 @@ BuildRequires: freetype-devel BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gd-devel +BuildRequires: jq %if 0%{?fedora} < 39 BuildRequires: libgpiod-devel %endif @@ -57,7 +59,7 @@ BuildRequires: libtool-ltdl-devel BuildRequires: libX11-devel BuildRequires: libXpm-devel BuildRequires: libmodbus-devel -#BuildRequires: libi2c-devel +BuildRequires: libi2c-devel BuildRequires: neon-devel BuildRequires: net-snmp-devel BuildRequires: netpbm-devel @@ -69,11 +71,11 @@ BuildRequires: powerman-devel %endif BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: /usr/bin/pathfix.py +BuildRequires: systemd-devel BuildRequires: systemd-rpm-macros %ifnarch s390 s390x -BuildRequires: libusb-devel +BuildRequires: libusb1-devel %endif ExcludeArch: s390 s390x @@ -91,12 +93,8 @@ live status tracking on web pages, and more. Summary: Network UPS Tools client monitoring utilities Requires(post): systemd Requires(preun): systemd -Requires(pre): shadow-utils -%if %{with python2} -Requires: pygtk2, pygtk2-libglade -#only for python and gui part -%endif -#Requires: +Requires: group(dialout) +Requires: group(tty) %description client This package includes the client utilities that are required to monitor a @@ -106,12 +104,19 @@ 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} @@ -130,19 +135,32 @@ necessary to develop NUT client applications. %prep %setup -q -%patch -P2 -p1 -b .piddir-owner -%patch -P9 -p1 -b .rmpidf -%patch -P15 -p1 +#patch -P 2 -p1 -b .piddir-owner +%patch -P 9 -p1 -b .rmpidf +#patch -P 15 -p1 +%patch -P 16 -p2 -b .rhinoname -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 < 38 +%if 0%{?fedora} --without-gpio \ %endif --with-systemdsystemunitdir=%{_unitdir} \ @@ -180,7 +196,8 @@ export LDFLAGS="-Wl,-z,now" --with-pkgconfig-dir=%{_libdir}/pkgconfig \ --disable-static \ --with-udev-dir=%{_usr}/lib/udev \ - --libdir=%{_libdir} + --libdir=%{_libdir} \ + --enable-docs-changelog=no # --with-doc # does not work in 2.7.1 # for rhbz#838139 check if still needed? @@ -229,34 +246,39 @@ 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 -p -D -m 644 scripts/python/module/PyNUT.py %{buildroot}%{python3_sitearch}/PyNUT.py -# 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 +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 -%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} +install -m0644 -D nut.sysusers.conf %{buildroot}%{_sysusersdir}/nut.conf +%pre # 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 @@ -269,15 +291,7 @@ fi %postun %systemd_postun_with_restart nut-driver.target 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 @@ -306,7 +320,9 @@ fi %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}/* +%{modeldir}/ +# dummy-ups requires libupsclient +%exclude %{modeldir}/dummy-ups %exclude %{modeldir}/netxml-ups %{_unitdir}/nut-driver-enumerator.path %{_unitdir}/nut-driver-enumerator.service @@ -317,13 +333,22 @@ fi %{_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 %{_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/ups.conf.5.gz @@ -339,6 +364,7 @@ fi %{_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 @@ -347,31 +373,38 @@ 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 @@ -381,12 +414,15 @@ fi %{_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/rhino.8.gz +%{_mandir}/man8/powervar_cx_ser.8.gz +%{_mandir}/man8/powervar_cx_usb.8.gz +%{_mandir}/man8/nutdrv_rhino.8.gz %{_mandir}/man8/richcomm_usb.8.gz %{_mandir}/man8/riello_ser.8.gz %{_mandir}/man8/riello_usb.8.gz @@ -399,12 +435,14 @@ fi %{_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/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 @@ -424,6 +462,8 @@ fi %{_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 @@ -434,20 +474,26 @@ fi %{_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_sitearch}/PyNUT.py -%pycached %{python3_sitearch}/test_nutclient.py %{_datadir}/nut -%if %{with python2} +%{_sysusersdir}/nut.conf + +%files monitor %{_bindir}/nut-monitor -%{_datadir}/pixmaps/nut-monitor.png +%{_bindir}/NUT-Monitor %{_datadir}/applications/nut-monitor.desktop -%endif +%{_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 %files cgi %config(noreplace) %attr(644,root,root) %{_sysconfdir}/ups/hosts.conf @@ -475,35 +521,183 @@ 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 -* Wed Nov 27 2024 Michal Hlavinka - 2.8.2-1 -- updated to 2.8.2 +* Sat Dec 06 2025 Orion Poplawski - 2.8.4-5 +- Add missing || : to preinstall scriptlet (rhbz#2419644) -* Wed Nov 29 2023 Michal Hlavinka - 2.8.0-5 -- fix tmpfiles path in unit file (#2227107) +* Tue Sep 30 2025 Michal Hlavinka - 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 Feb 14 2023 Michal Hlavinka - 2.8.0-4 -- add nut-xml to nut recommends (#1379382) +* Fri Sep 19 2025 Python Maint - 2.8.4-3 +- Rebuilt for Python 3.14.0rc3 bytecode -* Mon Dec 12 2022 Michal Hlavinka - 2.8.0-3 -- apply missing patch +* Fri Aug 15 2025 Python Maint - 2.8.4-2 +- Rebuilt for Python 3.14.0rc2 bytecode -* Tue Dec 06 2022 Michal Hlavinka - 2.8.0-2 -- fix STATEPATH location and creation (#2024651) -- merged C99 related changes to configure from fedora +* Thu Aug 14 2025 Michal Hlavinka - 2.8.4-1 +- updated to 2.8.4 (#2387244) -* Tue Sep 13 2022 Michal Hlavinka - 2.8.0-1 -- update to 2.8.0 +* Thu Jul 24 2025 Fedora Release Engineering - 2.8.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild -* Tue Jun 02 2020 Michal Hlavinka - 2.7.4-27 +* Mon Jun 02 2025 Python Maint - 2.8.3-3 +- Rebuilt for Python 3.14 + +* Wed May 21 2025 Michal Hlavinka - 2.8.3-2 +- rename rhino to nutdrv_rhino to prevent file conflict (rhbz#2367057) + +* Tue Apr 29 2025 Michal Hlavinka - 2.8.3-1 +- updated to 2.8.3 (#2352734) + +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 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 - 2.8.2.1-4.1.git20240703pr2505 +- fix ftbfs, make it build with unified bin/sbin + +* Fri Jan 17 2025 Fedora Release Engineering - 2.8.2.1-3.1.git20240703pr2505 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Nov 15 2024 Orion Poplawski - 2.8.2.1-2.1.git20240703pr2505 +- Add BR systemd-devel to enable systemd notification support + +* Thu Jul 18 2024 Fedora Release Engineering - 2.8.2.1-1.1.git20240703pr2505 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jul 03 2024 Michal Hlavinka - 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 - 2.8.2-2 +- Rebuilt for Python 3.13 + +* Wed Apr 03 2024 Michal Hlavinka - 2.8.2-1 +- updated to 2.8.2(2272586) + +* Thu Jan 25 2024 Fedora Release Engineering - 2.8.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2.8.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Nov 30 2023 Orion Poplawski - 2.8.1-2 +- Re-add nut.target to nut-client (bz#2156504) + +* Wed Nov 01 2023 Michal Hlavinka - 2.8.1-1 +- updated to 2.8.1 (#2247337) + +* Tue Oct 10 2023 Michal Hlavinka - 2.8.0-14 +- spec cleanup, based on PR#14 by Orion Poplawski + +* Thu Jul 20 2023 Fedora Release Engineering - 2.8.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 2.8.0-12 +- Rebuilt for Python 3.12 + +* Wed Apr 26 2023 Michal Hlavinka - 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 - 2.8.0-10 +- add nut-xml to nut recommends (#2151810) + +* Thu Jan 19 2023 Fedora Release Engineering - 2.8.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jan 04 2023 Michal Hlavinka - 2.8.0-8 +- move upslog to nut-client, some small spec file changes (#2156504) + +* Wed Nov 30 2022 Charles R. Anderson - 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 - 2.8.0-6 +- Port configure script to C99 + +* Wed Aug 31 2022 Michal Hlavinka - 2.8.0-5 +- update pid path + +* Fri Jul 22 2022 Fedora Release Engineering - 2.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 2.8.0-3 +- Rebuilt for Python 3.11 + +* Tue Jun 07 2022 Michal Hlavinka - 2.8.0-2 +- drop unused solaris init script pulling unnecessary dependency + +* Mon May 09 2022 Michal Hlavinka - 2.8.0-1 +- updated to 2.8.0 + +* Thu Jan 20 2022 Fedora Release Engineering - 2.7.4-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Sep 23 2021 Miro Hrončok - 2.7.4-43 +- Don't own /usr/lib/python3.X/site-packages + +* Tue Sep 14 2021 Sahana Prasad - 2.7.4-42 +- Rebuilt with OpenSSL 3.0.0 + +* Thu Jul 22 2021 Fedora Release Engineering - 2.7.4-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jun 08 2021 Michal Hlavinka - 2.7.4-40 +- drop snmp-ups support for DES, as required net-snmp no longer supports it + +* Fri Jun 04 2021 Python Maint - 2.7.4-39 +- Rebuilt for Python 3.10 + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.7.4-38 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Tue Jan 26 2021 Fedora Release Engineering - 2.7.4-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Sep 15 2020 Jeff Law - 2.7.4-36 +- Force C++14 as this code is not C++17 ready + +* Wed Sep 02 2020 Josef Ridky - 2.7.4-35 +- Resolves: #1865077 - FTBFS in Fedora 33 +- Rebuilt for new release of net-snmp + +* Sat Aug 01 2020 Fedora Release Engineering - 2.7.4-34 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 2.7.4-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jun 02 2020 Michal Hlavinka - 2.7.4-32 - nut user needs tty group for wall (#1774591) +* Tue Jun 02 2020 Michal Hlavinka - 2.7.4-31 +- update tmpfiles nut run directory + +* Tue May 26 2020 Orion Poplawski - 2.7.4-30 +- Drop old udev requires/scriptlet + +* Tue May 26 2020 Orion Poplawski - 2.7.4-29 +- Add upstream patch for OpenSSL 1.1.0 support, enable for Fedora >= 33 + +* Tue May 26 2020 Miro Hrončok - 2.7.4-28 +- Rebuilt for Python 3.9 + +* Wed Jan 29 2020 Fedora Release Engineering - 2.7.4-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Oct 04 2019 Michal Hlavinka - 2.7.4-26 - drop pygtk2 requirements @@ -664,499 +858,3 @@ fi * 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 index 474d28c..5f00a02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nut-2.8.2.tar.gz) = b6f8f22318e4a4fcb8073a63132b1cb083952c665191b82a7d6765a61b859575a4b0c2ba84ed17cfb8c88d34179876d64520dd2f75f02fe8707b406da2c0821c +SHA512 (nut-2.8.4.tar.gz) = 0d87c0006608f92ae54f8a500f93d9a81eac1d9abf57f32e7718dd72f265b8293a0b6cdba04c802b81eaf8907b52669c36b47b6875a4377f9752845ac6c5e8fa 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]