diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile index 07748f07688..01aec7cb63b 100644 --- a/mail/maildrop/Makefile +++ b/mail/maildrop/Makefile @@ -1,25 +1,24 @@ -# $OpenBSD: Makefile,v 1.19 2006/08/03 13:09:09 espie Exp $ +# $OpenBSD: Makefile,v 1.20 2006/11/03 13:50:54 mbalmer Exp $ -COMMENT= "local mail delivery agent with filtering abilities" -COMMENT-utils= "userdb and quota tools for the Courier mail suite" +COMMENT= "mail delivery agent with filtering abilities" +COMMENT-utils= "quota tools for the Courier mail suite" -VERSION= 1.7.0 -DISTNAME= maildrop-${VERSION} -CATEGORIES= mail +DISTNAME= maildrop-2.0.2 +CATEGORIES= mail -HOMEPAGE= http://www.courier-mta.org/maildrop/ -MAINTAINER= Marc Balmer +HOMEPAGE= http://www.courier-mta.org/maildrop/ +MAINTAINER= Marc Balmer -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} +EXTRACT_SUFX= .tar.bz2 -FLAVORS= ldap mysql +FLAVORS= postfix FLAVOR?= -MULTI_PACKAGES= -utils +MULTI_PACKAGES= -utils SUBPACKAGE?= -FULLPKGNAME-utils= courier-utils-${VERSION}p2 +FULLPKGNAME-utils= ${DISTNAME:S/maildrop/courier-utils/} # GPL PERMIT_PACKAGE_CDROM= Yes @@ -27,51 +26,73 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -LIB_DEPENDS= gdbm.>=3::databases/gdbm - CONFIGURE_STYLE= gnu -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="${CFLAGS:C/ *$//} -I${LOCALBASE}/include" MAKE_ENV= INCLUDES="-I${LOCALBASE}/include" -CONFIGURE_ARGS= --datadir=${PREFIX}/share/doc \ - --enable-sendmail=/usr/sbin/sendmail \ - --enable-maildrop-gid=bin \ - --disable-tempdir --enable-restricted-trusted=1 \ - --enable-syslog=1 --with-etcdir=${SYSCONFDIR} \ - --with-db=gdbm --enable-userdb --enable-maildirquota -DOCFILES= README INSTALL UPGRADE README.postfix +SUBST_VARS= MAILDROPCONF -.if ${FLAVOR:L:Mldap} -LIB_DEPENDS+= ldap,lber::databases/openldap -CONFIGURE_ARGS+= --enable-maildropldap \ - --with-ldapconfig=${SYSCONFDIR}/maildropldap.config -.endif +CONFIGURE_ARGS= --sysconfdir=${SYSCONFDIR}/courier \ + --with-etcdir=${SYSCONFDIR}/courier \ + --datadir=${PREFIX}/share/doc \ + --enable-static \ + --with-db=gdbm \ + --enable-maildrop-gid=_courier \ + --enable-maildrop-uid=_courier \ + --enable-syslog=1 \ + --enable-restrict-trusted=1 \ + --enable-keep-fromline=1 \ + --enable-use-flock=1 \ + --enable-use-dotlock=1 \ + --enable-authlib \ + --with-dirsync \ + --enable-maildirquota \ + --with-default-maildrop="./Maildir" -.if ${FLAVOR:L:Mmysql} -LIB_DEPENDS+= mysqlclient::databases/mysql -CONFIGURE_ARGS+= --enable-maildropmysql -WANTLIB= crypto ssl z +DOCFILES= ${WRKSRC}/README \ + ${WRKSRC}/INSTALL \ + ${WRKSRC}/UPGRADE \ + ${WRKSRC}/README.postfix \ + ${WRKSRC}/maildroptips.txt \ + ${WRKSRC}/maildir/README.sharedfolders.txt \ + ${WRKSRC}/maildir/README.maildirquota.txt \ + ${WRKSRC}/maildir/quotawarnmsg + + +.if ${FLAVOR:L:Mpostfix} +CONFIGURE_ARGS+= --enable-sendmail=/usr/local/sbin/sendmail +CONFIGURE_ARGS+= --enable-trusted-users="root _courier _postfix" +CONFIGURE_ARGS+= --enable-trusted-groups="wheel _courier _postdrop" +RUN_DEPENDS= ::mail/postfix/stable +.else +CONFIGURE_ARGS+= --enable-sendmail=/usr/sbin/sendmail +CONFIGURE_ARGS+= --enable-trusted-users="root _courier" +CONFIGURE_ARGS+= --enable-trusted-groups="wheel _courier" .endif .if defined(PACKAGING) && $(SUBPACKAGE) == "-utils" -LIB_DEPENDS= +LIB_DEPENS= WANTLIB+= c .else -WANTLIB+= c m stdc++ +WANTLIB+= c gdbm m stdc++ +LIB_DEPENDS+= gdbm.>=3::databases/gdbm \ + pcre.>=1::devel/pcre \ + courierauth::mail/courier-authlib .endif post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/maildrop -.for i in ${DOCFILES} - ${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/maildrop -.endfor -.if ${FLAVOR:L:Mldap} - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/maildrop - ${INSTALL_DATA} ${WRKSRC}/maildropldap.config ${PREFIX}/share/examples/maildrop -.endif -.if ${FLAVOR:L:Mmysql} - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/maildrop - ${INSTALL_DATA} ${WRKSRC}/maildropmysql.config ${PREFIX}/share/examples/maildrop -.endif + @for i in ${DOCFILES}; do \ + if [ -f $$i ]; then \ + ${INSTALL_DATA} $$i ${PREFIX}/share/doc/maildrop ;\ + fi \ + done + ${INSTALL_DATA} ${WRKSRC}/unicode/README \ + ${PREFIX}/share/doc/maildrop/README.unicode.txt + @sed -e s#!!PREFIX!!#${TRUEPREFIX}#g ${FILESDIR}/SECURITY > \ + ${WRKBUILD}/SECURITY + ${INSTALL_DATA} ${WRKBUILD}/SECURITY \ + ${PREFIX}/share/doc/maildrop/ .include diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo index 6810f4870fa..4b8700017e6 100644 --- a/mail/maildrop/distinfo +++ b/mail/maildrop/distinfo @@ -1,4 +1,4 @@ -MD5 (maildrop-1.7.0.tar.bz2) = fa2dbbb84795e459db36ea0013f6f214 -RMD160 (maildrop-1.7.0.tar.bz2) = ad9ae25b961bcce3e08956b6caafb3b453f70484 -SHA1 (maildrop-1.7.0.tar.bz2) = 7e5278771f6b7ed97e34e1b9e2f4f625eb87fc14 -SIZE (maildrop-1.7.0.tar.bz2) = 1209721 +MD5 (maildrop-2.0.2.tar.bz2) = 69c7cb0c93669c0831eb3ee304da8eac +RMD160 (maildrop-2.0.2.tar.bz2) = 7b2bd7fc0b3d9e7f8cefd9236e7e387d9d5ae1ce +SHA1 (maildrop-2.0.2.tar.bz2) = a7f3ac17cd1e14256b047e36810d3e8ec6cb872e +SIZE (maildrop-2.0.2.tar.bz2) = 2139549 diff --git a/mail/maildrop/pkg/DESCR-utils b/mail/maildrop/pkg/DESCR-utils index ad98a88a1f9..bdddd0160bb 100644 --- a/mail/maildrop/pkg/DESCR-utils +++ b/mail/maildrop/pkg/DESCR-utils @@ -1,4 +1,2 @@ -The Courier mail suite (courier-imap, maildrop) use the userdb -format as one method of authenticating users and storing information -about them. This package also includes support for the maildir -soft quota system. +The Courier mail suite (courier-imap, maildrop) use this package +to includes support for the maildir soft quota system. diff --git a/mail/maildrop/pkg/MESSAGE b/mail/maildrop/pkg/MESSAGE index f8d698caf9d..0c9d73d2d39 100644 --- a/mail/maildrop/pkg/MESSAGE +++ b/mail/maildrop/pkg/MESSAGE @@ -1,7 +1,8 @@ The documentation for maildrop has been installed in ${PREFIX}/share/doc/maildrop. -You should also read the pkg/SECURITY file now, as it has +You should also read ${PREFIX}/share/doc/maildrop/SECURITY +file now, as it has some important information regarding the setuid/setgid bits that some of the binaries that have been installed may need for correct operation. diff --git a/mail/maildrop/pkg/PFRAG.ldap b/mail/maildrop/pkg/PFRAG.ldap deleted file mode 100644 index e289cb599dd..00000000000 --- a/mail/maildrop/pkg/PFRAG.ldap +++ /dev/null @@ -1,3 +0,0 @@ -@comment $OpenBSD: PFRAG.ldap,v 1.1 2004/12/06 23:06:01 mbalmer Exp $ -share/examples/maildrop/maildropldap.config -@sample ${SYSCONFDIR}/maildropldap.config diff --git a/mail/maildrop/pkg/PFRAG.mysql b/mail/maildrop/pkg/PFRAG.mysql deleted file mode 100644 index aaa157dcfbe..00000000000 --- a/mail/maildrop/pkg/PFRAG.mysql +++ /dev/null @@ -1,3 +0,0 @@ -@comment $OpenBSD: PFRAG.mysql,v 1.1 2004/12/06 23:06:01 mbalmer Exp $ -share/examples/maildrop/maildropmysql.config -@sample ${SYSCONFDIR}/maildropmysql.config diff --git a/mail/maildrop/pkg/PLIST b/mail/maildrop/pkg/PLIST index afb18e07b8a..164a92761c2 100644 --- a/mail/maildrop/pkg/PLIST +++ b/mail/maildrop/pkg/PLIST @@ -1,18 +1,15 @@ -@comment $OpenBSD: PLIST,v 1.8 2004/12/06 23:06:01 mbalmer Exp $ -@mode 0555 +@comment $OpenBSD: PLIST,v 1.9 2006/11/03 13:50:54 mbalmer Exp $ +@newgroup _courier:556 +@newuser _courier:556:556:daemon:Courier Mail Server:/var/empty:/sbin/nologin bin/lockmail bin/mailbot bin/maildrop -bin/makedat -bin/makedatprog bin/makemime bin/reformail bin/reformime -@mode @man man/man1/lockmail.1 @man man/man1/mailbot.1 @man man/man1/maildrop.1 -@man man/man1/makedat.1 @man man/man1/makemime.1 @man man/man1/reformail.1 @man man/man1/reformime.1 @@ -24,7 +21,11 @@ bin/reformime share/doc/maildrop/ share/doc/maildrop/INSTALL share/doc/maildrop/README +share/doc/maildrop/README.maildirquota.txt share/doc/maildrop/README.postfix +share/doc/maildrop/README.sharedfolders.txt +share/doc/maildrop/README.unicode.txt +share/doc/maildrop/SECURITY share/doc/maildrop/UPGRADE share/doc/maildrop/html/ share/doc/maildrop/html/deliverquota.html @@ -37,15 +38,11 @@ share/doc/maildrop/html/maildrop.html share/doc/maildrop/html/maildropex.html share/doc/maildrop/html/maildropfilter.html share/doc/maildrop/html/maildropgdbm.html -share/doc/maildrop/html/makedat.html share/doc/maildrop/html/makemime.html -share/doc/maildrop/html/makeuserdb.html share/doc/maildrop/html/manpage.css share/doc/maildrop/html/reformail.html share/doc/maildrop/html/reformime.html share/doc/maildrop/html/rfc2045.html share/doc/maildrop/html/rfc822.html -share/doc/maildrop/html/userdb.html -share/doc/maildrop/html/userdbpw.html -%%ldap%% -%%mysql%% +share/doc/maildrop/maildroptips.txt +share/doc/maildrop/quotawarnmsg diff --git a/mail/maildrop/pkg/PLIST-utils b/mail/maildrop/pkg/PLIST-utils index 96313edc907..ed97284865b 100644 --- a/mail/maildrop/pkg/PLIST-utils +++ b/mail/maildrop/pkg/PLIST-utils @@ -1,24 +1,7 @@ -@comment $OpenBSD: PLIST-utils,v 1.5 2005/08/16 18:28:55 espie Exp $ -@conflict maildrop-<=1.5.3 +@comment $OpenBSD: PLIST-utils,v 1.6 2006/11/03 13:50:54 mbalmer Exp $ +@newgroup _courier:556 +@newuser _courier:556:556:daemon:Courier Mail Server:/var/empty:/sbin/nologin bin/deliverquota bin/maildirmake -bin/makeuserdb -bin/pw2userdb -bin/userdb -bin/userdbpw -bin/vchkpw2userdb @man man/man1/maildirmake.1 @man man/man8/deliverquota.8 -@man man/man8/makeuserdb.8 -@man man/man8/pw2userdb.8 -@man man/man8/userdb.8 -@man man/man8/userdbpw.8 -@man man/man8/vchkpw2userdb.8 -share/doc/maildrop/ -share/doc/maildrop/scripts/ -share/doc/maildrop/scripts/makedat -share/doc/maildrop/scripts/makeuserdb -share/doc/maildrop/scripts/pw2userdb -share/doc/maildrop/scripts/userdb -share/doc/maildrop/scripts/userdbpw -share/doc/maildrop/scripts/vchkpw2userdb diff --git a/mail/maildrop/pkg/SECURITY b/mail/maildrop/pkg/SECURITY deleted file mode 100644 index 73718a727f3..00000000000 --- a/mail/maildrop/pkg/SECURITY +++ /dev/null @@ -1,27 +0,0 @@ -Maildrop must be run as the uid/gid of the user whose mailbox it -is delivering to. - -Therefore, if the MTA does not spawn it with the correct uid/gid, -it needs to be suid root to perform the operation itself. - -The port is installed with the suid bit stripped by default. This -works out-of-the-box with MTAs like qmail, which spawn maildrop -with the correct uid/gid it needs to perform the delivery. - -For more information, please read the documentation in -${PREFIX}/share/doc/maildrop/INSTALL. It should be safe to enable -the suid bits, but scan over the code first and satisfy yourself -that there are no security holes. - -If you perform a full audit, please inform and -the suid bit may then be enabled by default. Note that there have -been no security advisories about this package in the past. - -The following files will need suid re-enabled if you so choose: - -${PREFIX}/bin/maildrop -${PREFIX}/bin/dotlock -${PREFIX}/bin/reformail - -Marc Balmer -$OpenBSD: SECURITY,v 1.2 2004/12/06 23:06:01 mbalmer Exp $