Fix for non-BSD platforms by avoiding sys/cdefs.h dependency.

Avoid system namespace for headers. Add missing RCS ID.

6 files changed, 84 insertions, 3 deletions

diff --git a/devel/netbsd-iscsi-lib/Makefile b/devel/netbsd-iscsi-lib/Makefile
index aeeaf09f539..32592961397 100644
--- a/devel/netbsd-iscsi-lib/Makefile
+++ b/devel/netbsd-iscsi-lib/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2013/04/08 11:17:11 rodent Exp $
+# $NetBSD: Makefile,v 1.5 2015/10/15 13:15:50 joerg Exp $
 
 PKGNAME=	${DISTNAME:C/-iscsi/-iscsi-lib/}
+PKGREVISION=	1
 CATEGORIES=	devel
 COMMENT=	NetBSD's iSCSI library (per iSCSI RFC 3720)
 
diff --git a/devel/netbsd-iscsi-lib/distinfo b/devel/netbsd-iscsi-lib/distinfo
index 4cab4cdbf06..02aa77b71b1 100644
--- a/devel/netbsd-iscsi-lib/distinfo
+++ b/devel/netbsd-iscsi-lib/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.5 2011/12/14 07:30:42 agc Exp $
+$NetBSD: distinfo,v 1.6 2015/10/15 13:15:50 joerg Exp $
 
 SHA1 (netbsd-iscsi-20111006.tar.gz) = e8c0176a32416e17f90ec33ebd014ec19d978c3b
 RMD160 (netbsd-iscsi-20111006.tar.gz) = fcb28098f0048f726570ee0f10d6d84e641330f2
 Size (netbsd-iscsi-20111006.tar.gz) = 535267 bytes
 SHA1 (patch-ab) = d769048053104c03739a7ff3f77280ef1357e23c
-SHA1 (patch-ac) = 6e2131c0e992c750aec272da5f88d7b99324898e
+SHA1 (patch-ac) = d7a7f72b83eb444f62bbfc34c2c02cc03b186ee9
 SHA1 (patch-ad) = 3844a8f8a6ddf6e584f1c097f95be0501f901a3e
 SHA1 (patch-ae) = e6cad821057074c50d0388cf1e6b3df2e080678c
+SHA1 (patch-include_iscsi-md5.h) = 038355a84a1c979fe1c439eea4604b5323437ea4
+SHA1 (patch-src_lib_md5c.c) = 905c0e4000a401a105bb0521c20281158c6ad149
+SHA1 (patch-src_lib_md5hl.c) = de4c44f00614fb871f2ac8619f3f41896c1d7f26
diff --git a/devel/netbsd-iscsi-lib/patches/patch-ac b/devel/netbsd-iscsi-lib/patches/patch-ac
index 2b3e4e39ab0..c9ef725abdd 100644
--- a/devel/netbsd-iscsi-lib/patches/patch-ac
+++ b/devel/netbsd-iscsi-lib/patches/patch-ac
@@ -1,3 +1,5 @@
+$NetBSD: patch-ac,v 1.2 2015/10/15 13:15:50 joerg Exp $
+
 --- src/initiator/Makefile.in.orig	2010-04-16 20:26:17.000000000 +0100
 +++ src/initiator/Makefile.in	2010-04-16 20:28:51.000000000 +0100
 @@ -53,7 +53,7 @@
diff --git a/devel/netbsd-iscsi-lib/patches/patch-include_iscsi-md5.h b/devel/netbsd-iscsi-lib/patches/patch-include_iscsi-md5.h
new file mode 100644
index 00000000000..daf8b73b653
--- /dev/null
+++ b/devel/netbsd-iscsi-lib/patches/patch-include_iscsi-md5.h
@@ -0,0 +1,38 @@
+$NetBSD: patch-include_iscsi-md5.h,v 1.1 2015/10/15 13:15:50 joerg Exp $
+
+--- include/iscsi-md5.h.orig	2009-07-02 09:12:23.000000000 +0000
++++ include/iscsi-md5.h
+@@ -29,8 +29,8 @@
+  * documentation and/or software.
+  */
+ 
+-#ifndef _SYS_MD5_H_
+-#define _SYS_MD5_H_
++#ifndef ISCSI_MD5_H
++#define ISCSI_MD5_H
+ 
+ #include <sys/types.h>
+ 
+@@ -49,15 +49,17 @@ typedef struct iSCSI_MD5Context {
+ 	unsigned char buffer[64]; /* input buffer */
+ } iSCSI_MD5_CTX;
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ void	iSCSI_MD5Init(iSCSI_MD5_CTX *);
+ void	iSCSI_MD5Update(iSCSI_MD5_CTX *, const uint8_t *, size_t);
+ void	iSCSI_MD5Final(unsigned char[16], iSCSI_MD5_CTX *);
+-#ifndef _KERNEL
+ char	*iSCSI_MD5End(iSCSI_MD5_CTX *, char *);
+ char	*iSCSI_MD5File(const char *, char *);
+ char	*iSCSI_MD5Data(const uint8_t *, size_t, char *);
+-#endif /* _KERNEL */
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+-#endif /* _SYS_MD5_H_ */
++#endif /* ISCSI_MD5_H */
diff --git a/devel/netbsd-iscsi-lib/patches/patch-src_lib_md5c.c b/devel/netbsd-iscsi-lib/patches/patch-src_lib_md5c.c
new file mode 100644
index 00000000000..fd756eabee2
--- /dev/null
+++ b/devel/netbsd-iscsi-lib/patches/patch-src_lib_md5c.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_lib_md5c.c,v 1.1 2015/10/15 13:15:50 joerg Exp $
+
+--- src/lib/md5c.c.orig	2015-09-12 21:01:19.530772945 +0000
++++ src/lib/md5c.c
+@@ -33,17 +33,10 @@
+ #include <config.h>
+ #endif
+ 
+-#if defined(_KERNEL) || defined(_STANDALONE)
+-#include <lib/libkern/libkern.h>
+-#include <sys/param.h>
+-#include <sys/md5.h>
+-#define _DIAGASSERT(x)	(void)0
+-#else
+ /* #include "namespace.h" */
+ #include <assert.h>
+ #include <string.h>
+ #include "iscsi-md5.h"
+-#endif /* _KERNEL || _STANDALONE */
+ 
+ #if defined(HAVE_MEMSET)
+ #define	ZEROIZE(d, l)		memset((d), 0, (l))
diff --git a/devel/netbsd-iscsi-lib/patches/patch-src_lib_md5hl.c b/devel/netbsd-iscsi-lib/patches/patch-src_lib_md5hl.c
new file mode 100644
index 00000000000..ec050ce2c76
--- /dev/null
+++ b/devel/netbsd-iscsi-lib/patches/patch-src_lib_md5hl.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_lib_md5hl.c,v 1.1 2015/10/15 13:15:50 joerg Exp $
+
+--- src/lib/md5hl.c.orig	2015-09-12 20:57:55.447892750 +0000
++++ src/lib/md5hl.c
+@@ -48,8 +48,8 @@
+ #include <unistd.h>
+ #endif
+ 
+-#define	CONCAT(x,y)	__CONCAT(x,y)
+-#define	MDNAME(x)	CONCAT(MDALGORITHM,x)
++#define	CONCAT(x,y)	x ## y
++#define	MDNAME(x)	CONCAT(iSCSI_MD5,x)
+ 
+ char *
+ MDNAME(End)(MDNAME(_CTX) *ctx, char *buf)