summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukem <lukem>2001-11-20 14:53:03 +0000
committerlukem <lukem>2001-11-20 14:53:03 +0000
commitb3c6de3972c8a2b7268e220d13a12d2207538ddc (patch)
treef50eead5ba74b6bd2296d95b6d56c66699aff50c
parent56d91ca322959d8eb0783942143f360eca24d6ae (diff)
downloadpkgsrc-b3c6de3972c8a2b7268e220d13a12d2207538ddc.tar.gz
newapc driver: chop any trailing `:'s off the end of APC_F_MINUTES fields;
specifically the RUNTIME field on my SmartUPS-1400.
-rw-r--r--sysutils/ups-nut/distinfo3
-rw-r--r--sysutils/ups-nut/patches/patch-af24
2 files changed, 26 insertions, 1 deletions
diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo
index c57fafcd055..72e2a3bd18b 100644
--- a/sysutils/ups-nut/distinfo
+++ b/sysutils/ups-nut/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/11/18 00:41:20 lukem Exp $
+$NetBSD: distinfo,v 1.6 2001/11/20 14:53:03 lukem Exp $
SHA1 (nut-0.45.2.tar.gz) = 9c225205127eee1e9bb55d9a28ff1290b47f75aa
Size (nut-0.45.2.tar.gz) = 330851 bytes
@@ -6,3 +6,4 @@ SHA1 (patch-aa) = 2919c36f928d7b3a22574f8ca0633cd11bb99c70
SHA1 (patch-ab) = 88c1b244d10c6f3a4db62565477260949a9f01f1
SHA1 (patch-ad) = 1132a678cc53882cc92764ed17bbd4cf4152c58d
SHA1 (patch-ae) = 601c7a2eb702e9220aa6f2b8cb596385596d5a92
+SHA1 (patch-af) = 92f99eae16425baab09b1f5e6546caf322ca430c
diff --git a/sysutils/ups-nut/patches/patch-af b/sysutils/ups-nut/patches/patch-af
new file mode 100644
index 00000000000..1cc9fb42d49
--- /dev/null
+++ b/sysutils/ups-nut/patches/patch-af
@@ -0,0 +1,24 @@
+$NetBSD: patch-af,v 1.3 2001/11/20 14:53:04 lukem Exp $
+
+--- models/newapc.c.orig Thu Oct 11 04:32:07 2001
++++ models/newapc.c
+@@ -185,11 +185,18 @@
+ case APC_F_HEX:
+ case APC_F_DEC:
+ case APC_F_SECONDS:
+- case APC_F_MINUTES:
+ case APC_F_HOURS:
+ case APC_F_LEAVE:
+ /* All of these just pass through at present */
+ ptr = upsval;
++ break;
++ case APC_F_MINUTES:
++ strncpy(tmp, upsval, sizeof(tmp) - 1);
++ tmp[sizeof(tmp) - 1] = 0;
++ tval = strlen(tmp) - 1;
++ if (tmp[tval] == ':') /* cull trailing `:' */
++ tmp[tval] = 0;
++ ptr = tmp;
+ break;
+ default:
+ /* Moan */