Update to 2.14.3:

3.14.3 -- 20 January 2008            (Maintenance Release)

NEW FEATURES

  * A HAL policy file is automatically installed on Linux systems to disable
    the hald-addon-hid-ups module which conflicts with apcupsd's control of
    USB UPSes. The file is automatically removed when apcupsd is
    uninstalled.

BUG FIXES

  * Add support for Nominal Power (aka Configured Active Power) reading.
    Credit to Lars Randers <lars@nstec.dk> for most of the code.

  * Add units to NOMINV, NOMOUTV, and NOMBATTV stats.

  * Eliminate "warning: deprecated conversion from string constant to
    'char*'" warnings emitted from gcc-4.2.1 (earlier versions with
    -Wwrite-strings). Contributed by Steve Yarmie <tribhuvanji@gmail.com>.

  * Fix killpower and eeprom settings bug on USB modules introduced when
    INPUT reports were prioritized over FEATURE reports.

  * Fix bugs that could cause NIS-net driver to get stuck waiting for
    comms to be restored instead of shutting down.


3.14.2 -- 15 September 2007          (Maintenance Release)

NEW FEATURES

  * Tray icon support on Vista. Vista does not allow background services
    to interact with the user's desktop, so winapcupsd's built-in tray
    icon did not work.

  * Tray icon is now a standalone application "apctray" which is capable of
    monitoring multiple Apcupsd instances via Apcupsd's NIS. Any Apcupsd
    running NIS can be monitored. By default the icon monitors a single
    apcupsd at 127.0.0.1:3551. See command line options below for adding
    additional monitors.

  * Tray icon can be installed individually (disable other packages in the
    installer) for users who want to use the icon only.

  * Apctray command line options:

       apctray.exe
          - No parameters: Start any instances listed in registry. If no
          instances in reg, start a default instance monitoring the local
          machine (127.0.0.1:3551).

       apctray.exe /host foo /port 3551 /add
          - Add a monitor for the given host and port.

       apctray.exe /host foo /port 3551 /del
          - Remove the given monitor.

       apctray.exe /del
          - Remove all monitors.

       apctray.exe /install
          - Configure apctray to start automatically.

       apctray.exe /remove
          - Do not start automatically.

       apctray.exe /kill
          - Shut down apctray

BUG FIXES

  * The win32 portions of winapcupsd have been almost entirely rewritten.
    The code is cleaner (mostly) and lots of unused baggage has been
    removed.

  * USB fix for BackUPS LCD series. This fix carries a risk of breaking
    other
    models, but test results are positive so far.

  * Fix linux-usb device detection bug when multiple hiddev nodes are
    present.  Fixes Fedora Bugzilla #245864:
    <https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=245864>

  * Fix SNMP port selection when using SNMP driver

  * Add workaround for broken BackUPS Pro model that returns certain
    reports encoded in ASCII. Based on a patch from David Fries
    <David@Fries.net>.

  * apcsmart: Wait 20 seconds before declaring COMMLOST. This is necessary
    when using a smart serial cable on an UPS with an SNMP monitoring card
    installed. The SNMP card appears to disrupt serial comms for several
    seconds when interesting events are in progress.

  * Documentation updates: Fix up udev info for modern Linux distros.
    Update Windows section for apctray.

  * Don't leak unnecessary descriptors to child when execing apccontrol.

  * Fix bug with multi-threaded net_open() calls. net_open() was using
    a global buffer for the destination address. Yikes! Bug manifestied
    itself in apctray with multiple monitors occasionally (and
    timing-dependently) pointing to the wrong UPS.

  * Correct multimon.conf humidity monitoring.  Problem fixed by
    Patrick Frei.  Reference:
    https://bugzilla.novell.com/show_bug.cgi?id=199834

  * Fix race between attach_ups() and detach_ups() which could result
    in the UPSINFO structure being freed prematurely. Thanks to James
    Abbott <j.abbott@imperial.ac.uk> for running many tests to help me
    find this bug.

  * Remove dependency on libc++ (again). Must use gcc as linker when
    using libsupc++ since g++ automatically links against full libc++.

4 files changed, 39 insertions, 19 deletions

diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 1356f1c7307..8c7d54c4f95 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2007/10/29 12:44:56 sborrill Exp $
+# $NetBSD: Makefile,v 1.57 2008/04/28 08:28:05 sborrill Exp $
 
-DISTNAME=		apcupsd-3.14.1
-PKGREVISION=		2
+DISTNAME=		apcupsd-3.14.3
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=apcupsd/}
 
diff --git a/sysutils/apcupsd/distinfo b/sysutils/apcupsd/distinfo
index 999eb99fbda..3a7016ed76c 100644
--- a/sysutils/apcupsd/distinfo
+++ b/sysutils/apcupsd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2007/06/19 22:22:55 bouyer Exp $
+$NetBSD: distinfo,v 1.13 2008/04/28 08:28:05 sborrill Exp $
 
-SHA1 (apcupsd-3.14.1.tar.gz) = ee2a9ba074b688aba047d571098f44dc591e985c
-RMD160 (apcupsd-3.14.1.tar.gz) = f6655123f7daa91966e9a2a4877e90b70babc670
-Size (apcupsd-3.14.1.tar.gz) = 4352400 bytes
+SHA1 (apcupsd-3.14.3.tar.gz) = b9f75732752cdee9792a5be526656c153c2d1274
+RMD160 (apcupsd-3.14.3.tar.gz) = 092726b2076e56368cdb7e3c790ee8d5e2a7d2f9
+Size (apcupsd-3.14.3.tar.gz) = 4350109 bytes
 SHA1 (patch-aa) = 112c8db7a67456821a2e449d6a8ff600a7998dc0
 SHA1 (patch-ab) = 3db85accf1b05c8723dd7625278dfac02909dc34
 SHA1 (patch-ac) = 98e8853dd030e09d5a487e57a277ff1269baa517
