Date: Wed, 7 Jan 2015 16:38:02 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376470 - head/mail/vpopmail Message-ID: <201501071638.t07Gc2eQ078547@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Jan 7 16:38:01 2015 New Revision: 376470 URL: https://svnweb.freebsd.org/changeset/ports/376470 QAT: https://qat.redports.org/buildarchive/r376470/ Log: - Update plist for new format Reviewed by: bapt Modified: head/mail/vpopmail/Makefile head/mail/vpopmail/pkg-plist Modified: head/mail/vpopmail/Makefile ============================================================================== --- head/mail/vpopmail/Makefile Wed Jan 7 16:16:02 2015 (r376469) +++ head/mail/vpopmail/Makefile Wed Jan 7 16:38:01 2015 (r376470) @@ -69,7 +69,7 @@ OPTIONS_DEFINE= DOCS \ SQL_LOG \ SQL_LOG_TRIM OPTIONS_SINGLE= AUTH -OPTIONS_SINGLE_AUTH= CDB MYSQL PGSQL LDAP LDAP_SASL ORACLE SYBASE +OPTIONS_SINGLE_AUTH= CDB MYSQL PGSQL LDAP LDAP_SASL ORACLE SYBASE OPTIONS_DEFAULT=MD5_PASSWORDS \ CDB \ @@ -173,8 +173,15 @@ SPAMASSASSIN_BUILD_DEPENDS= spamc:${PORT SPAMASSASSIN_RUN_DEPENDS= spamc:${PORTSDIR}/mail/spamassassin SPAMFOLDER_CONFIGURE_ON= --enable-spam-junkfolder +INSTALL_TARGET= install-strip + .include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MSUID_VCHKPW} +VCHKPW_MODE="6711" +.endif +PLIST_SUB+= VCHKPW_MODE="${VCHKPW_MODE}" + # PostgreSQL database configuration options # # WITH_PGSQL_USER - the username for connecting to the PostgreSQL server (postgres) Modified: head/mail/vpopmail/pkg-plist ============================================================================== --- head/mail/vpopmail/pkg-plist Wed Jan 7 16:16:02 2015 (r376469) +++ head/mail/vpopmail/pkg-plist Wed Jan 7 16:38:01 2015 (r376470) @@ -1,3 +1,5 @@ +@owner vpopmail +@group vchkpw vpopmail/bin/authvchkpw vpopmail/bin/clearopensmtp vpopmail/bin/dotqmail2valias @@ -6,7 +8,7 @@ vpopmail/bin/vadddomain vpopmail/bin/vadduser vpopmail/bin/valias vpopmail/bin/vchangepw -vpopmail/bin/vchkpw +@(,,%%VCHKPW_MODE%%) vpopmail/bin/vchkpw vpopmail/bin/vconvert vpopmail/bin/vdeldomain vpopmail/bin/vdelivermail @@ -25,6 +27,28 @@ vpopmail/bin/vpopmaild vpopmail/bin/vsetuserquota vpopmail/bin/vusagec vpopmail/bin/vuserinfo +vpopmail/etc/inc_deps +vpopmail/etc/lib_deps +@exec if [ ! -f %D/vpopmail/etc/defaultdomain ]; then install -o vpopmail -g vchkpw /dev/null %D/vpopmail/etc/defaultdomain; fi +@unexec if [ -f %D/vpopmail/etc/defaultdomain ] && [ ! -s %D/vpopmail/etc/defaultdomain ]; then rm -f %D/vpopmail/etc/defaultdomain; fi +@unexec if cmp -s %D/vpopmail/etc/tcp.smtp %D/vpopmail/etc/tcp.smtp-dist; then rm -f %D/vpopmail/etc/tcp.smtp; fi +vpopmail/etc/tcp.smtp-dist +@exec if [ ! -f %D/vpopmail/etc/tcp.smtp ] ; then cp -p %D/%F %B/tcp.smtp; fi +@unexec if cmp -s %D/vpopmail/etc/vlimits.default %D/vpopmail/etc/vlimits.default-dist; then rm -f %D/vpopmail/etc/vlimits.default; fi +vpopmail/etc/vlimits.default-dist +@exec if [ ! -f %D/vpopmail/etc/vlimits.default ] ; then cp -p %D/%F %B/vlimits.default; fi +%%LDAP%%@unexec if cmp -s %D/vpopmail/etc/vpopmail.ldap %D/vpopmail/etc/vpopmail.ldap-dist; then rm -f %D/vpopmail/etc/vpopmail.ldap; fi +%%LDAP%%vpopmail/etc/vpopmail.ldap-dist +%%LDAP%%@exec if [ ! -f %D/vpopmail/etc/vpopmail.ldap ] ; then cp -p %D/%F %B/vpopmail.ldap; fi +%%LDAP%%@exec echo "You need to specify the LDAP connection settings in the %D/vpopmail/etc/vpopmail.ldap file" | /usr/bin/fmt +%%MYSQL%%@unexec if cmp -s %D/vpopmail/etc/vpopmail.mysql %D/vpopmail/etc/vpopmail.mysql-dist; then rm -f %D/vpopmail/etc/vpopmail.mysql; fi +%%MYSQL%%vpopmail/etc/vpopmail.mysql-dist +%%MYSQL%%@exec if [ ! -f %D/vpopmail/etc/vpopmail.mysql ] ; then cp -p %D/%F %B/vpopmail.mysql; fi +@unexec if cmp -s %D/vpopmail/etc/vusagec.conf %D/vpopmail/etc/vusagec.conf-dist; then rm -f %D/vpopmail/etc/vusagec.conf; fi +vpopmail/etc/vusagec.conf-dist +@exec if [ ! -f %D/vpopmail/etc/vusagec.conf ] ; then cp -p %D/%F %B/vusagec.conf; fi +@owner +@group %%PORTDOCS%%vpopmail/doc/doc_html/vpopmail.html %%PORTDOCS%%vpopmail/doc/doc_html/vpopmail5.abw %%PORTDOCS%%vpopmail/doc/doc_html/vpopmailapi.png @@ -61,36 +85,6 @@ vpopmail/bin/vuserinfo %%PORTDOCS%%vpopmail/doc/README.vpopmaild %%PORTDOCS%%vpopmail/doc/README.vqmaillocal %%PORTDOCS%%vpopmail/doc/UPGRADE -vpopmail/etc/inc_deps -vpopmail/etc/lib_deps -@exec if [ ! -f %D/vpopmail/etc/defaultdomain ]; then touch %D/vpopmail/etc/defaultdomain; fi -@unexec if [ -f %D/vpopmail/etc/defaultdomain ] && [ ! -s %D/vpopmail/etc/defaultdomain ]; then rm -f %D/vpopmail/etc/defaultdomain; fi -@unexec if cmp -s %D/vpopmail/etc/tcp.smtp %D/vpopmail/etc/tcp.smtp-dist; then rm -f %D/vpopmail/etc/tcp.smtp; fi -vpopmail/etc/tcp.smtp-dist -@exec if [ ! -f %D/vpopmail/etc/tcp.smtp ] ; then cp -p %D/%F %B/tcp.smtp; fi -@unexec if cmp -s %D/vpopmail/etc/vlimits.default %D/vpopmail/etc/vlimits.default-dist; then rm -f %D/vpopmail/etc/vlimits.default; fi -vpopmail/etc/vlimits.default-dist -@exec if [ ! -f %D/vpopmail/etc/vlimits.default ] ; then cp -p %D/%F %B/vlimits.default; fi -%%LDAP%%@unexec if cmp -s %D/vpopmail/etc/vpopmail.ldap %D/vpopmail/etc/vpopmail.ldap-dist; then rm -f %D/vpopmail/etc/vpopmail.ldap; fi -%%LDAP%%vpopmail/etc/vpopmail.ldap-dist -%%LDAP%%@exec if [ ! -f %D/vpopmail/etc/vpopmail.ldap ] ; then cp -p %D/%F %B/vpopmail.ldap; fi -%%LDAP%%@exec echo "You need to specify the LDAP connection settings in the %D/vpopmail/etc/vpopmail.ldap file" | /usr/bin/fmt -%%MYSQL%%@unexec if cmp -s %D/vpopmail/etc/vpopmail.mysql %D/vpopmail/etc/vpopmail.mysql-dist; then rm -f %D/vpopmail/etc/vpopmail.mysql; fi -%%MYSQL%%vpopmail/etc/vpopmail.mysql-dist -%%MYSQL%%@exec if [ ! -f %D/vpopmail/etc/vpopmail.mysql ] ; then cp -p %D/%F %B/vpopmail.mysql; fi -@unexec if cmp -s %D/vpopmail/etc/vusagec.conf %D/vpopmail/etc/vusagec.conf-dist; then rm -f %D/vpopmail/etc/vusagec.conf; fi -vpopmail/etc/vusagec.conf-dist -@exec if [ ! -f %D/vpopmail/etc/vusagec.conf ] ; then cp -p %D/%F %B/vusagec.conf; fi -%%SPAMASSASSIN%%@exec echo "***********************************************************************" -%%SPAMASSASSIN%%@exec echo "Now you should add the following options to your spamd.sh startup file:" -%%SPAMASSASSIN%%@exec echo "-v -u vpopmail" -%%SPAMASSASSIN%%@exec echo "***********************************************************************" -@exec /usr/sbin/chown vpopmail:vchkpw %D/vpopmail -@exec /usr/sbin/chown -R vpopmail:vchkpw %D/vpopmail/bin %D/vpopmail/etc -%%SUID_VCHKPW%%@exec /bin/chmod ug+s %D/vpopmail/bin/vchkpw -@exec install -d -o vpopmail -g vchkpw %D/vpopmail/domains -@exec install -d -o vpopmail -g vchkpw %D/vpopmail/lib -@exec install -d -o vpopmail -g vchkpw %D/vpopmail/include vpopmail/include/client.h vpopmail/include/conf.h vpopmail/include/config.h @@ -108,16 +102,15 @@ vpopmail/lib/libvpopmail.a %%LDAP%%vpopmail/ldap/qmailUser.schema %%LDAP%%vpopmail/ldap/slapd.conf %%LDAP%%vpopmail/ldap/vpopmail.ldif -%%LDAP%%@dirrm vpopmail/ldap %%MAILDROP%%vpopmail/maildrop/maildroprc.v1 %%MAILDROP%%vpopmail/maildrop/maildroprc.v2 -%%MAILDROP%%@dirrm vpopmail/maildrop -@dirrm vpopmail/lib -@dirrm vpopmail/include -@dirrmtry vpopmail/etc -@dirrmtry vpopmail/domains -%%PORTDOCS%%@dirrm vpopmail/doc/man_html -%%PORTDOCS%%@dirrm vpopmail/doc/doc_html -%%PORTDOCS%%@dirrm vpopmail/doc -@dirrm vpopmail/bin -@dirrmtry vpopmail +@dir(vpopmail,vchkpw,) vpopmail/domains +@dir(vpopmail,vchkpw,) vpopmail/bin +@dir(vpopmail,vchkpw,) vpopmail/etc +@dir(vpopmail,vchkpw,) vpopmail/include +@dir(vpopmail,vchkpw,) vpopmail/lib +@dir(vpopmail,vchkpw,) vpopmail +%%SPAMASSASSIN%%@exec echo "***********************************************************************" +%%SPAMASSASSIN%%@exec echo "Now you should add the following options to your spamd.sh startup file:" +%%SPAMASSASSIN%%@exec echo "-v -u vpopmail" +%%SPAMASSASSIN%%@exec echo "***********************************************************************"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501071638.t07Gc2eQ078547>