Date: Tue, 31 Jul 2012 19:51:32 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r301812 - in head/net/openldap24-server: . files Message-ID: <201207311951.q6VJpWaM065546@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Tue Jul 31 19:51:32 2012 New Revision: 301812 URL: http://svn.freebsd.org/changeset/ports/301812 Log: Update to 2.4.32, while I'm there, convert to OptionsNG Modified: head/net/openldap24-server/Makefile head/net/openldap24-server/distinfo head/net/openldap24-server/files/patch-shlib-version Modified: head/net/openldap24-server/Makefile ============================================================================== --- head/net/openldap24-server/Makefile Tue Jul 31 19:07:32 2012 (r301811) +++ head/net/openldap24-server/Makefile Tue Jul 31 19:51:32 2012 (r301812) @@ -6,7 +6,7 @@ # PORTNAME= openldap -DISTVERSION= 2.4.31 +DISTVERSION= 2.4.32 PORTREVISION= ${OPENLDAP_PORTREVISION} CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ @@ -46,47 +46,58 @@ PORTREVISION_CLIENT= 1 PORTREVISION_SERVER= 0 OPENLDAP_SHLIB_MAJOR= 8 -OPTIONS= SASL "With (Cyrus) SASL2 support" off \ - FETCH "Enable fetch(3) support" off +OPTIONS_DEFINE= SASL FETCH + +SASL_DESC= With (Cyrus) SASL2 support +FETCH_DESC= Enable fetch(3) support .if !defined(CLIENT_ONLY) -OPTIONS+= DYNACL "Run-time loadable ACL (experimental)" off \ - ACI "Per-object ACI (experimental)" off \ - BDB "With BerkeleyDB backend" on \ - DNSSRV "With Dnssrv backend" off \ - MDB "With Memory-Mapped DB backend" off \ - PASSWD "With Passwd backend" off \ - PERL "With Perl backend" off \ - RELAY "With Relay backend" off \ - SHELL "With Shell backend (disables threading)" off \ - SOCK "With Sock backend" off \ - ODBC "With SQL backend" off \ - RLOOKUPS "With reverse lookups of client hostnames" off \ - SLP "With SLPv2 (RFC 2608) support" off \ - SLAPI "With Netscape SLAPI plugin API" off \ - TCP_WRAPPERS "With tcp wrapper support" on \ - ACCESSLOG "With In-Directory Access Logging overlay" off \ - AUDITLOG "With Audit Logging overlay" off \ - COLLECT "With Collect overy Services overlay" off \ - CONSTRAINT "With Attribute Constraint overlay" off \ - DDS "With Dynamic Directory Services overlay" off \ - DEREF "With Dereference overlay" off \ - DYNGROUP "With Dynamic Group overlay" off \ - DYNLIST "With Dynamic List overlay" off \ - MEMBEROF "With Reverse Group Membership overlay" off \ - PPOLICY "With Password Policy overlay" off \ - PROXYCACHE "With Proxy Cache overlay" off \ - REFINT "With Referential Integrity overlay" off \ - RETCODE "With Return Code testing overlay" off \ - RWM "With Rewrite/Remap overlay" off \ - SEQMOD "Sequential Modify overlay" on \ - SSSVLV "With ServerSideSort/VLV overlay" off \ - SYNCPROV "With Syncrepl Provider overlay" on \ - 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 +OPTIONS_DEFINE+= DYNACL ACI BDB DNSSRV MDB PASSWD PERL RELAY SHELL +OPTIONS_DEFINE+= SOCK ODBC RLOOKUPS SLP SLAPI TCP_WRAPPERS +OPTIONS_DEFINE+= ACCESSLOG AUDITLOG COLLECT CONSTRAINT DDS +OPTIONS_DEFINE+= DEREF DYNGROUP DYNLIST MEMBEROF PPOLICY PROXYCACHE +OPTIONS_DEFINE+= REFINT RETCODE RWM SEQMOD SSSVLV SYNCPROV TRANSLUCENT +OPTIONS_DEFINE+= UNIQUE VALSORT SMBPWD DYNAMIC_BACKENDS + +OPTIONS_DEFAULT= BDB TCP_WRAPPERS SEQMOD SYNCPROV + +DYNACL_DESC= Run-time loadable ACL (experimental) +ACI_DESC= Per-object ACI (experimental) +BDB_DESC= With BerkeleyDB backend +DNSSRV_DESC= With Dnssrv backend +MDB_DESC= With Memory-Mapped DB backend +PASSWD_DESC= With Passwd backend +PERL_DESC= With Perl backend +RELAY_DESC= With Relay backend +SHELL_DESC= With Shell backend (disables threading) +SOCK_DESC= With Sock backend +ODBC_DESC= With SQL backend +RLOOKUPS_DESC= With reverse lookups of client hostnames +SLP_DESC= With SLPv2 (RFC 2608) support +SLAPI_DESC= With Netscape SLAPI plugin API +TCP_WRAPPERS_DESC= With tcp wrapper support +ACCESSLOG_DESC= With In-Directory Access Logging overlay +AUDITLOG_DESC= With Audit Logging overlay +COLLECT_DESC= With Collect overy Services overlay +CONSTRAINT_DESC= With Attribute Constraint overlay +DDS_DESC= With Dynamic Directory Services overlay +DEREF_DESC= With Dereference overlay +DYNGROUP_DESC= With Dynamic Group overlay +DYNLIST_DESC= With Dynamic List overlay +MEMBEROF_DESC= With Reverse Group Membership overlay +PPOLICY_DESC= With Password Policy overlay +PROXYCACHE_DESC= With Proxy Cache overlay +REFINT_DESC= With Referential Integrity overlay +RETCODE_DESC= With Return Code testing overlay +RWM_DESC= With Rewrite/Remap overlay +SEQMOD_DESC= With Sequential Modify overlay +SSSVLV_DESC= With ServerSideSort/VLV overlay +SYNCPROV_DESC= With Syncrepl Provider overlay +TRANSLUCENT_DESC= With Translucent Proxy overlay +UNIQUE_DESC= With attribute Uniqueness overlay +VALSORT_DESC= With Value Sorting overlay +SMBPWD_DESC= With Samba Password hashes overlay +DYNAMIC_BACKENDS_DESC= Build dynamic backends .endif .if defined(CLIENT_ONLY) @@ -102,7 +113,7 @@ CONFIGURE_SED= -e 's,-kthread,${PTHREAD .include <bsd.port.pre.mk> .if defined(CLIENT_ONLY) -.if defined(WITH_SASL) +.if ${PORT_OPTIONS:MSASL} PKGNAMESUFFIX= -sasl-client COMMENT= Open source LDAP client implementation with SASL2 support CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \ @@ -123,7 +134,7 @@ BROKEN= You have `USE_OPENLDAP' variab USE_OPENLDAP= yes WANT_OPENLDAP_VER= 24 -.if defined(WITH_SASL) +.if ${PORT_OPTIONS:MSASL} WANT_OPENLDAP_SASL= yes CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* PKGNAMESUFFIX= -sasl-server @@ -156,11 +167,11 @@ CONFIGURE_ARGS= --with-threads=posix \ # XXX FreeBSD does not implement O_DSYNC and fdatasync at this time. CFLAGS+= -DMDB_DSYNC=O_SYNC -Dfdatasync=fsync -.if defined(WITHOUT_FETCH) +.if !${PORT_OPTIONS:MFETCH} CONFIGURE_ARGS+= --without-fetch .endif -.if defined(WITH_SASL) +.if ${PORT_OPTIONS:MSASL} LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= --with-cyrus-sasl .else @@ -189,7 +200,7 @@ USE_RC_SUBR= slapd.sh EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in -.if defined(WITH_MODULES) || !defined(WITHOUT_DYNAMIC_BACKENDS) || defined(WITH_SLAPI) +.if ${PORT_OPTIONS:MMODULES} || ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSLAPI} USE_AUTOTOOLS+= libltdl CONFIGURE_ARGS+= --enable-modules PLIST_SUB+= MODULES="" @@ -199,7 +210,7 @@ PLIST_SUB+= MODULES="@comment " SED_MODULES= -e 's/\(moduleload[ ]*back_[a-z]*\)\.la/\1/' -.if !defined(WITHOUT_DYNAMIC_BACKENDS) +.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} BACKEND_ENABLE= "mod" BACKEND_PLIST= "" SED_MODULES+= -e 's/\# *\(modulepath\)/\1/' \ @@ -209,6 +220,8 @@ BACKEND_ENABLE= "yes" BACKEND_PLIST= "@comment " .endif +OVERLAY_ENABLE= yes + CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \ --enable-crypt \ --enable-lmpasswd \ @@ -220,99 +233,99 @@ CONFIGURE_ARGS+= --localstatedir=${LOCAL PLIST_SUB+= BACKEND=${BACKEND_PLIST} -.if defined(WITH_ACCESSLOG) -CONFIGURE_ARGS+= --enable-accesslog +.if ${PORT_OPTIONS:MACCESSLOG} +CONFIGURE_ARGS+= --enable-accesslog=${OVERLAY_ENABLE} .endif -.if defined(WITH_AUDITLOG) -CONFIGURE_ARGS+= --enable-auditlog +.if ${PORT_OPTIONS:MAUDITLOG} +CONFIGURE_ARGS+= --enable-auditlog=${OVERLAY_ENABLE} .endif -.if defined(WITH_COLLECT) -CONFIGURE_ARGS+= --enable-collect +.if ${PORT_OPTIONS:MCOLLECT} +CONFIGURE_ARGS+= --enable-collect=${OVERLAY_ENABLE} .endif -.if defined(WITH_CONSTRAINT) -CONFIGURE_ARGS+= --enable-constraint +.if ${PORT_OPTIONS:MCONSTRAINT} +CONFIGURE_ARGS+= --enable-constraint=${OVERLAY_ENABLE} .endif -.if defined(WITH_DDS) -CONFIGURE_ARGS+= --enable-dds +.if ${PORT_OPTIONS:MDDS} +CONFIGURE_ARGS+= --enable-dds=${OVERLAY_ENABLE} .endif -.if defined(WITH_DEREF) -CONFIGURE_ARGS+= --enable-deref +.if ${PORT_OPTIONS:MDEREF} +CONFIGURE_ARGS+= --enable-deref=${OVERLAY_ENABLE} .endif -.if defined(WITH_DYNGROUP) -CONFIGURE_ARGS+= --enable-dyngroup +.if ${PORT_OPTIONS:MDYNGROUP} +CONFIGURE_ARGS+= --enable-dyngroup=${OVERLAY_ENABLE} .endif -.if defined(WITH_DYNLIST) -CONFIGURE_ARGS+= --enable-dynlist +.if ${PORT_OPTIONS:MDYNLIST} +CONFIGURE_ARGS+= --enable-dynlist=${OVERLAY_ENABLE} .endif -.if defined(WITH_MEMBEROF) -CONFIGURE_ARGS+= --enable-memberof +.if ${PORT_OPTIONS:MMEMBEROF} +CONFIGURE_ARGS+= --enable-memberof=${OVERLAY_ENABLE} .endif -.if defined(WITH_PPOLICY) -CONFIGURE_ARGS+= --enable-ppolicy +.if ${PORT_OPTIONS:MPPOLICY} +CONFIGURE_ARGS+= --enable-ppolicy=${OVERLAY_ENABLE} .endif -.if defined(WITH_PROXYCACHE) -CONFIGURE_ARGS+= --enable-proxycache +.if ${PORT_OPTIONS:MPROXYCACHE} +CONFIGURE_ARGS+= --enable-proxycache=${OVERLAY_ENABLE} .endif -.if defined(WITH_REFINT) -CONFIGURE_ARGS+= --enable-refint +.if ${PORT_OPTIONS:MREFINT} +CONFIGURE_ARGS+= --enable-refint=${OVERLAY_ENABLE} .endif -.if defined(WITH_RETCODE) -CONFIGURE_ARGS+= --enable-retcode +.if ${PORT_OPTIONS:MRETCODE} +CONFIGURE_ARGS+= --enable-retcode=${OVERLAY_ENABLE} .endif -.if defined(WITH_RWM) -CONFIGURE_ARGS+= --enable-rwm +.if ${PORT_OPTIONS:MRWM} +CONFIGURE_ARGS+= --enable-rwm=${OVERLAY_ENABLE} .endif -.if defined(WITHOUT_SEQMOD) -CONFIGURE_ARGS+= --disable-seqmod +.if ${PORT_OPTIONS:MSEQMOD} +CONFIGURE_ARGS+= --enable-seqmod=${OVERLAY_ENABLE} .else -CONFIGURE_ARGS+= --enable-seqmod +CONFIGURE_ARGS+= --disble-seqmod .endif -.if defined(WITH_SSSVLV) -CONFIGURE_ARGS+= --enable-sssvlv +.if ${PORT_OPTIONS:MSSSVLV} +CONFIGURE_ARGS+= --enable-sssvlv=${OVERLAY_ENABLE} .endif -.if defined(WITHOUT_SYNCPROV) -CONFIGURE_ARGS+= --disable-syncprov +.if ${PORT_OPTIONS:MSYNCPROV} +CONFIGURE_ARGS+= --enable-syncprov=${OVERLAY_ENABLE} .else -CONFIGURE_ARGS+= --enable-syncprov +CONFIGURE_ARGS+= --disable-syncprov .endif -.if defined(WITH_TRANSLUCENT) -CONFIGURE_ARGS+= --enable-translucent +.if ${PORT_OPTIONS:MTRANSLUCENT} +CONFIGURE_ARGS+= --enable-translucent=${OVERLAY_ENABLE} .endif -.if defined(WITH_UNIQUE) -CONFIGURE_ARGS+= --enable-unique +.if ${PORT_OPTIONS:MUNIQUE} +CONFIGURE_ARGS+= --enable-unique=${OVERLAY_ENABLE} .endif -.if defined(WITH_VALSORT) -CONFIGURE_ARGS+= --enable-valsort +.if ${PORT_OPTIONS:MVALSORT} +CONFIGURE_ARGS+= --enable-valsort=${OVERLAY_ENABLE} .endif -.if defined(WITH_ACI) +.if ${PORT_OPTIONS:MACI} CONFIGURE_ARGS+= --enable-aci .endif -.if defined(WITH_DYNACL) +.if ${PORT_OPTIONS:MDYNACL} CONFIGURE_ARGS+= --enable-dynacl .endif -.if defined(WITHOUT_BDB) +.if !${PORT_OPTIONS:MBDB} CONFIGURE_ARGS+= --disable-bdb \ --disable-hdb PLIST_SUB+= BACK_BDB="@comment " \ @@ -346,35 +359,35 @@ CONFIGURE_SED+= -e 's,ol_DB_LIB=$$,&-l$ -e 's,(ol_cv_lib_db=)yes$$,\1-l${BDB_LIB_NAME:R},' .endif -.if defined(WITH_DNSSRV) +.if ${PORT_OPTIONS:MDNSSRV} CONFIGURE_ARGS+= --enable-dnssrv=${BACKEND_ENABLE} PLIST_SUB+= BACK_DNSSRV=${BACKEND_PLIST} .else PLIST_SUB+= BACK_DNSSRV="@comment " .endif -.if defined(WITH_MDB) +.if ${PORT_OPTIONS:MMDB} CONFIGURE_ARGS+= --enable-mdb=${BACKEND_ENABLE} PLIST_SUB+= BACK_MDB=${BACKEND_PLIST} .else PLIST_SUB+= BACK_MDB="@comment " .endif -.if defined(WITH_PASSWD) +.if ${PORT_OPTIONS:MPASSWD} CONFIGURE_ARGS+= --enable-passwd=${BACKEND_ENABLE} PLIST_SUB+= BACK_PASSWD=${BACKEND_PLIST} .else PLIST_SUB+= BACK_PASSWD="@comment " .endif -.if defined(WITH_RELAY) +.if ${PORT_OPTIONS:MRELAY} CONFIGURE_ARGS+= --enable-relay=${BACKEND_ENABLE} PLIST_SUB+= BACK_RELAY=${BACKEND_PLIST} .else PLIST_SUB+= BACK_RELAY="@comment " .endif -.if defined(WITH_SHELL) +.if ${PORT_OPTIONS:MSHELL} CONFIGURE_ARGS+= --without-threads --enable-shell=${BACKEND_ENABLE} PLIST_SUB+= BACK_SHELL=${BACKEND_PLIST} .else @@ -382,14 +395,14 @@ PLIST_SUB+= BACK_SHELL="@comment " WANT_OPENLDAP_THREADS= yes .endif -.if defined(WITH_SOCK) +.if ${PORT_OPTIONS:MSOCK} CONFIGURE_ARGS+= --enable-sock=${BACKEND_ENABLE} PLIST_SUB+= BACK_SOCK=${BACKEND_PLIST} .else PLIST_SUB+= BACK_SOCK="@comment " .endif -.if defined(WITH_PERL) +.if ${PORT_OPTIONS:MPERL} USE_PERL5= yes CONFIGURE_ARGS+= --enable-perl=${BACKEND_ENABLE} CONFIGURE_ENV+= PERLBIN="${PERL}" @@ -398,11 +411,11 @@ PLIST_SUB+= BACK_PERL=${BACKEND_PLIST} PLIST_SUB+= BACK_PERL="@comment " .endif -.if defined(WITH_SASL) +.if ${PORT_OPTIONS:MSASL} CONFIGURE_ARGS+= --enable-spasswd .endif -.if defined(WITH_ODBC) +.if ${PORT_OPTIONS:MODBC} CONFIGURE_ARGS+= --enable-sql=${BACKEND_ENABLE} PLIST_SUB+= BACK_SQL=${BACKEND_PLIST} WITH_ODBC_TYPE?= iODBC @@ -417,20 +430,20 @@ BROKEN= choose either iODBC or unixODB PLIST_SUB+= BACK_SQL="@comment " .endif -.if defined(WITH_SMBPWD) +.if ${PORT_OPTIONS:MSMBPWD} PLIST_SUB+= SMBPWD="" .else PLIST_SUB+= SMBPWD="@comment " .endif -.if defined(WITH_RLOOKUPS) +.if ${PORT_OPTIONS:MRLOOKUPS} CONFIGURE_ARGS+= --enable-rlookups PLIST_SUB+= RLOOKUPS="" .else PLIST_SUB+= RLOOKUPS="@comment " .endif -.if defined(WITH_SLAPI) +.if ${PORT_OPTIONS:MSLAPI} CONFIGURE_ARGS+= --enable-slapi PLIST_SUB+= SLAPI="" USE_LDCONFIG= yes @@ -438,7 +451,7 @@ USE_LDCONFIG= yes PLIST_SUB+= SLAPI="@comment " .endif -.if defined(WITH_SLP) +.if ${PORT_OPTIONS:MSLP} CONFIGURE_ARGS+= --enable-slp LIB_DEPENDS+= slp.1:${PORTSDIR}/net/openslp .endif @@ -492,7 +505,7 @@ test: build @cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \ ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test -.if defined(WITH_SMBPWD) +.if ${PORT_OPTIONS:MSMBPWD} post-build: @cd ${BUILD_WRKSRC}/contrib/slapd-modules/smbk5pwd; ${SETENV} ${MAKE_ENV} \ ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} DEFS="-DDO_SAMBA" all @@ -503,7 +516,7 @@ pre-su-install: @if [ -f ${PKGINSTALL} ]; then \ ${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL; \ fi -.if defined(WITH_MODULES) || !defined(WITHOUT_DYNAMIC_BACKENDS) || defined(WITH_SLAPI) +.if ${PORT_OPTIONS:MMODULES} || ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSLAPI} @${MKDIR} ${PREFIX}/libexec/openldap .endif @@ -528,7 +541,7 @@ post-install: 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) +.if ${PORT_OPTIONS:MSMBPWD} @${INSTALL_DATA} ${WRKSRC}/contrib/slapd-modules/smbk5pwd/smbk5pwd.la \ ${PREFIX}/libexec/openldap/ @${INSTALL_PROGRAM} ${WRKSRC}/contrib/slapd-modules/smbk5pwd/.libs/smbk5pwd.so.0 \ Modified: head/net/openldap24-server/distinfo ============================================================================== --- head/net/openldap24-server/distinfo Tue Jul 31 19:07:32 2012 (r301811) +++ head/net/openldap24-server/distinfo Tue Jul 31 19:51:32 2012 (r301812) @@ -1,2 +1,2 @@ -SHA256 (openldap-2.4.31.tgz) = bde845840df4794b869a6efd6a6b1086f80989038e4844b2e4d7d6b57b39c5b6 -SIZE (openldap-2.4.31.tgz) = 5444236 +SHA256 (openldap-2.4.32.tgz) = 9ee413c6a816cb41f71826759b78001d04e747ede9dde302d6ba94ab16f0b82e +SIZE (openldap-2.4.32.tgz) = 5450134 Modified: head/net/openldap24-server/files/patch-shlib-version ============================================================================== --- head/net/openldap24-server/files/patch-shlib-version Tue Jul 31 19:07:32 2012 (r301811) +++ head/net/openldap24-server/files/patch-shlib-version Tue Jul 31 19:51:32 2012 (r301812) @@ -1,14 +1,14 @@ # I have checked all headers and don't think the shared library # bump is a needed one. We patch it back to prevent large # rebuild need. ---- build/version.var.orig 2012-04-22 13:25:08.000000000 -0700 -+++ build/version.var 2012-04-23 10:51:05.079392065 -0700 +--- build/version.var.orig 2012-07-31 09:39:26.000000000 -0700 ++++ build/version.var 2012-07-31 12:03:12.618025612 -0700 @@ -17,7 +17,7 @@ ol_minor=4 - ol_patch=31 - ol_api_inc=20431 + ol_patch=32 + ol_api_inc=20432 -ol_api_current=10 +ol_api_current=8 - ol_api_revision=3 + ol_api_revision=4 ol_api_age=8 - ol_release_date="2012/04/23" + ol_release_date="2012/07/31"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207311951.q6VJpWaM065546>