kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't depend on saslauthd. This is preparation for saslauthd

Browse source 
separation from cyrus-sasl2.
This commit is contained in:
Hajimu UMEMOTO 2003-06-01 04:01:12 +00:00
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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mail/cyrus-imapd2/Makefile
View file

@ -20,8 +20,7 @@ MAINTAINER= ume@FreeBSD.org
COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols
LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \ BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend
${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
USE_PERL5= yes USE_PERL5= yes
USE_REINPLACE= YES USE_REINPLACE= YES

4
mail/cyrus-imapd2/files/imapd.conf
View file

@ -268,9 +268,9 @@ sievedir: /var/imap/sieve
#sasl_minimum_layer: 0 #sasl_minimum_layer: 0
# The mechanism used by the server to verify plaintext passwords. Possible # 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 # If enabled, the SASL library will automatically create authentication
# secrets when given a plaintext password. See the SASL documentation. # secrets when given a plaintext password. See the SASL documentation.

13
mail/cyrus-imapd2/pkg-deinstall
View file

@ -25,18 +25,6 @@ checkfile() {
esac 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 # Modify the 'cyrus' user created from the cyrus-sasl port
# #
@ -62,7 +50,6 @@ modify_cyrus_user() {
case $2 in case $2 in
DEINSTALL) DEINSTALL)
cd ${PKG_PREFIX} cd ${PKG_PREFIX}
cyrus_conf
checkfile ${PKG_PREIFX}/etc/imapd.conf checkfile ${PKG_PREIFX}/etc/imapd.conf
checkfile ${PKG_PREIFX}/etc/cyrus.conf checkfile ${PKG_PREIFX}/etc/cyrus.conf
;; ;;

9
mail/cyrus-imapd2/pkg-install
View file

@ -42,14 +42,6 @@ checkfile() {
esac 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 case $2 in
PRE-INSTALL) PRE-INSTALL)
;; ;;
@ -57,7 +49,6 @@ case $2 in
POST-INSTALL) POST-INSTALL)
modify_cyrus_user modify_cyrus_user
cd ${PKG_PREFIX} cd ${PKG_PREFIX}
cyrus_conf
checkfile ${PKG_PREFIX}/etc/imapd.conf checkfile ${PKG_PREFIX}/etc/imapd.conf
checkfile ${PKG_PREFIX}/etc/cyrus.conf checkfile ${PKG_PREFIX}/etc/cyrus.conf
if grep 'sieve' /etc/services; then if grep 'sieve' /etc/services; then

3
mail/cyrus-imapd22/Makefile
View file

@ -18,8 +18,7 @@ MAINTAINER= ume@FreeBSD.org
COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols
LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \ BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend
${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
USE_PERL5= yes USE_PERL5= yes
USE_REINPLACE= YES USE_REINPLACE= YES

4
mail/cyrus-imapd22/files/imapd.conf
View file

@ -268,9 +268,9 @@ sievedir: /var/imap/sieve
#sasl_minimum_layer: 0 #sasl_minimum_layer: 0
# The mechanism used by the server to verify plaintext passwords. Possible # 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 # If enabled, the SASL library will automatically create authentication
# secrets when given a plaintext password. See the SASL documentation. # secrets when given a plaintext password. See the SASL documentation.

13
mail/cyrus-imapd22/pkg-deinstall
View file

@ -25,18 +25,6 @@ checkfile() {
esac 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 # Modify the 'cyrus' user created from the cyrus-sasl port
# #
@ -62,7 +50,6 @@ modify_cyrus_user() {
case $2 in case $2 in
DEINSTALL) DEINSTALL)
cd ${PKG_PREFIX} cd ${PKG_PREFIX}
cyrus_conf
checkfile ${PKG_PREIFX}/etc/imapd.conf checkfile ${PKG_PREIFX}/etc/imapd.conf
checkfile ${PKG_PREIFX}/etc/cyrus.conf checkfile ${PKG_PREIFX}/etc/cyrus.conf
;; ;;

9
mail/cyrus-imapd22/pkg-install
View file

@ -42,14 +42,6 @@ checkfile() {
esac 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 case $2 in
PRE-INSTALL) PRE-INSTALL)
;; ;;
@ -57,7 +49,6 @@ case $2 in
POST-INSTALL) POST-INSTALL)
modify_cyrus_user modify_cyrus_user
cd ${PKG_PREFIX} cd ${PKG_PREFIX}
cyrus_conf
checkfile ${PKG_PREFIX}/etc/imapd.conf checkfile ${PKG_PREFIX}/etc/imapd.conf
checkfile ${PKG_PREFIX}/etc/cyrus.conf checkfile ${PKG_PREFIX}/etc/cyrus.conf
if grep 'sieve' /etc/services; then if grep 'sieve' /etc/services; then

