Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2013Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/dptutil/DESCR Normal file
View File

@@ -0,0 +1,4 @@
Adaptec raidutil and dpteng. For use with DPT and Adaptec
EATA and I2O RAID adapters.
See also the "sysutils/storage-manager" package.

27
sysutils/dptutil/Makefile Normal file
View File

@@ -0,0 +1,27 @@
# $NetBSD: Makefile,v 1.14 2012/10/23 19:50:59 asau Exp $
DISTNAME= raidmgt-3.31
PKGNAME= dptutil-3.31
PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.NetBSD.org/~ad/raidmgt/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://opensource.adaptec.com/
COMMENT= DPT/Adaptec Storage Management software (dptutil)
# Should work for 32-bit PowerPC and SPARC, but untested. 64-bit platforms
# may have problems.
ONLY_FOR_PLATFORM= NetBSD-*-i386
USE_LANGUAGES= c++
USE_TOOLS+= makedepend
INSTALLATION_DIRS= sbin
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/dpteng/dpteng \
${DESTDIR}${PREFIX}/sbin/dpteng
${INSTALL_PROGRAM} ${WRKSRC}/dptutil/raidutil \
${DESTDIR}${PREFIX}/sbin/dptutil
.include "../../mk/bsd.pkg.mk"

3
sysutils/dptutil/PLIST Normal file
View File

@@ -0,0 +1,3 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
sbin/dpteng
sbin/dptutil

45
sysutils/dptutil/distinfo Normal file
View File

@@ -0,0 +1,45 @@
$NetBSD: distinfo,v 1.6 2011/05/22 19:17:57 dholland Exp $
SHA1 (raidmgt-3.31.tar.gz) = d55d573fbdd22c4c9c44003b9230b29c1c728848
RMD160 (raidmgt-3.31.tar.gz) = 387aee21d9b0730461b6cb77f88d9ec6b837db8f
Size (raidmgt-3.31.tar.gz) = 723349 bytes
SHA1 (patch-aa) = 7ac7861299b90794ca58fb3004d9c1af8632558c
SHA1 (patch-ab) = 90e0015ee9c8e4c8b4b0b3a21721f06327424223
SHA1 (patch-ac) = 5a55025bbb0dbf85af07c0c7d3dcde2d101e1c66
SHA1 (patch-ad) = 57ff83cdbfc2acd384f4e3ee56ed0b6a103ab834
SHA1 (patch-ae) = 95e879f5ef10fd9fbbec8338c13d5676a38e1d41
SHA1 (patch-af) = bd2a5777942f8758489852ada25b1cfdc0e8bc63
SHA1 (patch-ag) = 5dad34b5fa4aa843cd16a73d8bdecf3383e0a613
SHA1 (patch-ah) = 4c09208dfd3a245bf775a0a20fe03d041dadcc48
SHA1 (patch-ai) = 6d100c12cab2437c903ea6154820b5054e2a61ac
SHA1 (patch-ak) = 3ceef4fff08827af7fd7b28df2e049c1cc61973a
SHA1 (patch-al) = 4cfd01c04fae9f1a159b661341ccf46548d1c793
SHA1 (patch-am) = 6ffaa38d86399bdb80847cb99bd2b6adff4e804f
SHA1 (patch-an) = 1867a2bca5392b923186c268c483c026358d7062
SHA1 (patch-ao) = fb0402c30f159f0745ad647ebae330c4432b3a30
SHA1 (patch-dpteng_connect_hpp) = a70dace4057a8556ab075600232deec32e91a97f
SHA1 (patch-dpteng_debug_h) = 65f7303c8fea248977a83ae672b90f1d037f0e4b
SHA1 (patch-dpteng_device_cpp) = 5229ea4e4d66cfe1ad1b2b2fd5d63d8256d19893
SHA1 (patch-dpteng_lockunix_c) = 1cfc18a13204030430cf179eb2ce6bace2afcf8a
SHA1 (patch-dpteng_raid_h) = b09f23731390e616805d5090eaf70f226d578cb5
SHA1 (patch-dpteng_scsi__obj_cpp) = 7bb7d943b595ce0b32be0f40c222d6eff15caf9f
SHA1 (patch-dptutil_alarm_hpp) = cebf44b18ee74062b9ae32fb7be3bba794af24f1
SHA1 (patch-dptutil_dynsize_h) = 5f52756725e78cd926e9765e263828966ed0e3d3
SHA1 (patch-dptutil_engiface_cpp) = 42b8b0560ff9d8ebce474c696d21f66ee67d3b69
SHA1 (patch-dptutil_engiface_hpp) = cd3a8da4fb4a95188eb3880af49fe8e1abf57205
SHA1 (patch-dptutil_eventlog_hpp) = 89e180cceb2604561d36cb17039a243554fdfddb
SHA1 (patch-dptutil_expand_hpp) = 41dd4bda6d2a3d7be6305faf83bbfb4a9d45d0ed
SHA1 (patch-dptutil_flash_cpp) = bae84626ddcc3b39b7ccfe9fbef652145fa30918
SHA1 (patch-dptutil_flash_hpp) = 7d342bc3a8442abfed80aafeff0fab66ed72684b
SHA1 (patch-dptutil_forcest_hpp) = 41c1cec7d8ebf5d077806601dfe3cf0064b72be7
SHA1 (patch-dptutil_listdev_cpp) = 9ceadc0f48e52d244d5001131363007960d29874
SHA1 (patch-dptutil_lockunix_c) = d5d803648ce92862ec86ac19e036c941e31378ee
SHA1 (patch-dptutil_namarray_hpp) = e0296745e9b9730c1a745c875847254a4e3c9b18
SHA1 (patch-dptutil_rmwflash_hpp) = a96d17b792d6bf4bf456b0477d517dcdce8e3597
SHA1 (patch-dptutil_segment_hpp) = 8bb4adfb417c6766b0c9e817c7ae1b653d634499
SHA1 (patch-dptutil_setcache_hpp) = 70e3d5b3bacf516f11ac4387fcaf89c15928ee52
SHA1 (patch-dptutil_setrate_hpp) = 34aacabde14688fc2f11b8dd44d42ac68e59cb9a
SHA1 (patch-dptutil_setscfg_hpp) = 70b5e85fac174266f9cb156ad97a3c6b8a61e143
SHA1 (patch-dptutil_taskctrl_hpp) = b11a029e4cf02dc5a272870fc5d03590f0f76256
SHA1 (patch-dptutil_uartdmp_hpp) = 929aef7f5a1bd0f5fa864eda2741593c65f80631
SHA1 (patch-dptutil_zap_hpp) = 9e71768d4d2f0598ab25c51626da45e9013cac60

