diff options
-rw-r--r-- | mail/dovecot2-gssapi/DESCR | 3 | ||||
-rw-r--r-- | mail/dovecot2-gssapi/Makefile | 19 | ||||
-rw-r--r-- | mail/dovecot2-gssapi/PLIST | 2 | ||||
-rw-r--r-- | mail/dovecot2-ldap/DESCR | 3 | ||||
-rw-r--r-- | mail/dovecot2-ldap/Makefile | 30 | ||||
-rw-r--r-- | mail/dovecot2-ldap/PLIST | 5 | ||||
-rw-r--r-- | mail/dovecot2-mysql/DESCR | 3 | ||||
-rw-r--r-- | mail/dovecot2-mysql/Makefile | 24 | ||||
-rw-r--r-- | mail/dovecot2-mysql/PLIST | 4 | ||||
-rw-r--r-- | mail/dovecot2-pgsql/DESCR | 3 | ||||
-rw-r--r-- | mail/dovecot2-pgsql/Makefile | 24 | ||||
-rw-r--r-- | mail/dovecot2-pgsql/PLIST | 4 | ||||
-rw-r--r-- | mail/dovecot2-sqlite/DESCR | 3 | ||||
-rw-r--r-- | mail/dovecot2-sqlite/Makefile | 24 | ||||
-rw-r--r-- | mail/dovecot2-sqlite/PLIST | 4 | ||||
-rw-r--r-- | mail/dovecot2/Makefile | 42 | ||||
-rw-r--r-- | mail/dovecot2/Makefile.common | 48 | ||||
-rw-r--r-- | mail/dovecot2/Makefile.plugin | 8 | ||||
-rw-r--r-- | mail/dovecot2/PLIST | 5 | ||||
-rw-r--r-- | mail/dovecot2/options.mk | 52 |
20 files changed, 219 insertions, 91 deletions
diff --git a/mail/dovecot2-gssapi/DESCR b/mail/dovecot2-gssapi/DESCR new file mode 100644 index 00000000000..5c7bb366410 --- /dev/null +++ b/mail/dovecot2-gssapi/DESCR @@ -0,0 +1,3 @@ +Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like systems, +written with security primarily in mind. This package contains the GSSAPI +authentication plugin. diff --git a/mail/dovecot2-gssapi/Makefile b/mail/dovecot2-gssapi/Makefile new file mode 100644 index 00000000000..3cfda51b0ea --- /dev/null +++ b/mail/dovecot2-gssapi/Makefile @@ -0,0 +1,19 @@ +# $NetBSD: Makefile,v 1.1 2016/07/18 15:03:05 fhajny Exp $ +# + +.include "../../mail/dovecot2/Makefile.plugin" + +PKGNAME= ${DISTNAME:S/dovecot/dovecot-gssapi/} +COMMENT+= (GSSAPI plugin) + +CONFIGURE_ARGS+= --with-gssapi=plugin + +INSTALLATION_DIRS+= lib/dovecot/auth + +do-install: + cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + src/auth/libmech_gssapi.la \ + ${DESTDIR}${PREFIX}/lib/dovecot/auth + +.include "../../mk/krb5.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/mail/dovecot2-gssapi/PLIST b/mail/dovecot2-gssapi/PLIST new file mode 100644 index 00000000000..a57e812f4c6 --- /dev/null +++ b/mail/dovecot2-gssapi/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1 2016/07/18 15:03:05 fhajny Exp $ +lib/dovecot/auth/libmech_gssapi.la diff --git a/mail/dovecot2-ldap/DESCR b/mail/dovecot2-ldap/DESCR new file mode 100644 index 00000000000..1f2eb02311a --- /dev/null +++ b/mail/dovecot2-ldap/DESCR @@ -0,0 +1,3 @@ +Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like systems, +written with security primarily in mind. This package contains the LDAP +backend plugins. diff --git a/mail/dovecot2-ldap/Makefile b/mail/dovecot2-ldap/Makefile new file mode 100644 index 00000000000..63eb786d19d --- /dev/null +++ b/mail/dovecot2-ldap/Makefile @@ -0,0 +1,30 @@ +# $NetBSD: Makefile,v 1.1 2016/07/18 15:03:05 fhajny Exp $ +# + +.include "../../mail/dovecot2/Makefile.plugin" + +PKGNAME= ${DISTNAME:S/dovecot/dovecot-ldap/} +COMMENT+= (LDAP plugin) + +CONFIGURE_ARGS+= --with-ldap=plugin + +INSTALLATION_DIRS+= include/dovecot \ + lib/dovecot/auth lib/dovecot/dict + +do-install: + cd ${WRKSRC} && (\ + ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + src/auth/libauthdb_ldap.la \ + ${DESTDIR}${PREFIX}/lib/dovecot/auth; \ + ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + src/lib-ldap/libdovecot-ldap.la \ + ${DESTDIR}${PREFIX}/lib/dovecot; \ + ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + src/plugins/dict-ldap/libdict_ldap.la \ + ${DESTDIR}${PREFIX}/lib/dovecot/dict; \ + ) + ${INSTALL_DATA} ${WRKSRC}/src/lib-ldap/ldap-client.h \ + ${DESTDIR}${PREFIX}/include/dovecot + +.include "../../databases/openldap-client/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/mail/dovecot2-ldap/PLIST b/mail/dovecot2-ldap/PLIST new file mode 100644 index 00000000000..b83e8da8a1a --- /dev/null +++ b/mail/dovecot2-ldap/PLIST @@ -0,0 +1,5 @@ +@comment $NetBSD: PLIST,v 1.1 2016/07/18 15:03:05 fhajny Exp $ +include/dovecot/ldap-client.h +lib/dovecot/auth/libauthdb_ldap.la +lib/dovecot/dict/libdict_ldap.la +lib/dovecot/libdovecot-ldap.la diff --git a/mail/dovecot2-mysql/DESCR b/mail/dovecot2-mysql/DESCR new file mode 100644 index 00000000000..0c1dbffc2d6 --- /dev/null +++ b/mail/dovecot2-mysql/DESCR @@ -0,0 +1,3 @@ +Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like systems, +written with security primarily in mind. This package contains the MySQL +backend plugins. diff --git a/mail/dovecot2-mysql/Makefile b/mail/dovecot2-mysql/Makefile new file mode 100644 index 00000000000..2dee5a377a9 --- /dev/null +++ b/mail/dovecot2-mysql/Makefile @@ -0,0 +1,24 @@ +# $NetBSD: Makefile,v 1.1 2016/07/18 15:03:06 fhajny Exp $ +# + +.include "../../mail/dovecot2/Makefile.plugin" + +PKGNAME= ${DISTNAME:S/dovecot/dovecot-mysql/} +COMMENT+= (mysql plugin) + +CONFIGURE_ARGS+= --with-sql=plugin +CONFIGURE_ARGS+= --with-mysql + +INSTALLATION_DIRS+= lib/dovecot/auth lib/dovecot/dict + +do-install: + cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + src/lib-sql/libdriver_mysql.la \ + ${DESTDIR}${PREFIX}/lib/dovecot + ${LN} -s ../libdriver_mysql.so \ + ${DESTDIR}${PREFIX}/lib/dovecot/auth/libdriver_mysql.so + ${LN} -s ../libdriver_mysql.so \ + ${DESTDIR}${PREFIX}/lib/dovecot/dict/libdriver_mysql.so + +.include "../../mk/mysql.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/mail/dovecot2-mysql/PLIST b/mail/dovecot2-mysql/PLIST new file mode 100644 index 00000000000..5d1808a6e9c --- /dev/null +++ b/mail/dovecot2-mysql/PLIST @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST,v 1.1 2016/07/18 15:03:06 fhajny Exp $ +lib/dovecot/auth/libdriver_mysql.so +lib/dovecot/dict/libdriver_mysql.so +lib/dovecot/libdriver_mysql.la diff --git a/mail/dovecot2-pgsql/DESCR b/mail/dovecot2-pgsql/DESCR new file mode 100644 index 00000000000..745e4fed9a3 --- /dev/null +++ b/mail/dovecot2-pgsql/DESCR @@ -0,0 +1,3 @@ +Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like systems, +written with security primarily in mind. This package contains the PostgreSQL +backend plugins. diff --git a/mail/dovecot2-pgsql/Makefile b/mail/dovecot2-pgsql/Makefile new file mode 100644 index 00000000000..b572f68f65f --- /dev/null +++ b/mail/dovecot2-pgsql/Makefile @@ -0,0 +1,24 @@ +# $NetBSD: Makefile,v 1.1 2016/07/18 15:03:06 fhajny Exp $ +# + +.include "../../mail/dovecot2/Makefile.plugin" + +PKGNAME= ${DISTNAME:S/dovecot/dovecot-pgsql/} +COMMENT+= (pgsql plugin) + +CONFIGURE_ARGS+= --with-sql=plugin +CONFIGURE_ARGS+= --with-pgsql + +INSTALLATION_DIRS+= lib/dovecot/auth lib/dovecot/dict + +do-install: + cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + src/lib-sql/libdriver_pgsql.la \ + ${DESTDIR}${PREFIX}/lib/dovecot + ${LN} -s ../libdriver_pgsql.so \ + ${DESTDIR}${PREFIX}/lib/dovecot/auth/libdriver_pgsql.so + ${LN} -s ../libdriver_pgsql.so \ + ${DESTDIR}${PREFIX}/lib/dovecot/dict/libdriver_pgsql.so + +.include "../../mk/pgsql.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/mail/dovecot2-pgsql/PLIST b/mail/dovecot2-pgsql/PLIST new file mode 100644 index 00000000000..80a10409e67 --- /dev/null +++ b/mail/dovecot2-pgsql/PLIST @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST,v 1.1 2016/07/18 15:03:06 fhajny Exp $ +lib/dovecot/auth/libdriver_pgsql.so +lib/dovecot/dict/libdriver_pgsql.so +lib/dovecot/libdriver_pgsql.la diff --git a/mail/dovecot2-sqlite/DESCR b/mail/dovecot2-sqlite/DESCR new file mode 100644 index 00000000000..251cecf8350 --- /dev/null +++ b/mail/dovecot2-sqlite/DESCR @@ -0,0 +1,3 @@ +Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like systems, +written with security primarily in mind. This package contains the SQLite +backend plugins. diff --git a/mail/dovecot2-sqlite/Makefile b/mail/dovecot2-sqlite/Makefile new file mode 100644 index 00000000000..6173f755d31 --- /dev/null +++ b/mail/dovecot2-sqlite/Makefile @@ -0,0 +1,24 @@ +# $NetBSD: Makefile,v 1.1 2016/07/18 15:03:06 fhajny Exp $ +# + +.include "../../mail/dovecot2/Makefile.plugin" + +PKGNAME= ${DISTNAME:S/dovecot/dovecot-sqlite/} +COMMENT+= (sqlite plugin) + +CONFIGURE_ARGS+= --with-sql=plugin +CONFIGURE_ARGS+= --with-sqlite + +INSTALLATION_DIRS+= lib/dovecot/auth lib/dovecot/dict + +do-install: + cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + src/lib-sql/libdriver_sqlite.la \ + ${DESTDIR}${PREFIX}/lib/dovecot + ${LN} -s ../libdriver_sqlite.so \ + ${DESTDIR}${PREFIX}/lib/dovecot/auth/libdriver_sqlite.so + ${LN} -s ../libdriver_sqlite.so \ + ${DESTDIR}${PREFIX}/lib/dovecot/dict/libdriver_sqlite.so + +.include "../../databases/sqlite3/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/mail/dovecot2-sqlite/PLIST b/mail/dovecot2-sqlite/PLIST new file mode 100644 index 00000000000..4deda645615 --- /dev/null +++ b/mail/dovecot2-sqlite/PLIST @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST,v 1.1 2016/07/18 15:03:06 fhajny Exp $ +lib/dovecot/auth/libdriver_sqlite.so +lib/dovecot/dict/libdriver_sqlite.so +lib/dovecot/libdriver_sqlite.la diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile index a8d5d70762c..f71d71bff06 100644 --- a/mail/dovecot2/Makefile +++ b/mail/dovecot2/Makefile @@ -1,36 +1,9 @@ -# $NetBSD: Makefile,v 1.89 2016/07/06 10:39:22 adam Exp $ +# $NetBSD: Makefile,v 1.90 2016/07/18 15:03:05 fhajny Exp $ # -# when updating to a new release, update ABI depends in -# the buildlink3.mk file as well, since the plugins' version -# must match (see PR 49563). -DISTNAME= dovecot-2.2.25 -PKGREVISION= 1 -CATEGORIES= mail -MASTER_SITES= http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/ +.include "../../mail/dovecot2/Makefile.common" -MAINTAINER= adam@NetBSD.org -HOMEPAGE= http://www.dovecot.org/ -COMMENT= Secure IMAP and POP3 server -LICENSE= mit AND gnu-lgpl-v2.1 AND modified-bsd - -USE_LIBTOOL= yes -USE_TOOLS+= gmake pkg-config rpcgen -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-ssldir=${SSLDIR} - -TEST_TARGET= check - -# Explicitly disable inotify on illumos, it is provided for Linux compat only. -CONFIGURE_ENV.SunOS+= ac_cv_func_inotify_init=no - -# Sharing sources between binary and lib triggers libtool bugs -# mv: rename .deps/auth-stats.Tpo to .deps/auth-stats.Po: No such file or directory -MAKE_JOBS_SAFE= no - -.include "../../mk/bsd.prefs.mk" +PKGREVISION= 2 RCD_SCRIPTS= dovecot SMF_NAME= dovecot @@ -48,12 +21,6 @@ PKG_USERS_VARS= DOVECOT_USER DOVENULL_USER PKG_GECOS.${DOVECOT_USER}= Dovecot IMAP/POP3 user PKG_GECOS.${DOVENULL_USER}= Dovecot login user -SUBST_CLASSES+= ssldir -SUBST_MESSAGE.ssldir= Fixing SSLDIR -SUBST_FILES.ssldir= doc/example-config/conf.d/10-ssl.conf -SUBST_STAGE.ssldir= pre-configure -SUBST_SED.ssldir= -e 's,/etc/ssl,${SSLDIR},' - EGDIR= ${PREFIX}/share/examples/dovecot CNFS_cmd= ${SED} -ne "s,^share/examples/dovecot/,,p" PLIST @@ -79,7 +46,4 @@ post-install: # Don't compress manual pages as they include each other. .undef MANZ -.include "../../archivers/bzip2/buildlink3.mk" -.include "../../archivers/xz/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/dovecot2/Makefile.common b/mail/dovecot2/Makefile.common new file mode 100644 index 00000000000..9a9eab25ef8 --- /dev/null +++ b/mail/dovecot2/Makefile.common @@ -0,0 +1,48 @@ +# $NetBSD: Makefile.common,v 1.1 2016/07/18 15:03:05 fhajny Exp $ +# +# when updating to a new release, update ABI depends in +# the buildlink3.mk file as well, since the plugins' version +# must match (see PR 49563). +# +# used by mail/dovecot2/Makefile +# used by mail/dovecot2/Makefile.plugin +# used by mail/dovecot2-mysql/Makefile +# used by mail/dovecot2-pgsql/Makefile + +DISTNAME= dovecot-2.2.25 +CATEGORIES= mail +MASTER_SITES= http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/ + +MAINTAINER= adam@NetBSD.org +HOMEPAGE= http://www.dovecot.org/ +COMMENT= Secure IMAP and POP3 server +LICENSE= mit AND gnu-lgpl-v2.1 AND modified-bsd + +DISTINFO_FILE= ${.CURDIR}/../../mail/dovecot2/distinfo +PATCHDIR= ${.CURDIR}/../../mail/dovecot2/patches + +USE_LIBTOOL= yes +USE_TOOLS+= gmake pkg-config rpcgen +GNU_CONFIGURE= yes + +.include "../../mk/bsd.prefs.mk" + +CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-ssldir=${SSLDIR} +CONFIGURE_ARGS+= --without-gssapi +CONFIGURE_ARGS+= --without-ldap +CONFIGURE_ARGS+= --without-sql + +TEST_TARGET= check + +# Explicitly disable inotify on illumos, it is provided for Linux compat only. +CONFIGURE_ENV.SunOS+= ac_cv_func_inotify_init=no + +# Sharing sources between binary and lib triggers libtool bugs +# mv: rename .deps/auth-stats.Tpo to .deps/auth-stats.Po: No such file or directory +MAKE_JOBS_SAFE= no + +.include "../../archivers/bzip2/buildlink3.mk" +.include "../../archivers/xz/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" diff --git a/mail/dovecot2/Makefile.plugin b/mail/dovecot2/Makefile.plugin new file mode 100644 index 00000000000..767d0f5aa0f --- /dev/null +++ b/mail/dovecot2/Makefile.plugin @@ -0,0 +1,8 @@ +# $NetBSD: Makefile.plugin,v 1.1 2016/07/18 15:03:05 fhajny Exp $ +# +# used by mail/dovecot2-mysql/Makefile +# used by mail/dovecot2-pgsql/Makefile + +.include "../../mail/dovecot2/Makefile.common" + +DEPENDS+= dovecot>=${PKGVERSION_NOREV}{nb*,}:../../mail/dovecot2 diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST index b4e670704c8..a953a54c23f 100644 --- a/mail/dovecot2/PLIST +++ b/mail/dovecot2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.47 2016/07/02 19:32:09 adam Exp $ +@comment $NetBSD: PLIST,v 1.48 2016/07/18 15:03:05 fhajny Exp $ bin/doveadm bin/doveconf bin/dsync @@ -279,7 +279,6 @@ include/dovecot/istream.h include/dovecot/json-parser.h include/dovecot/json-tree.h include/dovecot/lda-settings.h -${PLIST.ldap}include/dovecot/ldap-client.h include/dovecot/lib-signals.h include/dovecot/lib.h include/dovecot/llist.h @@ -528,7 +527,6 @@ include/dovecot/var-expand.h include/dovecot/wildcard-match.h include/dovecot/write-full.h lib/dovecot/auth/libauthdb_imap.la -${PLIST.ldap}lib/dovecot/dict/libdict_ldap.la lib/dovecot/doveadm/lib10_doveadm_acl_plugin.la lib/dovecot/doveadm/lib10_doveadm_expire_plugin.la lib/dovecot/doveadm/lib10_doveadm_quota_plugin.la @@ -567,7 +565,6 @@ lib/dovecot/libdovecot-compression.la lib/dovecot/libdovecot-dsync.la lib/dovecot/libdovecot-fts.la lib/dovecot/libdovecot-lda.la -${PLIST.ldap}lib/dovecot/libdovecot-ldap.la lib/dovecot/libdovecot-login.la lib/dovecot/libdovecot-sql.la lib/dovecot/libdovecot-storage.la diff --git a/mail/dovecot2/options.mk b/mail/dovecot2/options.mk index a136d4b8467..dc0367e6d36 100644 --- a/mail/dovecot2/options.mk +++ b/mail/dovecot2/options.mk @@ -1,15 +1,15 @@ -# $NetBSD: options.mk,v 1.9 2016/05/03 12:34:27 taca Exp $ +# $NetBSD: options.mk,v 1.10 2016/07/18 15:03:05 fhajny Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot -PKG_SUPPORTED_OPTIONS= gssapi kqueue ldap mysql pam pgsql sqlite tcpwrappers +PKG_SUPPORTED_OPTIONS= kqueue pam tcpwrappers PKG_OPTIONS_OPTIONAL_GROUPS= ssl PKG_OPTIONS_GROUP.ssl= gnutls ssl -PKG_SUGGESTED_OPTIONS= pam sqlite ssl tcpwrappers +PKG_SUGGESTED_OPTIONS= pam ssl tcpwrappers .if defined(PKG_HAVE_KQUEUE) PKG_SUGGESTED_OPTIONS+= kqueue .endif -PLIST_VARS+= ldap ssl tcpwrappers +PLIST_VARS+= ssl tcpwrappers .include "../../mk/bsd.options.mk" @@ -31,32 +31,6 @@ CONFIGURE_ARGS+= --without-ssl .endif ### -### MySQL support -### -.if !empty(PKG_OPTIONS:Mmysql) -CONFIGURE_ARGS+= --with-mysql -. include "../../mk/mysql.buildlink3.mk" -.endif - -### -### PostgreSQL support -### -.if !empty(PKG_OPTIONS:Mpgsql) -CONFIGURE_ARGS+= --with-pgsql -CPPFLAGS+= -I${BUILDLINK_DIR}/include/pgsql -. include "../../mk/pgsql.buildlink3.mk" -.endif - -### -### LDAP directory support -### -.if !empty(PKG_OPTIONS:Mldap) -CONFIGURE_ARGS+= --with-ldap -. include "../../databases/openldap-client/buildlink3.mk" -PLIST.ldap= yes -.endif - -### ### PAM support ### .if !empty(PKG_OPTIONS:Mpam) @@ -67,14 +41,6 @@ CONFIGURE_ARGS+= --without-pam .endif ### -### SQLite support -### -.if !empty(PKG_OPTIONS:Msqlite) -CONFIGURE_ARGS+= --with-sqlite -. include "../../databases/sqlite3/buildlink3.mk" -.endif - -### ### kqueue support ### .if !empty(PKG_OPTIONS:Mkqueue) @@ -85,16 +51,6 @@ CONFIGURE_ARGS+= --with-notify=kqueue .endif ### -### GSSAPI support -### -.if !empty(PKG_OPTIONS:Mgssapi) -CONFIGURE_ARGS+= --with-gssapi -. include "../../mk/krb5.buildlink3.mk" -.else -CONFIGURE_ARGS+= --without-gssapi -.endif - -### ### tcpwrappers support ### .if !empty(PKG_OPTIONS:Mtcpwrappers) |