- updated to 3.10.15

Changed files:
    apcupsd-configure.patch -> 1.3

diff --git a/apcupsd-configure.patch b/apcupsd-configure.patch
index 008b5c153b711d040188a4b5ef4d88f0dc2125be..87dc83575bf9a6dbf4ab8c7e8e9e11c7d4012b3e 100644 (file)
--- a/apcupsd-configure.patch
+++ b/apcupsd-configure.patch
@@ -12,10 +12,9 @@ diff -urN apcupsd-3.10.13.orig/autoconf/acconfig.h apcupsd-3.10.13.new/autoconf/
  /* Define the default serial port lock directory */
  #undef LOCKDIR
  
-diff -urN apcupsd-3.10.13.orig/autoconf/configure.in apcupsd-3.10.13.new/autoconf/configure.in
 --- apcupsd-3.10.13.orig/autoconf/configure.in 2004-04-16 20:14:57.000000000 +0200
 +++ apcupsd-3.10.13.new/autoconf/configure.in  2004-05-22 19:09:30.116115272 +0200
-@@ -1196,16 +1196,25 @@
+@@ -1188,16 +1188,25 @@
  # Find the default directory to put the root-mode PID file in
  for PIDDIR in "/var/run" "/etc/apcupsd"
  do
@@ -44,19 +43,19 @@ diff -urN apcupsd-3.10.13.orig/autoconf/configure.in apcupsd-3.10.13.new/autocon
        then
                break;
        fi
-@@ -1504,11 +1513,18 @@
+@@ -1497,11 +1506,18 @@
  )
  # now allow user to specify LOGDIR
  AC_ARG_WITH(log-dir,
--    [  --with-log-dir=DIR      Specify EVENTS and STATUS directory (default is OS dependent)],
-+    [  --with-log-dir=DIR      Specify EVENTS directory (default is OS dependent)],
+-    [AC_HELP_STRING([--with-log-dir=DIR], [Specify EVENTS and STATUS directory (default is OS dependent)])],
++    [AC_HELP_STRING([--with-log-dir=DIR], [Specify EVENTS directory (default is OS dependent)])],
      [
        LOGDIR="$withval";
      ]
  )
 +# now allow user to specify STATDIR
 +AC_ARG_WITH(stat-dir,
-+    [  --with-stat-dir=DIR     Specify STATUS directory (default is OS dependent)],
++    [AC_HELP_STRING([--with-stat-dir=DIR], [Specify STATUS directory (default is OS dependent)])],
 +    [
 +      STATDIR="$withval";
 +    ]
@@ -64,7 +63,7 @@ diff -urN apcupsd-3.10.13.orig/autoconf/configure.in apcupsd-3.10.13.new/autocon
  # now allow user to specify LOCKDIR
  AC_ARG_WITH(lock-dir,
      [  --with-lock-dir=DIR     Specify serial port lock directory (default is OS dependent)],
-@@ -1582,6 +1598,8 @@
+@@ -1575,6 +1591,8 @@
  AC_SUBST(PIDDIR)
  AC_DEFINE_UNQUOTED(LOGDIR, "$LOGDIR")
  AC_SUBST(LOGDIR)
@@ -73,7 +72,7 @@ diff -urN apcupsd-3.10.13.orig/autoconf/configure.in apcupsd-3.10.13.new/autocon
  AC_DEFINE_UNQUOTED(NOLOGDIR, "$nologdir")
  AC_SUBST(nologdir)
  AC_DEFINE_UNQUOTED(PWRFAILDIR, "$PWRFAILDIR")
-@@ -1742,7 +1760,8 @@
+@@ -1735,7 +1753,8 @@
    Install man files:        ${mandir}
    Nologin file in:          ${nologdir}
    PID directory:            ${PIDDIR}
@@ -83,7 +82,6 @@ diff -urN apcupsd-3.10.13.orig/autoconf/configure.in apcupsd-3.10.13.new/autocon
    LOCK dir (for serial port)  ${LOCKDIR}
    Power Fail dir            ${PWRFAILDIR}
    Compiler:                 ${CC} ${CCVERSION}
-diff -urN apcupsd-3.10.13.orig/platforms/etc/apcupsd.conf.in apcupsd-3.10.13.new/platforms/etc/apcupsd.conf.in
 --- apcupsd-3.10.13.orig/platforms/etc/apcupsd.conf.in 2003-11-26 16:54:47.000000000 +0100
 +++ apcupsd-3.10.13.new/platforms/etc/apcupsd.conf.in  2004-05-22 19:11:36.654878456 +0200
 @@ -217,7 +217,7 @@