34
sysutils/dptutil/patches/patch-aa Normal file
View File

@@ -0,0 +1,34 @@
$NetBSD: patch-aa,v 1.2 2011/05/22 19:11:42 dholland Exp $
- fix msgget?
- use intptr_t
--- dpteng/eng_unix.c.orig 2002-08-13 15:02:23.000000000 +0000
+++ dpteng/eng_unix.c
@@ -319,7 +319,7 @@ main(int argc, char *argv[])
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 @@ main(int argc, char *argv[])
/* 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 */
@@ -469,7 +469,7 @@ main(int argc, char *argv[])
/* Make Sure That We Could Attach */
- if((int)toEng_P != -1)
+ if((intptr_t)toEng_P != -1)
{
fromEng_P = toEng_P + HdrBuff.FromEngBuffOffset;

28
sysutils/dptutil/patches/patch-ab Normal file
View File

@@ -0,0 +1,28 @@
$NetBSD: patch-ab,v 1.3 2011/05/22 19:11:42 dholland Exp $
- Config for netbsd.
--- 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/";
+#elif defined (__NetBSD__)
+
+char *EnginePathNameDefault = _NBSD_LIBEXEC "/dpteng &";
+char *CommEnginePathNameDefault = _NBSD_LIBEXEC "/dptcom &";
+char *DefaultPathName = _NBSD_LIBEXEC;
+
#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 */

26
sysutils/dptutil/patches/patch-ac Normal file
View File

@@ -0,0 +1,26 @@
$NetBSD: patch-ac,v 1.2 2011/05/22 19:11:42 dholland Exp $
diff -ur dpteng/makefile dpteng/makefile
--- odpteng/makefile Fri Aug 30 19:40:36 2002
+++ dpteng/makefile Fri Dec 6 09:55:31 2002
@@ -9,7 +9,10 @@
CPP_EXTENSION = .cpp
C_EXTENSION = .c
-CFLAGS= $(INCLUDE_DIR) -D__UNIX__ -DMESSAGES -D_DPT_ACTIVE_ALIGNMENT -DI_WANT_SNI_DEBUG -DNEW_LOGGER -c
+CFLAGS= $(INCLUDE_DIR) -Dunix -D__unix__ -D_DPT_FREE_BSD -D__UNIX__ -DMESSAGES \
+ -D_DPT_ACTIVE_ALIGNMENT -D_DPT_DEFINE_SEMUN -DI_WANT_SNI_DEBUG \
+ -DNEW_LOGGER -DDEFAULT_PATH=\"${PREFIX}/sbin\" \
+ -D_NBSD_LIBEXEC=\"${PREFIX}/sbin\" -c
SRCS = \
addr_rng.cpp \
@@ -105,7 +108,7 @@
rm -f *.o dpteng
depend :
- makedepend $(INCLUDE_DIR) -D_DPT_UNIX -D_DPT_LINUX -D__linux__ ${SRCS}
+ makedepend $(INCLUDE_DIR) -D_DPT_UNIX -D_DPT_FREE_BSD -D_DPT_DEFINE_SEMUN -D__unix__ -Dunix ${SRCS}
$(C_EXTENSION).o:

14
sysutils/dptutil/patches/patch-ad Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-ad,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
diff -ur dpteng/osd_defs.h dpteng/osd_defs.h
--- odpteng/osd_defs.h Tue Aug 13 16:02:26 2002
+++ dpteng/osd_defs.h Fri Dec 6 07:48:17 2002
@@ -56,7 +56,7 @@
# define _DPT_LINUX
#elif (defined(__bsdi__))
# define _DPT_BSDI
-#elif (defined(__FreeBSD__))
+#elif (defined(__FreeBSD__)) || (defined(__NetBSD__))
# undef _DPT_FREE_BSD
# define _DPT_FREE_BSD
#else

83
sysutils/dptutil/patches/patch-ae Normal file
View File

@@ -0,0 +1,83 @@
$NetBSD: patch-ae,v 1.3 2011/05/22 19:11:42 dholland Exp $
- fix shmget?
- use intptr_t
- config for netbsd
--- dpteng/osd_unix.c.orig 2002-08-13 15:02:26.000000000 +0000
+++ dpteng/osd_unix.c
@@ -2588,7 +2588,7 @@ int BufferAlloc(uLONG toLoggerSize, char
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 */
@@ -2599,7 +2599,7 @@ int BufferAlloc(uLONG toLoggerSize, char
/* The Attach Failed, So DeAllocate The Shared Memory */
- if((int)SharedMemoryPtr == -1)
+ if((intptr_t)SharedMemoryPtr == -1)
{
Rtnval = 1;
shmctl(BufferID,IPC_RMID,&shm_buff);
@@ -3676,7 +3676,7 @@ uSHORT BuildNodeNameList(void)
uCHAR DataBuff[100];
EATA_CP pkt;
int IoctlRtn;
-# if (defined(_DPT_FREE_BSD))
+# if (defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
int c;
int i2oMajorNode = 0;
FILE *fp = popen (
@@ -3695,7 +3695,7 @@ uSHORT BuildNodeNameList(void)
NumEntries = 0;
for(i = 0; i < MAX_HAS; ++i)
{
-# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD))
+# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
int created = 0;
# endif
@@ -3710,7 +3710,7 @@ uSHORT BuildNodeNameList(void)
IoctlRtn = osdSendIoctl(&HbaDevs[NumEntries],DPT_SIGNATURE,
DataBuff,&pkt);
-# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD))
+# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
/*
* Use Alternate access.
*/
@@ -3758,7 +3758,7 @@ uSHORT BuildNodeNameList(void)
HbaDevs[NumEntries].IoAddress = 0xffffffff;
++NumEntries;
}
-# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD))
+# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
else if (created)
{
unlink (HbaDevs[NumEntries].NodeName);
@@ -3777,8 +3777,10 @@ uSHORT BuildNodeNameList(void)
}
HbaDevs[NumEntries].Flags = 0;
strcpy(HbaDevs[NumEntries].NodeName,"/dev");
-# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD))
+# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
strcat(HbaDevs[NumEntries].NodeName,"/rdptr");
+# elif (defined(__NetBSD__))
+ strcat(HbaDevs[NumEntries].NodeName,"/dpt");
# else
strcat(HbaDevs[NumEntries].NodeName,"/dptr");
# endif
@@ -3789,7 +3791,7 @@ uSHORT BuildNodeNameList(void)
mknod(HbaDevs[NumEntries].NodeName, S_IFCHR|S_IRUSR|S_IWUSR,
(MAJOR_NODE << 20) + (i << 10) + 0);
# undef MAJOR_NODE
-# elif (defined(_DPT_FREE_BSD))
+# elif (defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
# define MAJOR_NODE 88
mknod(HbaDevs[NumEntries].NodeName, S_IFCHR|S_IRUSR|S_IWUSR,
(MAJOR_NODE << 8) + i);

39
sysutils/dptutil/patches/patch-af Normal file
View File

@@ -0,0 +1,39 @@
$NetBSD: patch-af,v 1.4 2011/05/22 19:11:42 dholland Exp $
- config for netbsd
- fix shmget?
- use intptr_t
--- dptutil/engcalls.c.orig 2002-08-13 15:02:24.000000000 +0000
+++ dptutil/engcalls.c
@@ -118,6 +118,12 @@ char *EnginePathNameDefault = "/opt/SUNW
char *CommEnginePathNameDefault = "/opt/SUNWhwrdg/dptcom";
char *DefaultPathName = "/opt/SUNWhwrdg/";
+#elif defined (__NetBSD__)
+
+char *EnginePathNameDefault = _NBSD_LIBEXEC "/dpteng &";
+char *CommEnginePathNameDefault = _NBSD_LIBEXEC "/dptcom &";
+char *DefaultPathName = _NBSD_LIBEXEC;
+
#else
char *EnginePathNameDefault = "/usr/dpt/dpteng &";
@@ -954,7 +960,7 @@ char *AllocBuffers(uLONG toEngSize, uLON
/* 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 */
@@ -965,7 +971,7 @@ char *AllocBuffers(uLONG toEngSize, uLON
/* The Attach Failed, So DeAllocate The Shared Memory */
- if((int)SharedMemoryPtr == -1)
+ if((intptr_t)SharedMemoryPtr == -1)
{
shmctl(BufferID,IPC_RMID,&shm_buff);
SharedMemoryPtr = NULL;

30
sysutils/dptutil/patches/patch-ag Normal file
View File

@@ -0,0 +1,30 @@
$NetBSD: patch-ag,v 1.2 2011/05/22 19:11:42 dholland Exp $
diff -ur dptutil/makefile dptutil/makefile
--- odptutil/makefile Fri Aug 30 19:50:02 2002
+++ dptutil/makefile Fri Dec 6 09:05:21 2002
@@ -11,11 +11,13 @@
DEBUG_FLAGS=-DDEBUG_ENTER_EXIT
DEBUG_FLAGS=
-CFLAGS= -O3 -c $(I) -DMESSAGES \
+CFLAGS= -O2 -c $(I) -DMESSAGES \
$(extra_cflags) -D_DPT_ACTIVE_ALIGNMENT $(DEBUG_FLAGS) \
-Dtrue=1 -Dfalse=0 \
-DHORIZONTAL -DNEW_RSC_MGR -DNEW_RSC_HDR \
- -D_DPT_FLASH
+ -DDEFAULT_PATH=\"${PREFIX}/sbin\" \
+ -D_NBSD_LIBEXEC=\"${PREFIX}/sbin\" \
+ -D_DPT_FLASH -D_DPT_FREE_BSD -Dunix -D__unix__
LINK_FLAGS = -v
@@ -140,7 +142,7 @@
$(LINK) $(LINK_FLAGS) -o $@ $(OBJS) $(LIBS)
depend :
- makedepend -DFLG_STAT_LAP=0x20 -D_DPT_UNIX -D_DPT_LINUX -D__linux__ -- ${CFLAGS} -- ${SRCS}
+ makedepend -DFLG_STAT_LAP=0x20 -D_DPT_UNIX -D_DPT_FREE_BSD -- ${CFLAGS} -- ${SRCS}
$(CPP_EXTENSION).o:
$(CC) $(CFLAGS) -c $<

24
sysutils/dptutil/patches/patch-ah Normal file
View File

@@ -0,0 +1,24 @@
$NetBSD: patch-ah,v 1.2 2011/05/22 19:11:42 dholland Exp $
- fix msgget?
--- 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 */

14
sysutils/dptutil/patches/patch-ai Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-ai,v 1.3 2011/05/22 19:17:58 dholland Exp $
- supply toplevel makefile
--- /dev/null Sat Dec 7 19:02:30 2002
+++ Makefile Sat Dec 7 19:22:44 2002
@@ -0,0 +1,7 @@
+all:
+ (cd dpteng && $(MAKE) depend && $(MAKE))
+ (cd dptutil && $(MAKE) depend && $(MAKE))
+
+clean:
+ (cd dpteng && $(MAKE) clean)
+ (cd dptutil && $(MAKE) clean)

24
sysutils/dptutil/patches/patch-ak Normal file
View File

@@ -0,0 +1,24 @@
$NetBSD: patch-ak,v 1.2 2011/05/22 19:11:42 dholland Exp $
- fix semget?
--- 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) {

15
sysutils/dptutil/patches/patch-al Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-al,v 1.2 2011/05/22 19:11:42 dholland Exp $
- Fix shmget?
--- 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 */

22
sysutils/dptutil/patches/patch-am Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-am,v 1.2 2011/05/22 19:11:42 dholland Exp $
- Config for netbsd.
--- 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

22
sysutils/dptutil/patches/patch-an Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-an,v 1.2 2011/05/22 19:11:42 dholland Exp $
Config for NetBSD.
--- 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

18
sysutils/dptutil/patches/patch-ao Normal file
View File

@@ -0,0 +1,18 @@
$NetBSD: patch-ao,v 1.2 2011/05/22 19:11:42 dholland Exp $
- ...?
--- dptutil/dynsize.cpp.orig 2003-12-09 19:22:47.000000000 +0000
+++ dptutil/dynsize.cpp 2003-12-09 19:25:59.000000000 +0000
@@ -68,7 +68,11 @@
if ( buf != NULL )
{
#if !defined __MWERKS__
+#if __GNUC__ >= 3
+ setbuf(buf, curSize);
+#else
setb(buf, buf + curSize, 1);
+#endif
#else
pubsetbuf (buf, curSize);
#endif

15
sysutils/dptutil/patches/patch-dpteng_connect_hpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-dpteng_connect_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dpteng/connect.hpp~ 2002-08-13 15:02:20.000000000 +0000
+++ dpteng/connect.hpp
@@ -167,7 +167,7 @@ public:
// Constructor/Destructor.............................
- dptSCSIcon_C::dptSCSIcon_C();
+ dptSCSIcon_C();
// Message Handlers...................................

23
sysutils/dptutil/patches/patch-dpteng_debug_h Normal file
View File

@@ -0,0 +1,23 @@
$NetBSD: patch-dpteng_debug_h,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dpteng/debug.h~ 2002-08-13 15:02:21.000000000 +0000
+++ dpteng/debug.h
@@ -4,11 +4,11 @@
#include "osd_defs.h"
#ifndef _DPT_NETWARE
-#include <fstream.h>
-#include <iostream.h>
-#include <iomanip.h>
-#include <string.h>
-#include <stdio.h>
+#include <fstream>
+#include <iostream>
+#include <iomanip>
+#include <cstring>
+#include <cstdio>
#endif

24
sysutils/dptutil/patches/patch-dpteng_device_cpp Normal file
View File

@@ -0,0 +1,24 @@
$NetBSD: patch-dpteng_device_cpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
gcc apparently won't accept passing a packed field by reference
nowadays.
--- dpteng/device.cpp~ 2002-08-13 15:02:21.000000000 +0000
+++ dpteng/device.cpp
@@ -4048,7 +4048,15 @@ if (bytesLeft >= bytesNeeded) {
// Return this object's manager SCSI ID instead of tag
basic_P->attachedTo = myMgr_P()->getAddrL();
// Reverse the SCSI address bytes
- reverseBytes(basic_P->attachedTo);
+ {
+ /*
+ * dholland 20110522 gcc apparently won't accept passing a
+ * packed field by reference nowadays.
+ */
+ uLONG tmp = basic_P->attachedTo;
+ reverseBytes(tmp);
+ basic_P->attachedTo = tmp;
+ }
}
// Return the component list size
fromEng_P->insert(compSize);

28
sysutils/dptutil/patches/patch-dpteng_lockunix_c Normal file
View File

@@ -0,0 +1,28 @@
$NetBSD: patch-dpteng_lockunix_c,v 1.1 2011/05/22 19:11:42 dholland Exp $
- Avoid mktemp.
- Pass a file mode to open when creating files.
Note that dpteng/lockunix.c and dptutil/lockunix.c are identical and
should be patched identically.
--- dpteng/lockunix.c.orig 2002-08-13 15:02:26.000000000 +0000
+++ dpteng/lockunix.c
@@ -73,7 +73,7 @@ MkLock (char * name)
return (-1);
}
sprintf (templateBuffer, Template, Name);
- if ((fd = open(mktemp (templateBuffer), O_WRONLY|O_CREAT|O_EXCL)) < 0) {
+ if ((fd = mkstemp (templateBuffer)) < 0) {
free (templateBuffer);
free (lock);
return (-1);
@@ -143,7 +143,7 @@ ChLock (char * name, int pid)
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, 0600)) >= 0) {
sprintf (buffer, "%d\n", pid);
write (fd, buffer, strlen(buffer));
close (fd);

15
sysutils/dptutil/patches/patch-dpteng_raid_h Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-dpteng_raid_h,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dpteng/raid.h~ 2002-08-13 15:02:27.000000000 +0000
+++ dpteng/raid.h
@@ -249,7 +249,7 @@ struct raidDef_S : public raidDefinition
// Constructor/Destructor.............................
- raidDef_S::raidDef_S();
+ raidDef_S();
};
#endif // c++

24
sysutils/dptutil/patches/patch-dpteng_scsi__obj_cpp Normal file
View File

@@ -0,0 +1,24 @@
$NetBSD: patch-dpteng_scsi__obj_cpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
gcc apparently won't accept passing a packed field by reference
nowadays.
--- dpteng/scsi_obj.cpp~ 2002-08-13 15:02:28.000000000 +0000
+++ dpteng/scsi_obj.cpp
@@ -421,7 +421,15 @@ if (bytesLeft >= (infoSize()+sizeof(uLON
// Return this object's manager SCSI ID instead of tag
basic_P->attachedTo = myMgr_P()->getAddrL();
// Reverse the SCSI address bytes
- reverseBytes(basic_P->attachedTo);
+ {
+ /*
+ * dholland 20110522 gcc apparently won't accept passing a
+ * packed field by reference nowadays.
+ */
+ uLONG tmp = basic_P->attachedTo;
+ reverseBytes(tmp);
+ basic_P->attachedTo = tmp;
+ }
DEBUG(6, PRT_SADDR(basic_P) << "new attachedTo=0x" << hex << \
basic_P->attachedTo << " is set");

15
sysutils/dptutil/patches/patch-dptutil_alarm_hpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-dptutil_alarm_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/alarm.hpp~ 2002-08-13 15:02:44.000000000 +0000
+++ dptutil/alarm.hpp
@@ -32,7 +32,7 @@ enum AlarmCommand { None, On, Off, Enabl
class AlarmStatus:public Command
{
public:
- AlarmStatus::AlarmStatus( int hba, AlarmCommand cmd );
+ AlarmStatus( int hba, AlarmCommand cmd );
AlarmStatus( const AlarmStatus &new_AlarmStatus );
virtual ~AlarmStatus();
AlarmStatus &operator = ( AlarmStatus &right );

20
sysutils/dptutil/patches/patch-dptutil_dynsize_h Normal file
View File

@@ -0,0 +1,20 @@
$NetBSD: patch-dptutil_dynsize_h,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/dynsize.h.orig 2002-08-13 15:02:46.000000000 +0000
+++ dptutil/dynsize.h
@@ -22,8 +22,11 @@
*****************************************************************************/
/*** INCLUDES ***/
-#include <iostream.h>
-#include <stdio.h>
+#include <iostream>
+#include <cstdio>
+using std::ios;
+using std::istream;
+using std::streambuf;
/*** DEFINES ***/

15
sysutils/dptutil/patches/patch-dptutil_engiface_cpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-dptutil_engiface_cpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/engiface.cpp~ 2002-08-13 15:02:46.000000000 +0000
+++ dptutil/engiface.cpp
@@ -26,7 +26,7 @@
#include "id_list.hpp"
#include "dpt_api.h"
-extern "C" uLONG engineTimeOut = 0;
+uLONG engineTimeOut = 0;
//Function - DPT_EngineIO_C::DPT_EngineIO_C() - start
//===========================================================================

15
sysutils/dptutil/patches/patch-dptutil_engiface_hpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-dptutil_engiface_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/engiface.hpp~ 2002-08-13 15:02:46.000000000 +0000
+++ dptutil/engiface.hpp
@@ -33,7 +33,7 @@
#include "id_list.hpp"
-extern "C" uLONG engineTimeOut;
+extern uLONG engineTimeOut;
//class - DPT_EngineIO_C - start

15
sysutils/dptutil/patches/patch-dptutil_eventlog_hpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-dptutil_eventlog_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/eventlog.hpp~ 2002-08-13 15:02:47.000000000 +0000
+++ dptutil/eventlog.hpp
@@ -51,7 +51,7 @@ class EventLog:public Command
{
public:
- EventLog::EventLog(SCSI_Addr_List *deviceList,
+ EventLog(SCSI_Addr_List *deviceList,
EventLogOptions cmd);
EventLog(const EventLog &new_EventLog);
virtual ~EventLog();

15
sysutils/dptutil/patches/patch-dptutil_expand_hpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-dptutil_expand_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/expand.hpp~ 2002-08-13 15:02:47.000000000 +0000
+++ dptutil/expand.hpp
@@ -29,7 +29,7 @@
class Expand:public Command
{
public:
- Expand::Expand (SCSI_Address raid, SCSI_Addr_List *list);
+ Expand (SCSI_Address raid, SCSI_Addr_List *list);
Expand (const Expand &new_Expand);
virtual ~Expand();
Expand &operator = (Expand &right);

23
sysutils/dptutil/patches/patch-dptutil_flash_cpp Normal file
View File

@@ -0,0 +1,23 @@
$NetBSD: patch-dptutil_flash_cpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/flash.cpp.orig 2002-08-13 15:02:47.000000000 +0000
+++ dptutil/flash.cpp
@@ -31,12 +31,10 @@
#include <stdio.h>
#include <ctype.h>
-#include <fstream.h>
-#if defined _DPT_WIN_NT
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
+#include <fstream>
+//#include <strstream>
+using std::fstream;
+using std::ios;
extern char* EventStrings[];
/*** CONSTANTS ***/

16
sysutils/dptutil/patches/patch-dptutil_flash_hpp Normal file
View File

@@ -0,0 +1,16 @@
$NetBSD: patch-dptutil_flash_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/flash.hpp~ 2002-08-13 15:02:47.000000000 +0000
+++ dptutil/flash.hpp
@@ -21,7 +21,8 @@
*****************************************************************************/
/*** INCLUDES ***/
-#include <iostream.h>
+#include <iostream>
+using std::istream;
/*** CONSTANTS ***/
enum FlashRegion { FW, I2OBIOS, SMOR, NVRAM };

15
sysutils/dptutil/patches/patch-dptutil_forcest_hpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-dptutil_forcest_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/forcest.hpp~ 2002-08-13 15:02:47.000000000 +0000
+++ dptutil/forcest.hpp
@@ -39,7 +39,7 @@ enum ForceStateOptions { Optimal, Fail,
class ForceState:public Command
{
public:
- ForceState::ForceState(SCSI_Addr_List *deviceList, ForceStateOptions cmd);
+ ForceState(SCSI_Addr_List *deviceList, ForceStateOptions cmd);
ForceState(const ForceState &new_ForceState);
virtual ~ForceState();

15
sysutils/dptutil/patches/patch-dptutil_listdev_cpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-dptutil_listdev_cpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/listdev.cpp~ 2002-08-13 15:02:48.000000000 +0000
+++ dptutil/listdev.cpp
@@ -1896,7 +1896,7 @@ void List_Device::GetSmorBiosSignatures(
// Save some data from the engine (I have no idea what this data is).
//
size_t saveSize = engine->fromEng_P->allocSize + sizeof(dptData_S) - 1;
- void *saveData = new char[saveSize];
+ char *saveData = new char[saveSize];
if ( saveData != NULL )
{
memcpy(saveData, engine->fromEng_P, saveSize);

28
sysutils/dptutil/patches/patch-dptutil_lockunix_c Normal file
View File

@@ -0,0 +1,28 @@
$NetBSD: patch-dptutil_lockunix_c,v 1.1 2011/05/22 19:11:42 dholland Exp $
- Avoid mktemp.
- Pass a file mode to open when creating files.
Note that dpteng/lockunix.c and dptutil/lockunix.c are identical and
should be patched identically.
--- dptutil/lockunix.c.orig 2002-08-13 15:02:26.000000000 +0000
+++ dptutil/lockunix.c
@@ -73,7 +73,7 @@ MkLock (char * name)
return (-1);
}
sprintf (templateBuffer, Template, Name);
- if ((fd = open(mktemp (templateBuffer), O_WRONLY|O_CREAT|O_EXCL)) < 0) {
+ if ((fd = mkstemp (templateBuffer)) < 0) {
free (templateBuffer);
free (lock);
return (-1);
@@ -143,7 +143,7 @@ ChLock (char * name, int pid)
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, 0600)) >= 0) {
sprintf (buffer, "%d\n", pid);
write (fd, buffer, strlen(buffer));
close (fd);

15
sysutils/dptutil/patches/patch-dptutil_namarray_hpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-dptutil_namarray_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/namarray.hpp~ 2002-08-13 15:02:49.000000000 +0000
+++ dptutil/namarray.hpp
@@ -32,7 +32,7 @@ class NameArray:public Command
{
public:
- NameArray::NameArray(SCSI_Address arrayToName, char *arrayName);
+ NameArray(SCSI_Address arrayToName, char *arrayName);
NameArray(const NameArray &new_NameArray);
virtual ~NameArray();

15
sysutils/dptutil/patches/patch-dptutil_rmwflash_hpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-dptutil_rmwflash_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/rmwflash.hpp~ 2002-08-13 15:02:50.000000000 +0000
+++ dptutil/rmwflash.hpp
@@ -33,7 +33,7 @@ class RMWFlash:public Command
{
public:
- RMWFlash::RMWFlash(int hbaNo, char *Data, int Region, unsigned long Offset, unsigned Size);
+ RMWFlash(int hbaNo, char *Data, int Region, unsigned long Offset, unsigned Size);
RMWFlash(const RMWFlash &new_RMWFlash);
virtual ~RMWFlash();

15
sysutils/dptutil/patches/patch-dptutil_segment_hpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-dptutil_segment_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/segment.hpp~ 2002-08-13 15:02:51.000000000 +0000
+++ dptutil/segment.hpp
@@ -23,7 +23,7 @@ class arraySegment:public Command
{
public:
- arraySegment::arraySegment(SCSI_Address raidToSeg, uLONG segSize[8], uLONG segOffset[8], bool showSeg);
+ arraySegment(SCSI_Address raidToSeg, uLONG segSize[8], uLONG segOffset[8], bool showSeg);
arraySegment(const arraySegment &new_arraySegment);
virtual ~arraySegment();

15
sysutils/dptutil/patches/patch-dptutil_setcache_hpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-dptutil_setcache_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/setcache.hpp~ 2002-08-13 15:02:51.000000000 +0000
+++ dptutil/setcache.hpp
@@ -29,7 +29,7 @@
class SetCache:public Command
{
public:
- SetCache::SetCache(
+ SetCache(
SCSI_Addr_List *addresses, // a list of addresses
int on, // Whether to enable or disable
int rw // Read or write cacheing.

17
sysutils/dptutil/patches/patch-dptutil_setrate_hpp Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-dptutil_setrate_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/setrate.hpp~ 2002-08-13 15:02:51.000000000 +0000
+++ dptutil/setrate.hpp
@@ -33,8 +33,8 @@ class SetRate: public Command
public:
// Set the (global) rebuild rate
- SetRate::SetRate(int rate, SCSI_Addr_List *objs);
- SetRate::SetRate(const SetRate &right);
+ SetRate(int rate, SCSI_Addr_List *objs);
+ SetRate(const SetRate &right);
virtual ~SetRate();
Dpt_Error execute(String_List **output);

15
sysutils/dptutil/patches/patch-dptutil_setscfg_hpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-dptutil_setscfg_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/setscfg.hpp~ 2002-08-13 15:02:51.000000000 +0000
+++ dptutil/setscfg.hpp
@@ -33,7 +33,7 @@ class setscfg:public Command
{
public:
- setscfg::setscfg();
+ setscfg();
virtual ~setscfg();
Dpt_Error execute(String_List **output);

15
sysutils/dptutil/patches/patch-dptutil_taskctrl_hpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-dptutil_taskctrl_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/taskctrl.hpp~ 2002-08-13 15:02:52.000000000 +0000
+++ dptutil/taskctrl.hpp
@@ -33,7 +33,7 @@ enum TaskCommandOptions { List, Build, R
class TaskControl:public Command
{
public:
- TaskControl::TaskControl(SCSI_Addr_List *deviceList, TaskCommandOptions cmd);
+ TaskControl(SCSI_Addr_List *deviceList, TaskCommandOptions cmd);
TaskControl(const TaskControl &new_TaskControl);
virtual ~TaskControl();

15
sysutils/dptutil/patches/patch-dptutil_uartdmp_hpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-dptutil_uartdmp_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/uartdmp.hpp~ 2002-08-13 15:02:52.000000000 +0000
+++ dptutil/uartdmp.hpp
@@ -33,7 +33,7 @@ class UartDmp:public Command
{
public:
- UartDmp::UartDmp(int hbaNo, char *fileName);
+ UartDmp(int hbaNo, char *fileName);
UartDmp(const UartDmp &new_UartDmp);
virtual ~UartDmp();

15
sysutils/dptutil/patches/patch-dptutil_zap_hpp Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-dptutil_zap_hpp,v 1.1 2011/05/22 19:11:42 dholland Exp $
Build fix for semi-modern C++.
--- dptutil/zap.hpp~ 2002-08-13 15:02:53.000000000 +0000
+++ dptutil/zap.hpp
@@ -29,7 +29,7 @@
class Zap:public Command
{
public:
- Zap::Zap(
+ Zap(
SCSI_Addr_List *addresses, // a list of addresses
int resync = 0 // (send reset to hba or not)
); // to delete raid tables on