svn commit: r447787 - in head/security: . cyrus-sasl2 cyrus-sasl2-sql
Mahdi Mokhtari
mmokhi at FreeBSD.org
Fri Aug 11 18:47:22 UTC 2017
Author: mmokhi
Date: Fri Aug 11 18:47:20 2017
New Revision: 447787
URL: https://svnweb.freebsd.org/changeset/ports/447787
Log:
security/cyrus-sasl2: separate sql plugins into security/cyrus-sasl2-sql
Fix circular-dependency problem happens after SASL/LDAP was added as
plugin to mysql57-client in r446496
Reviewed by: bapt, mat (mentor), ume (maintainer)
Approved by: mat (mentor), ume (maintainer)
MFH: 2017Q3
Differential Revision: https://reviews.freebsd.org/D11805
Added:
head/security/cyrus-sasl2-sql/
head/security/cyrus-sasl2-sql/Makefile (contents, props changed)
head/security/cyrus-sasl2-sql/pkg-descr (contents, props changed)
Modified:
head/security/Makefile
head/security/cyrus-sasl2/Makefile
head/security/cyrus-sasl2/Makefile.common
head/security/cyrus-sasl2/pkg-plist
Modified: head/security/Makefile
==============================================================================
--- head/security/Makefile Fri Aug 11 18:38:33 2017 (r447786)
+++ head/security/Makefile Fri Aug 11 18:47:20 2017 (r447787)
@@ -107,6 +107,7 @@
SUBDIR += cyrus-sasl2-gssapi
SUBDIR += cyrus-sasl2-ldapdb
SUBDIR += cyrus-sasl2-saslauthd
+ SUBDIR += cyrus-sasl2-sql
SUBDIR += cyrus-sasl2-srp
SUBDIR += d0_blind_id
SUBDIR += dcetest
Added: head/security/cyrus-sasl2-sql/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/cyrus-sasl2-sql/Makefile Fri Aug 11 18:47:20 2017 (r447787)
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+PKGNAMESUFFIX= -sql
+
+COMMENT= SASL SQL plugins
+
+OPTIONS_DEFINE= MYSQL PGSQL
+OPTIONS_RADIO= SQLITE
+OPTIONS_RADIO_SQLITE= SQLITE2 SQLITE3
+
+OPTIONS_DEFAULT= MYSQL
+OPTIONS_SUB= yes
+
+MYSQL_USES= mysql
+MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}
+MYSQL_CONFIGURE_OFF= --without-mysql
+PGSQL_USES= pgsql
+PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE}
+PGSQL_CONFIGURE_OFF= --without-pgsql
+SQLITE2_USES= sqlite:2
+SQLITE2_CONFIGURE_ON= --with-sqlite=${LOCALBASE}
+SQLITE2_CONFIGURE_OFF= --without-sqlite
+SQLITE3_USES= sqlite:3
+SQLITE3_CONFIGURE_ON= --with-sqlite3=${LOCALBASE}
+SQLITE3_CONFIGURE_OFF= --without-sqlite3
+
+CONFIGURE_ARGS+= --enable-sql
+
+.include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"
Added: head/security/cyrus-sasl2-sql/pkg-descr
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/cyrus-sasl2-sql/pkg-descr Fri Aug 11 18:47:20 2017 (r447787)
@@ -0,0 +1,3 @@
+SASL SQL database plugin support
+
+WWW: http://cyrusimap.web.cmu.edu/
Modified: head/security/cyrus-sasl2/Makefile
==============================================================================
--- head/security/cyrus-sasl2/Makefile Fri Aug 11 18:38:33 2017 (r447786)
+++ head/security/cyrus-sasl2/Makefile Fri Aug 11 18:47:20 2017 (r447787)
@@ -11,10 +11,9 @@ CYRUS_CONFIGURE_ARGS= --with-saslauthd=${SASLAUTHD_RUN
NO_OPTIONS_SORT= yes
OPTIONS_DEFINE= ALWAYSTRUE AUTHDAEMOND DOCS KEEP_DB_OPEN \
- OBSOLETE_CRAM_ATTR MYSQL PGSQL
-OPTIONS_RADIO= SASLDB SQLITE
+ OBSOLETE_CRAM_ATTR
+OPTIONS_RADIO= SASLDB
OPTIONS_RADIO_SASLDB= BDB1 BDB GDBM
-OPTIONS_RADIO_SQLITE= SQLITE2 SQLITE3
OPTIONS_GROUP= PLUGIN
OPTIONS_GROUP_PLUGIN= ANONYMOUS CRAM DIGEST LOGIN NTLM OTP PLAIN SCRAM
OPTIONS_DEFAULT= ANONYMOUS AUTHDAEMOND BDB1 OBSOLETE_CRAM_ATTR CRAM \
@@ -39,18 +38,6 @@ BDB1_CONFIGURE_ON= --with-dblib=ndbm
GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm
GDBM_CONFIGURE_ON= --with-dblib=gdbm \
--with-gdbm=${LOCALBASE}
-MYSQL_USES= mysql
-MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}
-MYSQL_CONFIGURE_OFF= --without-mysql
-PGSQL_USES= pgsql
-PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE}
-PGSQL_CONFIGURE_OFF= --without-pgsql
-SQLITE2_USES= sqlite:2
-SQLITE2_CONFIGURE_ON= --with-sqlite=${LOCALBASE}
-SQLITE2_CONFIGURE_OFF= --without-sqlite
-SQLITE3_USES= sqlite:3
-SQLITE3_CONFIGURE_ON= --with-sqlite3=${LOCALBASE}
-SQLITE3_CONFIGURE_OFF= --without-sqlite3
ANONYMOUS_DESC= ANONYMOUS authentication
ANONYMOUS_CONFIGURE_ENABLE= anon
CRAM_DESC= CRAM-MD5 authentication
Modified: head/security/cyrus-sasl2/Makefile.common
==============================================================================
--- head/security/cyrus-sasl2/Makefile.common Fri Aug 11 18:38:33 2017 (r447786)
+++ head/security/cyrus-sasl2/Makefile.common Fri Aug 11 18:47:20 2017 (r447787)
@@ -96,20 +96,12 @@ SASLDB_NAME= sasldb2
SASLDB= "@comment "
.endif
-.if ${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL} || \
- ${PORT_OPTIONS:MSQLITE2} || ${PORT_OPTIONS:MSQLITE3}
-CONFIGURE_ARGS+=--enable-sql
-.else
-SQL= "@comment "
-.endif
-
SUB_FILES= pkg-deinstall pkg-install pkg-message
SUB_LIST= CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP} \
SASLDB_NAME=${SASLDB_NAME}
PLIST_SUB+= PREFIX=${PREFIX} \
SASLDB=${SASLDB} \
- SQL=${SQL} \
DOCSDIR=${DOCSDIR:S/^${PREFIX}\///}
post-patch:
Modified: head/security/cyrus-sasl2/pkg-plist
==============================================================================
--- head/security/cyrus-sasl2/pkg-plist Fri Aug 11 18:38:33 2017 (r447786)
+++ head/security/cyrus-sasl2/pkg-plist Fri Aug 11 18:47:20 2017 (r447787)
@@ -35,11 +35,6 @@ lib/libsasl2.so.3.0.0
%%SCRAM%%lib/sasl2/libscram.so
%%SCRAM%%lib/sasl2/libscram.so.3
%%SCRAM%%lib/sasl2/libscram.so.3.0.0
-%%SQL%%lib/sasl2/libsql.a
-%%SQL%%lib/sasl2/libsql.la
-%%SQL%%lib/sasl2/libsql.so
-%%SQL%%lib/sasl2/libsql.so.3
-%%SQL%%lib/sasl2/libsql.so.3.0.0
%%NTLM%%lib/sasl2/libntlm.a
%%NTLM%%lib/sasl2/libntlm.la
%%NTLM%%lib/sasl2/libntlm.so
More information about the svn-ports-head
mailing list