Miscellaneous fixes and improvements; crank version to nb1.

12 files changed, 209 insertions, 47 deletions

diff --git a/sysutils/dptutil/Makefile b/sysutils/dptutil/Makefile
index 8e0509843e6..2af44a922e3 100644
--- a/sysutils/dptutil/Makefile
+++ b/sysutils/dptutil/Makefile
@@ -1,45 +1,26 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/27 23:39:02 ad Exp $
 
-DISTNAME=		raidmgt
+DISTNAME=		raidmgt-3.31
 PKGNAME=		dptutil-3.31
-WRKSRC=			${WRKDIR}
+PKGREVISION=		1
 CATEGORIES=		sysutils
-MASTER_SITES=		# empty
-EXTRACT_SUFX=		.tgz
+MASTER_SITES=		http://www.interlude.eu.org/~ad/raidmgt/
 
 MAINTAINER=		ad@netbsd.org
 HOMEPAGE=		http://opensource.adaptec.com/
-COMMENT=		DPT/Adaptec Storage Management software (dputil)
+COMMENT=		DPT/Adaptec Storage Management software (dptutil)
 
-# Should work on other platforms, not yet tested.
+# Should work for 32-bit PowerPC and SPARC, but untested.  64-bit platforms
+# may have problems.
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-RESTRICTED=		"Redistribution not permitted"
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
-CHECK_SHLIBS=		NO
-NO_CONFIGURE=		# defined
-INTERACTIVE_STAGE=	fetch
-
-DOWNLOAD=		http://mbserver.adaptec.com/index.php?bn=linux_downloads
-
-_FETCH_MESSAGE= \
-	${ECHO} "================================================================="; \
-	${ECHO} "  dputil and dpteng source (raidmgt.tgz) must be fetched"; \
-	${ECHO} "  into ${DISTDIR} from"; \
-	${ECHO} "  ${DOWNLOAD}."; \
-	${ECHO} "================================================================="
-
 post-patch:
 	${SED}	-e "s,@SBINDIR@,${PREFIX}/sbin,g"			\
-		${WRKDIR}/dpteng/makefile > ${WRKDIR}/dpteng/makefile.tmp
-	${MV} ${WRKDIR}/dpteng/makefile.tmp ${WRKDIR}/dpteng/makefile
+		${WRKSRC}/dpteng/makefile > ${WRKSRC}/dpteng/makefile.tmp
+	${MV} ${WRKSRC}/dpteng/makefile.tmp ${WRKSRC}/dpteng/makefile
 	${SED}	-e "s,@SBINDIR@,${PREFIX}/sbin,g"			\
-		${WRKDIR}/dptutil/makefile > ${WRKDIR}/dptutil/makefile.tmp
-	${MV} ${WRKDIR}/dptutil/makefile.tmp ${WRKDIR}/dptutil/makefile
+		${WRKSRC}/dptutil/makefile > ${WRKSRC}/dptutil/makefile.tmp
+	${MV} ${WRKSRC}/dptutil/makefile.tmp ${WRKSRC}/dptutil/makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dpteng/dpteng ${PREFIX}/sbin/dpteng
diff --git a/sysutils/dptutil/distinfo b/sysutils/dptutil/distinfo
index 94171452cef..de68e85926c 100644
--- a/sysutils/dptutil/distinfo
+++ b/sysutils/dptutil/distinfo
@@ -1,11 +1,18 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
+$NetBSD: distinfo,v 1.2 2003/01/27 23:39:02 ad Exp $
 
