From bea8f0f6d49a4b2bba1d2ae9224b97a3a7d445ca Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 22 May 2011 19:11:42 +0000 Subject: Fix assorted build problems. Should close PR 42081. While here, add at least minimal comments to all patches and tidy up some (but by no means all) pkglint. I have no idea if this works. It spews warnings about "packed", which lead me to suspect it may not run correctly, but I don't have the facilities to test it. It does, however, now build ok on LP64 and if someone can test it may be reasonable to remove the restriction on that. --- sysutils/dptutil/Makefile | 18 +++---- sysutils/dptutil/distinfo | 56 +++++++++++++++------- sysutils/dptutil/patches/patch-aa | 22 +++++++-- sysutils/dptutil/patches/patch-ab | 4 +- sysutils/dptutil/patches/patch-ac | 6 +-- sysutils/dptutil/patches/patch-ae | 33 +++++++++---- sysutils/dptutil/patches/patch-af | 23 +++++++-- sysutils/dptutil/patches/patch-ag | 6 +-- sysutils/dptutil/patches/patch-ah | 4 +- sysutils/dptutil/patches/patch-ai | 4 +- sysutils/dptutil/patches/patch-aj | 30 ------------ sysutils/dptutil/patches/patch-ak | 4 +- sysutils/dptutil/patches/patch-al | 4 +- sysutils/dptutil/patches/patch-am | 4 +- sysutils/dptutil/patches/patch-an | 4 +- sysutils/dptutil/patches/patch-ao | 4 +- sysutils/dptutil/patches/patch-ap | 13 ----- sysutils/dptutil/patches/patch-dpteng_connect_hpp | 15 ++++++ sysutils/dptutil/patches/patch-dpteng_debug_h | 23 +++++++++ sysutils/dptutil/patches/patch-dpteng_device_cpp | 24 ++++++++++ sysutils/dptutil/patches/patch-dpteng_lockunix_c | 28 +++++++++++ sysutils/dptutil/patches/patch-dpteng_raid_h | 15 ++++++ .../dptutil/patches/patch-dpteng_scsi__obj_cpp | 24 ++++++++++ sysutils/dptutil/patches/patch-dptutil_alarm_hpp | 15 ++++++ sysutils/dptutil/patches/patch-dptutil_dynsize_h | 20 ++++++++ .../dptutil/patches/patch-dptutil_engiface_cpp | 15 ++++++ .../dptutil/patches/patch-dptutil_engiface_hpp | 15 ++++++ .../dptutil/patches/patch-dptutil_eventlog_hpp | 15 ++++++ sysutils/dptutil/patches/patch-dptutil_expand_hpp | 15 ++++++ sysutils/dptutil/patches/patch-dptutil_flash_cpp | 23 +++++++++ sysutils/dptutil/patches/patch-dptutil_flash_hpp | 16 +++++++ sysutils/dptutil/patches/patch-dptutil_forcest_hpp | 15 ++++++ sysutils/dptutil/patches/patch-dptutil_listdev_cpp | 15 ++++++ sysutils/dptutil/patches/patch-dptutil_lockunix_c | 28 +++++++++++ .../dptutil/patches/patch-dptutil_namarray_hpp | 15 ++++++ .../dptutil/patches/patch-dptutil_rmwflash_hpp | 15 ++++++ sysutils/dptutil/patches/patch-dptutil_segment_hpp | 15 ++++++ .../dptutil/patches/patch-dptutil_setcache_hpp | 15 ++++++ sysutils/dptutil/patches/patch-dptutil_setrate_hpp | 17 +++++++ sysutils/dptutil/patches/patch-dptutil_setscfg_hpp | 15 ++++++ .../dptutil/patches/patch-dptutil_taskctrl_hpp | 15 ++++++ sysutils/dptutil/patches/patch-dptutil_uartdmp_hpp | 15 ++++++ sysutils/dptutil/patches/patch-dptutil_zap_hpp | 15 ++++++ 43 files changed, 592 insertions(+), 105 deletions(-) delete mode 100644 sysutils/dptutil/patches/patch-aj delete mode 100644 sysutils/dptutil/patches/patch-ap create mode 100644 sysutils/dptutil/patches/patch-dpteng_connect_hpp create mode 100644 sysutils/dptutil/patches/patch-dpteng_debug_h create mode 100644 sysutils/dptutil/patches/patch-dpteng_device_cpp create mode 100644 sysutils/dptutil/patches/patch-dpteng_lockunix_c create mode 100644 sysutils/dptutil/patches/patch-dpteng_raid_h create mode 100644 sysutils/dptutil/patches/patch-dpteng_scsi__obj_cpp create mode 100644 sysutils/dptutil/patches/patch-dptutil_alarm_hpp create mode 100644 sysutils/dptutil/patches/patch-dptutil_dynsize_h create mode 100644 sysutils/dptutil/patches/patch-dptutil_engiface_cpp create mode 100644 sysutils/dptutil/patches/patch-dptutil_engiface_hpp create mode 100644 sysutils/dptutil/patches/patch-dptutil_eventlog_hpp create mode 100644 sysutils/dptutil/patches/patch-dptutil_expand_hpp create mode 100644 sysutils/dptutil/patches/patch-dptutil_flash_cpp create mode 100644 sysutils/dptutil/patches/patch-dptutil_flash_hpp create mode 100644 sysutils/dptutil/patches/patch-dptutil_forcest_hpp create mode 100644 sysutils/dptutil/patches/patch-dptutil_listdev_cpp create mode 100644 sysutils/dptutil/patches/patch-dptutil_lockunix_c create mode 100644 sysutils/dptutil/patches/patch-dptutil_namarray_hpp create mode 100644 sysutils/dptutil/patches/patch-dptutil_rmwflash_hpp create mode 100644 sysutils/dptutil/patches/patch-dptutil_segment_hpp create mode 100644 sysutils/dptutil/patches/patch-dptutil_setcache_hpp create mode 100644 sysutils/dptutil/patches/patch-dptutil_setrate_hpp create mode 100644 sysutils/dptutil/patches/patch-dptutil_setscfg_hpp create mode 100644 sysutils/dptutil/patches/patch-dptutil_taskctrl_hpp create mode 100644 sysutils/dptutil/patches/patch-dptutil_uartdmp_hpp create mode 100644 sysutils/dptutil/patches/patch-dptutil_zap_hpp (limited to 'sysutils/dptutil') diff --git a/sysutils/dptutil/Makefile b/sysutils/dptutil/Makefile index 9298aaade8e..36cf2a567be 100644 --- a/sysutils/dptutil/Makefile +++ b/sysutils/dptutil/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2010/01/27 18:47:15 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2011/05/22 19:11:42 dholland Exp $ DISTNAME= raidmgt-3.31 PKGNAME= dptutil-3.31 PKGREVISION= 1 CATEGORIES= sysutils -MASTER_SITES= http://www.netbsd.org/~ad/raidmgt/ +MASTER_SITES= http://www.NetBSD.org/~ad/raidmgt/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://opensource.adaptec.com/ @@ -20,16 +20,10 @@ USE_LANGUAGES= c++ USE_TOOLS+= makedepend INSTALLATION_DIRS= sbin -post-patch: - ${SED} -e "s,@SBINDIR@,${PREFIX}/sbin,g" \ - ${WRKSRC}/dpteng/makefile > ${WRKSRC}/dpteng/makefile.tmp - ${MV} ${WRKSRC}/dpteng/makefile.tmp ${WRKSRC}/dpteng/makefile - ${SED} -e "s,@SBINDIR@,${PREFIX}/sbin,g" \ - ${WRKSRC}/dptutil/makefile > ${WRKSRC}/dptutil/makefile.tmp - ${MV} ${WRKSRC}/dptutil/makefile.tmp ${WRKSRC}/dptutil/makefile - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/dpteng/dpteng ${DESTDIR}${PREFIX}/sbin/dpteng - ${INSTALL_PROGRAM} ${WRKSRC}/dptutil/raidutil ${DESTDIR}${PREFIX}/sbin/dptutil + ${INSTALL_PROGRAM} ${WRKSRC}/dpteng/dpteng \ + ${DESTDIR}${PREFIX}/sbin/dpteng + ${INSTALL_PROGRAM} ${WRKSRC}/dptutil/raidutil \ + ${DESTDIR}${PREFIX}/sbin/dptutil .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/dptutil/distinfo b/sysutils/dptutil/distinfo index f45defcc6ef..659ef609c0f 100644 --- a/sysutils/dptutil/distinfo +++ b/sysutils/dptutil/distinfo @@ -1,21 +1,45 @@ -$NetBSD: distinfo,v 1.4 2005/02/24 13:40:52 agc Exp $ +$NetBSD: distinfo,v 1.5 2011/05/22 19:11:42 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) = 23e5cc93f26cd3e12d8465fccf1ded6e91b114fb -SHA1 (patch-ab) = 54ed1a72d070b234598b7e0da88f65fc64088300 -SHA1 (patch-ac) = fb9cad0e76f9f2aef416cc731e271cae8eade6ee +SHA1 (patch-aa) = 7ac7861299b90794ca58fb3004d9c1af8632558c +SHA1 (patch-ab) = 90e0015ee9c8e4c8b4b0b3a21721f06327424223 +SHA1 (patch-ac) = 5a55025bbb0dbf85af07c0c7d3dcde2d101e1c66 SHA1 (patch-ad) = 57ff83cdbfc2acd384f4e3ee56ed0b6a103ab834 -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 -SHA1 (patch-ao) = 5b63d7312894a9d4ca4bf74da74914ef119fb7c6 -SHA1 (patch-ap) = 862a1c820ef43e08ac2143d6612d3177fc6dc628 +SHA1 (patch-ae) = 95e879f5ef10fd9fbbec8338c13d5676a38e1d41 +SHA1 (patch-af) = bd2a5777942f8758489852ada25b1cfdc0e8bc63 +SHA1 (patch-ag) = 5dad34b5fa4aa843cd16a73d8bdecf3383e0a613 +SHA1 (patch-ah) = 4c09208dfd3a245bf775a0a20fe03d041dadcc48 +SHA1 (patch-ai) = 79c695ac644f2842a98274e9eea96b777cf6a0ae +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 diff --git a/sysutils/dptutil/patches/patch-aa b/sysutils/dptutil/patches/patch-aa index e22dfb07c89..26d4484e305 100644 --- a/sysutils/dptutil/patches/patch-aa +++ b/sysutils/dptutil/patches/patch-aa @@ -1,8 +1,11 @@ -$NetBSD: patch-aa,v 1.1 2003/01/27 23:39:02 ad Exp $ +$NetBSD: patch-aa,v 1.2 2011/05/22 19:11:42 dholland 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 @@ +- 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; @@ -11,7 +14,7 @@ $NetBSD: patch-aa,v 1.1 2003/01/27 23:39:02 ad Exp $ if(MsqID != -1) { msgctl(MsqID, IPC_STAT, &CtlBuf); // Stop engine only, if no dptmgr still running -@@ -359,7 +359,7 @@ +@@ -359,7 +359,7 @@ main(int argc, char *argv[]) /* Try To Create The Unique Message Que Of This ID */ @@ -20,3 +23,12 @@ $NetBSD: patch-aa,v 1.1 2003/01/27 23:39:02 ad Exp $ /* 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; + diff --git a/sysutils/dptutil/patches/patch-ab b/sysutils/dptutil/patches/patch-ab index 29ce7d5a5f5..7559e19109e 100644 --- a/sysutils/dptutil/patches/patch-ab +++ b/sysutils/dptutil/patches/patch-ab @@ -1,4 +1,6 @@ -$NetBSD: patch-ab,v 1.2 2003/01/27 23:39:03 ad Exp $ +$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 diff --git a/sysutils/dptutil/patches/patch-ac b/sysutils/dptutil/patches/patch-ac index 975de1bdc66..4e262da3141 100644 --- a/sysutils/dptutil/patches/patch-ac +++ b/sysutils/dptutil/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $ +$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 @@ -10,8 +10,8 @@ diff -ur dpteng/makefile dpteng/makefile -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=\"@SBINDIR@\" \ -+ -D_NBSD_LIBEXEC=\"@SBINDIR@\" -c ++ -DNEW_LOGGER -DDEFAULT_PATH=\"${PREFIX}/sbin\" \ ++ -D_NBSD_LIBEXEC=\"${PREFIX}/sbin\" -c SRCS = \ addr_rng.cpp \ diff --git a/sysutils/dptutil/patches/patch-ae b/sysutils/dptutil/patches/patch-ae index 349fb014570..58b3bbb7f7f 100644 --- a/sysutils/dptutil/patches/patch-ae +++ b/sysutils/dptutil/patches/patch-ae @@ -1,8 +1,12 @@ -$NetBSD: patch-ae,v 1.2 2003/01/27 23:39:03 ad Exp $ +$NetBSD: patch-ae,v 1.3 2011/05/22 19:11:42 dholland Exp $ ---- 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 @@ +- 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), @@ -11,7 +15,16 @@ $NetBSD: patch-ae,v 1.2 2003/01/27 23:39:03 ad Exp $ /* If We Got The Segment, Try To Attach To It */ -@@ -3676,7 +3676,7 @@ +@@ -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; @@ -20,7 +33,7 @@ $NetBSD: patch-ae,v 1.2 2003/01/27 23:39:03 ad Exp $ int c; int i2oMajorNode = 0; FILE *fp = popen ( -@@ -3695,7 +3695,7 @@ +@@ -3695,7 +3695,7 @@ uSHORT BuildNodeNameList(void) NumEntries = 0; for(i = 0; i < MAX_HAS; ++i) { @@ -29,7 +42,7 @@ $NetBSD: patch-ae,v 1.2 2003/01/27 23:39:03 ad Exp $ int created = 0; # endif -@@ -3710,7 +3710,7 @@ +@@ -3710,7 +3710,7 @@ uSHORT BuildNodeNameList(void) IoctlRtn = osdSendIoctl(&HbaDevs[NumEntries],DPT_SIGNATURE, DataBuff,&pkt); @@ -38,7 +51,7 @@ $NetBSD: patch-ae,v 1.2 2003/01/27 23:39:03 ad Exp $ /* * Use Alternate access. */ -@@ -3758,7 +3758,7 @@ +@@ -3758,7 +3758,7 @@ uSHORT BuildNodeNameList(void) HbaDevs[NumEntries].IoAddress = 0xffffffff; ++NumEntries; } @@ -47,7 +60,7 @@ $NetBSD: patch-ae,v 1.2 2003/01/27 23:39:03 ad Exp $ else if (created) { unlink (HbaDevs[NumEntries].NodeName); -@@ -3777,8 +3777,10 @@ +@@ -3777,8 +3777,10 @@ uSHORT BuildNodeNameList(void) } HbaDevs[NumEntries].Flags = 0; strcpy(HbaDevs[NumEntries].NodeName,"/dev"); @@ -59,7 +72,7 @@ $NetBSD: patch-ae,v 1.2 2003/01/27 23:39:03 ad Exp $ # else strcat(HbaDevs[NumEntries].NodeName,"/dptr"); # endif -@@ -3789,7 +3791,7 @@ +@@ -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 diff --git a/sysutils/dptutil/patches/patch-af b/sysutils/dptutil/patches/patch-af index 08e7751c15d..16163937a34 100644 --- a/sysutils/dptutil/patches/patch-af +++ b/sysutils/dptutil/patches/patch-af @@ -1,8 +1,12 @@ -$NetBSD: patch-af,v 1.3 2003/04/21 20:28:45 cjep Exp $ +$NetBSD: patch-af,v 1.4 2011/05/22 19:11:42 dholland Exp $ ---- 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 @@ +- 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/"; @@ -15,7 +19,7 @@ $NetBSD: patch-af,v 1.3 2003/04/21 20:28:45 cjep Exp $ #else char *EnginePathNameDefault = "/usr/dpt/dpteng &"; -@@ -954,7 +960,7 @@ +@@ -954,7 +960,7 @@ char *AllocBuffers(uLONG toEngSize, uLON /* Get The Shared Memory Segment */ BufferID = shmget(IPC_PRIVATE,(int)(toEngTotalSize + fromEngTotalSize), @@ -24,3 +28,12 @@ $NetBSD: patch-af,v 1.3 2003/04/21 20:28:45 cjep Exp $ /* 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; diff --git a/sysutils/dptutil/patches/patch-ag b/sysutils/dptutil/patches/patch-ag index 4fa6bf39948..8dbbd65494c 100644 --- a/sysutils/dptutil/patches/patch-ag +++ b/sysutils/dptutil/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $ +$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 @@ -13,8 +13,8 @@ diff -ur dptutil/makefile dptutil/makefile -Dtrue=1 -Dfalse=0 \ -DHORIZONTAL -DNEW_RSC_MGR -DNEW_RSC_HDR \ - -D_DPT_FLASH -+ -DDEFAULT_PATH=\"@SBINDIR@\" \ -+ -D_NBSD_LIBEXEC=\"@SBINDIR@\" \ ++ -DDEFAULT_PATH=\"${PREFIX}/sbin\" \ ++ -D_NBSD_LIBEXEC=\"${PREFIX}/sbin\" \ + -D_DPT_FLASH -D_DPT_FREE_BSD -Dunix -D__unix__ LINK_FLAGS = -v diff --git a/sysutils/dptutil/patches/patch-ah b/sysutils/dptutil/patches/patch-ah index 7f765f2c0b2..f70dbbbbe08 100644 --- a/sysutils/dptutil/patches/patch-ah +++ b/sysutils/dptutil/patches/patch-ah @@ -1,4 +1,6 @@ -$NetBSD: patch-ah,v 1.1 2003/01/27 23:39:03 ad Exp $ +$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 diff --git a/sysutils/dptutil/patches/patch-ai b/sysutils/dptutil/patches/patch-ai index c65d83f25dc..0806e330fae 100644 --- a/sysutils/dptutil/patches/patch-ai +++ b/sysutils/dptutil/patches/patch-ai @@ -1,4 +1,6 @@ -$NetBSD: patch-ai,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $ +$NetBSD: patch-ai,v 1.2 2011/05/22 19:11:42 dholland Exp $ + +- supply toplevel makefile --- /dev/null Sat Dec 7 19:02:30 2002 +++ Makefile Sat Dec 7 19:22:44 2002 diff --git a/sysutils/dptutil/patches/patch-aj b/sysutils/dptutil/patches/patch-aj deleted file mode 100644 index 4f5d0bd860d..00000000000 --- a/sysutils/dptutil/patches/patch-aj +++ /dev/null @@ -1,30 +0,0 @@ -$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 index ba5e4e59998..87cfac866e3 100644 --- a/sysutils/dptutil/patches/patch-ak +++ b/sysutils/dptutil/patches/patch-ak @@ -1,4 +1,6 @@ -$NetBSD: patch-ak,v 1.1 2003/01/27 23:39:03 ad Exp $ +$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 diff --git a/sysutils/dptutil/patches/patch-al b/sysutils/dptutil/patches/patch-al index eeb93cf0dd1..7d6dcb0f48e 100644 --- a/sysutils/dptutil/patches/patch-al +++ b/sysutils/dptutil/patches/patch-al @@ -1,4 +1,6 @@ -$NetBSD: patch-al,v 1.1 2003/01/27 23:39:04 ad Exp $ +$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 diff --git a/sysutils/dptutil/patches/patch-am b/sysutils/dptutil/patches/patch-am index 7b9b5420026..0a6bee0e962 100644 --- a/sysutils/dptutil/patches/patch-am +++ b/sysutils/dptutil/patches/patch-am @@ -1,4 +1,6 @@ -$NetBSD: patch-am,v 1.1 2003/01/27 23:39:04 ad Exp $ +$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 diff --git a/sysutils/dptutil/patches/patch-an b/sysutils/dptutil/patches/patch-an index 5ac0d4a155b..fa1a4356d5a 100644 --- a/sysutils/dptutil/patches/patch-an +++ b/sysutils/dptutil/patches/patch-an @@ -1,4 +1,6 @@ -$NetBSD: patch-an,v 1.1 2003/01/27 23:39:04 ad Exp $ +$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 diff --git a/sysutils/dptutil/patches/patch-ao b/sysutils/dptutil/patches/patch-ao index 5bb1728f1d1..0b9b0bdcad8 100644 --- a/sysutils/dptutil/patches/patch-ao +++ b/sysutils/dptutil/patches/patch-ao @@ -1,4 +1,6 @@ -$NetBSD: patch-ao,v 1.1 2003/12/09 19:41:26 ad Exp $ +$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 diff --git a/sysutils/dptutil/patches/patch-ap b/sysutils/dptutil/patches/patch-ap deleted file mode 100644 index 7942370fe7f..00000000000 --- a/sysutils/dptutil/patches/patch-ap +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2003/12/09 19:41:26 ad Exp $ - ---- dptutil/flash.cpp.orig 2003-12-09 19:34:13.000000000 +0000 -+++ dptutil/flash.cpp 2003-12-09 19:34:26.000000000 +0000 -@@ -34,7 +34,7 @@ - #include - #if defined _DPT_WIN_NT - #include --#else -+#elif __GNUC__ < 3 - #include - #endif - diff --git a/sysutils/dptutil/patches/patch-dpteng_connect_hpp b/sysutils/dptutil/patches/patch-dpteng_connect_hpp new file mode 100644 index 00000000000..2c5963432b7 --- /dev/null +++ b/sysutils/dptutil/patches/patch-dpteng_connect_hpp @@ -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................................... + diff --git a/sysutils/dptutil/patches/patch-dpteng_debug_h b/sysutils/dptutil/patches/patch-dpteng_debug_h new file mode 100644 index 00000000000..c1dd4f7fb6b --- /dev/null +++ b/sysutils/dptutil/patches/patch-dpteng_debug_h @@ -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 +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + #endif + + diff --git a/sysutils/dptutil/patches/patch-dpteng_device_cpp b/sysutils/dptutil/patches/patch-dpteng_device_cpp new file mode 100644 index 00000000000..d92b38a70af --- /dev/null +++ b/sysutils/dptutil/patches/patch-dpteng_device_cpp @@ -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); diff --git a/sysutils/dptutil/patches/patch-dpteng_lockunix_c b/sysutils/dptutil/patches/patch-dpteng_lockunix_c new file mode 100644 index 00000000000..eb4dcc9bd83 --- /dev/null +++ b/sysutils/dptutil/patches/patch-dpteng_lockunix_c @@ -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); diff --git a/sysutils/dptutil/patches/patch-dpteng_raid_h b/sysutils/dptutil/patches/patch-dpteng_raid_h new file mode 100644 index 00000000000..a0455c57b49 --- /dev/null +++ b/sysutils/dptutil/patches/patch-dpteng_raid_h @@ -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++ diff --git a/sysutils/dptutil/patches/patch-dpteng_scsi__obj_cpp b/sysutils/dptutil/patches/patch-dpteng_scsi__obj_cpp new file mode 100644 index 00000000000..30fc2a43c9b --- /dev/null +++ b/sysutils/dptutil/patches/patch-dpteng_scsi__obj_cpp @@ -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"); diff --git a/sysutils/dptutil/patches/patch-dptutil_alarm_hpp b/sysutils/dptutil/patches/patch-dptutil_alarm_hpp new file mode 100644 index 00000000000..3848109082a --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_alarm_hpp @@ -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 ); diff --git a/sysutils/dptutil/patches/patch-dptutil_dynsize_h b/sysutils/dptutil/patches/patch-dptutil_dynsize_h new file mode 100644 index 00000000000..92ff1b5dee4 --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_dynsize_h @@ -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 +-#include ++#include ++#include ++using std::ios; ++using std::istream; ++using std::streambuf; + + + /*** DEFINES ***/ diff --git a/sysutils/dptutil/patches/patch-dptutil_engiface_cpp b/sysutils/dptutil/patches/patch-dptutil_engiface_cpp new file mode 100644 index 00000000000..40dff669682 --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_engiface_cpp @@ -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 + //=========================================================================== diff --git a/sysutils/dptutil/patches/patch-dptutil_engiface_hpp b/sysutils/dptutil/patches/patch-dptutil_engiface_hpp new file mode 100644 index 00000000000..f73fe4aef81 --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_engiface_hpp @@ -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 diff --git a/sysutils/dptutil/patches/patch-dptutil_eventlog_hpp b/sysutils/dptutil/patches/patch-dptutil_eventlog_hpp new file mode 100644 index 00000000000..4e87bc80be5 --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_eventlog_hpp @@ -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(); diff --git a/sysutils/dptutil/patches/patch-dptutil_expand_hpp b/sysutils/dptutil/patches/patch-dptutil_expand_hpp new file mode 100644 index 00000000000..ac5c78d5821 --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_expand_hpp @@ -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); diff --git a/sysutils/dptutil/patches/patch-dptutil_flash_cpp b/sysutils/dptutil/patches/patch-dptutil_flash_cpp new file mode 100644 index 00000000000..34449781b41 --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_flash_cpp @@ -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 + #include +-#include +-#if defined _DPT_WIN_NT +-#include +-#else +-#include +-#endif ++#include ++//#include ++using std::fstream; ++using std::ios; + + extern char* EventStrings[]; + /*** CONSTANTS ***/ diff --git a/sysutils/dptutil/patches/patch-dptutil_flash_hpp b/sysutils/dptutil/patches/patch-dptutil_flash_hpp new file mode 100644 index 00000000000..9486d5cf178 --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_flash_hpp @@ -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 ++#include ++using std::istream; + /*** CONSTANTS ***/ + enum FlashRegion { FW, I2OBIOS, SMOR, NVRAM }; + diff --git a/sysutils/dptutil/patches/patch-dptutil_forcest_hpp b/sysutils/dptutil/patches/patch-dptutil_forcest_hpp new file mode 100644 index 00000000000..c8c2bd623b7 --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_forcest_hpp @@ -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(); + diff --git a/sysutils/dptutil/patches/patch-dptutil_listdev_cpp b/sysutils/dptutil/patches/patch-dptutil_listdev_cpp new file mode 100644 index 00000000000..66f60fb0f1a --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_listdev_cpp @@ -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); diff --git a/sysutils/dptutil/patches/patch-dptutil_lockunix_c b/sysutils/dptutil/patches/patch-dptutil_lockunix_c new file mode 100644 index 00000000000..d9d32d9a48a --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_lockunix_c @@ -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); diff --git a/sysutils/dptutil/patches/patch-dptutil_namarray_hpp b/sysutils/dptutil/patches/patch-dptutil_namarray_hpp new file mode 100644 index 00000000000..44220881d66 --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_namarray_hpp @@ -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(); + diff --git a/sysutils/dptutil/patches/patch-dptutil_rmwflash_hpp b/sysutils/dptutil/patches/patch-dptutil_rmwflash_hpp new file mode 100644 index 00000000000..4d84e32fd99 --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_rmwflash_hpp @@ -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(); + diff --git a/sysutils/dptutil/patches/patch-dptutil_segment_hpp b/sysutils/dptutil/patches/patch-dptutil_segment_hpp new file mode 100644 index 00000000000..b20fe4c402d --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_segment_hpp @@ -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(); + diff --git a/sysutils/dptutil/patches/patch-dptutil_setcache_hpp b/sysutils/dptutil/patches/patch-dptutil_setcache_hpp new file mode 100644 index 00000000000..7bdb5c1015c --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_setcache_hpp @@ -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. diff --git a/sysutils/dptutil/patches/patch-dptutil_setrate_hpp b/sysutils/dptutil/patches/patch-dptutil_setrate_hpp new file mode 100644 index 00000000000..24851c2e460 --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_setrate_hpp @@ -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); diff --git a/sysutils/dptutil/patches/patch-dptutil_setscfg_hpp b/sysutils/dptutil/patches/patch-dptutil_setscfg_hpp new file mode 100644 index 00000000000..8a30cd8bd42 --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_setscfg_hpp @@ -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); diff --git a/sysutils/dptutil/patches/patch-dptutil_taskctrl_hpp b/sysutils/dptutil/patches/patch-dptutil_taskctrl_hpp new file mode 100644 index 00000000000..5420a85fb17 --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_taskctrl_hpp @@ -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(); + diff --git a/sysutils/dptutil/patches/patch-dptutil_uartdmp_hpp b/sysutils/dptutil/patches/patch-dptutil_uartdmp_hpp new file mode 100644 index 00000000000..42d1b9290b1 --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_uartdmp_hpp @@ -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(); + diff --git a/sysutils/dptutil/patches/patch-dptutil_zap_hpp b/sysutils/dptutil/patches/patch-dptutil_zap_hpp new file mode 100644 index 00000000000..6f9e758cfcf --- /dev/null +++ b/sysutils/dptutil/patches/patch-dptutil_zap_hpp @@ -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 -- cgit v1.2.3