@@ -13,7 +13,7 @@ SHA1 (patch-ag) = 2b77e969d6cbe8ed06797cd753eb443bd6a3881b
 SHA1 (patch-ah) = 738b93b481310aa92ee16d0fbf91b5723b8cabb8
 SHA1 (patch-ai) = be802d4ea438ac991f7e0ebd1c086699aade0b2b
 SHA1 (patch-aj) = cce8e25f52cc4eaa38eb31baffceb33fe4a43cee
-SHA1 (patch-al) = a41cb4ee8d896fc633d8869f24e548fda0761340
+SHA1 (patch-al) = 071f01068f80aa4380446690c791dd0b2cd8b8af
 SHA1 (patch-am) = a2c060519748cf95f0f9aaa284f783f086c1d7d4
 SHA1 (patch-an) = 56afb8709129ec3bb42d4c29fa5a24c9032aa8a3
-SHA1 (patch-ao) = 4bae4f04a5766b49f1a3cf13cf63c70bd3807937
+SHA1 (patch-ao) = 08594041766d7655e60f7179b086498f27cc4ece
diff --git a/sysutils/apcupsd/patches/patch-al b/sysutils/apcupsd/patches/patch-al
index 5ee712fdacc..cdd4d664343 100644
--- a/sysutils/apcupsd/patches/patch-al
+++ b/sysutils/apcupsd/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.3 2007/03/07 20:48:04 joerg Exp $
+$NetBSD: patch-al,v 1.4 2008/04/28 08:28:05 sborrill Exp $
 
 --- src/drivers/usb/bsd/bsd-usb.c.orig	2007-03-07 19:31:11.000000000 +0000
 +++ src/drivers/usb/bsd/bsd-usb.c
@@ -16,3 +16,23 @@ $NetBSD: patch-al,v 1.3 2007/03/07 20:48:04 joerg Exp $
  
  /* Compatibility cruft for FreeBSD <= 4.7 */
  #ifndef USB_MAX_DEVNAMES
+@@ -357,8 +357,9 @@
+ int pusb_ups_get_capabilities(UPSINFO *ups, const struct s_known_info *known_info)
+ {
+    int i, rc, ci, phys;
++   int input, feature;
+    USB_DATA *my_data = (USB_DATA *)ups->driver_internal_data;
+-   hid_item_t item;
++   hid_item_t item, witem;
+    USB_INFO *info;
+ 
+    write_lock(ups);
+@@ -780,7 +781,7 @@
+    return true;
+ }
+ 
+-int pusb_write_int_to_ups(UPSINFO *ups, int ci, int value, char *name)
++int pusb_write_int_to_ups(UPSINFO *ups, int ci, int value, const char *name)
+ {
+    USB_DATA *my_data = (USB_DATA *)ups->driver_internal_data;
+    USB_INFO *info;
diff --git a/sysutils/apcupsd/patches/patch-ao b/sysutils/apcupsd/patches/patch-ao
index e8a91256323..9aed3ccabde 100644
--- a/sysutils/apcupsd/patches/patch-ao
+++ b/sysutils/apcupsd/patches/patch-ao
@@ -1,9 +1,9 @@
-$NetBSD: patch-ao,v 1.5 2007/06/19 22:22:55 bouyer Exp $
+$NetBSD: patch-ao,v 1.6 2008/04/28 08:28:05 sborrill Exp $
 
---- platforms/Makefile.in.orig	2007-06-19 23:54:40.000000000 +0200
-+++ platforms/Makefile.in	2007-06-19 23:56:17.000000000 +0200
-@@ -26,19 +26,6 @@
- 		 DESTDIR=$(DESTDIR) install);
+--- platforms/Makefile.in.orig	2007-11-17 19:09:23.000000000 +0000
++++ platforms/Makefile.in	2008-04-26 22:24:19.000000000 +0100
+@@ -26,20 +26,6 @@
+ 	      DESTDIR=$(DESTDIR) install);
  
  install: @INSTALL_DISTDIR@
 -	@echo "Installing apccontrol script..."
@@ -12,13 +12,14 @@ $NetBSD: patch-ao,v 1.5 2007/06/19 22:22:55 bouyer Exp $
 -	   echo " Found old apccontrol moving it to $(DESTDIR)$(sysconfdir)/apccontrol.orig"; \
 -	fi 
 -	@if test -f ./$(DISTNAME)/apccontrol; then \
--	     $(INSTALL_SCRIPT) -m 744 ./$(DISTNAME)/apccontrol \
--		$(DESTDIR)$(sysconfdir)/apccontrol; \
+-	   $(INSTALL_SCRIPT) -m 744 ./$(DISTNAME)/apccontrol $(DESTDIR)$(sysconfdir)/apccontrol; \
 -	else \
--	     $(INSTALL_SCRIPT) -m 744 ./apccontrol \
--		$(DESTDIR)$(sysconfdir)/apccontrol; \
+-	   $(INSTALL_SCRIPT) -m 744 ./apccontrol $(DESTDIR)$(sysconfdir)/apccontrol; \
 -	fi
 -	(cd etc/; $(MAKE) DESTDIR=$(DESTDIR) install)
+-	@if test "x@HALPOLICYDIR@" != "xno" -a "x@HALPOLICYDIR@" != "x" ; then \
+-	   $(INSTALL_DATA) -m 644 ./80-apcupsd-ups-policy.fdi $(DESTDIR)@HALPOLICYDIR@ ; \
+-	fi
  
  #
  # uninstall symlinks before removing the boot script etc etc