From b08c307bd286ed95d31e4affe44b0dc3d4d2cf7d Mon Sep 17 00:00:00 2001
From: martin <martin>
Date: Sun, 1 Apr 2001 14:04:36 +0000
Subject: Make shared memory rights the same on systems without SHM_R/SHM_W
 defined and -current. Cosmetic changes in Makefile.

---
 sysutils/ups-nut/Makefile         |  4 ++--
 sysutils/ups-nut/files/patch-sum  |  4 ++--
 sysutils/ups-nut/patches/patch-ae | 15 ++++++++++-----
 3 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index 00a3f46a298..1f328036bc6 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/03/27 03:20:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2001/04/01 14:04:36 martin Exp $
 #
 
 DISTNAME=		nut-0.44.3-pre5
@@ -67,7 +67,7 @@ pre-install:
 
 post-install:
 	@${SED} -e "/%%PREFIX%%/s##${LOCALBASE}#g" \
-		files/upsd \
+		${FILESDIR}/upsd \
 		>${LOCALBASE}/etc/rc.d/upsd
 	@${CHMOD} 0755 ${LOCALBASE}/etc/rc.d/upsd
 	@${INSTALL} -d -o ${NUT_USER} -g ${NUT_GROUP} -m 0770 /var/db/nut
diff --git a/sysutils/ups-nut/files/patch-sum b/sysutils/ups-nut/files/patch-sum
index 471eb778359..6277baad381 100644
--- a/sysutils/ups-nut/files/patch-sum
+++ b/sysutils/ups-nut/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.4 2001/03/11 19:20:51 martin Exp $
+$NetBSD: patch-sum,v 1.5 2001/04/01 14:04:37 martin Exp $
 
 SHA1 (patch-aa) = 2919c36f928d7b3a22574f8ca0633cd11bb99c70
 SHA1 (patch-ab) = da464964fd63f2c3cb34d06f2d6de9e5c1aa356a
 SHA1 (patch-ad) = 2e325eb1a8bd85ef81d265df76e866d8a31a6b57
-SHA1 (patch-ae) = a895fb6f94730db349375b46e4649257cebdcc58
+SHA1 (patch-ae) = 22f61a60b3f707514d67ebd0ec7ba9a0ba50e781
 SHA1 (patch-af) = 6bc9661388928d6a294cdfa156e77aa5fe9669cb
 SHA1 (patch-ag) = e46760b14601313ddd61c40a09965c01be9060fb
diff --git a/sysutils/ups-nut/patches/patch-ae b/sysutils/ups-nut/patches/patch-ae
index d4821a06a1c..ad051ff2d52 100644
--- a/sysutils/ups-nut/patches/patch-ae
+++ b/sysutils/ups-nut/patches/patch-ae
@@ -1,18 +1,23 @@
-$NetBSD: patch-ae,v 1.1 2001/03/11 13:46:12 martin Exp $
+$NetBSD: patch-ae,v 1.2 2001/04/01 14:04:37 martin Exp $
 
 --- models/upscommon.c.orig	Tue Feb 27 07:01:46 2001
-+++ models/upscommon.c	Sun Mar 11 14:08:48 2001
-@@ -555,11 +555,11 @@
++++ models/upscommon.c	Sun Apr  1 15:59:54 2001
+@@ -555,11 +555,16 @@
  #ifdef HAVE_SHMAT
          test_writeinfo();
  
 -/* some systems (NetBSD) don't define SHM_R and SHM_W - they default to it */
-+/* some systems (NetBSD) don't define SHM_R and SHM_W */
++/*
++ * The use of SHM_R and SHM_W is not portable. Neither Posix nor
++ * SUSv2 specify it. Solaris and Linux have them (as well as newer
++ * versions of NetBSD) but either do not document them (Solaris) or
++ * explicitly depreceate their use (NetBSD).
++ */ 
  #ifdef SHM_R
  #define IPC_MODE IPC_CREAT|SHM_R|SHM_W|S_IRGRP|S_IWGRP
  #else
 -#define IPC_MODE IPC_CREAT
-+#define IPC_MODE IPC_CREAT|0700
++#define IPC_MODE IPC_CREAT|0600|S_IRGRP|S_IWGRP
  #endif
          
  	if (shmok == 1) {
-- 
cgit v1.2.3