- updated, build with ver. 3.10.13

Changed files:
    apcupsd-configure.patch -> 1.2

diff --git a/apcupsd-configure.patch b/apcupsd-configure.patch
index c33330d56c92971b6e938e1ba92a006371692952..008b5c153b711d040188a4b5ef4d88f0dc2125be 100644 (file)
--- a/apcupsd-configure.patch
+++ b/apcupsd-configure.patch
@@ -1,20 +1,28 @@
-diff -urN apcupsd-3.10.12.orig/autoconf/acconfig.h apcupsd-3.10.12.new/autoconf/acconfig.h
---- apcupsd-3.10.12.orig/autoconf/acconfig.h   2003-03-08 16:14:52.000000000 +0100
-+++ apcupsd-3.10.12.new/autoconf/acconfig.h    2004-04-08 12:40:17.892974408 +0200
-@@ -97,6 +97,9 @@
+diff -urN apcupsd-3.10.13.orig/autoconf/acconfig.h apcupsd-3.10.13.new/autoconf/acconfig.h
+--- apcupsd-3.10.13.orig/autoconf/acconfig.h   2004-04-16 15:18:42.000000000 +0200
++++ apcupsd-3.10.13.new/autoconf/acconfig.h    2004-05-22 15:54:12.854409808 +0200
+@@ -97,6 +97,10 @@
  /* Define the default "log" files directory. */
  #undef LOGDIR
  
 +/* Define the default "status" files directory. */
 +#undef STATDIR
++
 +
  /* Define the default serial port lock directory */
  #undef LOCKDIR
  
-diff -urN apcupsd-3.10.12.orig/autoconf/configure.in apcupsd-3.10.12.new/autoconf/configure.in
---- apcupsd-3.10.12.orig/autoconf/configure.in 2004-03-04 11:48:42.000000000 +0100
-+++ apcupsd-3.10.12.new/autoconf/configure.in  2004-04-08 13:13:47.029539224 +0200
-@@ -1176,10 +1176,19 @@
+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 @@
+ # Find the default directory to put the root-mode PID file in
+ for PIDDIR in "/var/run" "/etc/apcupsd"
+ do
+-      if test -d $PIDDIR 
++      if test -d $PIDDIR
+       then
+               break;
        fi
  done
  
@@ -30,33 +38,33 @@ diff -urN apcupsd-3.10.12.orig/autoconf/configure.in apcupsd-3.10.12.new/autocon
 +done
 +
 +# Find the default directory to put the apcupsd.status file
-+for STATDIR in "/var/log" "/etc/apcupsd"
++for STATDIR in "/var/log" "/etc/apcupsd" "/var/lib/apcupsd"
 +do
 +      if test -d $STATDIR
        then
                break;
        fi
-@@ -1479,11 +1488,18 @@
+@@ -1504,11 +1513,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)],
-       [
-               LOGDIR="$withval";
-       ]
+-    [  --with-log-dir=DIR      Specify EVENTS and STATUS directory (default is OS dependent)],
++    [  --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)],
-+      [
-+              STATDIR="$withval";
-+      ]
++    [  --with-stat-dir=DIR     Specify STATUS directory (default is OS dependent)],
++    [
++      STATDIR="$withval";
++    ]
 +)
  # now allow user to specify LOCKDIR
  AC_ARG_WITH(lock-dir,
-       [  --with-lock-dir=DIR     Specify serial port lock directory (default is OS dependent)],
-@@ -1549,6 +1565,8 @@
+     [  --with-lock-dir=DIR     Specify serial port lock directory (default is OS dependent)],
+@@ -1582,6 +1598,8 @@
  AC_SUBST(PIDDIR)
  AC_DEFINE_UNQUOTED(LOGDIR, "$LOGDIR")
  AC_SUBST(LOGDIR)
@@ -65,7 +73,7 @@ diff -urN apcupsd-3.10.12.orig/autoconf/configure.in apcupsd-3.10.12.new/autocon
  AC_DEFINE_UNQUOTED(NOLOGDIR, "$nologdir")
  AC_SUBST(nologdir)
  AC_DEFINE_UNQUOTED(PWRFAILDIR, "$PWRFAILDIR")
-@@ -1709,7 +1727,8 @@
+@@ -1742,7 +1760,8 @@
    Install man files:        ${mandir}
    Nologin file in:          ${nologdir}
    PID directory:            ${PIDDIR}
@@ -75,9 +83,9 @@ diff -urN apcupsd-3.10.12.orig/autoconf/configure.in apcupsd-3.10.12.new/autocon
    LOCK dir (for serial port)  ${LOCKDIR}
    Power Fail dir            ${PWRFAILDIR}
    Compiler:                 ${CC} ${CCVERSION}
-diff -urN apcupsd-3.10.12.orig/platforms/etc/apcupsd.conf.in apcupsd-3.10.12.new/platforms/etc/apcupsd.conf.in
---- apcupsd-3.10.12.orig/platforms/etc/apcupsd.conf.in 2003-11-26 16:54:47.000000000 +0100
-+++ apcupsd-3.10.12.new/platforms/etc/apcupsd.conf.in  2004-04-08 13:27:59.542937488 +0200
+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 @@
  STATTIME 0
  #