-SHA1 (raidmgt.tgz) = d67b954b9f089734a2a77a52ded1584ea12fa7ec
-Size (raidmgt.tgz) = 722714 bytes
-SHA1 (patch-ab) = 24c7cdcd9576651ac9cea30127ee474aa7f3ff28
+SHA1 (raidmgt-3.31.tar.gz) = d55d573fbdd22c4c9c44003b9230b29c1c728848
+Size (raidmgt-3.31.tar.gz) = 723349 bytes
+SHA1 (patch-aa) = 23e5cc93f26cd3e12d8465fccf1ded6e91b114fb
+SHA1 (patch-ab) = 54ed1a72d070b234598b7e0da88f65fc64088300
 SHA1 (patch-ac) = fb9cad0e76f9f2aef416cc731e271cae8eade6ee
 SHA1 (patch-ad) = 57ff83cdbfc2acd384f4e3ee56ed0b6a103ab834
-SHA1 (patch-ae) = 95beb3e29891efd919f9051c0ea690f72fbc350f
-SHA1 (patch-af) = ea17ec9920ac5468f64c8279b681d4bdd6dd3a02
+SHA1 (patch-ae) = 789c9aa558307f5daaf9c273a952c964e86014cf
+SHA1 (patch-af) = daeea5d535ea206e698f69eb9d5466cac115b308
 SHA1 (patch-ag) = 9b08ca81ce8cbc80f94c0ffc5a8b69c89a65e07a
+SHA1 (patch-ah) = f80b40f5f6a6cc1c39949af301c7c39d26b9cd4d
 SHA1 (patch-ai) = e40e81bc2896693ab9f51bf6dcec2e1667ea993a
+SHA1 (patch-aj) = e055f4a137399ca7f85c4b0ad5fc67765e327cee
+SHA1 (patch-ak) = 928681b9b01f3d126c70eb82ba169c54865a542b
+SHA1 (patch-al) = f9884d55ae1b85a2912f6042cbe5485ff9f8f46d
+SHA1 (patch-am) = d8c6397f7868492faefaf1c127df9d129a667592
+SHA1 (patch-an) = 8c18f8015c131690a3fdd9e8ee96b5576d70eb9a
diff --git a/sysutils/dptutil/patches/patch-aa b/sysutils/dptutil/patches/patch-aa
new file mode 100644
index 00000000000..e22dfb07c89
--- /dev/null
+++ b/sysutils/dptutil/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2003/01/27 23:39:02 ad Exp $
+
+--- dpteng/eng_unix.c.orig	Fri Dec 13 14:17:47 2002
++++ dpteng/eng_unix.c	Fri Dec 13 14:18:13 2002
+@@ -319,7 +319,7 @@
+   if (ExitEngine) {
+       int i;
+       struct msqid_ds CtlBuf;
+-      MsqID = msgget(DPT_EngineKey, MSG_ALLRD | MSG_ALLWR);
++      MsqID = msgget(DPT_EngineKey, MSG_URD | MSG_UWR);
+       if(MsqID != -1) {
+ 	  msgctl(MsqID, IPC_STAT, &CtlBuf);
+ 	  // Stop engine only, if no dptmgr still running
+@@ -359,7 +359,7 @@
+ 
+   /* Try To Create The Unique Message Que Of This ID */
+ 
+-    MsqID = msgget(DPT_EngineKey,IPC_CREAT | IPC_EXCL | MSG_ALLRD | MSG_ALLWR);
++    MsqID = msgget(DPT_EngineKey,IPC_CREAT | IPC_EXCL | MSG_URD | MSG_UWR);
+ 
+   /* If We Could Not Allocate The Message Que, Print A Message And Exit */
+ 
diff --git a/sysutils/dptutil/patches/patch-ab b/sysutils/dptutil/patches/patch-ab
index 3085188597d..29ce7d5a5f5 100644
--- a/sysutils/dptutil/patches/patch-ab
+++ b/sysutils/dptutil/patches/patch-ab
@@ -1,8 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
+$NetBSD: patch-ab,v 1.2 2003/01/27 23:39:03 ad Exp $
 
-diff -ur dpteng/engcalls.c dpteng/engcalls.c
---- odpteng/engcalls.c	Tue Aug 13 16:02:24 2002
-+++ dpteng/engcalls.c	Fri Dec  6 09:04:44 2002
+--- dpteng/engcalls.c.orig	Tue Aug 13 16:02:24 2002
++++ dpteng/engcalls.c	Fri Dec 13 14:14:51 2002
 @@ -118,6 +118,12 @@
  char *CommEnginePathNameDefault = "/opt/SUNWhwrdg/dptcom";
  char *DefaultPathName = "/opt/SUNWhwrdg/";
@@ -16,3 +15,12 @@ diff -ur dpteng/engcalls.c dpteng/engcalls.c
  #else
  
  char *EnginePathNameDefault = "/usr/dpt/dpteng &";
+@@ -954,7 +960,7 @@
+   /* Get The Shared Memory Segment */
+ 
+     BufferID = shmget(IPC_PRIVATE,(int)(toEngTotalSize + fromEngTotalSize),
+-                      SHM_ALLRD | SHM_ALLWR | IPC_CREAT);
++                      SHM_URD | SHM_UWR | IPC_CREAT);
+ 
+   /* If We Got The Segment, Try To Attach To It */
+ 
diff --git a/sysutils/dptutil/patches/patch-ae b/sysutils/dptutil/patches/patch-ae
index e2d3269797a..349fb014570 100644
--- a/sysutils/dptutil/patches/patch-ae
+++ b/sysutils/dptutil/patches/patch-ae
@@ -1,7 +1,16 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
+$NetBSD: patch-ae,v 1.2 2003/01/27 23:39:03 ad Exp $
 
---- dpteng/osd_unix.c.orig	Fri Dec  6 07:56:59 2002
-+++ dpteng/osd_unix.c	Sat Dec  7 17:15:49 2002
+--- dpteng/osd_unix.c.orig	Tue Aug 13 16:02:26 2002
++++ dpteng/osd_unix.c	Fri Dec 13 14:15:13 2002
+@@ -2588,7 +2588,7 @@
+ 
+         BufferID = shmget(IPC_PRIVATE,(int)(toLoggerTotalSize +
+                           fromLoggerTotalSize),
+-                          SHM_ALLRD | SHM_ALLWR | IPC_CREAT);
++                          SHM_URD | SHM_UWR | IPC_CREAT);
+ 
+   /* If We Got The Segment, Try To Attach To It */
+ 
 @@ -3676,7 +3676,7 @@
     uCHAR DataBuff[100];
     EATA_CP pkt;
