Import of pkgsrc-2015Q1

This commit is contained in:
2016-01-21 23:40:00 +01:00
committed by sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870539 additions and 795424 deletions
+4 -4
View File
@@ -1,9 +1,9 @@
$NetBSD: patch-de,v 1.3 2012/08/06 13:33:38 adam Exp $
$NetBSD: patch-de,v 1.4 2014/10/01 08:32:31 adam Exp $
--- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig 2012-07-31 16:39:26.000000000 +0000
--- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig 2014-09-19 01:48:49.000000000 +0000
+++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c
@@ -69,8 +69,15 @@ static ObjectClass *oc_krb5KDCEntry;
#include <gcrypt.h>
@@ -70,8 +70,15 @@ static ObjectClass *oc_krb5KDCEntry;
#include <nettle/md4.h>
typedef unsigned char DES_cblock[8];
#elif HAVE_OPENSSL
+#ifdef __NetBSD__
@@ -0,0 +1,16 @@
$NetBSD: patch-libraries_libldap_os-local.c,v 1.1 2014/07/18 11:31:25 ryoon Exp $
--- libraries/libldap/os-local.c.orig 2014-01-25 13:36:15.000000000 +0000
+++ libraries/libldap/os-local.c
@@ -202,6 +202,11 @@ sendcred:
struct msghdr msg = {0};
# ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL
# ifndef CMSG_SPACE
+# if defined(_SCO_DS)
+/* SCO OpenServer 5.0.7/3.2 has no cmsg macros. */
+#define __ALIGNBYTES (sizeof(long) - 1)
+#define _CMSG_ALIGN(n) (((n) + __ALIGNBYTES) & ~__ALIGNBYTES)
+# endif
# define CMSG_SPACE(len) (_CMSG_ALIGN( sizeof(struct cmsghdr)) + _CMSG_ALIGN(len) )
# endif
# ifndef CMSG_LEN