View | Details | Raw Unified | Return to bug 42153
Collapse All | Expand All

(-)Makefile (-1 / +20 lines)
Lines 42-48 Link Here
42
		sasl_listmech.3 sasl_log_t.3 sasl_server_init.3 \
42
		sasl_listmech.3 sasl_log_t.3 sasl_server_init.3 \
43
		sasl_server_new.3 sasl_server_start.3 sasl_server_step.3 \
43
		sasl_server_new.3 sasl_server_start.3 sasl_server_step.3 \
44
		sasl_setprop.3 sasl_usererr.3
44
		sasl_setprop.3 sasl_usererr.3
45
MAN8=		sasldblistusers.8 saslpasswd.8 saslauthd.8
45
MAN8=		sasldblistusers.8 saslpasswd.8 saslauthd1.8
46
46
47
USE_AUTOMAKE_VER=14
47
USE_AUTOMAKE_VER=14
48
USE_LIBTOOL=	YES
48
USE_LIBTOOL=	YES
Lines 99-104 Link Here
99
		GSSAPI=${GSSAPI} \
99
		GSSAPI=${GSSAPI} \
100
		EBONES=${EBONES} \
100
		EBONES=${EBONES} \
101
		DOCSDIR=${DOCSDIR:S/^${PREFIX}\///} \
101
		DOCSDIR=${DOCSDIR:S/^${PREFIX}\///} \
102
		EXAMPLESDIR=${EXAMPLESDIR:S/^${PREFIX}\///}
102
103
103
LDAP_MYSQL_PATCH=	ldap-mysql_sasl-${PORTVERSION}/sasl-ldap+mysql.patch
104
LDAP_MYSQL_PATCH=	ldap-mysql_sasl-${PORTVERSION}/sasl-ldap+mysql.patch
104
105
Lines 150-160 Link Here
150
	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
151
	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
151
	@if [ -f ${PREFIX}/sbin/saslauthd ]; then \
152
	@if [ -f ${PREFIX}/sbin/saslauthd ]; then \
152
		mv ${PREFIX}/sbin/saslauthd ${PREFIX}/sbin/saslauthd2; \
153
		mv ${PREFIX}/sbin/saslauthd ${PREFIX}/sbin/saslauthd2; \
154
		if [ -f ${PREFIX}/man/man8/saslauthd.8 ]; then \
155
			mv ${PREFIX}/man/man8/saslauthd.8 \
156
			   ${PREFIX}/man/man8/saslauthd2.8; \
157
		elif [ -f ${PREFIX}/man/man8/saslauthd.8.gz ]; then \
158
			mv ${PREFIX}/man/man8/saslauthd.8.gz \
159
			   ${PREFIX}/man/man8/saslauthd2.8.gz; \
160
		fi; \
153
	fi
161
	fi
154
162
155
post-install:
163
post-install:
156
	@${SED} -e "s;%%PREFIX%%;${PREFIX};g" ${PWCHECK_SUB} \
164
	@${SED} -e "s;%%PREFIX%%;${PREFIX};g" ${PWCHECK_SUB} \
157
		${FILESDIR}/pwcheck.sh > ${PREFIX}/etc/rc.d/pwcheck.sh
165
		${FILESDIR}/pwcheck.sh > ${PREFIX}/etc/rc.d/pwcheck.sh
166
	@${MKDIR} ${EXAMPLESDIR}
167
	@${SED} -e 's;%%PREFIX%%;${PREFIX};g' \
168
		${FILESDIR}/cyrus.pam > ${EXAMPLESDIR}/cyrus.pam
158
	@${CHMOD} 755 ${PREFIX}/etc/rc.d/pwcheck.sh
169
	@${CHMOD} 755 ${PREFIX}/etc/rc.d/pwcheck.sh
159
	${INSTALL} -d -m 770 -o cyrus -g cyrus /var/pwcheck
170
	${INSTALL} -d -m 770 -o cyrus -g cyrus /var/pwcheck
160
	@${SED} -e "s;%%PREFIX%%;${PREFIX};g" ${SASLAUTHD_SUB} \
171
	@${SED} -e "s;%%PREFIX%%;${PREFIX};g" ${SASLAUTHD_SUB} \
Lines 174-181 Link Here
174
	@${INSTALL_DATA} ${FILESDIR}/Sendmail.README ${DOCSDIR}
185
	@${INSTALL_DATA} ${FILESDIR}/Sendmail.README ${DOCSDIR}
175
.endif
186
.endif
176
	@mv ${PREFIX}/sbin/saslauthd ${PREFIX}/sbin/saslauthd1
187
	@mv ${PREFIX}/sbin/saslauthd ${PREFIX}/sbin/saslauthd1
188
	@mv ${PREFIX}/man/man8/saslauthd.8 ${PREFIX}/man/man8/saslauthd1.8
177
	@if [ -f ${PREFIX}/sbin/saslauthd2 ]; then \
189
	@if [ -f ${PREFIX}/sbin/saslauthd2 ]; then \
178
		mv ${PREFIX}/sbin/saslauthd2 ${PREFIX}/sbin/saslauthd; \
190
		mv ${PREFIX}/sbin/saslauthd2 ${PREFIX}/sbin/saslauthd; \
191
		if [ -f ${PREFIX}/man/man8/saslauthd2.8 ]; then \
192
			mv ${PREFIX}/man/man8/saslauthd2.8 \
193
			   ${PREFIX}/man/man8/saslauthd.8; \
194
		elif [ -f ${PREFIX}/man/man8/saslauthd2.8.gz ]; then \
195
			mv ${PREFIX}/man/man8/saslauthd2.8.gz \
196
			   ${PREFIX}/man/man8/saslauthd.8.gz; \
197
		fi; \
179
	fi
198
	fi
180
	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
199
	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
181
	@${CAT} ${PKGMESSAGE}
200
	@${CAT} ${PKGMESSAGE}
(-)pkg-plist (-2 / +3 lines)
Lines 43-48 Link Here
43
sbin/pwcheck
43
sbin/pwcheck
44
sbin/pwcheck_pam
44
sbin/pwcheck_pam
45
sbin/saslauthd1
45
sbin/saslauthd1
46
%%EXAMPLESDIR%%/cyrus.pam
46
%%JAVASASL%%share/java/classes/sasl/CyrusSasl/ClientFactory.class
47
%%JAVASASL%%share/java/classes/sasl/CyrusSasl/ClientFactory.class
47
%%JAVASASL%%share/java/classes/sasl/CyrusSasl/GenericClient.class
48
%%JAVASASL%%share/java/classes/sasl/CyrusSasl/GenericClient.class
48
%%JAVASASL%%share/java/classes/sasl/CyrusSasl/GenericCommon.class
49
%%JAVASASL%%share/java/classes/sasl/CyrusSasl/GenericCommon.class
Lines 93-106 Link Here
93
@dirrm lib/sasl
94
@dirrm lib/sasl
94
@cwd /var
95
@cwd /var
95
@exec install -d -m 770 -o cyrus -g cyrus %D/pwcheck
96
@exec install -d -m 770 -o cyrus -g cyrus %D/pwcheck
96
@comment This file gets created by the pwcheck program
97
@comment This file is created by the pwcheck program
97
@unexec rm -f %D/pwcheck/pwcheck
98
@unexec rm -f %D/pwcheck/pwcheck
98
@dirrm pwcheck
99
@dirrm pwcheck
99
@mode ug=rwx,o=
100
@mode ug=rwx,o=
100
@exec mkdir -p /var/state/saslauthd1
101
@exec mkdir -p /var/state/saslauthd1
101
@exec chown -R cyrus:cyrus state
102
@exec chown -R cyrus:cyrus state
102
@exec chmod -R o= state
103
@exec chmod -R o= state
103
@comment This file gets created by the state/saslauthd program
104
@comment These files are created by the saslauthd program
104
@unexec rm -fr /var/state/saslauthd1
105
@unexec rm -fr /var/state/saslauthd1
105
@unexec rmdir /var/state
106
@unexec rmdir /var/state
106
@cwd %%PREFIX%%
107
@cwd %%PREFIX%%
(-)files/Sendmail.README (-4 / +16 lines)
Lines 7-20 Link Here
7
    SENDMAIL_LDFLAGS+=	-L/usr/local/lib
7
    SENDMAIL_LDFLAGS+=	-L/usr/local/lib
8
    SENDMAIL_LDADD+=	-lsasl
8
    SENDMAIL_LDADD+=	-lsasl
9
9
10
    NOTE: Sendmail 8.10 - 8.11 needS -D_FFR_UNSAFE_SASL added
10
    NOTE: 1. Sendmail 8.10 - 8.11 needS -D_FFR_UNSAFE_SASL added
11
          to SENDMAIL_CFLAGS, if you need the GroupReadableSASLFile option
11
          to SENDMAIL_CFLAGS, if you need the GroupReadableSASLFile option
12
12
13
    Starting with Sendmail 8.12, you can also use the security/cyrus-sasl2
14
    port.  Then you will not need the SASL V1 port installed.
15
16
    SENDMAIL_CFLAGS=-I/usr/local/include -DSASL=2
17
    SENDMAIL_LDFLAGS=-L/usr/local/lib
18
    SENDMAIL_LDADD=-lsasl2
19
20
13
2) Rebuild FreeBSD (make buildworld, ...)
21
2) Rebuild FreeBSD (make buildworld, ...)
14
22
15
3) Create /usr/local/lib/sasl/Sendmail.conf with the following.
23
3) Make sure that the pwcheck_method is correct in Sendmail.conf.
16
24
17
   pwcheck_method: pwcheck
