[nut] nut updated to 2.7.1
Michal Hlavinka
mhlavink at fedoraproject.org
Thu Feb 27 14:25:52 UTC 2014
commit 0b850eb3a85b397c1415ee003920056bf379f019
Author: Michal Hlavinka <mhlavink at redhat.com>
Date: Thu Feb 27 15:26:42 2014 +0100
nut updated to 2.7.1
.gitignore | 1 +
nut-2.6.5-dlfix.patch | 44 ++++++++++++++++++++++----------------------
nut-2.6.5-foreground.patch | 44 ++++++++++++++++++++++----------------------
nut-2.6.5-pthreadfix.patch | 12 ++++++++----
nut-2.6.5-quickfix.patch | 8 ++++----
nut-2.6.5-rmpidf.patch | 32 ++++++++++++++++----------------
nut.spec | 41 +++++++++++++++++++++--------------------
sources | 2 +-
8 files changed, 95 insertions(+), 89 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8d08d5f..67b2231 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ nut-2.4.3.tar.gz
/nut-2.6.3.tar.gz
/nut-2.6.4.tar.gz
/nut-2.6.5.tar.gz
+/nut-2.7.1.tar.gz
diff --git a/nut-2.6.5-dlfix.patch b/nut-2.6.5-dlfix.patch
index 9198f65..4375324 100644
--- a/nut-2.6.5-dlfix.patch
+++ b/nut-2.6.5-dlfix.patch
@@ -1,6 +1,6 @@
-diff -up nut-2.6.5/tools/nut-scanner/scan_avahi.c.dlfix nut-2.6.5/tools/nut-scanner/scan_avahi.c
---- nut-2.6.5/tools/nut-scanner/scan_avahi.c.dlfix 2012-07-31 19:38:58.000000000 +0200
-+++ nut-2.6.5/tools/nut-scanner/scan_avahi.c 2012-09-06 12:56:45.383206759 +0200
+diff -up nut-2.7.1/tools/nut-scanner/scan_avahi.c.dlfix nut-2.7.1/tools/nut-scanner/scan_avahi.c
+--- nut-2.7.1/tools/nut-scanner/scan_avahi.c.dlfix 2013-07-31 22:41:31.000000000 +0200
++++ nut-2.7.1/tools/nut-scanner/scan_avahi.c 2014-02-27 11:25:57.610869514 +0100
@@ -36,7 +36,7 @@
#include <ltdl.h>
@@ -19,11 +19,11 @@ diff -up nut-2.6.5/tools/nut-scanner/scan_avahi.c.dlfix nut-2.6.5/tools/nut-scan
if (!dl_handle) {
dl_error = lt_dlerror();
goto err;
-diff -up nut-2.6.5/tools/nut-scanner/scan_ipmi.c.dlfix nut-2.6.5/tools/nut-scanner/scan_ipmi.c
---- nut-2.6.5/tools/nut-scanner/scan_ipmi.c.dlfix 2012-07-31 19:38:58.000000000 +0200
-+++ nut-2.6.5/tools/nut-scanner/scan_ipmi.c 2012-09-06 12:56:55.760402197 +0200
-@@ -30,7 +30,7 @@
- #define NUT_IPMI_DRV_NAME "nut-ipmipsu"
+diff -up nut-2.7.1/tools/nut-scanner/scan_ipmi.c.dlfix nut-2.7.1/tools/nut-scanner/scan_ipmi.c
+--- nut-2.7.1/tools/nut-scanner/scan_ipmi.c.dlfix 2013-07-31 22:41:31.000000000 +0200
++++ nut-2.7.1/tools/nut-scanner/scan_ipmi.c 2014-02-27 11:32:20.393015238 +0100
+@@ -35,7 +35,7 @@
+ #define IPMI_RETRANSMISSION_TIMEOUT_LENGTH_DEFAULT 250
/* dynamic link library stuff */
-static char * libname = "libfreeipmi";
@@ -31,7 +31,7 @@ diff -up nut-2.6.5/tools/nut-scanner/scan_ipmi.c.dlfix nut-2.6.5/tools/nut-scann
static lt_dlhandle dl_handle = NULL;
static const char *dl_error = NULL;
-@@ -83,7 +83,7 @@ int nutscan_load_ipmi_library()
+@@ -128,7 +128,7 @@ int nutscan_load_ipmi_library()
return 0;
}
@@ -40,9 +40,9 @@ diff -up nut-2.6.5/tools/nut-scanner/scan_ipmi.c.dlfix nut-2.6.5/tools/nut-scann
if (!dl_handle) {
dl_error = lt_dlerror();
goto err;
-diff -up nut-2.6.5/tools/nut-scanner/scan_nut.c.dlfix nut-2.6.5/tools/nut-scanner/scan_nut.c
---- nut-2.6.5/tools/nut-scanner/scan_nut.c.dlfix 2012-07-31 19:38:58.000000000 +0200
-+++ nut-2.6.5/tools/nut-scanner/scan_nut.c 2012-09-06 12:54:59.308897430 +0200
+diff -up nut-2.7.1/tools/nut-scanner/scan_nut.c.dlfix nut-2.7.1/tools/nut-scanner/scan_nut.c
+--- nut-2.7.1/tools/nut-scanner/scan_nut.c.dlfix 2013-10-30 14:47:15.000000000 +0100
++++ nut-2.7.1/tools/nut-scanner/scan_nut.c 2014-02-27 11:25:57.611869522 +0100
@@ -26,7 +26,7 @@
#include <ltdl.h>
@@ -52,7 +52,7 @@ diff -up nut-2.6.5/tools/nut-scanner/scan_nut.c.dlfix nut-2.6.5/tools/nut-scanne
static lt_dlhandle dl_handle = NULL;
static const char *dl_error = NULL;
-@@ -66,7 +66,7 @@ int nutscan_load_upsclient_library()
+@@ -67,7 +67,7 @@ int nutscan_load_upsclient_library()
return 0;
}
@@ -61,9 +61,9 @@ diff -up nut-2.6.5/tools/nut-scanner/scan_nut.c.dlfix nut-2.6.5/tools/nut-scanne
if (!dl_handle) {
dl_error = lt_dlerror();
goto err;
-diff -up nut-2.6.5/tools/nut-scanner/scan_snmp.c.dlfix nut-2.6.5/tools/nut-scanner/scan_snmp.c
---- nut-2.6.5/tools/nut-scanner/scan_snmp.c.dlfix 2012-07-31 19:38:58.000000000 +0200
-+++ nut-2.6.5/tools/nut-scanner/scan_snmp.c 2012-09-06 12:57:16.250774817 +0200
+diff -up nut-2.7.1/tools/nut-scanner/scan_snmp.c.dlfix nut-2.7.1/tools/nut-scanner/scan_snmp.c
+--- nut-2.7.1/tools/nut-scanner/scan_snmp.c.dlfix 2013-07-31 22:41:31.000000000 +0200
++++ nut-2.7.1/tools/nut-scanner/scan_snmp.c 2014-02-27 11:25:57.611869522 +0100
@@ -74,7 +74,7 @@ static int thread_count = 0;
long g_usec_timeout ;
@@ -82,9 +82,9 @@ diff -up nut-2.6.5/tools/nut-scanner/scan_snmp.c.dlfix nut-2.6.5/tools/nut-scann
if (!dl_handle) {
dl_error = lt_dlerror();
goto err;
-diff -up nut-2.6.5/tools/nut-scanner/scan_usb.c.dlfix nut-2.6.5/tools/nut-scanner/scan_usb.c
---- nut-2.6.5/tools/nut-scanner/scan_usb.c.dlfix 2012-07-31 19:38:58.000000000 +0200
-+++ nut-2.6.5/tools/nut-scanner/scan_usb.c 2012-09-06 12:56:34.007987045 +0200
+diff -up nut-2.7.1/tools/nut-scanner/scan_usb.c.dlfix nut-2.7.1/tools/nut-scanner/scan_usb.c
+--- nut-2.7.1/tools/nut-scanner/scan_usb.c.dlfix 2013-07-31 22:41:31.000000000 +0200
++++ nut-2.7.1/tools/nut-scanner/scan_usb.c 2014-02-27 11:25:57.611869522 +0100
@@ -28,7 +28,7 @@
#include <ltdl.h>
@@ -103,9 +103,9 @@ diff -up nut-2.6.5/tools/nut-scanner/scan_usb.c.dlfix nut-2.6.5/tools/nut-scanne
if (!dl_handle) {
dl_error = lt_dlerror();
goto err;
-diff -up nut-2.6.5/tools/nut-scanner/scan_xml_http.c.dlfix nut-2.6.5/tools/nut-scanner/scan_xml_http.c
---- nut-2.6.5/tools/nut-scanner/scan_xml_http.c.dlfix 2012-07-31 19:38:58.000000000 +0200
-+++ nut-2.6.5/tools/nut-scanner/scan_xml_http.c 2012-09-06 12:57:28.617991656 +0200
+diff -up nut-2.7.1/tools/nut-scanner/scan_xml_http.c.dlfix nut-2.7.1/tools/nut-scanner/scan_xml_http.c
+--- nut-2.7.1/tools/nut-scanner/scan_xml_http.c.dlfix 2013-07-31 22:41:31.000000000 +0200
++++ nut-2.7.1/tools/nut-scanner/scan_xml_http.c 2014-02-27 11:25:57.611869522 +0100
@@ -33,7 +33,7 @@
#include <ltdl.h>
diff --git a/nut-2.6.5-foreground.patch b/nut-2.6.5-foreground.patch
index 639cc54..ce1570c 100644
--- a/nut-2.6.5-foreground.patch
+++ b/nut-2.6.5-foreground.patch
@@ -1,7 +1,7 @@
-diff -up nut-2.6.5/clients/upsmon.c.foreground nut-2.6.5/clients/upsmon.c
---- nut-2.6.5/clients/upsmon.c.foreground 2012-07-31 19:38:58.000000000 +0200
-+++ nut-2.6.5/clients/upsmon.c 2012-09-11 17:54:55.109343036 +0200
-@@ -1659,6 +1659,7 @@ static void help(const char *progname)
+diff -up nut-2.7.1/clients/upsmon.c.foreground nut-2.7.1/clients/upsmon.c
+--- nut-2.7.1/clients/upsmon.c.foreground 2013-07-26 21:41:10.000000000 +0200
++++ nut-2.7.1/clients/upsmon.c 2014-02-27 11:39:58.158784578 +0100
+@@ -1645,6 +1645,7 @@ static void help(const char *progname)
printf(" - reload: reread configuration\n");
printf(" - stop: stop monitoring and exit\n");
printf(" -D raise debugging level\n");
@@ -9,7 +9,7 @@ diff -up nut-2.6.5/clients/upsmon.c.foreground nut-2.6.5/clients/upsmon.c
printf(" -h display this help\n");
printf(" -K checks POWERDOWNFLAG, sets exit code to 0 if set\n");
printf(" -p always run privileged (disable privileged parent)\n");
-@@ -1873,7 +1874,7 @@ static void check_parent(void)
+@@ -1859,7 +1860,7 @@ static void check_parent(void)
int main(int argc, char *argv[])
{
const char *prog = xbasename(argv[0]);
@@ -18,7 +18,7 @@ diff -up nut-2.6.5/clients/upsmon.c.foreground nut-2.6.5/clients/upsmon.c
printf("Network UPS Tools %s %s\n", prog, UPS_VERSION);
-@@ -1884,7 +1885,7 @@ int main(int argc, char *argv[])
+@@ -1870,7 +1871,7 @@ int main(int argc, char *argv[])
run_as_user = xstrdup(RUN_AS_USER);
@@ -27,7 +27,7 @@ diff -up nut-2.6.5/clients/upsmon.c.foreground nut-2.6.5/clients/upsmon.c
switch (i) {
case 'c':
if (!strncmp(optarg, "fsd", strlen(optarg)))
-@@ -1901,6 +1902,9 @@ int main(int argc, char *argv[])
+@@ -1887,6 +1888,9 @@ int main(int argc, char *argv[])
case 'D':
nut_debug_level++;
break;
@@ -37,7 +37,7 @@ diff -up nut-2.6.5/clients/upsmon.c.foreground nut-2.6.5/clients/upsmon.c
case 'f':
free(configfile);
configfile = xstrdup(optarg);
-@@ -1976,9 +1980,9 @@ int main(int argc, char *argv[])
+@@ -1962,9 +1966,9 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
@@ -49,9 +49,9 @@ diff -up nut-2.6.5/clients/upsmon.c.foreground nut-2.6.5/clients/upsmon.c
upsdebugx(1, "debug level is '%d'", nut_debug_level);
}
-diff -up nut-2.6.5/scripts/systemd/nut-monitor.service.in.foreground nut-2.6.5/scripts/systemd/nut-monitor.service.in
---- nut-2.6.5/scripts/systemd/nut-monitor.service.in.foreground 2012-09-11 17:56:05.037920175 +0200
-+++ nut-2.6.5/scripts/systemd/nut-monitor.service.in 2012-09-11 17:56:05.038920183 +0200
+diff -up nut-2.7.1/scripts/systemd/nut-monitor.service.in.foreground nut-2.7.1/scripts/systemd/nut-monitor.service.in
+--- nut-2.7.1/scripts/systemd/nut-monitor.service.in.foreground 2014-02-27 11:39:58.141784438 +0100
++++ nut-2.7.1/scripts/systemd/nut-monitor.service.in 2014-02-27 11:39:58.152784529 +0100
@@ -4,9 +4,8 @@ After=local-fs.target network.target nut
[Service]
@@ -64,9 +64,9 @@ diff -up nut-2.6.5/scripts/systemd/nut-monitor.service.in.foreground nut-2.6.5/s
[Install]
WantedBy=multi-user.target
-diff -up nut-2.6.5/scripts/systemd/nut-server.service.in.foreground nut-2.6.5/scripts/systemd/nut-server.service.in
---- nut-2.6.5/scripts/systemd/nut-server.service.in.foreground 2012-09-11 17:56:19.850042294 +0200
-+++ nut-2.6.5/scripts/systemd/nut-server.service.in 2012-09-11 17:56:19.851042303 +0200
+diff -up nut-2.7.1/scripts/systemd/nut-server.service.in.foreground nut-2.7.1/scripts/systemd/nut-server.service.in
+--- nut-2.7.1/scripts/systemd/nut-server.service.in.foreground 2013-07-26 21:41:11.000000000 +0200
++++ nut-2.7.1/scripts/systemd/nut-server.service.in 2014-02-27 11:39:58.152784529 +0100
@@ -5,8 +5,8 @@ Requires=nut-driver.service
Before=nut-monitor.service
@@ -78,10 +78,10 @@ diff -up nut-2.6.5/scripts/systemd/nut-server.service.in.foreground nut-2.6.5/sc
[Install]
WantedBy=multi-user.target
-diff -up nut-2.6.5/server/upsd.c.foreground nut-2.6.5/server/upsd.c
---- nut-2.6.5/server/upsd.c.foreground 2012-07-31 19:38:58.000000000 +0200
-+++ nut-2.6.5/server/upsd.c 2012-09-11 17:54:55.109343036 +0200
-@@ -819,6 +819,7 @@ static void help(const char *progname)
+diff -up nut-2.7.1/server/upsd.c.foreground nut-2.7.1/server/upsd.c
+--- nut-2.7.1/server/upsd.c.foreground 2013-07-26 21:41:11.000000000 +0200
++++ nut-2.7.1/server/upsd.c 2014-02-27 11:39:58.153784537 +0100
+@@ -827,6 +827,7 @@ static void help(const char *progname)
printf(" - reload: reread configuration files\n");
printf(" - stop: stop process and exit\n");
printf(" -D raise debugging level\n");
@@ -89,7 +89,7 @@ diff -up nut-2.6.5/server/upsd.c.foreground nut-2.6.5/server/upsd.c
printf(" -h display this help\n");
printf(" -r <dir> chroots to <dir>\n");
printf(" -q raise log level threshold\n");
-@@ -882,7 +883,7 @@ void check_perms(const char *fn)
+@@ -890,7 +891,7 @@ void check_perms(const char *fn)
int main(int argc, char **argv)
{
@@ -98,7 +98,7 @@ diff -up nut-2.6.5/server/upsd.c.foreground nut-2.6.5/server/upsd.c
char *chroot_path = NULL;
const char *user = RUN_AS_USER;
struct passwd *new_uid = NULL;
-@@ -898,7 +899,7 @@ int main(int argc, char **argv)
+@@ -906,7 +907,7 @@ int main(int argc, char **argv)
printf("Network UPS Tools %s %s\n", progname, UPS_VERSION);
@@ -107,7 +107,7 @@ diff -up nut-2.6.5/server/upsd.c.foreground nut-2.6.5/server/upsd.c
switch (i) {
case 'h':
help(progname);
-@@ -936,6 +937,10 @@ int main(int argc, char **argv)
+@@ -944,6 +945,10 @@ int main(int argc, char **argv)
nut_debug_level++;
break;
@@ -118,7 +118,7 @@ diff -up nut-2.6.5/server/upsd.c.foreground nut-2.6.5/server/upsd.c
case '4':
opt_af = AF_INET;
break;
-@@ -1023,7 +1028,7 @@ int main(int argc, char **argv)
+@@ -1031,7 +1036,7 @@ int main(int argc, char **argv)
/* handle upsd.users */
user_load();
diff --git a/nut-2.6.5-pthreadfix.patch b/nut-2.6.5-pthreadfix.patch
index 9aca92b..a471c99 100644
--- a/nut-2.6.5-pthreadfix.patch
+++ b/nut-2.6.5-pthreadfix.patch
@@ -1,7 +1,7 @@
-diff -up nut-2.6.5/tools/nut-scanner/nut-scanner.c.pthreadfix nut-2.6.5/tools/nut-scanner/nut-scanner.c
---- nut-2.6.5/tools/nut-scanner/nut-scanner.c.pthreadfix 2012-09-06 13:25:03.856936357 +0200
-+++ nut-2.6.5/tools/nut-scanner/nut-scanner.c 2012-09-06 13:25:03.881936493 +0200
-@@ -434,22 +434,22 @@ display_help:
+diff -up nut-2.7.1/tools/nut-scanner/nut-scanner.c.pthreadfix nut-2.7.1/tools/nut-scanner/nut-scanner.c
+--- nut-2.7.1/tools/nut-scanner/nut-scanner.c.pthreadfix 2014-02-27 11:37:57.045786437 +0100
++++ nut-2.7.1/tools/nut-scanner/nut-scanner.c 2014-02-27 11:39:02.591326696 +0100
+@@ -532,25 +532,25 @@ display_help:
}
#ifdef HAVE_PTHREAD
@@ -29,4 +29,8 @@ diff -up nut-2.6.5/tools/nut-scanner/nut-scanner.c.pthreadfix nut-2.6.5/tools/nu
+ if( allow_ipmi && nutscan_avail_ipmi && thread[TYPE_IPMI]) {
pthread_join(thread[TYPE_IPMI],NULL);
}
+- if (allow_eaton_serial) {
++ if (allow_eaton_serial && thread[TYPE_EATON_SERIAL]) {
+ pthread_join(thread[TYPE_EATON_SERIAL],NULL);
+ }
#endif /* HAVE_PTHREAD */
diff --git a/nut-2.6.5-quickfix.patch b/nut-2.6.5-quickfix.patch
index 8330518..d815df6 100644
--- a/nut-2.6.5-quickfix.patch
+++ b/nut-2.6.5-quickfix.patch
@@ -1,7 +1,7 @@
-diff -up nut-2.6.5/configure.in.quickfix nut-2.6.5/configure.in
---- nut-2.6.5/configure.in.quickfix 2012-08-10 14:19:55.924431026 +0200
-+++ nut-2.6.5/configure.in 2012-08-10 14:20:13.332566508 +0200
-@@ -986,9 +986,8 @@ dnl Override installation directory, wit
+diff -up nut-2.7.1/configure.in.quickfix nut-2.7.1/configure.in
+--- nut-2.7.1/configure.in.quickfix 2013-11-20 20:53:31.000000000 +0100
++++ nut-2.7.1/configure.in 2014-02-27 11:25:57.608869497 +0100
+@@ -1027,9 +1027,8 @@ 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
diff --git a/nut-2.6.5-rmpidf.patch b/nut-2.6.5-rmpidf.patch
index ada8d70..3041c6d 100644
--- a/nut-2.6.5-rmpidf.patch
+++ b/nut-2.6.5-rmpidf.patch
@@ -1,7 +1,7 @@
-diff -up nut-2.6.5/clients/upsmon.c.rmpidf nut-2.6.5/clients/upsmon.c
---- nut-2.6.5/clients/upsmon.c.rmpidf 2013-02-28 12:08:34.487394359 +0100
-+++ nut-2.6.5/clients/upsmon.c 2013-02-28 12:08:34.494394419 +0100
-@@ -2037,6 +2037,7 @@ int main(int argc, char *argv[])
+diff -up nut-2.7.1/clients/upsmon.c.rmpidf nut-2.7.1/clients/upsmon.c
+--- nut-2.7.1/clients/upsmon.c.rmpidf 2014-02-27 11:41:09.139369295 +0100
++++ nut-2.7.1/clients/upsmon.c 2014-02-27 11:41:09.145369344 +0100
+@@ -2027,6 +2027,7 @@ int main(int argc, char *argv[])
upslogx(LOG_INFO, "Signal %d: exiting", exit_flag);
upsmon_cleanup();
@@ -9,9 +9,9 @@ diff -up nut-2.6.5/clients/upsmon.c.rmpidf nut-2.6.5/clients/upsmon.c
exit(EXIT_SUCCESS);
}
-diff -up nut-2.6.5/common/common.c.rmpidf nut-2.6.5/common/common.c
---- nut-2.6.5/common/common.c.rmpidf 2012-07-31 19:38:58.000000000 +0200
-+++ nut-2.6.5/common/common.c 2013-02-28 12:08:34.494394419 +0100
+diff -up nut-2.7.1/common/common.c.rmpidf nut-2.7.1/common/common.c
+--- nut-2.7.1/common/common.c.rmpidf 2013-11-20 20:53:31.000000000 +0100
++++ nut-2.7.1/common/common.c 2014-02-27 11:41:09.146369353 +0100
@@ -229,6 +229,20 @@ void writepid(const char *name)
umask(mask);
}
@@ -33,10 +33,10 @@ diff -up nut-2.6.5/common/common.c.rmpidf nut-2.6.5/common/common.c
/* open pidfn, get the pid, then send it sig */
int sendsignalfn(const char *pidfn, int sig)
{
-diff -up nut-2.6.5/include/common.h.rmpidf nut-2.6.5/include/common.h
---- nut-2.6.5/include/common.h.rmpidf 2012-07-31 19:38:56.000000000 +0200
-+++ nut-2.6.5/include/common.h 2013-02-28 12:08:34.495394429 +0100
-@@ -64,6 +64,9 @@ void chroot_start(const char *path);
+diff -up nut-2.7.1/include/common.h.rmpidf nut-2.7.1/include/common.h
+--- nut-2.7.1/include/common.h.rmpidf 2013-11-20 20:53:31.000000000 +0100
++++ nut-2.7.1/include/common.h 2014-02-27 11:41:09.146369353 +0100
+@@ -70,6 +70,9 @@ void chroot_start(const char *path);
/* write a pid file - <name> is a full pathname *or* just the program name */
void writepid(const char *name);
@@ -46,11 +46,11 @@ diff -up nut-2.6.5/include/common.h.rmpidf nut-2.6.5/include/common.h
/* send a signal to another running process */
int sendsignal(const char *progname, int sig);
-diff -up nut-2.6.5/server/upsd.c.rmpidf nut-2.6.5/server/upsd.c
---- nut-2.6.5/server/upsd.c.rmpidf 2013-02-28 12:08:37.967424582 +0100
-+++ nut-2.6.5/server/upsd.c 2013-02-28 12:08:37.982424720 +0100
-@@ -1040,6 +1040,7 @@ int main(int argc, char **argv)
- }
+diff -up nut-2.7.1/server/upsd.c.rmpidf nut-2.7.1/server/upsd.c
+--- nut-2.7.1/server/upsd.c.rmpidf 2014-02-27 11:41:09.146369353 +0100
++++ nut-2.7.1/server/upsd.c 2014-02-27 11:42:03.715818754 +0100
+@@ -1050,6 +1050,7 @@ int main(int argc, char **argv)
+ ssl_cleanup();
upslogx(LOG_INFO, "Signal %d: exiting", exit_flag);
+ if (*pidfn) cleanpid(pidfn);
diff --git a/nut.spec b/nut.spec
index 9b9b92a..d56b630 100644
--- a/nut.spec
+++ b/nut.spec
@@ -12,12 +12,12 @@
Summary: Network UPS Tools
Name: nut
-Version: 2.6.5
-Release: 16%{?dist}
+Version: 2.7.1
+Release: 1%{?dist}
Group: Applications/System
License: GPLv2+ and GPLv3+
Url: http://www.networkupstools.org/
-Source: http://www.networkupstools.org/source/2.6/%{name}-%{version}.tar.gz
+Source: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz
Source3: nut-client.tmpfiles
Source4: libs.sh
Patch1: nut-2.6.3-tmpfiles.patch
@@ -122,7 +122,7 @@ necessary to develop NUT client applications.
%setup -q
%patch1 -p1 -b .tmpfiles
%patch3 -p1 -b .quickfix
-%patch4 -p1 -b .ipmifix
+#%patch4 -p1 -b .ipmifix
%patch5 -p1 -b .dlfix
%patch6 -p1 -b .pthreadfix
%patch7 -p1 -b .foreground
@@ -159,8 +159,8 @@ autoreconf -i
--with-pkgconfig-dir=%{_libdir}/pkgconfig \
--disable-static \
--with-udev-dir=/lib/udev \
- --libdir=%{_libdir}
-# --with-doc \ asciidoc >= 8.6.3 is required
+ --libdir=%{_libdir}
+# --with-doc # does not work in 2.7.1
sh %{SOURCE4} >>include/config.h
@@ -300,25 +300,14 @@ rm -rf %{buildroot}
%{_libdir}/libnutscan.so.*
%{_datadir}/%{name}/cmdvartab
%{_datadir}/%{name}/driver.list
-%{_mandir}/man3/nutscan_add_device_to_device.3.gz
-%{_mandir}/man3/nutscan_add_option_to_device.3.gz
-%{_mandir}/man3/nutscan_cidr_to_ip.3.gz
-%{_mandir}/man3/nutscan_display_parsable.3.gz
-%{_mandir}/man3/nutscan_display_ups_conf.3.gz
-%{_mandir}/man3/nutscan_free_device.3.gz
-%{_mandir}/man3/nutscan_new_device.3.gz
-%{_mandir}/man3/nutscan_scan_avahi.3.gz
-%{_mandir}/man3/nutscan_scan_ipmi.3.gz
-%{_mandir}/man3/nutscan_scan_nut.3.gz
-%{_mandir}/man3/nutscan_scan_snmp.3.gz
-%{_mandir}/man3/nutscan_scan_usb.3.gz
-%{_mandir}/man3/nutscan_scan_xml_http.3.gz
%{_mandir}/man5/nut.conf.5.gz
%{_mandir}/man5/ups.conf.5.gz
%{_mandir}/man5/upsd.conf.5.gz
%{_mandir}/man5/upsd.users.5.gz
+%{_mandir}/man8/al175.8.gz
%{_mandir}/man8/apcsmart.8.gz
%{_mandir}/man8/apcsmart-old.8.gz
+%{_mandir}/man8/apcupsd-ups.8.gz
%{_mandir}/man8/bcmxcp.8*
%{_mandir}/man8/bcmxcp_usb.8.gz
%{_mandir}/man8/belkin.8.gz
@@ -327,7 +316,8 @@ rm -rf %{buildroot}
%{_mandir}/man8/bestfortress.8.gz
%{_mandir}/man8/bestups.8.gz
%{_mandir}/man8/bestuferrups.8.gz
-%{_mandir}/man8/blazer.8.gz
+%{_mandir}/man8/blazer_ser.8.gz
+%{_mandir}/man8/blazer_usb.8.gz
%{_mandir}/man8/clone.8.gz
%{_mandir}/man8/dummy-ups.8.gz
%{_mandir}/man8/everups.8.gz
@@ -347,6 +337,7 @@ rm -rf %{buildroot}
%{_mandir}/man8/nut-ipmipsu.8.gz
%{_mandir}/man8/nut-recorder.8.gz
%{_mandir}/man8/nut-scanner.8.gz
+%{_mandir}/man8/nutdrv_qx.8.gz
%{_mandir}/man8/oneac.8.gz
%{_mandir}/man8/optiups.8.gz
%{_mandir}/man8/powercom.8.gz
@@ -354,6 +345,8 @@ rm -rf %{buildroot}
%{_mandir}/man8/powerpanel.8.gz
%{_mandir}/man8/rhino.8.gz
%{_mandir}/man8/richcomm_usb.8.gz
+%{_mandir}/man8/riello_ser.8.gz
+%{_mandir}/man8/riello_usb.8.gz
%{_mandir}/man8/safenet.8.gz
%{_mandir}/man8/snmp-ups.8.gz
%{_mandir}/man8/solis.8*
@@ -387,6 +380,7 @@ rm -rf %{buildroot}
%{_unitdir}/nut-monitor.service
/lib/systemd/system-shutdown/nutshutdown
%{_libdir}/libupsclient.so.*
+%{_libdir}/libnutclient.so.*
%{_mandir}/man5/upsmon.conf.5.gz
%{_mandir}/man5/upssched.conf.5.gz
%{_mandir}/man8/upsc.8.gz
@@ -424,12 +418,19 @@ rm -rf %{buildroot}
%{_includedir}/*
%{_mandir}/man3/upscli*
%{_mandir}/man3/nutscan*
+%{_mandir}/man3/nutclient*
+%{_mandir}/man3/libnutclient*
%{_libdir}/libupsclient.so
+%{_libdir}/libnutclient.so
%{_libdir}/libnutscan.so
%{_libdir}/pkgconfig/libupsclient.pc
+%{_libdir}/pkgconfig/libnutclient.pc
%{_libdir}/pkgconfig/libnutscan.pc
%changelog
+* Thu Feb 27 2014 Michal Hlavinka <mhlavink at redhat.com> - 2.7.1-1
+- nut updated to 2.7.1
+
* Tue Sep 24 2013 Michal Hlavinka <mhlavink at redhat.com> - 2.6.5-16
- rebuilt with updated freeipmi (1.3.2)
diff --git a/sources b/sources
index a333d82..c554961 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6eac4fa04baff0d0a827d64efe81a7e nut-2.6.5.tar.gz
+e64cf832063ecd6645683fc2ac2bd564 nut-2.7.1.tar.gz
More information about the scm-commits
mailing list