summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/cyrus-imapd2/Makefile3
-rw-r--r--mail/cyrus-imapd2/files/imapd.conf4
-rw-r--r--mail/cyrus-imapd2/pkg-deinstall13
-rw-r--r--mail/cyrus-imapd2/pkg-install9
-rw-r--r--mail/cyrus-imapd22/Makefile3
-rw-r--r--mail/cyrus-imapd22/files/imapd.conf4
-rw-r--r--mail/cyrus-imapd22/pkg-deinstall13
-rw-r--r--mail/cyrus-imapd22/pkg-install9
-rw-r--r--mail/cyrus-imapd23/Makefile3
-rw-r--r--mail/cyrus-imapd23/files/imapd.conf4
-rw-r--r--mail/cyrus-imapd23/pkg-deinstall13
-rw-r--r--mail/cyrus-imapd23/pkg-install9
-rw-r--r--mail/cyrus-imapd24/Makefile3
-rw-r--r--mail/cyrus-imapd24/files/imapd.conf4
-rw-r--r--mail/cyrus-imapd24/pkg-deinstall13
-rw-r--r--mail/cyrus-imapd24/pkg-install9
16 files changed, 12 insertions, 104 deletions
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 282fef93b819..29fa3850ff8b 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -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
diff --git a/mail/cyrus-imapd2/files/imapd.conf b/mail/cyrus-imapd2/files/imapd.conf
index 8384d7892b02..8a6f77561179 100644
--- a/mail/cyrus-imapd2/files/imapd.conf
+++ b/mail/cyrus-imapd2/files/imapd.conf
@@ -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.
diff --git a/mail/cyrus-imapd2/pkg-deinstall b/mail/cyrus-imapd2/pkg-deinstall
index 482b69d2f5c8..aed34d1fec6e 100644
--- a/mail/cyrus-imapd2/pkg-deinstall
+++ b/mail/cyrus-imapd2/pkg-deinstall
@@ -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
;;
diff --git a/mail/cyrus-imapd2/pkg-install b/mail/cyrus-imapd2/pkg-install
index 21e473bac5db..8bbe09d840f5 100644
--- a/mail/cyrus-imapd2/pkg-install
+++ b/mail/cyrus-imapd2/pkg-install
@@ -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
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 5d59ceff21aa..feccc0d2180f 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -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
diff --git a/mail/cyrus-imapd22/files/imapd.conf b/mail/cyrus-imapd22/files/imapd.conf
index 8fbc33c976e4..36794aeb8f6f 100644
--- a/mail/cyrus-imapd22/files/imapd.conf
+++ b/mail/cyrus-imapd22/files/imapd.conf
@@ -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.
diff --git a/mail/cyrus-imapd22/pkg-deinstall b/mail/cyrus-imapd22/pkg-deinstall
index 482b69d2f5c8..aed34d1fec6e 100644
--- a/mail/cyrus-imapd22/pkg-deinstall
+++ b/mail/cyrus-imapd22/pkg-deinstall
@@ -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
;;
diff --git a/mail/cyrus-imapd22/pkg-install b/mail/cyrus-imapd22/pkg-install
index 21e473bac5db..8bbe09d840f5 100644
--- a/mail/cyrus-imapd22/pkg-install
+++ b/mail/cyrus-imapd22/pkg-install
@@ -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
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 5d59ceff21aa..feccc0d2180f 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -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
diff --git a/mail/cyrus-imapd23/files/imapd.conf b/mail/cyrus-imapd23/files/imapd.conf
index 8fbc33c976e4..36794aeb8f6f 100644
--- a/mail/cyrus-imapd23/files/imapd.conf
+++ b/mail/cyrus-imapd23/files/imapd.conf
@@ -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.
diff --git a/mail/cyrus-imapd23/pkg-deinstall b/mail/cyrus-imapd23/pkg-deinstall
index 482b69d2f5c8..aed34d1fec6e 100644
--- a/mail/cyrus-imapd23/pkg-deinstall
+++ b/mail/cyrus-imapd23/pkg-deinstall
@@ -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
;;
diff --git a/mail/cyrus-imapd23/pkg-install b/mail/cyrus-imapd23/pkg-install
index 21e473bac5db..8bbe09d840f5 100644
--- a/mail/cyrus-imapd23/pkg-install
+++ b/mail/cyrus-imapd23/pkg-install
@@ -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
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 5d59ceff21aa..feccc0d2180f 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -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
diff --git a/mail/cyrus-imapd24/files/imapd.conf b/mail/cyrus-imapd24/files/imapd.conf
index 8fbc33c976e4..36794aeb8f6f 100644
--- a/mail/cyrus-imapd24/files/imapd.conf
+++ b/mail/cyrus-imapd24/files/imapd.conf
@@ -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.
diff --git a/mail/cyrus-imapd24/pkg-deinstall b/mail/cyrus-imapd24/pkg-deinstall
index 482b69d2f5c8..aed34d1fec6e 100644
--- a/mail/cyrus-imapd24/pkg-deinstall
+++ b/mail/cyrus-imapd24/pkg-deinstall
@@ -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
;;
diff --git a/mail/cyrus-imapd24/pkg-install b/mail/cyrus-imapd24/pkg-install
index 21e473bac5db..8bbe09d840f5 100644
--- a/mail/cyrus-imapd24/pkg-install
+++ b/mail/cyrus-imapd24/pkg-install
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 07:10:13 +0000