diff --git a/sysutils/dptutil/patches/patch-af b/sysutils/dptutil/patches/patch-af
index 87f24a51c12..05aee13fae3 100644
--- a/sysutils/dptutil/patches/patch-af
+++ b/sysutils/dptutil/patches/patch-af
@@ -1,8 +1,7 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
+$NetBSD
 
-diff -ur dptutil/engcalls.c dptutil/engcalls.c
---- odptutil/engcalls.c	Tue Aug 13 16:02:24 2002
-+++ dptutil/engcalls.c	Fri Dec  6 09:04:44 2002
+--- dptutil/engcalls.c.orig	Tue Aug 13 16:02:24 2002
++++ dptutil/engcalls.c	Fri Dec 13 14:19:12 2002
 @@ -118,6 +118,12 @@
  char *CommEnginePathNameDefault = "/opt/SUNWhwrdg/dptcom";
  char *DefaultPathName = "/opt/SUNWhwrdg/";
@@ -16,3 +15,12 @@ diff -ur dptutil/engcalls.c dptutil/engcalls.c
  #else
  
  char *EnginePathNameDefault = "/usr/dpt/dpteng &";
+@@ -954,7 +960,7 @@
+   /* Get The Shared Memory Segment */
+ 
+     BufferID = shmget(IPC_PRIVATE,(int)(toEngTotalSize + fromEngTotalSize),
+-                      SHM_ALLRD | SHM_ALLWR | IPC_CREAT);
++                      SHM_URD | SHM_UWR | IPC_CREAT);
+ 
+   /* If We Got The Segment, Try To Attach To It */
+ 
diff --git a/sysutils/dptutil/patches/patch-ah b/sysutils/dptutil/patches/patch-ah
new file mode 100644
index 00000000000..7f765f2c0b2
--- /dev/null
+++ b/sysutils/dptutil/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.1 2003/01/27 23:39:03 ad Exp $
+
+--- dpteng/engmsg.c.orig	Fri Dec 13 14:18:21 2002
++++ dpteng/engmsg.c	Fri Dec 13 14:18:40 2002
+@@ -259,7 +259,7 @@
+   /* Try To Get The Unique Message Que Of This ID */
+ 
+ // need to get ENGINE's q - old code -> msqID = msgget(EngineMsgKey, ...
+-   msqID = msgget(DPT_EngineKey, MSG_ALLRD | MSG_ALLWR);
++   msqID = msgget(DPT_EngineKey, MSG_URD | MSG_UWR);
+ 
+   /* If There Is One Out There, Try To Send A Message To It */
+ 
+@@ -374,7 +374,7 @@
+ 
+   /* Try To Get The Unique Message Que Of This ID */
+   /* (we need to look for the ENGINE's msq) */
+-   msqID = msgget(DPT_EngineKey, MSG_ALLRD | MSG_ALLWR);
++   msqID = msgget(DPT_EngineKey, MSG_URD | MSG_UWR);
+ 
+   /* If There Is One Out There, Try To Send A Message To It */
+ 
diff --git a/sysutils/dptutil/patches/patch-aj b/sysutils/dptutil/patches/patch-aj
new file mode 100644
index 00000000000..4f5d0bd860d
--- /dev/null
+++ b/sysutils/dptutil/patches/patch-aj
@@ -0,0 +1,30 @@
+$NetBSD: patch-aj,v 1.1 2003/01/27 23:39:03 ad Exp $
+
+--- dpteng/lockunix.c.orig	Fri Dec 13 14:04:11 2002
++++ dpteng/lockunix.c	Fri Dec 13 14:07:56 2002
+@@ -31,6 +31,7 @@
+ #include "lockunix.h"
+ 
+ static char Lock[] = "/tmp/%s.LOCK";
++static const int LockMode = 0600;
+ extern int errno;
+ 
+ static char *
+@@ -73,7 +74,7 @@
+ 		return (-1);
+ 	}
+ 	sprintf (templateBuffer, Template, Name);
+-	if ((fd = open(mktemp (templateBuffer), O_WRONLY|O_CREAT|O_EXCL)) < 0) {
++	if ((fd = open(mktemp (templateBuffer), O_WRONLY|O_CREAT|O_EXCL, LockMode)) < 0) {
+ 		free (templateBuffer);
+ 		free (lock);
+ 		return (-1);
+@@ -143,7 +144,7 @@
+ 
+ 	if (lock != (char *)NULL) {
+ 		sprintf (lock, Lock, Name);
+-	    if ((fd = open(lock, O_WRONLY|O_CREAT|O_TRUNC)) >= 0) {
++	    if ((fd = open(lock, O_WRONLY|O_CREAT|O_TRUNC, LockMode)) >= 0) {
+ 			sprintf (buffer, "%d\n", pid);
+ 			write (fd, buffer, strlen(buffer));
+ 			close (fd);
diff --git a/sysutils/dptutil/patches/patch-ak b/sysutils/dptutil/patches/patch-ak
new file mode 100644
index 00000000000..ba5e4e59998
--- /dev/null
+++ b/sysutils/dptutil/patches/patch-ak
@@ -0,0 +1,22 @@
+$NetBSD: patch-ak,v 1.1 2003/01/27 23:39:03 ad Exp $
+
+--- dpteng/semaphor.c.orig	Fri Dec 13 14:16:50 2002
++++ dpteng/semaphor.c	Fri Dec 13 14:17:22 2002
+@@ -204,7 +204,7 @@
+         // Get the semaphore handle and create it if it isn't already there.
+         // Let other processes access it as well
+ 
+-        rtnVal->semID = semget(key, 1, IPC_CREAT | S_IRWXU | S_IRWXG);
++        rtnVal->semID = semget(key, 1, IPC_CREAT | S_IRUSR | S_IWUSR);
+ 
+         if (rtnVal->semID == -1) {
+             if (Verbose)
+@@ -328,7 +328,7 @@
+ 
+         // Get the semaphore ID for the block of unnamed semaphores
+ 
+-        LocalSemID = semget(key, MAX_LOCAL_SEM, IPC_CREAT);
++        LocalSemID = semget(key, MAX_LOCAL_SEM, IPC_CREAT | S_IWUSR | S_IRUSR);
+ 
+         if (LocalSemID == -1) {
+ 
diff --git a/sysutils/dptutil/patches/patch-al b/sysutils/dptutil/patches/patch-al
new file mode 100644
index 00000000000..eeb93cf0dd1
--- /dev/null
+++ b/sysutils/dptutil/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2003/01/27 23:39:04 ad Exp $
+
+--- dpteng/sharmem.c.orig	Fri Dec 13 14:15:20 2002
++++ dpteng/sharmem.c	Fri Dec 13 14:15:29 2002
+@@ -82,7 +82,7 @@
+   /* Get The Shared Memory Segment */
+ 
+     BufferID = shmget(IPC_PRIVATE,(int)TotalSize,
+-                       SHM_ALLRD | SHM_ALLWR | IPC_CREAT);
++                       SHM_URD | SHM_UWR | IPC_CREAT);
+ 
+   /* If We Got The Segment, Try To Attach To It */
+ 
diff --git a/sysutils/dptutil/patches/patch-am b/sysutils/dptutil/patches/patch-am
new file mode 100644
index 00000000000..7b9b5420026
--- /dev/null
+++ b/sysutils/dptutil/patches/patch-am
@@ -0,0 +1,20 @@
+$NetBSD: patch-am,v 1.1 2003/01/27 23:39:04 ad Exp $
+
+--- dpteng/osd_util.h.orig	Fri Dec 13 14:57:20 2002
++++ dpteng/osd_util.h	Fri Dec 13 15:03:59 2002
+@@ -108,6 +108,15 @@
+ /* OS dependent defines */
+ /*--------------------- */
+ 
++#ifdef __NetBSD__
++#  if defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__)
++#    define _DPT_BIG_ENDIAN
++#  endif
++#  if defined(_DPT_BIG_ENDIAN) || defined(__alpha__)
++#    define _DPT_STRICT_ALIGN
++#  endif
++#endif
++
+ #if defined (_DPT_MSDOS) || defined (_DPT_WIN_3X)
+    #define      _DPT_16_BIT
+ #else
diff --git a/sysutils/dptutil/patches/patch-an b/sysutils/dptutil/patches/patch-an
new file mode 100644
index 00000000000..5ac0d4a155b
--- /dev/null
+++ b/sysutils/dptutil/patches/patch-an
@@ -0,0 +1,20 @@
+$NetBSD: patch-an,v 1.1 2003/01/27 23:39:04 ad Exp $
+
+--- dptutil/osd_util.h.orig	Fri Dec 13 14:57:20 2002
++++ dptutil/osd_util.h	Fri Dec 13 15:03:59 2002
+@@ -108,6 +108,15 @@
+ /* OS dependent defines */
+ /*--------------------- */
+ 
++#ifdef __NetBSD__
++#  if defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__)
++#    define _DPT_BIG_ENDIAN
++#  endif
++#  if defined(_DPT_BIG_ENDIAN) || defined(__alpha__)
++#    define _DPT_STRICT_ALIGN
++#  endif
++#endif
++
+ #if defined (_DPT_MSDOS) || defined (_DPT_WIN_3X)
+    #define      _DPT_16_BIT
+ #else