Attachment #186473 for bug #222405

View | Details | Raw Unified | Return to bug 222405
Collapse All | Expand All




MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
			ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \
			ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
			ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/%SUBDIR%/ \
			ftp://ftp.u-aizu.ac.jp/pub/net/openldap/%SUBDIR%/ \
			ftp://ftp.nl.uu.net/pub/unix/db/openldap/%SUBDIR%/ \
			ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \
			http://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/
MASTER_SITE_SUBDIR=	openldap-release

.if defined(CLIENT_ONLY)
.if ${CLIENT_ONLY} == sasl
PKGNAMESUFFIX=		-sasl-client
COMMENT=		Open source LDAP client implementation with SASL2 support
CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.* \
			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[0-3].*
.else
PKGNAMESUFFIX=		-client
COMMENT=		Open source LDAP client implementation
CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-3].* \
			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
.endif
.else
PKGNAMESUFFIX?=		-server
.endif
EXTRACT_SUFX=		.tgz

MAINTAINER=		delphij@FreeBSD.org
.if defined(CLIENT_ONLY)
.if ${CLIENT_ONLY} == sasl
COMMENT=		Open source LDAP client implementation with SASL2 support
.else
COMMENT=		Open source LDAP client implementation
.endif
.else
COMMENT=		Open source LDAP server implementation
.endif

LICENSE=		OPENLDAP
LICENSE_NAME=		OpenLDAP Public License

LICENSE_FILE=		${WRKSRC}/LICENSE
LICENSE_PERMS=		dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

.if defined(CLIENT_ONLY)
.if ${CLIENT_ONLY} == sasl
CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.* \
			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[0-3].*
.else
CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-3].* \
			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
.endif
.endif

GNU_CONFIGURE=		yes
# :keepla because port uses lt_dlopen
USES=			cpe libtool:keepla ssl tar:tgz
.if !defined(CLIENT_ONLY)
USERS=			ldap
GROUPS=			ldap


EXTRA_PATCHES+=		${FILESDIR}/extrapatch-Makefile.in

.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSLAPI}
LIB_DEPENDS+=		libltdl.so:devel/libltdl
CONFIGURE_ARGS+=	--enable-modules
PLIST_SUB+=		MODULES=""


pre-install:
.if !defined(CLIENT_ONLY)
	${MKDIR} ${STAGEDIR}${DATABASEDIR}
.endif