25
   Sendmail.conf (${PREFIX}/lib/sasl{,2}/Sendmail.conf) is created by
26
   the cyrus-sasl and cyrus-sasl2 ports during installation.  It may have
27
   pwcheck_method set to either pwcheck (V1 only) or saslauthd (V1 & V2) by
28
   default.  Change this to what is appropriate for your site.
18
29
19
4) Add the following to your sendmail.mc file:
30
4) Add the following to your sendmail.mc file:
20
31
Lines 44-50 Link Here
44
55
45
   PLAIN is required for Netscape Communicator users.  By default Netscape
56
   PLAIN is required for Netscape Communicator users.  By default Netscape
46
   Communicator will use SASL Authentication when sendmail is compiled with
57
   Communicator will use SASL Authentication when sendmail is compiled with
47
   SASL.
58
   SASL and will cause your users to enter their passwords each time they
59
   retreive their mail (NS 4.7).
48
60
49
   The DONT_BLAME_SENDMAIL option GroupReadableSASL[DB]File is needed when you
61
   The DONT_BLAME_SENDMAIL option GroupReadableSASL[DB]File is needed when you
50
   are using cyrus-imapd and sendmail on the same server that requires access
62
   are using cyrus-imapd and sendmail on the same server that requires access
(-)files/cyrus.pam (+18 lines)
Added Link Here
1
#
2
# $FreeBSD$
3
#
4
# PAM configuration for the "cyrus" service
5
# Copy this file to /etc/pam.d/cyrus
6
#
7
8
# auth
9
#auth		required	pam_nologin.so	no_warn
10
#auth		sufficient	%%PREFIX%%/lib/pam_ldap.so	nowarn
11
#auth		sufficient	pam_opie.so	no_warn no_fake_prompts
12
#auth		requisite	pam_opieaccess.so	no_warn
13
#auth		required	pam_ssh.so	no_warn try_first_pass
14
auth		required	pam_unix.so	no_warn try_first_pass
15
16
# account
17
#account		sufficient	%%PREFIX%%/lib/pam_ldap.so
18
account		required	pam_unix.so

Return to bug 42153