ports/126367: [PATCH] net/openldap24-server add option for smbk5pwd overlay

[Alexander Kriventsov]

>Number:         126367
>Category:       ports
>Synopsis:       [PATCH] net/openldap24-server add option for smbk5pwd overlay
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 08 12:50:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Alexander Kriventsov
>Release:        FreeBSD 7.0-20080601-RELENG_7_0 amd64
>Organization:
.masterhost
>Environment:
System: FreeBSD ldap3.vega.ru 7.0-20080601-RELENG_7_0 FreeBSD 7.0-20080601-RELENG_7_0 #0: Sun Jun 1 22:41:16 UTC 2008 root at aleph.mgmt.vega.ru:/usr/obj/usr/src/sys/GENERICDEBUG amd64

>Description:
add option for smbk5pwd overlay
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -r -u -B -N openldap24-server/Makefile /root/openldap24-server/Makefile
--- openldap24-server/Makefile	2008-07-20 03:34:43.000000000 +0000
+++ /root/openldap24-server/Makefile	2008-08-08 12:03:45.139363000 +0000
@@ -39,7 +39,7 @@
 .endif
 
 PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	0
+PORTREVISION_SERVER=	1
 
 .if !defined(CLIENT_ONLY)
 OPTIONS=	SASL "With (Cyrus) SASL2 support" off \
@@ -74,6 +74,7 @@
 		TRANSLUCENT "With Translucent Proxy overlay" off \
 		UNIQUE "With attribute Uniqueness overlay" off \
 		VALSORT "With Value Sorting overlay" off \
+		SMBPWD "With Samba Password hashes overlay" off \
 		DYNAMIC_BACKENDS "Build dynamic backends" on
 .endif
 
@@ -388,6 +389,12 @@
 PLIST_SUB+=		BACK_SQL="@comment "
 .endif
 
+.if defined(WITH_SMBPWD)
+PLIST_SUB+=		SMBPWD=""
+.else
+PLIST_SUB+=		SMBPWD="@comment "
+.endif
+
 .if defined(WITH_RLOOKUPS)
 CONFIGURE_ARGS+=	--enable-rlookups
 PLIST_SUB+=		RLOOKUPS=""
@@ -461,6 +468,11 @@
 		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
 .endif
 
+.if defined(WITH_SMBPWD)
+post-build:
+	@cd ${BUILD_WRKSRC}/contrib/slapd-modules/smbk5pwd; ${MAKE} all
+.endif
+
 pre-su-install:
 	@if [ -f ${PKGINSTALL} ]; then \
 		${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL; \
@@ -490,6 +502,11 @@
 	done >>${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} %D/etc/openldap/schema 2>/dev/null || true" >>${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} %D/etc/openldap 2>/dev/null || true" >>${TMPPLIST}
+.if defined(WITH_SMBPWD)
+	@${INSTALL} -m 0755 ${WRKSRC}/contrib/slapd-modules/smbk5pwd/smbk5pwd.la ${PREFIX}/libexec/openldap/
+	@${INSTALL} -m 0755 ${WRKSRC}/contrib/slapd-modules/smbk5pwd/.libs/smbk5pwd.so.0 ${PREFIX}/libexec/openldap/
+	@${LN} -s smbk5pwd.so.0 ${PREFIX}/libexec/openldap/smbk5pwd.so
+.endif
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff -r -u -B -N openldap24-server/files/patch-smbk5pwd::Makefile /root/openldap24-server/files/patch-smbk5pwd::Makefile
--- openldap24-server/files/patch-smbk5pwd::Makefile	1970-01-01 00:00:00.000000000 +0000
+++ /root/openldap24-server/files/patch-smbk5pwd::Makefile	2008-08-08 10:32:14.239807000 +0000
@@ -0,0 +1,22 @@
+--- contrib/slapd-modules/smbk5pwd/Makefile.orig        2008-08-08 08:00:19.216573053 +0000
++++ contrib/slapd-modules/smbk5pwd/Makefile     2008-08-08 09:09:09.304097584 +0000
+@@ -14,16 +14,16 @@
+ CC=gcc
+
+ # Omit DO_KRB5 or DO_SAMBA if you don't want to support it.
+-DEFS=-DDO_KRB5 -DDO_SAMBA
++DEFS=-DDO_SAMBA
+
+ HEIMDAL_INC=-I/usr/heimdal/include
+ SSL_INC=
+ LDAP_INC=-I../../../include -I../../../servers/slapd
+ INCS=$(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
+
+-HEIMDAL_LIB=-L/usr/heimdal/lib -lkrb5 -lkadm5srv
++HEIMDAL_LIB=-L/usr/heimdal/lib -lkadm5srv
+ SSL_LIB=-lcrypto
+-LDAP_LIB=-lldap_r -llber
++LDAP_LIB=-L/usr/local/lib -lldap_r -llber
+ LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
+
+ all:   smbk5pwd.la
Files openldap24-server/openldap-server-2.4.11.tbz and /root/openldap24-server/openldap-server-2.4.11.tbz differ
Files openldap24-server/openldap-server-2.4.11_1.tbz and /root/openldap24-server/openldap-server-2.4.11_1.tbz differ
diff -r -u -B -N openldap24-server/pkg-plist /root/openldap24-server/pkg-plist
--- openldap24-server/pkg-plist	2008-07-20 03:34:43.000000000 +0000
+++ /root/openldap24-server/pkg-plist	2008-08-08 11:42:29.171976000 +0000
@@ -68,6 +68,9 @@
 %%BACK_SQL%%libexec/openldap/back_sql-2.4.so.3
 %%BACK_SQL%%libexec/openldap/back_sql.la
 %%BACK_SQL%%libexec/openldap/back_sql.so
+%%SMBPWD%%libexec/openldap/smbk5pwd.la
+%%SMBPWD%%libexec/openldap/smbk5pwd.so
+%%SMBPWD%%libexec/openldap/smbk5pwd.so.0
 libexec/slapd
 @dirrmtry libexec/openldap
 sbin/slapacl


>Release-Note:
>Audit-Trail:
>Unformatted: