packages: nut/nut-config.patch, nut/nut-hal-paths.patch, nut/nut-matrix.pat...
arekm
arekm at pld-linux.org
Thu Jul 15 09:57:34 CEST 2010
Author: arekm Date: Thu Jul 15 07:57:34 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.4.3
---- Files affected:
packages/nut:
nut-config.patch (1.6 -> 1.7) , nut-hal-paths.patch (1.2 -> 1.3) , nut-matrix.patch (1.3 -> 1.4) , nut.spec (1.156 -> 1.157)
---- Diffs:
================================================================
Index: packages/nut/nut-config.patch
diff -u packages/nut/nut-config.patch:1.6 packages/nut/nut-config.patch:1.7
--- packages/nut/nut-config.patch:1.6 Sun Feb 17 14:22:31 2008
+++ packages/nut/nut-config.patch Thu Jul 15 09:57:28 2010
@@ -17,7 +17,7 @@
# A shell script with a big case..esac construct should work nicely for this.
# An example has been provided to help you get started.
--CMDSCRIPT /usr/local/ups/bin/upssched-cmd
+-CMDSCRIPT @BINDIR@/upssched-cmd
+CMDSCRIPT /usr/sbin/upssched-cmd
# ============================================================================
================================================================
Index: packages/nut/nut-hal-paths.patch
diff -u packages/nut/nut-hal-paths.patch:1.2 packages/nut/nut-hal-paths.patch:1.3
--- packages/nut/nut-hal-paths.patch:1.2 Wed Jan 27 15:28:01 2010
+++ packages/nut/nut-hal-paths.patch Thu Jul 15 09:57:28 2010
@@ -1,54 +1,53 @@
---- nut-2.2.2/m4/nut_check_libhal.m4~ 2008-05-07 11:25:45.000000000 +0200
-+++ nut-2.2.2/m4/nut_check_libhal.m4 2008-06-04 13:41:31.000000000 +0200
-@@ -74,7 +74,20 @@
- dnl Determine installation paths for callout and .fdi
- dnl As per HAL spec, §5 Callouts and §2 Device Information Files
- dnl - addon install path: $libdir/hal
-+ HAL_CALLOUTS_PATH=""
- AC_MSG_CHECKING(for libhal Callouts path)
-+ AC_ARG_WITH(hal-callouts-path,
-+ AC_HELP_STRING([--with-hal-callouts-path=PATH], [path for callout and .fdi files (auto)]),
-+ [case "${withval}" in
-+ yes|no)
-+ ;;
-+ *)
-+ HAL_CALLOUTS_PATH="${withval}"
-+ ;;
-+ esac],)
-+
-+ if (test -z "${HAL_CALLOUTS_PATH}")
-+ then
- HAL_CALLOUTS_PATH=`pkg-config --silence-errors --variable=libexecdir hal`
- if (test -z "$HAL_CALLOUTS_PATH")
- then
-@@ -98,9 +98,22 @@
- else
- AC_MSG_RESULT(${HAL_CALLOUTS_PATH})
- fi
-+ fi
-
- dnl - fdi install path: $datarootdir/hal/fdi/information/20thirdparty
-+ HAL_FDI_PATH=""
- AC_MSG_CHECKING(for libhal Device Information path)
-+ AC_ARG_WITH(hal-fdi-path,
-+ AC_HELP_STRING([--with-hal-fdi-path=PATH], [fdi install path (auto)]),
-+ [case "${withval}" in
-+ yes|no)
-+ ;;
-+ *)
-+ HAL_FDI_PATH="${withval}"
-+ ;;
-+ esac],)
-+ if (test -z "${HAL_FDI_PATH}")
-+ then
- HAL_FDI_PATH=`pkg-config --silence-errors --variable=hal_fdidir hal`
- if (test -z "$HAL_FDI_PATH")
- then
-@@ -120,6 +120,7 @@
- HAL_FDI_PATH="${HAL_FDI_PATH}/information/20thirdparty"
- AC_MSG_RESULT(${HAL_FDI_PATH})
- fi
-+ fi
+--- nut-2.4.3/m4/nut_check_libhal.m4~ 2010-02-11 22:43:05.000000000 +0100
++++ nut-2.4.3/m4/nut_check_libhal.m4 2010-07-15 09:44:54.901127729 +0200
+@@ -85,7 +85,19 @@
+ dnl Determine installation paths for callout and .fdi
+ dnl As per HAL spec, §5 Callouts and §2 Device Information Files
+ dnl - addon install path: $libdir/hal
++ HAL_CALLOUTS_PATH=""
+ AC_MSG_CHECKING(for libhal Callouts path)
++ AC_ARG_WITH(hal-callouts-path,
++ AC_HELP_STRING([--with-hal-callouts-path=PATH], [path for callout and .fdi files (auto)]),
++ [case "${withval}" in
++ yes|no)
++ ;;
++ *)
++ HAL_CALLOUTS_PATH="${withval}"
++ ;;
++ esac],)
++ if (test -z "${HAL_CALLOUTS_PATH}")
++ then
+ HAL_CALLOUTS_PATH=`pkg-config --silence-errors --variable=libexecdir hal`
+ if test -n "$HAL_CALLOUTS_PATH"; then
+ AC_MSG_RESULT(${HAL_CALLOUTS_PATH})
+@@ -109,9 +121,22 @@
+ AC_MSG_RESULT(using default (${HAL_CALLOUTS_PATH}))
+ fi
+ fi
++ fi
- if test "${nut_have_libhal}" != "yes"; then
- dnl try again
+ dnl - fdi install path: $datarootdir/hal/fdi/information/20thirdparty
++ HAL_FDI_PATH=""
+ AC_MSG_CHECKING(for libhal Device Information path)
++ AC_ARG_WITH(hal-fdi-path,
++ AC_HELP_STRING([--with-hal-fdi-path=PATH], [fdi install path (auto)]),
++ [case "${withval}" in
++ yes|no)
++ ;;
++ *)
++ HAL_FDI_PATH="${withval}"
++ ;;
++ esac],)
++ if (test -z "${HAL_FDI_PATH}")
++ then
+ HAL_FDI_PATH=`pkg-config --silence-errors --variable=hal_fdidir hal`
+ if test -n "$HAL_FDI_PATH"; then
+ HAL_FDI_PATH="${HAL_FDI_PATH}/information/20thirdparty"
+@@ -121,6 +146,7 @@
+ HAL_FDI_PATH="${datarootdir}/hal/fdi/information/20thirdparty"
+ AC_MSG_RESULT(${HAL_FDI_PATH})
+ fi
++ fi
+ fi
+
+ CFLAGS="${CFLAGS_ORIG}"
================================================================
Index: packages/nut/nut-matrix.patch
diff -u packages/nut/nut-matrix.patch:1.3 packages/nut/nut-matrix.patch:1.4
--- packages/nut/nut-matrix.patch:1.3 Wed Jan 27 15:28:02 2010
+++ packages/nut/nut-matrix.patch Thu Jul 15 09:57:28 2010
@@ -1,23 +1,10 @@
---- nut-2.2.2/drivers/apcsmart.h~ 2008-06-10 16:43:03.000000000 +0200
-+++ nut-2.2.2/drivers/apcsmart.h 2008-06-12 17:14:18.000000000 +0200
-@@ -265,6 +265,7 @@
+--- nut-2.4.3/drivers/apcsmart.h~ 2010-07-15 09:48:38.358605322 +0200
++++ nut-2.4.3/drivers/apcsmart.h 2010-07-15 09:49:46.457765191 +0200
+@@ -257,6 +257,7 @@
/* APC Matrix */
{ "0ZI", "79ABCDEFGKLMNOPQRSUVWXYZcefgjklmnopqrsuxz/<>", 0 },
{ "5UI", "79ABCDEFGKLMNOPQRSUVWXYZcefgjklmnopqrsuxz/<>", 0 },
-+ { "5YI", "789ABCDEFGLMNOPQTUVWXYcefgjklmnopqrsuwxyz\\<>/", 0 },
-
- { NULL, NULL, 0 },
- };
---- nut-2.2.2/drivers/apcsmart.c~ 2007-12-12 21:34:51.000000000 +0100
-+++ nut-2.2.2/drivers/apcsmart.c 2008-06-12 17:38:28.000000000 +0200
-@@ -540,8 +540,8 @@
- !strcmp(buf, "6QI")) { /* (APC600.) */
- upsdebugx(1, "Found Smart-UPS");
- dstate_setinfo("ups.model", "Smart-UPS");
-- }
-- else return 0;
-+ } else if (strcmp(buf, "5YI")) /* Matrix */
-+ return 0;
- }
-
- upsdebugx(2, "Firmware: [%s]", buf);
++ { "5YI", "789ABCDEFGLMNOPQTUVWXYcefgjklmnopqrsuwxyz\\<>/", 0 },
+ { "5ZM", "79ABCDEFGKLMNOPQRSUVWXYZcefgjklmnopqrsuxz/<>", 0 },
+ /* APC600 */
+ { "6QD", "79ABCDEFGKLMNOPQRSUVWXYZcefgjklmnopqrsuxz", 0 },
================================================================
Index: packages/nut/nut.spec
diff -u packages/nut/nut.spec:1.156 packages/nut/nut.spec:1.157
--- packages/nut/nut.spec:1.156 Sun Jun 6 15:03:21 2010
+++ packages/nut/nut.spec Thu Jul 15 09:57:28 2010
@@ -13,12 +13,12 @@
Summary: Network UPS Tools
Summary(pl.UTF-8): Sieciowe narzędzie do UPS-ów
Name: nut
-Version: 2.4.1
-Release: 4
+Version: 2.4.3
+Release: 1
License: GPL
Group: Applications/System
Source0: http://www.networkupstools.org/source/2.4/%{name}-%{version}.tar.gz
-# Source0-md5: 609ebaf2123fc7171d25a6c742dd7d66
+# Source0-md5: 6f893b61b07915e7a139324fa3f79121
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}-upsmon.init
@@ -209,8 +209,7 @@
--with%{!?with_hal:out}-hal \
--with%{!?with_cgi:out}-cgi \
--with-dev \
- --with%{!?with_neon:out}-neonxml \
- --with-linux-hiddev=%{_includedir}/linux/hiddev.h \
+ --with%{!?with_neon:out}-neon \
--with-ssl \
--with-ipv6 \
%{?with_usb:--with-udev-dir=/etc/udev} \
@@ -319,18 +318,22 @@
%attr(755,root,root) /lib/nut/belkin
%attr(755,root,root) /lib/nut/belkinunv
%attr(755,root,root) /lib/nut/bestfcom
+%attr(755,root,root) /lib/nut/bestfortress
%attr(755,root,root) /lib/nut/bestuferrups
%attr(755,root,root) /lib/nut/bestups
%attr(755,root,root) /lib/nut/blazer_ser
%{?with_usb:%attr(755,root,root) /lib/nut/blazer_usb}
-%attr(755,root,root) /lib/nut/cyberpower
+%attr(755,root,root) /lib/nut/clone
+%attr(755,root,root) /lib/nut/clone-outlet
%attr(755,root,root) /lib/nut/dummy-ups
%attr(755,root,root) /lib/nut/etapro
%attr(755,root,root) /lib/nut/everups
%attr(755,root,root) /lib/nut/gamatronic
%attr(755,root,root) /lib/nut/genericups
%attr(755,root,root) /lib/nut/isbmex
+%attr(755,root,root) /lib/nut/ivtscd
%attr(755,root,root) /lib/nut/liebert
+%attr(755,root,root) /lib/nut/liebertgxt2
%attr(755,root,root) /lib/nut/masterguard
%attr(755,root,root) /lib/nut/megatec
%{?with_usb:%attr(755,root,root) /lib/nut/megatec_usb}
@@ -358,23 +361,27 @@
%{?with_usb:%attr(755,root,root) /lib/nut/usbhid-ups}
%attr(755,root,root) /lib/nut/victronups
%{_datadir}/nut
+%{_mandir}/man5/nut.conf.5*
%{_mandir}/man8/apcsmart.8*
%{_mandir}/man8/bcmxcp.8*
%{?with_usb:%{_mandir}/man8/bcmxcp_usb.8*}
%{_mandir}/man8/belkin.8*
%{_mandir}/man8/belkinunv.8*
%{_mandir}/man8/bestfcom.8*
+%{_mandir}/man8/bestfortress.8*
%{_mandir}/man8/bestuferrups.8*
%{_mandir}/man8/bestups.8*
%{_mandir}/man8/blazer.8*
-%{_mandir}/man8/cyberpower.8*
+%{_mandir}/man8/clone.8*
%{_mandir}/man8/dummy-ups.8*
%{_mandir}/man8/etapro.8*
%{_mandir}/man8/everups.8*
%{_mandir}/man8/gamatronic.8*
%{_mandir}/man8/genericups.8*
%{_mandir}/man8/isbmex.8*
+%{_mandir}/man8/ivtscd.8*
%{_mandir}/man8/liebert.8*
+%{_mandir}/man8/liebertgxt2.8*
%{_mandir}/man8/masterguard.8*
%{_mandir}/man8/megatec.8*
%{?with_usb:%{_mandir}/man8/megatec_usb.8*}
@@ -463,6 +470,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.157 2010/07/15 07:57:28 arekm
+- up to 2.4.3
+
Revision 1.156 2010/06/06 13:03:21 glen
- release 4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nut/nut-config.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nut/nut-hal-paths.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nut/nut-matrix.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nut/nut.spec?r1=1.156&r2=1.157&f=u
More information about the pld-cvs-commit
mailing list