Don't depend on saslauthd. This is preparation for saslauthd
separation from cyrus-sasl2.
This commit is contained in:
parent
e238d52139
commit
067f86b4a6
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=81847
16 changed files with 12 additions and 104 deletions
|
@ -20,8 +20,7 @@ MAINTAINER= ume@FreeBSD.org
|
|||
COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols
|
||||
|
||||
LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
|
||||
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \
|
||||
${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
|
||||
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend
|
||||
|
||||
USE_PERL5= yes
|
||||
USE_REINPLACE= YES
|
||||
|
|
|
@ -268,9 +268,9 @@ sievedir: /var/imap/sieve
|
|||
#sasl_minimum_layer: 0
|
||||
|
||||
# The mechanism used by the server to verify plaintext passwords. Possible
|
||||
# values include "auxprop", "saslauthd", and "pwcheck"
|
||||
# values include "auxprop" or "saslauthd"
|
||||
#
|
||||
sasl_pwcheck_method: saslauthd
|
||||
sasl_pwcheck_method: auxprop
|
||||
|
||||
# If enabled, the SASL library will automatically create authentication
|
||||
# secrets when given a plaintext password. See the SASL documentation.
|
||||
|
|
|
@ -25,18 +25,6 @@ checkfile() {
|
|||
esac
|
||||
}
|
||||
|
||||
# Uninstall timseived's Cyrus.conf file.
|
||||
|
||||
cyrus_conf() {
|
||||
if [ -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then
|
||||
echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp
|
||||
if cmp -s ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp; then
|
||||
rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf
|
||||
fi
|
||||
rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp
|
||||
fi
|
||||
}
|
||||
|
||||
#
|
||||
# Modify the 'cyrus' user created from the cyrus-sasl port
|
||||
#
|
||||
|
@ -62,7 +50,6 @@ modify_cyrus_user() {
|
|||
case $2 in
|
||||
DEINSTALL)
|
||||
cd ${PKG_PREFIX}
|
||||
cyrus_conf
|
||||
checkfile ${PKG_PREIFX}/etc/imapd.conf
|
||||
checkfile ${PKG_PREIFX}/etc/cyrus.conf
|
||||
;;
|
||||
|
|
|
@ -42,14 +42,6 @@ checkfile() {
|
|||
esac
|
||||
}
|
||||
|
||||
# Install timseived's Cyrus.conf file
|
||||
|
||||
cyrus_conf() {
|
||||
if [ ! -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then
|
||||
echo "pwcheck_method: saslauthd" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf
|
||||
fi
|
||||
}
|
||||
|
||||
case $2 in
|
||||
PRE-INSTALL)
|
||||
;;
|
||||
|
@ -57,7 +49,6 @@ case $2 in
|
|||
POST-INSTALL)
|
||||
modify_cyrus_user
|
||||
cd ${PKG_PREFIX}
|
||||
cyrus_conf
|
||||
checkfile ${PKG_PREFIX}/etc/imapd.conf
|
||||
checkfile ${PKG_PREFIX}/etc/cyrus.conf
|
||||
if grep 'sieve' /etc/services; then
|
||||
|
|
|
@ -18,8 +18,7 @@ MAINTAINER= ume@FreeBSD.org
|
|||
COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols
|
||||
|
||||
LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
|
||||
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \
|
||||
${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
|
||||
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend
|
||||
|
||||
USE_PERL5= yes
|
||||
USE_REINPLACE= YES
|
||||
|
|
|
@ -268,9 +268,9 @@ sievedir: /var/imap/sieve
|
|||
#sasl_minimum_layer: 0
|
||||
|
||||
# The mechanism used by the server to verify plaintext passwords. Possible
|
||||
# values include "auxprop", "saslauthd", and "pwcheck"
|
||||
# values include "auxprop" or "saslauthd"
|
||||
#
|
||||
sasl_pwcheck_method: saslauthd
|
||||
sasl_pwcheck_method: auxprop
|
||||
|
||||
# If enabled, the SASL library will automatically create authentication
|
||||
# secrets when given a plaintext password. See the SASL documentation.
|
||||
|
|
|
@ -25,18 +25,6 @@ checkfile() {
|
|||
esac
|
||||
}
|
||||
|
||||
# Uninstall timseived's Cyrus.conf file.
|
||||
|
||||
cyrus_conf() {
|
||||
if [ -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then
|
||||
echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp
|
||||
if cmp -s ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp; then
|
||||
rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf
|
||||
fi
|
||||
rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp
|
||||
fi
|
||||
}
|
||||
|
||||
#
|
||||
# Modify the 'cyrus' user created from the cyrus-sasl port
|
||||
#
|
||||
|
@ -62,7 +50,6 @@ modify_cyrus_user() {
|
|||
case $2 in
|
||||
DEINSTALL)
|
||||
cd ${PKG_PREFIX}
|
||||
cyrus_conf
|
||||
checkfile ${PKG_PREIFX}/etc/imapd.conf
|
||||
checkfile ${PKG_PREIFX}/etc/cyrus.conf
|
||||
;;
|
||||
|
|
|
@ -42,14 +42,6 @@ checkfile() {
|
|||
esac
|
||||
}
|
||||
|
||||
# Install timseived's Cyrus.conf file
|
||||
|
||||
cyrus_conf() {
|
||||
if [ ! -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then
|
||||
echo "pwcheck_method: saslauthd" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf
|
||||
fi
|
||||
}
|
||||
|
||||
case $2 in
|
||||
PRE-INSTALL)
|
||||
;;
|
||||
|
@ -57,7 +49,6 @@ case $2 in
|
|||
POST-INSTALL)
|
||||
modify_cyrus_user
|
||||
cd ${PKG_PREFIX}
|
||||
cyrus_conf
|
||||
checkfile ${PKG_PREFIX}/etc/imapd.conf
|
||||
checkfile ${PKG_PREFIX}/etc/cyrus.conf
|
||||
if grep 'sieve' /etc/services; then
|
||||
|
|
|
@ -18,8 +18,7 @@ MAINTAINER= ume@FreeBSD.org
|
|||
COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols
|
||||
|
||||
LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
|
||||
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \
|
||||
${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
|
||||
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend
|
||||
|
||||
USE_PERL5= yes
|
||||
USE_REINPLACE= YES
|
||||
|
|
|
@ -268,9 +268,9 @@ sievedir: /var/imap/sieve
|
|||
#sasl_minimum_layer: 0
|
||||
|
||||
# The mechanism used by the server to verify plaintext passwords. Possible
|
||||
# values include "auxprop", "saslauthd", and "pwcheck"
|
||||
# values include "auxprop" or "saslauthd"
|
||||
#
|
||||
sasl_pwcheck_method: saslauthd
|
||||
sasl_pwcheck_method: auxprop
|
||||
|
||||
# If enabled, the SASL library will automatically create authentication
|
||||
# secrets when given a plaintext password. See the SASL documentation.
|
||||
|
|
|
@ -25,18 +25,6 @@ checkfile() {
|
|||
esac
|
||||
}
|
||||
|
||||
# Uninstall timseived's Cyrus.conf file.
|
||||
|
||||
cyrus_conf() {
|
||||
if [ -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then
|
||||
echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp
|
||||
if cmp -s ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp; then
|
||||
rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf
|
||||
fi
|
||||
rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp
|
||||
fi
|
||||
}
|
||||
|
||||
#
|
||||
# Modify the 'cyrus' user created from the cyrus-sasl port
|
||||
#
|
||||
|
@ -62,7 +50,6 @@ modify_cyrus_user() {
|
|||
case $2 in
|
||||
DEINSTALL)
|
||||
cd ${PKG_PREFIX}
|
||||
cyrus_conf
|
||||
checkfile ${PKG_PREIFX}/etc/imapd.conf
|
||||
checkfile ${PKG_PREIFX}/etc/cyrus.conf
|
||||
;;
|
||||
|
|
|
@ -42,14 +42,6 @@ checkfile() {
|
|||
esac
|
||||
}
|
||||
|
||||
# Install timseived's Cyrus.conf file
|
||||
|
||||
cyrus_conf() {
|
||||
if [ ! -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then
|
||||
echo "pwcheck_method: saslauthd" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf
|
||||
fi
|
||||
}
|
||||
|
||||
case $2 in
|
||||
PRE-INSTALL)
|
||||
;;
|
||||
|
@ -57,7 +49,6 @@ case $2 in
|
|||
POST-INSTALL)
|
||||
modify_cyrus_user
|
||||
cd ${PKG_PREFIX}
|
||||
cyrus_conf
|
||||
checkfile ${PKG_PREFIX}/etc/imapd.conf
|
||||
checkfile ${PKG_PREFIX}/etc/cyrus.conf
|
||||
if grep 'sieve' /etc/services; then
|
||||
|
|
|
@ -18,8 +18,7 @@ MAINTAINER= ume@FreeBSD.org
|
|||
COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols
|
||||
|
||||
LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
|
||||
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \
|
||||
${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
|
||||
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend
|
||||
|
||||
USE_PERL5= yes
|
||||
USE_REINPLACE= YES
|
||||
|
|
|
@ -268,9 +268,9 @@ sievedir: /var/imap/sieve
|
|||
#sasl_minimum_layer: 0
|
||||
|
||||
# The mechanism used by the server to verify plaintext passwords. Possible
|
||||
# values include "auxprop", "saslauthd", and "pwcheck"
|
||||
# values include "auxprop" or "saslauthd"
|
||||
#
|
||||
sasl_pwcheck_method: saslauthd
|
||||
sasl_pwcheck_method: auxprop
|
||||
|
||||
# If enabled, the SASL library will automatically create authentication
|
||||
# secrets when given a plaintext password. See the SASL documentation.
|
||||
|
|
|
@ -25,18 +25,6 @@ checkfile() {
|
|||
esac
|
||||
}
|
||||
|
||||
# Uninstall timseived's Cyrus.conf file.
|
||||
|
||||
cyrus_conf() {
|
||||
if [ -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then
|
||||
echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp
|
||||
if cmp -s ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp; then
|
||||
rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf
|
||||
fi
|
||||
rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp
|
||||
fi
|
||||
}
|
||||
|
||||
#
|
||||
# Modify the 'cyrus' user created from the cyrus-sasl port
|
||||
#
|
||||
|
@ -62,7 +50,6 @@ modify_cyrus_user() {
|
|||
case $2 in
|
||||
DEINSTALL)
|
||||
cd ${PKG_PREFIX}
|
||||
cyrus_conf
|
||||
checkfile ${PKG_PREIFX}/etc/imapd.conf
|
||||
checkfile ${PKG_PREIFX}/etc/cyrus.conf
|
||||
;;
|
||||
|
|
|
@ -42,14 +42,6 @@ checkfile() {
|
|||
esac
|
||||
}
|
||||
|
||||
# Install timseived's Cyrus.conf file
|
||||
|
||||
cyrus_conf() {
|
||||
if [ ! -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then
|
||||
echo "pwcheck_method: saslauthd" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf
|
||||
fi
|
||||
}
|
||||
|
||||
case $2 in
|
||||
PRE-INSTALL)
|
||||
;;
|
||||
|
@ -57,7 +49,6 @@ case $2 in
|
|||
POST-INSTALL)
|
||||
modify_cyrus_user
|
||||
cd ${PKG_PREFIX}
|
||||
cyrus_conf
|
||||
checkfile ${PKG_PREFIX}/etc/imapd.conf
|
||||
checkfile ${PKG_PREFIX}/etc/cyrus.conf
|
||||
if grep 'sieve' /etc/services; then
|
||||
|
|
Loading…
Reference in a new issue