post-install:
.if defined(CLIENT_ONLY)
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}
	for dir in drafts rfc; do \
		${MKDIR} ${STAGEDIR}${DOCSDIR}/$${dir}; \
		${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${STAGEDIR}${DOCSDIR}/$${dir}; \
	done
	for prog in ldapcompare ldapdelete ldapexop ldapmodify ldapmodrdn ldappasswd ldapsearch ldapurl ldapwhoami; do\
		${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$${prog}; \
	done

	for library in lber ldap ldap_r; do \
		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib$${library}-${OPENLDAP_MAJOR}.so.${OPENLDAP_SHLIB_MAJOR}; \
	done
.else
	${MKDIR} ${STAGEDIR}${LDAP_RUN_DIR}
.if ${PORT_OPTIONS:MSMBPWD}
	(cd ${WRKSRC}/contrib/slapd-modules/smbk5pwd && \
		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
		${MAKE_ARGS} prefix="${PREFIX}" install)
	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/smbk5pwd.a
.endif
.if ${PORT_OPTIONS:MSHA2}
	(cd ${WRKSRC}/contrib/slapd-modules/passwd/sha2 && \
		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
		${MAKE_ARGS} prefix="${PREFIX}" install)
	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/pw-sha2.a
.endif
.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSMBPWD} || ${PORT_OPTIONS:MSHA2}
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/openldap/*.so
.endif
.endif # defined(CLIENT_ONLY)
.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSLAPI}
	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/openldap
.endif

.include <bsd.port.post.mk>




--- build/man.mk.orig	2017-06-01 20:01:07 UTC
+++ build/man.mk
@@ -20,8 +20,7 @@ MANDIR=$(mandir)/man$(MANSECT)
 TMP_SUFFIX=tmp
 
 all-common:

 		$(SED) -e "s%LDVERSION%$(VERSION)%" \
 			-e 's%ETCDIR%$(sysconfdir)%g' \
 			-e 's%LOCALSTATEDIR%$(localstatedir)%' \
@@ -39,8 +38,7 @@ all-common:
 
 install-common:
 	-$(MKDIR) $(DESTDIR)$(MANDIR)

 		echo "installing $$page in $(DESTDIR)$(MANDIR)"; \
 		$(RM) $(DESTDIR)$(MANDIR)/$$page; \
 		$(INSTALL) $(INSTALLFLAGS) -m 644 $$page.$(TMP_SUFFIX) $(DESTDIR)$(MANDIR)/$$page; \
--- doc/man/man1/Makefile.in.orig	2017-06-01 20:01:07 UTC
+++ doc/man/man1/Makefile.in
@@ -14,3 +14,20 @@
 ## <http://www.OpenLDAP.org/license.html>.
 

+PAGES=
+.endif
+
--- doc/man/man3/Makefile.in.orig	2017-06-01 20:01:07 UTC
+++ doc/man/man3/Makefile.in
@@ -14,3 +14,49 @@
 ## <http://www.OpenLDAP.org/license.html>.
 

+PAGES=
+.endif
+
--- doc/man/man5/Makefile.in.orig	2017-06-01 20:01:07 UTC
+++ doc/man/man5/Makefile.in
@@ -14,3 +14,54 @@
 ## <http://www.OpenLDAP.org/license.html>.
 

+	slapo-valsort.${MANSECT}
+.endif
+
--- doc/man/man8/Makefile.in.orig	2017-06-01 20:01:07 UTC
+++ doc/man/man8/Makefile.in
@@ -14,3 +14,21 @@
 ## <http://www.OpenLDAP.org/license.html>.
 




--- build/openldap.m4.orig	2013-11-15 12:31:27.000000000 +0900
+++ build/openldap.m4	2014-01-10 15:21:33.000000000 +0900
@@ -357,7 +357,14 @@
 AC_DEFUN([OL_BERKELEY_DB_LINK],
 [ol_cv_lib_db=no
 
-if test $ol_cv_bdb_major = 5 ; then
+if test $ol_cv_bdb_major = 6 ; then
+	OL_BERKELEY_DB_TRY(ol_cv_db_db_6_dot_m,[-ldb-6.$ol_cv_bdb_minor])
+	OL_BERKELEY_DB_TRY(ol_cv_db_db6m,[-ldb6$ol_cv_bdb_minor])
+	OL_BERKELEY_DB_TRY(ol_cv_db_db_6m,[-ldb-6$ol_cv_bdb_minor])
+	OL_BERKELEY_DB_TRY(ol_cv_db_db_6_m,[-ldb-6-$ol_cv_bdb_minor])
+	OL_BERKELEY_DB_TRY(ol_cv_db_db_6,[-ldb-6])
+	OL_BERKELEY_DB_TRY(ol_cv_db_db6,[-ldb6])
+elif test $ol_cv_bdb_major = 5 ; then
 	OL_BERKELEY_DB_TRY(ol_cv_db_db_5_dot_m,[-ldb-5.$ol_cv_bdb_minor])
 	OL_BERKELEY_DB_TRY(ol_cv_db_db5m,[-ldb5$ol_cv_bdb_minor])
 	OL_BERKELEY_DB_TRY(ol_cv_db_db_5m,[-ldb-5$ol_cv_bdb_minor])

Lines 1-6 Link Here

(-)files/patch-build__top.mk (-3 / +3 lines)
1	--- build/top.mk.orig 2014-09-18 18:48:49.000000000 -0700	1	--- build/top.mk.orig 2017-06-01 20:01:07 UTC
2	+++ build/top.mk 2015-04-27 12:02:52.234737749 -0700	2	+++ build/top.mk
3	@@ -59,8 +59,6 @@	3	@@ -59,8 +59,6 @@ INSTALL_PROGRAM = $(INSTALL)
4	INSTALL_DATA = $(INSTALL) -m 644	4	INSTALL_DATA = $(INSTALL) -m 644
5	INSTALL_SCRIPT = $(INSTALL)	5	INSTALL_SCRIPT = $(INSTALL)
6		6




--- build/openldap.m4.orig	2017-06-01 20:01:07 UTC
+++ build/openldap.m4
@@ -357,7 +357,14 @@ dnl Try to locate appropriate library
 AC_DEFUN([OL_BERKELEY_DB_LINK],
 [ol_cv_lib_db=no
 
-if test $ol_cv_bdb_major = 5 ; then
+if test $ol_cv_bdb_major = 6 ; then
+	OL_BERKELEY_DB_TRY(ol_cv_db_db_6_dot_m,[-ldb-6.$ol_cv_bdb_minor])
+	OL_BERKELEY_DB_TRY(ol_cv_db_db6m,[-ldb6$ol_cv_bdb_minor])
+	OL_BERKELEY_DB_TRY(ol_cv_db_db_6m,[-ldb-6$ol_cv_bdb_minor])
+	OL_BERKELEY_DB_TRY(ol_cv_db_db_6_m,[-ldb-6-$ol_cv_bdb_minor])
+	OL_BERKELEY_DB_TRY(ol_cv_db_db_6,[-ldb-6])
+	OL_BERKELEY_DB_TRY(ol_cv_db_db6,[-ldb6])
+elif test $ol_cv_bdb_major = 5 ; then
 	OL_BERKELEY_DB_TRY(ol_cv_db_db_5_dot_m,[-ldb-5.$ol_cv_bdb_minor])
 	OL_BERKELEY_DB_TRY(ol_cv_db_db5m,[-ldb5$ol_cv_bdb_minor])
 	OL_BERKELEY_DB_TRY(ol_cv_db_db_5m,[-ldb-5$ol_cv_bdb_minor])




--- configure.orig	2017-06-01 20:01:07 UTC
+++ configure
@@ -21656,7 +21656,7 @@ if test "${ac_cv_lib_iodbc_SQLDriverConn
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS

 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -21704,7 +21704,7 @@ if test "${ac_cv_lib_odbc_SQLDriverConne
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS

 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -21994,7 +21994,7 @@ else
 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 

Lines 1-4 Link Here

(-)files/patch-contrib_slapd-modules_passwd_sha2_sha2.h (-2 / +2 lines)
1	--- contrib/slapd-modules/passwd/sha2/sha2.h.orig 2014-09-19 01:48:49 UTC	1	--- contrib/slapd-modules/passwd/sha2/sha2.h.orig 2017-06-01 20:01:07 UTC
2	+++ contrib/slapd-modules/passwd/sha2/sha2.h	2	+++ contrib/slapd-modules/passwd/sha2/sha2.h
3	@@ -142,6 +142,21 @@ typedef struct _SHA512_CTX {	3	@@ -142,6 +142,21 @@ typedef struct _SHA512_CTX {
4		4
Lines 21-24 Link Here
21	+#define SHA512_Data _sha2_SHA512_Data	21	+#define SHA512_Data _sha2_SHA512_Data
22		22
23	/* SHA-256/384/512 Function Prototypes ****************************/	23	/* SHA-256/384/512 Function Prototypes ****************************/
24	#ifndef NOPROTO	24	/* avoid symbol clash with other crypto libs */

Line 0 Link Here

(-)files/patch-contrib_slapd-modules_smbk5pwd_Makefile (+11 lines)
	1	--- contrib/slapd-modules/smbk5pwd/Makefile.orig 2017-06-01 20:01:07 UTC
	2	+++ contrib/slapd-modules/smbk5pwd/Makefile
	3	@@ -30,7 +30,7 @@ OPT = -g -O2 -Wall
	4	# Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it.
	5	DEFS = -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW
	6	INCS = $(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
	7	-LIBS = $(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
	8	+LIBS = $(LDAP_LIB) $(SSL_LIB)
	9
	10	PROGRAMS = smbk5pwd.la
	11	LTVER = 0:0:0

Lines 1-5 Link Here

(-)files/patch-include__ldap_defaults.h (-2 / +2 lines)
1	--- include/ldap_defaults.h.orig Tue Sep 28 20:18:40 2004	1	--- include/ldap_defaults.h.orig 2017-06-01 20:01:07 UTC
2	+++ include/ldap_defaults.h Tue Sep 28 20:20:01 2004	2	+++ include/ldap_defaults.h
3	@@ -39,7 +39,7 @@	3	@@ -39,7 +39,7 @@
4	#define LDAP_ENV_PREFIX "LDAP"	4	#define LDAP_ENV_PREFIX "LDAP"
5		5

Lines 1-6 Link Here

(-)files/patch-libraries__libldap__Makefile.in (-3 / +3 lines)
1	--- ./libraries/libldap/Makefile.in.orig 2014-08-27 09:41:52.000000000 +0200	1	--- libraries/libldap/Makefile.in.orig 2017-06-01 20:01:07 UTC
2	+++ ./libraries/libldap/Makefile.in 2014-08-27 09:43:35.000000000 +0200	2	+++ libraries/libldap/Makefile.in
3	@@ -72,13 +72,6 @@	3	@@ -72,13 +72,6 @@ install-local: $(CFFILES) FORCE
4	$(LTFINISH) $(DESTDIR)$(libdir)	4	$(LTFINISH) $(DESTDIR)$(libdir)
5	-$(MKDIR) $(DESTDIR)$(sysconfdir)	5	-$(MKDIR) $(DESTDIR)$(sysconfdir)
6	@for i in $(CFFILES); do \	6	@for i in $(CFFILES); do \




--- libraries/libldap/tls_o.c.orig	2017-06-01 20:01:07 UTC
+++ libraries/libldap/tls_o.c
@@ -47,7 +47,7 @@
 #include <ssl.h>
 #endif
 
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
 #define ASN1_STRING_data(x)	ASN1_STRING_get0_data(x)
 #endif
 
@@ -157,7 +157,7 @@ tlso_init( void )
 	(void) tlso_seed_PRNG( lo->ldo_tls_randfile );
 #endif
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
 	SSL_load_error_strings();
 	SSL_library_init();
 	OpenSSL_add_all_digests();
@@ -205,7 +205,7 @@ static void
 tlso_ctx_ref( tls_ctx *ctx )
 {
 	tlso_ctx *c = (tlso_ctx *)ctx;
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
 #define	SSL_CTX_up_ref(ctx)	CRYPTO_add( &(ctx->references), 1, CRYPTO_LOCK_SSL_CTX )
 #endif
 	SSL_CTX_up_ref( c );
@@ -464,7 +464,7 @@ tlso_session_my_dn( tls_session *sess, s
 	if (!x) return LDAP_INVALID_CREDENTIALS;
 	
 	xn = X509_get_subject_name(x);
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
 	der_dn->bv_len = i2d_X509_NAME( xn, NULL );
 	der_dn->bv_val = xn->bytes->data;
 #else
@@ -500,7 +500,7 @@ tlso_session_peer_dn( tls_session *sess,
 		return LDAP_INVALID_CREDENTIALS;
 
 	xn = X509_get_subject_name(x);
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
 	der_dn->bv_len = i2d_X509_NAME( xn, NULL );
 	der_dn->bv_val = xn->bytes->data;
 #else
@@ -721,7 +721,7 @@ struct tls_data {
 	Sockbuf_IO_Desc		*sbiod;
 };
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
 #define BIO_set_init(b, x)	b->init = x
 #define BIO_set_data(b, x)	b->ptr = x
 #define BIO_clear_flags(b, x)	b->flags &= ~(x)
@@ -822,7 +822,7 @@ tlso_bio_puts( BIO *b, const char *str )
 	return tlso_bio_write( b, str, strlen( str ) );
 }
 
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
 struct bio_method_st {
     int type;
     const char *name;




--- libraries/libldap/tls_o.c.orig	2017-06-04 16:31:28 UTC
+++ libraries/libldap/tls_o.c
@@ -47,7 +47,7 @@
 #include <ssl.h>
 #endif
 
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
 #define ASN1_STRING_data(x)	ASN1_STRING_get0_data(x)
 #endif
 
@@ -157,7 +157,7 @@ tlso_init( void )
 	(void) tlso_seed_PRNG( lo->ldo_tls_randfile );
 #endif
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
 	SSL_load_error_strings();
 	SSL_library_init();
 	OpenSSL_add_all_digests();
@@ -205,7 +205,7 @@ static void
 tlso_ctx_ref( tls_ctx *ctx )
 {
 	tlso_ctx *c = (tlso_ctx *)ctx;
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
 #define	SSL_CTX_up_ref(ctx)	CRYPTO_add( &(ctx->references), 1, CRYPTO_LOCK_SSL_CTX )
 #endif
 	SSL_CTX_up_ref( c );
@@ -464,7 +464,7 @@ tlso_session_my_dn( tls_session *sess, struct berval *
 	if (!x) return LDAP_INVALID_CREDENTIALS;
 	
 	xn = X509_get_subject_name(x);
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
 	der_dn->bv_len = i2d_X509_NAME( xn, NULL );
 	der_dn->bv_val = xn->bytes->data;
 #else
@@ -500,7 +500,7 @@ tlso_session_peer_dn( tls_session *sess, struct berval
 		return LDAP_INVALID_CREDENTIALS;
 
 	xn = X509_get_subject_name(x);
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
 	der_dn->bv_len = i2d_X509_NAME( xn, NULL );
 	der_dn->bv_val = xn->bytes->data;
 #else
@@ -721,7 +721,7 @@ struct tls_data {
 	Sockbuf_IO_Desc		*sbiod;
 };
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
 #define BIO_set_init(b, x)	b->init = x
 #define BIO_set_data(b, x)	b->ptr = x
 #define BIO_clear_flags(b, x)	b->flags &= ~(x)
@@ -822,7 +822,7 @@ tlso_bio_puts( BIO *b, const char *str )
 	return tlso_bio_write( b, str, strlen( str ) );
 }
 
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
 struct bio_method_st {
     int type;
     const char *name;

Lines 1-6 Link Here

(-)files/patch-servers__slapd__Makefile.in (-3 / +3 lines)
1	--- servers/slapd/Makefile.in.orig 2014-01-25 13:36:15 UTC	1	--- servers/slapd/Makefile.in.orig 2017-06-01 20:01:07 UTC
2	+++ servers/slapd/Makefile.in	2	+++ servers/slapd/Makefile.in
3	@@ -377,7 +377,6 @@	3	@@ -377,7 +377,6 @@ install-local-srv: install-slapd install
4		4
5	install-slapd: FORCE	5	install-slapd: FORCE
6	-$(MKDIR) $(DESTDIR)$(libexecdir)	6	-$(MKDIR) $(DESTDIR)$(libexecdir)
Lines 8-14 Link Here
8	$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \	8	$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
9	slapd$(EXEEXT) $(DESTDIR)$(libexecdir)	9	slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
10	@for i in $(SUBDIRS); do \	10	@for i in $(SUBDIRS); do \
11	@@ -412,43 +411,28 @@	11	@@ -412,43 +411,28 @@ all-cffiles: slapd $(SLAPD_DYNAMIC_BACKE
12	touch all-cffiles	12	touch all-cffiles
13		13
14	install-schema: FORCE	14	install-schema: FORCE

Lines 1-11 Link Here

(-)files/patch-smbk5pwd-Makefile (-11 lines)
1	--- contrib/slapd-modules/smbk5pwd/Makefile.orig 2013-03-03 13:17:30.000000000 -0800
2	+++ contrib/slapd-modules/smbk5pwd/Makefile 2013-03-14 10:54:56.917578861 -0700
3	@@ -30,7 +30,7 @@
4	# Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it.
5	DEFS = -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW
6	INCS = $(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
7	-LIBS = $(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
8	+LIBS = $(LDAP_LIB) $(SSL_LIB)
9
10	PROGRAMS = smbk5pwd.la
11	LTVER = 0:0:0

Lines 1-4 Link Here

(-)pkg-plist (-2 / +1 lines)
1	@unexec %%RC_DIR%%/etc/rc.d/slapd stop 2>&1 >/dev/null \|\| true	1	@preunexec %%RC_DIR%%/etc/rc.d/slapd stop 2>&1 >/dev/null \|\| true
2	%%ETCDIR%%/schema/README	2	%%ETCDIR%%/schema/README
3	%%ETCDIR%%/schema/collective.ldif	3	%%ETCDIR%%/schema/collective.ldif
4	@sample %%ETCDIR%%/schema/collective.schema.sample	4	@sample %%ETCDIR%%/schema/collective.schema.sample
Lines 34-40 Link Here
34	%%SLAPI%%lib/libslapi.a	34	%%SLAPI%%lib/libslapi.a
35	%%SLAPI%%lib/libslapi.la	35	%%SLAPI%%lib/libslapi.la
36	%%SLAPI%%lib/libslapi.so	36	%%SLAPI%%lib/libslapi.so
37	%%MODULES%%@exec mkdir -p %D/libexec/openldap
38	%%BACK_BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%	37	%%BACK_BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
39	%%BACK_BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%	38	%%BACK_BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
40	%%BACK_BDB%%libexec/openldap/back_bdb.la	39	%%BACK_BDB%%libexec/openldap/back_bdb.la

Return to bug 222405

Lines 8-39 Link Here

(-)Makefile (-22 / +34 lines)
8	MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \	8	MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
9	ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \	9	ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \
10	ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \	10	ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
11	ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/%SUBDIR%/ \
12	ftp://ftp.u-aizu.ac.jp/pub/net/openldap/%SUBDIR%/ \	11	ftp://ftp.u-aizu.ac.jp/pub/net/openldap/%SUBDIR%/ \
13	ftp://ftp.nl.uu.net/pub/unix/db/openldap/%SUBDIR%/ \	12	ftp://ftp.nl.uu.net/pub/unix/db/openldap/%SUBDIR%/ \
14	ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \	13	ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \
15	http://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/	14	http://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/
16	MASTER_SITE_SUBDIR= openldap-release	15	MASTER_SITE_SUBDIR= openldap-release
17
18	.if defined(CLIENT_ONLY)	16	.if defined(CLIENT_ONLY)
19	.if ${CLIENT_ONLY} == sasl	17	.if ${CLIENT_ONLY} == sasl
20	PKGNAMESUFFIX= -sasl-client	18	PKGNAMESUFFIX= -sasl-client
21	COMMENT= Open source LDAP client implementation with SASL2 support
22	CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \
23	${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[0-3].*
24	.else	19	.else
25	PKGNAMESUFFIX= -client	20	PKGNAMESUFFIX= -client
26	COMMENT= Open source LDAP client implementation
27	CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-3].* \
28	${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
29	.endif	21	.endif
30	.else	22	.else
31	PKGNAMESUFFIX?= -server	23	PKGNAMESUFFIX?= -server
32	.endif	24	.endif
33	EXTRACT_SUFX= .tgz
34		25
35	MAINTAINER= delphij@FreeBSD.org	26	MAINTAINER= delphij@FreeBSD.org
36	COMMENT?= Open source LDAP server implementation	27	.if defined(CLIENT_ONLY)
		28	.if ${CLIENT_ONLY} == sasl
		29	COMMENT= Open source LDAP client implementation with SASL2 support
		30	.else
		31	COMMENT= Open source LDAP client implementation
		32	.endif
		33	.else
		34	COMMENT= Open source LDAP server implementation
		35	.endif
37		36
38	LICENSE= OPENLDAP	37	LICENSE= OPENLDAP
39	LICENSE_NAME= OpenLDAP Public License	38	LICENSE_NAME= OpenLDAP Public License
Lines 40-48 Link Here
40	LICENSE_FILE= ${WRKSRC}/LICENSE	39	LICENSE_FILE= ${WRKSRC}/LICENSE
41	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	40	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
42		41
		42	.if defined(CLIENT_ONLY)
		43	.if ${CLIENT_ONLY} == sasl
		44	CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \
		45	${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[0-3].*
		46	.else
		47	CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-3].* \
		48	${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
		49	.endif
		50	.endif
		51
43	GNU_CONFIGURE= yes	52	GNU_CONFIGURE= yes
44	# :keepla because port uses lt_dlopen	53	# :keepla because port uses lt_dlopen
45	USES= cpe libtool:keepla ssl	54	USES= cpe libtool:keepla ssl tar:tgz
46	.if !defined(CLIENT_ONLY)	55	.if !defined(CLIENT_ONLY)
47	USERS= ldap	56	USERS= ldap
48	GROUPS= ldap	57	GROUPS= ldap
Lines 217-223 Link Here
217		226
218	EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in	227	EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in
219		228
220	.if ${PORT_OPTIONS:MMODULES} \|\| ${PORT_OPTIONS:MDYNAMIC_BACKENDS} \|\| ${PORT_OPTIONS:MSLAPI}	229	.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} \|\| ${PORT_OPTIONS:MSLAPI}
221	LIB_DEPENDS+= libltdl.so:devel/libltdl	230	LIB_DEPENDS+= libltdl.so:devel/libltdl
222	CONFIGURE_ARGS+= --enable-modules	231	CONFIGURE_ARGS+= --enable-modules
223	PLIST_SUB+= MODULES=""	232	PLIST_SUB+= MODULES=""
Lines 556-596 Link Here
556		565
557	pre-install:	566	pre-install:
558	.if !defined(CLIENT_ONLY)	567	.if !defined(CLIENT_ONLY)
559	@${MKDIR} ${STAGEDIR}${DATABASEDIR}	568	${MKDIR} ${STAGEDIR}${DATABASEDIR}
560	.endif	569	.endif
561		570
562	post-install:	571	post-install:
563	.if defined(CLIENT_ONLY)	572	.if defined(CLIENT_ONLY)
564	@${MKDIR} ${STAGEDIR}${DOCSDIR}	573	${MKDIR} ${STAGEDIR}${DOCSDIR}
565	@${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}	574	${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}
566	@for dir in drafts rfc; do \	575	for dir in drafts rfc; do \
567	${MKDIR} ${STAGEDIR}${DOCSDIR}/$${dir}; \	576	${MKDIR} ${STAGEDIR}${DOCSDIR}/$${dir}; \
568	${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${STAGEDIR}${DOCSDIR}/$${dir}; \	577	${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${STAGEDIR}${DOCSDIR}/$${dir}; \
569	done	578	done
570	@for prog in ldapcompare ldapdelete ldapexop ldapmodify ldapmodrdn ldappasswd ldapsearch ldapurl ldapwhoami; do\	579	for prog in ldapcompare ldapdelete ldapexop ldapmodify ldapmodrdn ldappasswd ldapsearch ldapurl ldapwhoami; do\
571	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$${prog}; \	580	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$${prog}; \
572	done	581	done
573		582
574	@for library in lber ldap ldap_r; do \	583	for library in lber ldap ldap_r; do \
575	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib$${library}-${OPENLDAP_MAJOR}.so.${OPENLDAP_SHLIB_MAJOR}; \	584	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib$${library}-${OPENLDAP_MAJOR}.so.${OPENLDAP_SHLIB_MAJOR}; \
576	done	585	done
577	.else	586	.else
578	@${MKDIR} ${STAGEDIR}${LDAP_RUN_DIR}	587	${MKDIR} ${STAGEDIR}${LDAP_RUN_DIR}
579	.if ${PORT_OPTIONS:MSMBPWD}	588	.if ${PORT_OPTIONS:MSMBPWD}
580	@(cd ${WRKSRC}/contrib/slapd-modules/smbk5pwd && \	589	(cd ${WRKSRC}/contrib/slapd-modules/smbk5pwd && \
581	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \	590	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
582	${MAKE_ARGS} prefix="${PREFIX}" install)	591	${MAKE_ARGS} prefix="${PREFIX}" install)
583	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/smbk5pwd.a	592	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/smbk5pwd.a
584	.endif	593	.endif
585	.if ${PORT_OPTIONS:MSHA2}	594	.if ${PORT_OPTIONS:MSHA2}
586	@(cd ${WRKSRC}/contrib/slapd-modules/passwd/sha2 && \	595	(cd ${WRKSRC}/contrib/slapd-modules/passwd/sha2 && \
587	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \	596	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
588	${MAKE_ARGS} prefix="${PREFIX}" install)	597	${MAKE_ARGS} prefix="${PREFIX}" install)
589	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/pw-sha2.a	598	${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/pw-sha2.a
590	.endif	599	.endif
591	.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} \|\| ${PORT_OPTIONS:MSMBPWD} \|\| ${PORT_OPTIONS:MSHA2}	600	.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} \|\| ${PORT_OPTIONS:MSMBPWD} \|\| ${PORT_OPTIONS:MSHA2}
592	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/openldap/*.so	601	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/openldap/*.so
593	.endif	602	.endif
594	.endif # defined(CLIENT_ONLY)	603	.endif # defined(CLIENT_ONLY)
		604	.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} \|\| ${PORT_OPTIONS:MSLAPI}
		605	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/openldap
		606	.endif
595		607
596	.include <bsd.port.post.mk>	608	.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)files/patch-ITS7548 (-12 / +12 lines)
1	--- build/man.mk.orig 2013-03-13 19:51:52.000000000 +0200	1	--- build/man.mk.orig 2017-06-01 20:01:07 UTC
2	+++ build/man.mk 2013-03-13 19:52:53.000000000 +0200	2	+++ build/man.mk
3	@@ -20,8 +20,7 @@	3	@@ -20,8 +20,7 @@ MANDIR=$(mandir)/man$(MANSECT)
4	TMP_SUFFIX=tmp	4	TMP_SUFFIX=tmp
5		5
6	all-common:	6	all-common:
Lines 10-16 Link Here
10	$(SED) -e "s%LDVERSION%$(VERSION)%" \	10	$(SED) -e "s%LDVERSION%$(VERSION)%" \
11	-e 's%ETCDIR%$(sysconfdir)%g' \	11	-e 's%ETCDIR%$(sysconfdir)%g' \
12	-e 's%LOCALSTATEDIR%$(localstatedir)%' \	12	-e 's%LOCALSTATEDIR%$(localstatedir)%' \
13	@@ -39,8 +38,7 @@	13	@@ -39,8 +38,7 @@ all-common:
14		14
15	install-common:	15	install-common:
16	-$(MKDIR) $(DESTDIR)$(MANDIR)	16	-$(MKDIR) $(DESTDIR)$(MANDIR)
Lines 20-27 Link Here
20	echo "installing $$page in $(DESTDIR)$(MANDIR)"; \	20	echo "installing $$page in $(DESTDIR)$(MANDIR)"; \
21	$(RM) $(DESTDIR)$(MANDIR)/$$page; \	21	$(RM) $(DESTDIR)$(MANDIR)/$$page; \
22	$(INSTALL) $(INSTALLFLAGS) -m 644 $$page.$(TMP_SUFFIX) $(DESTDIR)$(MANDIR)/$$page; \	22	$(INSTALL) $(INSTALLFLAGS) -m 644 $$page.$(TMP_SUFFIX) $(DESTDIR)$(MANDIR)/$$page; \
23	--- doc/man/man1/Makefile.in.orig 2013-03-03 23:17:30.000000000 +0200	23	--- doc/man/man1/Makefile.in.orig 2017-06-01 20:01:07 UTC
24	+++ doc/man/man1/Makefile.in 2013-03-13 20:30:47.000000000 +0200	24	+++ doc/man/man1/Makefile.in
25	@@ -14,3 +14,20 @@	25	@@ -14,3 +14,20 @@
26	## <http://www.OpenLDAP.org/license.html>.	26	## <http://www.OpenLDAP.org/license.html>.
27		27
Lines 43-50 Link Here
43	+PAGES=	43	+PAGES=
44	+.endif	44	+.endif
45	+	45	+
46	--- doc/man/man3/Makefile.in.orig 2013-03-03 23:17:30.000000000 +0200	46	--- doc/man/man3/Makefile.in.orig 2017-06-01 20:01:07 UTC
47	+++ doc/man/man3/Makefile.in 2013-03-13 20:31:03.000000000 +0200	47	+++ doc/man/man3/Makefile.in
48	@@ -14,3 +14,49 @@	48	@@ -14,3 +14,49 @@
49	## <http://www.OpenLDAP.org/license.html>.	49	## <http://www.OpenLDAP.org/license.html>.
50		50
Lines 95-102 Link Here
95	+PAGES=	95	+PAGES=
96	+.endif	96	+.endif
97	+	97	+
98	--- doc/man/man5/Makefile.in.orig 2013-03-03 23:17:30.000000000 +0200	98	--- doc/man/man5/Makefile.in.orig 2017-06-01 20:01:07 UTC
99	+++ doc/man/man5/Makefile.in 2013-03-13 20:31:37.000000000 +0200	99	+++ doc/man/man5/Makefile.in
100	@@ -14,3 +14,54 @@	100	@@ -14,3 +14,54 @@
101	## <http://www.OpenLDAP.org/license.html>.	101	## <http://www.OpenLDAP.org/license.html>.
102		102
Lines 152-159 Link Here
152	+ slapo-valsort.${MANSECT}	152	+ slapo-valsort.${MANSECT}
153	+.endif	153	+.endif
154	+	154	+
155	--- doc/man/man8/Makefile.in.orig 2013-03-03 23:17:30.000000000 +0200	155	--- doc/man/man8/Makefile.in.orig 2017-06-01 20:01:07 UTC
156	+++ doc/man/man8/Makefile.in 2013-03-13 20:32:07.000000000 +0200	156	+++ doc/man/man8/Makefile.in
157	@@ -14,3 +14,21 @@	157	@@ -14,3 +14,21 @@
158	## <http://www.OpenLDAP.org/license.html>.	158	## <http://www.OpenLDAP.org/license.html>.
159		159

Lines 1-18 Link Here

(-)files/patch-bdb6 (-18 lines)
1	--- build/openldap.m4.orig 2013-11-15 12:31:27.000000000 +0900
2	+++ build/openldap.m4 2014-01-10 15:21:33.000000000 +0900
3	@@ -357,7 +357,14 @@
4	AC_DEFUN([OL_BERKELEY_DB_LINK],
5	[ol_cv_lib_db=no
6
7	-if test $ol_cv_bdb_major = 5 ; then
8	+if test $ol_cv_bdb_major = 6 ; then
9	+ OL_BERKELEY_DB_TRY(ol_cv_db_db_6_dot_m,[-ldb-6.$ol_cv_bdb_minor])
10	+ OL_BERKELEY_DB_TRY(ol_cv_db_db6m,[-ldb6$ol_cv_bdb_minor])
11	+ OL_BERKELEY_DB_TRY(ol_cv_db_db_6m,[-ldb-6$ol_cv_bdb_minor])
12	+ OL_BERKELEY_DB_TRY(ol_cv_db_db_6_m,[-ldb-6-$ol_cv_bdb_minor])
13	+ OL_BERKELEY_DB_TRY(ol_cv_db_db_6,[-ldb-6])
14	+ OL_BERKELEY_DB_TRY(ol_cv_db_db6,[-ldb6])
15	+elif test $ol_cv_bdb_major = 5 ; then
16	OL_BERKELEY_DB_TRY(ol_cv_db_db_5_dot_m,[-ldb-5.$ol_cv_bdb_minor])
17	OL_BERKELEY_DB_TRY(ol_cv_db_db5m,[-ldb5$ol_cv_bdb_minor])
18	OL_BERKELEY_DB_TRY(ol_cv_db_db_5m,[-ldb-5$ol_cv_bdb_minor])

Line 0 Link Here

(-)files/patch-build_openldap.m4 (+18 lines)
	1	--- build/openldap.m4.orig 2017-06-01 20:01:07 UTC
	2	+++ build/openldap.m4
	3	@@ -357,7 +357,14 @@ dnl Try to locate appropriate library
	4	AC_DEFUN([OL_BERKELEY_DB_LINK],
	5	[ol_cv_lib_db=no
	6
	7	-if test $ol_cv_bdb_major = 5 ; then
	8	+if test $ol_cv_bdb_major = 6 ; then
	9	+ OL_BERKELEY_DB_TRY(ol_cv_db_db_6_dot_m,[-ldb-6.$ol_cv_bdb_minor])
	10	+ OL_BERKELEY_DB_TRY(ol_cv_db_db6m,[-ldb6$ol_cv_bdb_minor])
	11	+ OL_BERKELEY_DB_TRY(ol_cv_db_db_6m,[-ldb-6$ol_cv_bdb_minor])
	12	+ OL_BERKELEY_DB_TRY(ol_cv_db_db_6_m,[-ldb-6-$ol_cv_bdb_minor])
	13	+ OL_BERKELEY_DB_TRY(ol_cv_db_db_6,[-ldb-6])
	14	+ OL_BERKELEY_DB_TRY(ol_cv_db_db6,[-ldb6])
	15	+elif test $ol_cv_bdb_major = 5 ; then
	16	OL_BERKELEY_DB_TRY(ol_cv_db_db_5_dot_m,[-ldb-5.$ol_cv_bdb_minor])
	17	OL_BERKELEY_DB_TRY(ol_cv_db_db5m,[-ldb5$ol_cv_bdb_minor])
	18	OL_BERKELEY_DB_TRY(ol_cv_db_db_5m,[-ldb-5$ol_cv_bdb_minor])

Lines 1-6 Link Here

(-)files/patch-configure (-5 / +5 lines)
1	--- configure.orig 2011-06-30 08:13:36.000000000 -0700	1	--- configure.orig 2017-06-01 20:01:07 UTC
2	+++ configure 2011-07-01 16:50:58.734235092 -0700	2	+++ configure
3	@@ -21600,7 +21600,7 @@	3	@@ -21656,7 +21656,7 @@ if test "${ac_cv_lib_iodbc_SQLDriverConn
4	$as_echo_n "(cached) " >&6	4	$as_echo_n "(cached) " >&6
5	else	5	else
6	ac_check_lib_save_LIBS=$LIBS	6	ac_check_lib_save_LIBS=$LIBS
Lines 9-15 Link Here
9	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	9	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10	/* end confdefs.h. */	10	/* end confdefs.h. */
11		11
12	@@ -21648,7 +21648,7 @@	12	@@ -21704,7 +21704,7 @@ if test "${ac_cv_lib_odbc_SQLDriverConne
13	$as_echo_n "(cached) " >&6	13	$as_echo_n "(cached) " >&6
14	else	14	else
15	ac_check_lib_save_LIBS=$LIBS	15	ac_check_lib_save_LIBS=$LIBS
Lines 18-24 Link Here
18	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	18	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19	/* end confdefs.h. */	19	/* end confdefs.h. */
20		20
21	@@ -21938,7 +21938,7 @@	21	@@ -21994,7 +21994,7 @@ else
22	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	22	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23	/* end confdefs.h. */	23	/* end confdefs.h. */
24		24

Line 0 Link Here

(-)files/patch-libraries_libldap_tls__o.c (+65 lines)
		1	--- libraries/libldap/tls_o.c.orig 2017-06-01 20:01:07 UTC
		2	+++ libraries/libldap/tls_o.c
		3	@@ -47,7 +47,7 @@
		4	#include <ssl.h>
		5	#endif
		6
		7	-#if OPENSSL_VERSION_NUMBER >= 0x10100000
		8	+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
		9	#define ASN1_STRING_data(x) ASN1_STRING_get0_data(x)
		10	#endif
		11
		12	@@ -157,7 +157,7 @@ tlso_init( void )
		13	(void) tlso_seed_PRNG( lo->ldo_tls_randfile );
		14	#endif
		15
		16	-#if OPENSSL_VERSION_NUMBER < 0x10100000
		17	+#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER)
		18	SSL_load_error_strings();
		19	SSL_library_init();
		20	OpenSSL_add_all_digests();
		21	@@ -205,7 +205,7 @@ static void
		22	tlso_ctx_ref( tls_ctx *ctx )
		23	{
		24	tlso_ctx c = (tlso_ctx )ctx;
		25	-#if OPENSSL_VERSION_NUMBER < 0x10100000
		26	+#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER)
		27	#define SSL_CTX_up_ref(ctx) CRYPTO_add( &(ctx->references), 1, CRYPTO_LOCK_SSL_CTX )
		28	#endif
		29	SSL_CTX_up_ref( c );
		30	@@ -464,7 +464,7 @@ tlso_session_my_dn( tls_session *sess, s
		31	if (!x) return LDAP_INVALID_CREDENTIALS;
		32
		33	xn = X509_get_subject_name(x);
		34	-#if OPENSSL_VERSION_NUMBER < 0x10100000
		35	+#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER)
		36	der_dn->bv_len = i2d_X509_NAME( xn, NULL );
		37	der_dn->bv_val = xn->bytes->data;
		38	#else
		39	@@ -500,7 +500,7 @@ tlso_session_peer_dn( tls_session *sess,
		40	return LDAP_INVALID_CREDENTIALS;
		41
		42	xn = X509_get_subject_name(x);
		43	-#if OPENSSL_VERSION_NUMBER < 0x10100000
		44	+#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER)
		45	der_dn->bv_len = i2d_X509_NAME( xn, NULL );
		46	der_dn->bv_val = xn->bytes->data;
		47	#else
		48	@@ -721,7 +721,7 @@ struct tls_data {
		49	Sockbuf_IO_Desc *sbiod;
		50	};
		51
		52	-#if OPENSSL_VERSION_NUMBER < 0x10100000
		53	+#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER)
		54	#define BIO_set_init(b, x) b->init = x
		55	#define BIO_set_data(b, x) b->ptr = x
		56	#define BIO_clear_flags(b, x) b->flags &= ~(x)
		57	@@ -822,7 +822,7 @@ tlso_bio_puts( BIO b, const char str )
		58	return tlso_bio_write( b, str, strlen( str ) );
		59	}
		60
		61	-#if OPENSSL_VERSION_NUMBER >= 0x10100000
		62	+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
		63	struct bio_method_st {
		64	int type;
65	const char *name;

Lines 1-65 Link Here

(-)files/patch-libressl (-65 lines)
1	--- libraries/libldap/tls_o.c.orig 2017-06-04 16:31:28 UTC
2	+++ libraries/libldap/tls_o.c
3	@@ -47,7 +47,7 @@
4	#include <ssl.h>
5	#endif
6
7	-#if OPENSSL_VERSION_NUMBER >= 0x10100000
8	+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
9	#define ASN1_STRING_data(x) ASN1_STRING_get0_data(x)
10	#endif
11
12	@@ -157,7 +157,7 @@ tlso_init( void )
13	(void) tlso_seed_PRNG( lo->ldo_tls_randfile );
14	#endif
15
16	-#if OPENSSL_VERSION_NUMBER < 0x10100000
17	+#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER)
18	SSL_load_error_strings();
19	SSL_library_init();
20	OpenSSL_add_all_digests();
21	@@ -205,7 +205,7 @@ static void
22	tlso_ctx_ref( tls_ctx *ctx )
23	{
24	tlso_ctx c = (tlso_ctx )ctx;
25	-#if OPENSSL_VERSION_NUMBER < 0x10100000
26	+#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER)
27	#define SSL_CTX_up_ref(ctx) CRYPTO_add( &(ctx->references), 1, CRYPTO_LOCK_SSL_CTX )
28	#endif
29	SSL_CTX_up_ref( c );
30	@@ -464,7 +464,7 @@ tlso_session_my_dn( tls_session sess, struct berval
31	if (!x) return LDAP_INVALID_CREDENTIALS;
32
33	xn = X509_get_subject_name(x);
34	-#if OPENSSL_VERSION_NUMBER < 0x10100000
35	+#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER)
36	der_dn->bv_len = i2d_X509_NAME( xn, NULL );
37	der_dn->bv_val = xn->bytes->data;
38	#else
39	@@ -500,7 +500,7 @@ tlso_session_peer_dn( tls_session *sess, struct berval
40	return LDAP_INVALID_CREDENTIALS;
41
42	xn = X509_get_subject_name(x);
43	-#if OPENSSL_VERSION_NUMBER < 0x10100000
44	+#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER)
45	der_dn->bv_len = i2d_X509_NAME( xn, NULL );
46	der_dn->bv_val = xn->bytes->data;
47	#else
48	@@ -721,7 +721,7 @@ struct tls_data {
49	Sockbuf_IO_Desc *sbiod;
50	};
51
52	-#if OPENSSL_VERSION_NUMBER < 0x10100000
53	+#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER)
54	#define BIO_set_init(b, x) b->init = x
55	#define BIO_set_data(b, x) b->ptr = x
56	#define BIO_clear_flags(b, x) b->flags &= ~(x)
57	@@ -822,7 +822,7 @@ tlso_bio_puts( BIO b, const char str )
58	return tlso_bio_write( b, str, strlen( str ) );
59	}
60
61	-#if OPENSSL_VERSION_NUMBER >= 0x10100000
62	+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
63	struct bio_method_st {
64	int type;
65	const char *name;