mhlavink pushed to nut (f21). "nut updated to 2.7.3"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 24 07:56:20 UTC 2015
>From c8cddcc12aac6ae521c0552302cd5ca3ec81fb54 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink at redhat.com>
Date: Fri, 24 Apr 2015 09:56:12 +0200
Subject: nut updated to 2.7.3
diff --git a/.gitignore b/.gitignore
index e21a10c..ec15165 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ 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
diff --git a/nut-2.6.5-ipmifix.patch b/nut-2.6.5-ipmifix.patch
deleted file mode 100644
index db7bff8..0000000
--- a/nut-2.6.5-ipmifix.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -up nut-2.6.5/drivers/nut-libfreeipmi.c.ipmifix nut-2.6.5/drivers/nut-libfreeipmi.c
---- nut-2.6.5/drivers/nut-libfreeipmi.c.ipmifix 2012-07-31 19:38:59.000000000 +0200
-+++ nut-2.6.5/drivers/nut-libfreeipmi.c 2012-09-04 09:42:48.000000000 +0200
-@@ -49,6 +49,36 @@
- #include "nut-ipmi.h"
- #include "dstate.h"
-
-+#ifdef HAVE_FREEIPMI_11X_12X
-+#define ipmi_fru_parse_ctx_t ipmi_fru_ctx_t
-+#define nut_ipmi_fru_parse_close_device_id nut_ipmi_fru_close_device_id
-+#define nut_ipmi_fru_parse_ctx_destroy nut_ipmi_fru_ctx_destroy
-+#define nut_ipmi_fru_parse_ctx_create nut_ipmi_fru_ctx_create
-+#define nut_ipmi_fru_parse_ctx_set_flags nut_ipmi_fru_ctx_set_flags
-+#define nut_ipmi_fru_parse_open_device_id nut_ipmi_fru_open_device_id
-+#define nut_ipmi_fru_parse_ctx_errormsg nut_ipmi_fru_ctx_errormsg
-+#define nut_ipmi_fru_parse_next nut_ipmi_fru_next
-+#define IPMI_FRU_PARSE_AREA_SIZE_MAX IPMI_FRU_AREA_SIZE_MAX
-+#define IPMI_FRU_PARSE_FLAGS_SKIP_CHECKSUM_CHECKS IPMI_FRU_FLAGS_SKIP_CHECKSUM_CHECKS
-+#define IPMI_FRU_PARSE_AREA_TYPE_MULTIRECORD_POWER_SUPPLY_INFORMATION IPMI_FRU_AREA_TYPE_MULTIRECORD_POWER_SUPPLY_INFORMATION
-+#define IPMI_FRU_PARSE_AREA_TYPE_BOARD_INFO_AREA IPMI_FRU_AREA_TYPE_BOARD_INFO_AREA
-+#define ipmi_fru_parse_field_t ipmi_fru_field_t
-+#define ipmi_fru_parse_ctx_create ipmi_fru_ctx_create
-+#define ipmi_fru_parse_ctx_set_flags ipmi_fru_ctx_set_flags
-+#define ipmi_fru_parse_ctx_strerror ipmi_fru_ctx_strerror
-+#define ipmi_fru_parse_ctx_errnum ipmi_fru_ctx_errnum
-+#define ipmi_fru_parse_open_device_id ipmi_fru_open_device_id
-+#define ipmi_fru_parse_ctx_errormsg ipmi_fru_ctx_errormsg
-+#define ipmi_fru_parse_read_data_area ipmi_fru_read_data_area
-+#define ipmi_fru_parse_type_length_field_to_string ipmi_fru_type_length_field_to_string
-+#define ipmi_fru_parse_close_device_id ipmi_fru_close_device_id
-+#define ipmi_fru_parse_ctx_destroy ipmi_fru_ctx_destroy
-+#define ipmi_fru_parse_multirecord_power_supply_information ipmi_fru_multirecord_power_supply_information
-+#define ipmi_fru_parse_board_info_area ipmi_fru_board_info_area
-+#define ipmi_fru_parse_next ipmi_fru_next
-+#define IPMI_FRU_PARSE_AREA_STRING_MAX IPMI_FRU_AREA_STRING_MAX
-+#endif
-+
- /* FreeIPMI defines */
- #define IPMI_FRU_STR_BUFLEN 1024
- /* haven't seen a motherboard with more than 2-3 so far,
-diff -up nut-2.6.5/m4/nut_check_libfreeipmi.m4.ipmifix nut-2.6.5/m4/nut_check_libfreeipmi.m4
---- nut-2.6.5/m4/nut_check_libfreeipmi.m4.ipmifix 2012-07-31 19:38:56.000000000 +0200
-+++ nut-2.6.5/m4/nut_check_libfreeipmi.m4 2012-09-04 09:45:45.399328962 +0200
-@@ -66,15 +66,23 @@ if test -z "${nut_have_libfreeipmi_seen}
- dnl when version cannot be tested (prior to 1.0.5, with no pkg-config)
- dnl we have to check for some specific functions
- AC_SEARCH_LIBS([ipmi_ctx_find_inband], [freeipmi], [], [nut_have_freeipmi=no])
-- AC_SEARCH_LIBS([ipmi_fru_parse_ctx_create], [freeipmi], [], [nut_have_freeipmi=no])
-
- AC_SEARCH_LIBS([ipmi_monitoring_init], [ipmimonitoring], [nut_have_freeipmi_monitoring=yes], [nut_have_freeipmi_monitoring=no])
- AC_SEARCH_LIBS([ipmi_monitoring_sensor_read_record_id], [ipmimonitoring], [], [nut_have_freeipmi_monitoring=no])
-
- dnl Check for FreeIPMI 1.1.X / 1.2.X which implies API changes!
-- AC_SEARCH_LIBS([ipmi_sdr_cache_ctx_destroy], [freeipmi], [nut_have_freeipmi_11x_12x=no], [])
-+ nut_have_freeipmi_old="${nut_have_freeipmi}"
-+ AC_SEARCH_LIBS([ipmi_fru_parse_ctx_create], [freeipmi], [nut_have_freeipmi_11x_12x=no], [nut_have_freeipmi_old=no])
-+ AC_SEARCH_LIBS([ipmi_sdr_cache_ctx_destroy], [freeipmi], [nut_have_freeipmi_11x_12x=no], [nut_have_freeipmi_old=no])
-+ AC_SEARCH_LIBS([ipmi_fru_ctx_create], [freeipmi], [nut_have_freeipmi_11x_12x=yes], [nut_have_freeipmi_11x_12x=no])
- AC_SEARCH_LIBS([ipmi_sdr_ctx_destroy], [freeipmi], [nut_have_freeipmi_11x_12x=yes], [nut_have_freeipmi_11x_12x=no])
-
-+ if test "${nut_have_freeipmi}${nut_have_freeipmi_11x_12x}" = "yesyes"; then
-+ AC_DEFINE(HAVE_FREEIPMI_11X_12X, 1, [Define if FreeIPMI 1.1.X / 1.2.X support is available])
-+ elif test "${nut_have_freeipmi_old}" = "no"; then
-+ nut_have_freeipmi="no"
-+ fi
-+
- if test "${nut_have_freeipmi}" = "yes"; then
- nut_with_ipmi="yes"
- nut_ipmi_lib="(FreeIPMI)"
-@@ -84,10 +92,6 @@ if test -z "${nut_have_libfreeipmi_seen}
- LIBIPMI_LIBS="${LIBS}"
- fi
-
-- if test "${nut_have_freeipmi_11x_12x}" = "yes"; then
-- AC_DEFINE(HAVE_FREEIPMI_11X_12X, 1, [Define if FreeIPMI 1.1.X / 1.2.X support is available])
-- fi
--
- if test "${nut_have_freeipmi_monitoring}" = "yes"; then
- AC_DEFINE(HAVE_FREEIPMI_MONITORING, 1, [Define if FreeIPMI monitoring support is available])
- fi
-diff -up nut-2.6.5/tools/nut-scanner/scan_ipmi.c.ipmifix nut-2.6.5/tools/nut-scanner/scan_ipmi.c
---- nut-2.6.5/tools/nut-scanner/scan_ipmi.c.ipmifix 2012-07-31 19:38:58.000000000 +0200
-+++ nut-2.6.5/tools/nut-scanner/scan_ipmi.c 2012-09-04 09:42:35.000000000 +0200
-@@ -34,24 +34,50 @@ static char * libname = "libfreeipmi";
- static lt_dlhandle dl_handle = NULL;
- static const char *dl_error = NULL;
-
--static int (*nut_ipmi_fru_parse_close_device_id) (ipmi_fru_parse_ctx_t ctx);
--static void (*nut_ipmi_fru_parse_ctx_destroy) (ipmi_fru_parse_ctx_t ctx);
- #ifdef HAVE_FREEIPMI_11X_12X
- static void (*nut_ipmi_sdr_ctx_destroy) (ipmi_sdr_ctx_t ctx);
-+static int (*nut_ipmi_fru_close_device_id) (ipmi_fru_ctx_t ctx);
-+static void (*nut_ipmi_fru_ctx_destroy) (ipmi_fru_ctx_t ctx);
-+static ipmi_fru_ctx_t (*nut_ipmi_fru_ctx_create) (ipmi_ctx_t ipmi_ctx);
-+static int (*nut_ipmi_fru_ctx_set_flags) (ipmi_fru_ctx_t ctx, unsigned int flags);
-+static int (*nut_ipmi_fru_open_device_id) (ipmi_fru_ctx_t ctx, uint8_t fru_device_id);
-+static char * (*nut_ipmi_fru_ctx_errormsg) (ipmi_fru_ctx_t ctx);
-+static int (*nut_ipmi_fru_next) (ipmi_fru_ctx_t ctx);
- #else /* HAVE_FREEIPMI_11X_12X */
-+static int (*nut_ipmi_fru_parse_close_device_id) (ipmi_fru_parse_ctx_t ctx);
-+static void (*nut_ipmi_fru_parse_ctx_destroy) (ipmi_fru_parse_ctx_t ctx);
- static void (*nut_ipmi_sdr_cache_ctx_destroy) (ipmi_sdr_cache_ctx_t ctx);
- static void (*nut_ipmi_sdr_parse_ctx_destroy) (ipmi_sdr_parse_ctx_t ctx);
--#endif /* HAVE_FREEIPMI_11X_12X */
- static ipmi_fru_parse_ctx_t (*nut_ipmi_fru_parse_ctx_create) (ipmi_ctx_t ipmi_ctx);
- static int (*nut_ipmi_fru_parse_ctx_set_flags) (ipmi_fru_parse_ctx_t ctx, unsigned int flags);
- static int (*nut_ipmi_fru_parse_open_device_id) (ipmi_fru_parse_ctx_t ctx, uint8_t fru_device_id);
- static char * (*nut_ipmi_fru_parse_ctx_errormsg) (ipmi_fru_parse_ctx_t ctx);
-+static int (*nut_ipmi_fru_parse_next) (ipmi_fru_parse_ctx_t ctx);
-+#endif /* HAVE_FREEIPMI_11X_12X */
-+
-+#ifndef ipmi_fru_parse_ctx_t
-+#define ipmi_fru_parse_ctx_t ipmi_fru_ctx_t
-+#endif
-+
-+#ifndef nut_ipmi_fru_parse_close_device_id
-+#define nut_ipmi_fru_parse_close_device_id nut_ipmi_fru_close_device_id
-+#endif
-+
-+#define nut_ipmi_fru_parse_ctx_destroy nut_ipmi_fru_ctx_destroy
-+#define nut_ipmi_fru_parse_ctx_create nut_ipmi_fru_ctx_create
-+#define nut_ipmi_fru_parse_ctx_set_flags nut_ipmi_fru_ctx_set_flags
-+#define nut_ipmi_fru_parse_open_device_id nut_ipmi_fru_open_device_id
-+#define nut_ipmi_fru_parse_ctx_errormsg nut_ipmi_fru_ctx_errormsg
-+#define nut_ipmi_fru_parse_next nut_ipmi_fru_next
-+#define IPMI_FRU_PARSE_AREA_SIZE_MAX IPMI_FRU_AREA_SIZE_MAX
-+#define IPMI_FRU_PARSE_FLAGS_SKIP_CHECKSUM_CHECKS IPMI_FRU_FLAGS_SKIP_CHECKSUM_CHECKS
-+#define IPMI_FRU_PARSE_AREA_TYPE_MULTIRECORD_POWER_SUPPLY_INFORMATION IPMI_FRU_AREA_TYPE_MULTIRECORD_POWER_SUPPLY_INFORMATION
-+
- static int (*nut_ipmi_fru_parse_read_data_area) (ipmi_fru_parse_ctx_t ctx,
- unsigned int *area_type,
- unsigned int *area_length,
- void *areabuf,
- unsigned int areabuflen);
--static int (*nut_ipmi_fru_parse_next) (ipmi_fru_parse_ctx_t ctx);
- static ipmi_ctx_t (*nut_ipmi_ctx_create) (void);
- static int (*nut_ipmi_ctx_find_inband) (ipmi_ctx_t ctx,
- ipmi_driver_type_t *driver_type,
diff --git a/nut-2.6.5-quickfix.patch b/nut-2.6.5-quickfix.patch
index c5b8038..aa11fe6 100644
--- a/nut-2.6.5-quickfix.patch
+++ b/nut-2.6.5-quickfix.patch
@@ -1,14 +1,12 @@
-diff -up nut-2.7.1/configure.ac.quickfix nut-2.7.1/configure.ac
---- nut-2.7.1/configure.ac.quickfix 2013-11-20 20:53:31.000000000 +0100
-+++ nut-2.7.1/configure.ac 2014-02-27 11:25:57.608869497 +0100
-@@ -1027,9 +1027,8 @@ dnl Override installation directory, wit
+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})
-- systemdsystemunitdir="`echo ${systemdsystemunitdir} | sed 's/\/lib/\${libdir}/'`"
else
AC_MSG_RESULT(no)
- fi
diff --git a/nut.spec b/nut.spec
index efe90fc..edab1e6 100644
--- a/nut.spec
+++ b/nut.spec
@@ -1,3 +1,6 @@
+# Does not build with hardened build enabled due to PIC
+%global _hardened_build 0
+
#TODO: split nut-client so it does not require python
%global nut_uid 57
%global nut_gid 57
@@ -12,8 +15,8 @@
Summary: Network UPS Tools
Name: nut
-Version: 2.7.2
-Release: 3%{?dist}
+Version: 2.7.3
+Release: 1%{?dist}
Group: Applications/System
License: GPLv2+ and GPLv3+
Url: http://www.networkupstools.org/
@@ -24,7 +27,6 @@ Patch1: nut-2.6.3-tmpfiles.patch
#quick fix. TODO: fix it properly
Patch3: nut-2.6.5-quickfix.patch
-Patch4: nut-2.6.5-ipmifix.patch
Patch5: nut-2.6.5-dlfix.patch
Patch6: nut-2.6.5-pthreadfix.patch
Patch7: nut-2.6.5-foreground.patch
@@ -122,14 +124,13 @@ necessary to develop NUT client applications.
%setup -q
%patch1 -p1 -b .tmpfiles
%patch3 -p1 -b .quickfix
-#%patch4 -p1 -b .ipmifix
%patch5 -p1 -b .dlfix
%patch6 -p1 -b .pthreadfix
%patch7 -p1 -b .foreground
%patch8 -p1 -b .unreachable
%patch9 -p1 -b .rmpidf
-#%patch10 -p1 -b .fixupslog
-#%patch11 -p1 -b .systemdfix
+
+
sed -i 's|=NUT-Monitor|=nut-monitor|' scripts/python/app/nut-monitor.desktop
sed -i "s|sys.argv\[0\]|'%{_datadir}/%{name}/nut-monitor/nut-monitor'|" scripts/python/app/NUT-Monitor
sed -i 's|LIBSSL_LDFLAGS|LIBSSL_LIBS|' lib/libupsclient-config.in
@@ -146,6 +147,8 @@ find . -mtime -1 -print0 | xargs -0 touch --reference %{SOURCE0}
%build
autoreconf -i
+# prevent assignment of default value, it would break configure's tests
+export LDFLAGS="-Wl,-z,now"
%configure \
--with-all \
--with-libltdl \
@@ -164,7 +167,7 @@ autoreconf -i
--with-pkgconfig-dir=%{_libdir}/pkgconfig \
--disable-static \
--with-udev-dir=%{_usr}/lib/udev \
- --libdir=%{_libdir}
+ --libdir=%{_libdir}
# --with-doc # does not work in 2.7.1
sh %{SOURCE4} >>include/config.h
@@ -205,7 +208,7 @@ done
popd
#fix collision with virtualbox
-mv %{buildroot}/%{_usr}/lib/udev/rules.d/52-nut-usbups.rules %{buildroot}/%{_usr}/lib/udev/rules.d/62-nut-usbups.rules
+#mv %{buildroot}/%{_usr}/lib/udev/rules.d/52-nut-usbups.rules %{buildroot}/%{_usr}/lib/udev/rules.d/62-nut-usbups.rules
mv %{buildroot}/%{_usr}/lib/udev/rules.d/52-nut-ipmipsu.rules %{buildroot}/%{_usr}/lib/udev/rules.d/62-nut-ipmipsu.rules
# fix encoding
@@ -272,6 +275,7 @@ udevadm control --reload ||:
%postun client
/sbin/ldconfig
+%systemd_postun_with_restart nut-monitor.service
%posttrans
# phase 2: start upsmon again
@@ -434,6 +438,9 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/libnutscan.pc
%changelog
+* Thu Apr 23 2015 Michal Hlavinka <mhlavink at redhat.com> - 2.7.3-1
+- nut updated to 2.7.3
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index e01f451..ee3e16e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c3568b42e058cfc385b46d25140dced4 nut-2.7.2.tar.gz
+a1a7f747093663e1f39ab595b63b45e4 nut-2.7.3.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/nut.git/commit/?h=f21&id=c8cddcc12aac6ae521c0552302cd5ca3ec81fb54
More information about the scm-commits
mailing list