Fix build under OpenBSD 5.5

* OpenBSD's vis.h requires stdlib.h
* OpenBSD has SO_PEERCRED, but it is different from Linux's one
* __weak_alias is not for OpenBSD's gcc 4.2.1
* OpenBSD 5.5 has not VIS_HTTPSTYLE.
* Fix PLIST for OpenBSD

8 files changed, 168 insertions, 4 deletions

diff --git a/security/heimdal/PLIST.OpenBSD b/security/heimdal/PLIST.OpenBSD
new file mode 100644
index 00000000000..986eba263b3
--- /dev/null
+++ b/security/heimdal/PLIST.OpenBSD
@@ -0,0 +1 @@
+lib/libheimedit.la
diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index 86a8454050b..0e73b7bff09 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1,15 +1,20 @@
-$NetBSD: distinfo,v 1.40 2013/12/04 10:01:30 bsiegert Exp $
+$NetBSD: distinfo,v 1.41 2014/05/16 12:49:42 ryoon Exp $
 
 SHA1 (heimdal-1.5.3.tar.gz) = 23f39a099ae862dce1f5f4e5c3720861849a4bd0
 RMD160 (heimdal-1.5.3.tar.gz) = 834660b4c0fe81a3aac4ffd9d8d37d74add1fa70
 Size (heimdal-1.5.3.tar.gz) = 6798305 bytes
-SHA1 (patch-ad) = 3dad4f3dfb19deb37c6b684ddea3e931678c5c6e
+SHA1 (patch-ad) = 4376ee49bea9e79fa75f589b65b7a4b9b0676966
 SHA1 (patch-al) = 022d5f3723bd1db7fe5e92eea5d0106851a5d424
 SHA1 (patch-cf_install-catman.sh) = 8eb8ea0c0c8b281c080c85eefc3abbc7dcbe6746
 SHA1 (patch-cf_libtool.m4) = cd229e0e934649cb04c3f39928d1fa12c2474f62
 SHA1 (patch-cf_pthreads.m4) = eff8f355887d2f9795446073efd67ccf739db2c9
+SHA1 (patch-cf_roken-frag.m4) = 599216f2650facaff0559f2a9cc27439e2f1f099
 SHA1 (patch-kdc_version-script.map) = 42b0417a16b19a680f30ae34cfffd082f609d4a6
+SHA1 (patch-lib_ipc_server.c) = fa806b549ed5cb3c4427e3865642e6d9555a59b0
 SHA1 (patch-lib_libedit_aclocal.m4) = c50025a3b9bcae9913adab251169462dbc0f3221
 SHA1 (patch-lib_libedit_configure) = c029c471d68d389e67e1cc636a352a004fd6124e
 SHA1 (patch-lib_libedit_configure.ac) = 588b184615a80ab85d7c3624c6c05860c8e6feb0
+SHA1 (patch-lib_libedit_src_unvis.c) = c54dbf201d2fc68f537d7cc735a13d75f6e32947
+SHA1 (patch-lib_libedit_src_vis.c) = 6eb41d9704f84aacedb7d7f80ab0cdc4accceeb4
 SHA1 (patch-lib_otp_Makefile.in) = 0fe1426000824614f0e31d3ab2348948f3f414d3
+SHA1 (patch-lib_roken_vis.c) = 8037c4b36d6cd4bc2557a9409df04232276b7a28
diff --git a/security/heimdal/patches/patch-ad b/security/heimdal/patches/patch-ad
index 520554e2293..22cc65e9304 100644
--- a/security/heimdal/patches/patch-ad
+++ b/security/heimdal/patches/patch-ad
@@ -1,8 +1,9 @@
-$NetBSD: patch-ad,v 1.13 2013/08/16 08:30:14 adam Exp $
+$NetBSD: patch-ad,v 1.14 2014/05/16 12:49:42 ryoon Exp $
 
 * GNU/kFreeBSD parts: use host of Debian GNU/kFreeBSD 7.0.
+* OpenBSD's vish requires stdlib.h.
 
---- configure.orig	2012-01-11 13:04:10.000000000 +0000
+--- configure.orig	2012-12-09 22:09:32.000000000 +0000
 +++ configure
 @@ -6779,7 +6779,7 @@ ia64-*-hpux*)
    rm -rf conftest*
@@ -53,3 +54,75 @@ $NetBSD: patch-ad,v 1.13 2013/08/16 08:30:14 adam Exp $
  	native_pthread_support=yes
  	PTHREAD_CFLAGS=-pthread
  	PTHREAD_LIBADD=-pthread
