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

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
databases/openldap/Makefile
View File

@@ -1,5 +1,6 @@
# $NetBSD: Makefile,v 1.144 2014/10/01 08:32:31 adam Exp $
# $NetBSD: Makefile,v 1.145 2016/03/05 11:28:12 jperkin Exp $
PKGREVISION= 1
.include "../../databases/openldap/Makefile.version"
DISTNAME= openldap-${OPENLDAP_VERSION}

7
databases/openldap/Makefile.common
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.36 2013/05/10 06:51:26 riastradh Exp $
# $NetBSD: Makefile.common,v 1.38 2016/06/17 13:56:53 jperkin Exp $
#
# used by databases/openldap-client/Makefile
# used by databases/openldap-cloak/Makefile
@@ -29,7 +29,6 @@ CONFLICTS+= ldapsdk-[0-9]*
DISTINFO_FILE= ${.CURDIR}/../../databases/openldap/distinfo
PATCHDIR= ${.CURDIR}/../../databases/openldap/patches
FILESDIR= ${.CURDIR}/../../databases/openldap/files
USE_LIBTOOL= yes
USE_TOOLS+= soelim
@@ -51,8 +50,7 @@ PKG_USERS_VARS+= SLAPD_USER
# the internal avl_* prototypes conflict with those in <sys/avl.h> which
# is included by another system header file on Solaris, so subst them.
.if ${OPSYS} == "SunOS"
SUBST_CLASSES+= conflict
SUBST_CLASSES.SunOS+= conflict
SUBST_STAGE.conflict= post-patch
SUBST_FILES.conflict= ${WRKSRC}/*/*.h
SUBST_FILES.conflict+= ${WRKSRC}/*/*/*.c ${WRKSRC}/*/*/*/*.c
@@ -62,7 +60,6 @@ SUBST_SED.conflict+= -e 's,avl_delete,openldap_avl_delete,g'
SUBST_SED.conflict+= -e 's,avl_find,openldap_avl_find,g'
SUBST_SED.conflict+= -e 's,avl_find2,openldap_avl_find2,g'
SUBST_MESSAGE.conflict= Fixing conflicting function prototypes.
.endif
CPPFLAGS.Darwin+= -DBIND_8_COMPAT
CPPFLAGS.Linux+= -D_GNU_SOURCE

4
databases/openldap/Makefile.version
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile.version,v 1.11 2015/08/24 22:35:50 adam Exp $
# $NetBSD: Makefile.version,v 1.13 2016/02/07 08:42:59 adam Exp $
# used by databases/openldap/Makefile
# used by databases/openldap/Makefile.common
# used by databases/openldap-docs/Makefile
OPENLDAP_VERSION= 2.4.42
OPENLDAP_VERSION= 2.4.44

10
databases/openldap/distinfo
View File

@@ -1,8 +1,9 @@
$NetBSD: distinfo,v 1.102 2015/09/14 16:32:26 manu Exp $
$NetBSD: distinfo,v 1.106 2016/06/17 14:01:58 jperkin Exp $
SHA1 (openldap-2.4.42.tgz) = ec03e061bfdb2e6a90827855cf77a72cb3f89cf4
RMD160 (openldap-2.4.42.tgz) = e45f38305f9a151b194534c60899d16be02813f8
Size (openldap-2.4.42.tgz) = 5645925 bytes
SHA1 (openldap-2.4.44.tgz) = 016a738d050a68d388602a74b5e991035cdba149
RMD160 (openldap-2.4.44.tgz) = 6ea3139f630e93c6e0af60638672d88d6c535a6a
SHA512 (openldap-2.4.44.tgz) = 132eb81798f59a364c9246d08697e1c7ebb6c2c3b983f786b14ec0233df09696cbad33a1f35f3076348b5efb77665a076ab854a24122c31e8b58310b7c7fd136
Size (openldap-2.4.44.tgz) = 5658830 bytes
SHA1 (patch-ac) = 2995c518278b363bf9657e181c2340d3024d5980
SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
SHA1 (patch-af) = 2e00b01bd813e73bdc1fb764a02e98d7755703de
@@ -20,3 +21,4 @@ SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16
SHA1 (patch-its7506) = a50f9428d6d7dd28f71d21e11ae3f8b0f1372f75
SHA1 (patch-its7595) = 9ea396adb7f2fd572d60190534caa80a01ef79d2
SHA1 (patch-libraries_libldap_os-local.c) = 7cd4f8638456fae12499de0d36d7802e47d3d688
SHA1 (patch-libraries_liblmdb_mdb.c) = 590a059d784687f678ac44a577770551b11a2be5

19
databases/openldap/files/slapd.sh
View File

@@ -1,19 +0,0 @@
#!@RCD_SCRIPTS_SHELL@
#
# $NetBSD: slapd.sh,v 1.8 2006/05/31 18:17:49 ghen Exp $
#
# OpenLDAP standalone LDAP daemon
#
# PROVIDE: slapd
# REQUIRE: DAEMON
. /etc/rc.subr
name="slapd"
rcvar=${name}
command="@PREFIX@/libexec/${name}"
required_files="@OPENLDAP_ETCDIR@/${name}.conf"
command_args="-u @SLAPD_USER@"
load_rc_config $name
run_rc_command "$1"

39
databases/openldap/patches/patch-libraries_liblmdb_mdb.c Normal file
View File

@@ -0,0 +1,39 @@
$NetBSD: patch-libraries_liblmdb_mdb.c,v 1.1 2016/06/17 14:01:58 jperkin Exp $
Apply https://www.gulag.ch/www/download/0001-Solaris-robust-mutex-fix.patch
--- libraries/liblmdb/mdb.c.orig 2016-02-05 23:57:45.000000000 +0000
+++ libraries/liblmdb/mdb.c
@@ -257,7 +257,7 @@ typedef SSIZE_T ssize_t;
# else
# define MDB_USE_ROBUST 1
/* glibc < 2.12 only provided _np API */
-# if defined(__GLIBC__) && GLIBC_VER < 0x02000c
+# if (defined(__GLIBC__) && GLIBC_VER < 0x02000a) || defined(__SunOS_5_10)
# define PTHREAD_MUTEX_ROBUST PTHREAD_MUTEX_ROBUST_NP
# define pthread_mutexattr_setrobust(attr, flag) pthread_mutexattr_setrobust_np(attr, flag)
# define pthread_mutex_consistent(mutex) pthread_mutex_consistent_np(mutex)
@@ -4623,10 +4623,21 @@ mdb_env_setup_locks(MDB_env *env, char *
|| (rc = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED))
#ifdef MDB_ROBUST_SUPPORTED
|| (rc = pthread_mutexattr_setrobust(&mattr, PTHREAD_MUTEX_ROBUST))
-#endif
+#else
+ #ifndef __sun
|| (rc = pthread_mutex_init(env->me_txns->mti_rmutex, &mattr))
- || (rc = pthread_mutex_init(env->me_txns->mti_wmutex, &mattr)))
+ || (rc = pthread_mutex_init(env->me_txns->mti_wmutex, &mattr))
+ #endif
+#endif
+ ) {
goto fail;
+ }
+ #ifdef __sun
+ rc = pthread_mutex_init(env->me_txns->mti_rmutex, &mattr);
+ if (!(rc == EBUSY || rc == EINVAL)) goto fail;
+ rc = pthread_mutex_init(env->me_txns->mti_wmutex, &mattr);
+ if (!(rc == EBUSY || rc == EINVAL)) goto fail;
+ #endif
pthread_mutexattr_destroy(&mattr);
#endif /* _WIN32 || MDB_USE_POSIX_SEM */