3
mail/cyrus-imapd23/Makefile
View file

@ -18,8 +18,7 @@ MAINTAINER= ume@FreeBSD.org
COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols
LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \ BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend
${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
USE_PERL5= yes USE_PERL5= yes
USE_REINPLACE= YES USE_REINPLACE= YES

4
mail/cyrus-imapd23/files/imapd.conf
View file

@ -268,9 +268,9 @@ sievedir: /var/imap/sieve
#sasl_minimum_layer: 0 #sasl_minimum_layer: 0
# The mechanism used by the server to verify plaintext passwords. Possible # 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 # If enabled, the SASL library will automatically create authentication
# secrets when given a plaintext password. See the SASL documentation. # secrets when given a plaintext password. See the SASL documentation.

13
mail/cyrus-imapd23/pkg-deinstall
View file

@ -25,18 +25,6 @@ checkfile() {
esac 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 # Modify the 'cyrus' user created from the cyrus-sasl port
# #
@ -62,7 +50,6 @@ modify_cyrus_user() {
case $2 in case $2 in
DEINSTALL) DEINSTALL)
cd ${PKG_PREFIX} cd ${PKG_PREFIX}
cyrus_conf
checkfile ${PKG_PREIFX}/etc/imapd.conf checkfile ${PKG_PREIFX}/etc/imapd.conf
checkfile ${PKG_PREIFX}/etc/cyrus.conf checkfile ${PKG_PREIFX}/etc/cyrus.conf
;; ;;

9
mail/cyrus-imapd23/pkg-install
View file

@ -42,14 +42,6 @@ checkfile() {
esac 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 case $2 in
PRE-INSTALL) PRE-INSTALL)
;; ;;
@ -57,7 +49,6 @@ case $2 in
POST-INSTALL) POST-INSTALL)
modify_cyrus_user modify_cyrus_user
cd ${PKG_PREFIX} cd ${PKG_PREFIX}
cyrus_conf
checkfile ${PKG_PREFIX}/etc/imapd.conf checkfile ${PKG_PREFIX}/etc/imapd.conf
checkfile ${PKG_PREFIX}/etc/cyrus.conf checkfile ${PKG_PREFIX}/etc/cyrus.conf
if grep 'sieve' /etc/services; then if grep 'sieve' /etc/services; then

3
mail/cyrus-imapd24/Makefile
View file

@ -18,8 +18,7 @@ MAINTAINER= ume@FreeBSD.org
COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols
LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \ BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend
${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
USE_PERL5= yes USE_PERL5= yes
USE_REINPLACE= YES USE_REINPLACE= YES

4
mail/cyrus-imapd24/files/imapd.conf
View file

@ -268,9 +268,9 @@ sievedir: /var/imap/sieve
#sasl_minimum_layer: 0 #sasl_minimum_layer: 0
# The mechanism used by the server to verify plaintext passwords. Possible # 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 # If enabled, the SASL library will automatically create authentication
# secrets when given a plaintext password. See the SASL documentation. # secrets when given a plaintext password. See the SASL documentation.

13
mail/cyrus-imapd24/pkg-deinstall
View file

@ -25,18 +25,6 @@ checkfile() {
esac 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 # Modify the 'cyrus' user created from the cyrus-sasl port
# #
@ -62,7 +50,6 @@ modify_cyrus_user() {
case $2 in case $2 in
DEINSTALL) DEINSTALL)
cd ${PKG_PREFIX} cd ${PKG_PREFIX}
cyrus_conf
checkfile ${PKG_PREIFX}/etc/imapd.conf checkfile ${PKG_PREIFX}/etc/imapd.conf
checkfile ${PKG_PREIFX}/etc/cyrus.conf checkfile ${PKG_PREIFX}/etc/cyrus.conf
;; ;;

9
mail/cyrus-imapd24/pkg-install
View file

@ -42,14 +42,6 @@ checkfile() {
esac 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 case $2 in
PRE-INSTALL) PRE-INSTALL)
;; ;;
@ -57,7 +49,6 @@ case $2 in
POST-INSTALL) POST-INSTALL)
modify_cyrus_user modify_cyrus_user
cd ${PKG_PREFIX} cd ${PKG_PREFIX}
cyrus_conf
checkfile ${PKG_PREFIX}/etc/imapd.conf checkfile ${PKG_PREFIX}/etc/imapd.conf
checkfile ${PKG_PREFIX}/etc/cyrus.conf checkfile ${PKG_PREFIX}/etc/cyrus.conf
if grep 'sieve' /etc/services; then if grep 'sieve' /etc/services; then