+@@ -16057,6 +16061,7 @@ fi
+ for ac_header in vis.h
+ do :
+   ac_fn_c_check_header_compile "$LINENO" "vis.h" "ac_cv_header_vis_h" "
++#include <stdlib.h>
+ #include <vis.h>
+ #ifndef VIS_SP
+ #error invis
+@@ -20473,6 +20478,7 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef HAVE_VIS_H
++#include <stdlib.h>
+ #include <vis.h>
+ #endif
+ struct foo { int foo; } xx;
+@@ -20510,6 +20516,7 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef HAVE_VIS_H
++#include <stdlib.h>
+ #include <vis.h>
+ #endif
+ struct foo { int foo; } xx;
+@@ -20547,6 +20554,7 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef HAVE_VIS_H
++#include <stdlib.h>
+ #include <vis.h>
+ #endif
+ struct foo { int foo; } xx;
+@@ -20584,6 +20592,7 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef HAVE_VIS_H
++#include <stdlib.h>
+ #include <vis.h>
+ #endif
+ struct foo { int foo; } xx;
+@@ -20621,6 +20630,7 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef HAVE_VIS_H
++#include <stdlib.h>
+ #include <vis.h>
+ #endif
+ struct foo { int foo; } xx;
+@@ -20658,6 +20668,7 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef HAVE_VIS_H
++#include <stdlib.h>
+ #include <vis.h>
+ #endif
+ struct foo { int foo; } xx;
+@@ -20695,6 +20706,7 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef HAVE_VIS_H
++#include <stdlib.h>
+ #include <vis.h>
+ #endif
+ struct foo { int foo; } xx;
+@@ -20732,6 +20744,7 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef HAVE_VIS_H
++#include <stdlib.h>
+ #include <vis.h>
+ #endif
+ struct foo { int foo; } xx;
diff --git a/security/heimdal/patches/patch-cf_roken-frag.m4 b/security/heimdal/patches/patch-cf_roken-frag.m4
new file mode 100644
index 00000000000..57584a6ea3a
--- /dev/null
+++ b/security/heimdal/patches/patch-cf_roken-frag.m4
@@ -0,0 +1,14 @@
+$NetBSD: patch-cf_roken-frag.m4,v 1.1 2014/05/16 12:49:42 ryoon Exp $
+
+* OpenBSD's vis.h requires stdlib.h
+
+--- cf/roken-frag.m4.orig	2012-12-09 22:06:44.000000000 +0000
++++ cf/roken-frag.m4
+@@ -97,6 +97,7 @@ AC_HAVE_TYPE([uintptr_t],[#ifdef HAVE_ST
+ 
+ dnl Sunpro 5.2 has a vis.h which is something different.
+ AC_CHECK_HEADERS(vis.h, , , [
++#include <stdlib.h>
+ #include <vis.h>
+ #ifndef VIS_SP
+ #error invis
diff --git a/security/heimdal/patches/patch-lib_ipc_server.c b/security/heimdal/patches/patch-lib_ipc_server.c
new file mode 100644
index 00000000000..e0233413ac0
--- /dev/null
+++ b/security/heimdal/patches/patch-lib_ipc_server.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_ipc_server.c,v 1.1 2014/05/16 12:49:42 ryoon Exp $
+
+* OpenBSD should use its own conditional.
+
+--- lib/ipc/server.c.orig	2012-12-09 22:06:44.000000000 +0000
++++ lib/ipc/server.c
+@@ -525,7 +525,7 @@ update_client_creds(struct client *c)
+ 	}
+     }
+ #endif
+-#ifdef SO_PEERCRED
++#if defined(SO_PEERCRED) && !defined(__OpenBSD__)
+     /* Linux */
+     {
+ 	struct ucred pc;
diff --git a/security/heimdal/patches/patch-lib_libedit_src_unvis.c b/security/heimdal/patches/patch-lib_libedit_src_unvis.c
new file mode 100644
index 00000000000..bcc209d4a37
--- /dev/null
+++ b/security/heimdal/patches/patch-lib_libedit_src_unvis.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-lib_libedit_src_unvis.c,v 1.1 2014/05/16 12:49:42 ryoon Exp $
+
+* Fix OpenBSD 5.5 build
+
+--- lib/libedit/src/unvis.c.orig	2012-12-09 22:06:44.000000000 +0000
++++ lib/libedit/src/unvis.c
+@@ -46,9 +46,11 @@ __RCSID("$NetBSD: unvis.c,v 1.32 2010/11
+ #include <stdio.h>
+ #include <vis.h>
+ 
++#if !defined(__OpenBSD__)
+ #ifdef __weak_alias
+ __weak_alias(strunvis,_strunvis)
+ #endif
++#endif
+ 
+ #if !HAVE_VIS
+ /*
diff --git a/security/heimdal/patches/patch-lib_libedit_src_vis.c b/security/heimdal/patches/patch-lib_libedit_src_vis.c
new file mode 100644
index 00000000000..569c86addec
--- /dev/null
+++ b/security/heimdal/patches/patch-lib_libedit_src_vis.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-lib_libedit_src_vis.c,v 1.1 2014/05/16 12:49:42 ryoon Exp $
+
+* Fix OpenBSD 5.5 build
+
+--- lib/libedit/src/vis.c.orig	2012-12-09 22:06:44.000000000 +0000
++++ lib/libedit/src/vis.c
+@@ -67,6 +67,7 @@ __RCSID("$NetBSD: vis.c,v 1.41 2009/11/2
+ #include <vis.h>
+ #include <stdlib.h>
+ 
++#if !defined(__OpenBSD__)
+ #ifdef __weak_alias
+ __weak_alias(strsvis,_strsvis)
+ __weak_alias(strsvisx,_strsvisx)
+@@ -75,6 +76,7 @@ __weak_alias(strvisx,_strvisx)
+ __weak_alias(svis,_svis)
+ __weak_alias(vis,_vis)
+ #endif
++#endif
+ 
+ #if !HAVE_VIS || !HAVE_SVIS
+ #include <ctype.h>
diff --git a/security/heimdal/patches/patch-lib_roken_vis.c b/security/heimdal/patches/patch-lib_roken_vis.c
new file mode 100644
index 00000000000..2c07995b180
--- /dev/null
+++ b/security/heimdal/patches/patch-lib_roken_vis.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_roken_vis.c,v 1.1 2014/05/16 12:49:42 ryoon Exp $
+
+--- lib/roken/vis.c.orig	2012-12-09 22:06:44.000000000 +0000
++++ lib/roken/vis.c
+@@ -55,6 +55,11 @@
+  * POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++/* OpenBSD 5.5 has not VIS_HTTPSTYLE. */
++#if defined(__OpenBSD__)
++#define VIS_HTTPSTYLE	0x0080
++#endif
++
+ #if 1
+ #include <config.h>
+ #include "roken.h"