View | Details | Raw Unified | Return to bug 255641 | Differences between
and this patch

Collapse All | Expand All

(-)b/mail/Makefile (-2 lines)
Lines 469-481 Link Here
469
    SUBDIR += postfix
469
    SUBDIR += postfix
470
    SUBDIR += postfix-current
470
    SUBDIR += postfix-current
471
    SUBDIR += postfix-current-sasl
471
    SUBDIR += postfix-current-sasl
472
    SUBDIR += postfix-ldap-sasl
473
    SUBDIR += postfix-logwatch
472
    SUBDIR += postfix-logwatch
474
    SUBDIR += postfix-policyd-sf
473
    SUBDIR += postfix-policyd-sf
475
    SUBDIR += postfix-policyd-spf-perl
474
    SUBDIR += postfix-policyd-spf-perl
476
    SUBDIR += postfix-policyd-weight
475
    SUBDIR += postfix-policyd-weight
477
    SUBDIR += postfix-postfwd
476
    SUBDIR += postfix-postfwd
478
    SUBDIR += postfix-sasl
479
    SUBDIR += postfixadmin
477
    SUBDIR += postfixadmin
480
    SUBDIR += postgrey
478
    SUBDIR += postgrey
481
    SUBDIR += postsrsd
479
    SUBDIR += postsrsd
(-)a/mail/postfix-ldap-sasl/Makefile (-13 lines)
Removed Link Here
1
PORTREVISION=	1
2
PKGNAMESUFFIX?=	-ldap-sasl
3
4
MAINTAINER=	otis@FreeBSD.org
5
COMMENT=	Postfix with OpenLDAP and Cyrus SASL support
6
7
MASTERDIR=	${.CURDIR}/../postfix
8
9
OPTIONS_SLAVE=	LDAP LDAP_SASL SASL
10
11
SASL_SLAVE=	yes
12
13
.include "${MASTERDIR}/Makefile"
(-)a/mail/postfix-sasl/Makefile (-12 lines)
Removed Link Here
1
PKGNAMESUFFIX?=	-sasl
2
3
MAINTAINER=	otis@FreeBSD.org
4
COMMENT=	Postfix with Cyrus SASL support
5
6
MASTERDIR=	${.CURDIR}/../postfix
7
8
OPTIONS_SLAVE=	SASL
9
10
SASL_SLAVE=	yes
11
12
.include "${MASTERDIR}/Makefile"
(-)b/mail/postfix/Makefile (-90 / +104 lines)
Lines 15-80 MASTER_SITES:= ${MASTER_SITES:S|$|official/|} Link Here
15
DIST_SUBDIR=	${PORTNAME}
15
DIST_SUBDIR=	${PORTNAME}
16
16
17
MAINTAINER=	otis@FreeBSD.org
17
MAINTAINER=	otis@FreeBSD.org
18
COMMENT?=	Secure alternative to widely-used Sendmail
18
COMMENT=	Secure alternative to widely-used Sendmail ${COMMENT_${FLAVOR}}
19
19
20
LICENSE=	EPL IPL10
20
LICENSE=	EPL IPL10
21
LICENSE_COMB=	multi
21
LICENSE_COMB=	multi
22
LICENSE_FILE=	${WRKSRC}/LICENSE
23
LICENSE_NAME_IPL10=	IBM PUBLIC LICENSE VERSION 1.0
22
LICENSE_NAME_IPL10=	IBM PUBLIC LICENSE VERSION 1.0
23
LICENSE_FILE=	${WRKSRC}/LICENSE
24
LICENSE_PERMS_IPL10=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
24
LICENSE_PERMS_IPL10=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
25
25
26
PORTSCOUT=	limit:^3\.6\.
26
FLAVORS=			default ldap sasl
27
27
default_CONFLICTS_INSTALL=	postfix-base-ldap-* postfix-base-sasl-* \
28
CONFLICTS_INSTALL?=	courier-0.* opensmtpd-[0-9]* sendmail-8.* sendmail+*-8.* \
28
				postfix-ldap-* postfix-sasl-*
29
		postfix35-* postfix-current-*
29
ldap_PKGNAMESUFFIX=		-ldap
30
ldap_CONFLICTS_INSTALL=		postfix-[0-9]* postfix-base-[0-9]* \
31
				postfix-base-sasl-* postfix-sasl-*
32
sasl_PKGNAMESUFFIX=		-sasl
33
sasl_CONFLICTS_INSTALL=		postfix-[0-9]* postfix-base-[0-9]* \
34
				postfix-base-ldap-* postfix-ldap-*
30
35
31
USERS=		postfix
36
COMMENT_ldap=	(with OpenLDAP and Cyrus SASL support)
32
GROUPS=		mail maildrop postfix
37
COMMENT_sasl=	(with Cyrus SASL support)
33
USES=		shebangfix cpe ssl
34
SHEBANG_FILES=	auxiliary/qshape/qshape.pl
35
38
39
USES=		cpe shebangfix
36
USE_RC_SUBR=	postfix
40
USE_RC_SUBR=	postfix
37
USE_SUBMAKE=	yes
41
USE_SUBMAKE=	yes
42
43
SHEBANG_FILES=	auxiliary/qshape/qshape.pl
44
38
SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
45
SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
39
46
40
OPTIONS_SUB=	yes
47
CONFLICTS_INSTALL=	courier-0.* opensmtpd-[0-9]* opensmtpd-devel-* \
41
OPTIONS_DEFINE=	BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP \
48
			postfix-current-* sendmail-[0-9]* sendmail-devel-*
42
		LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS
43
49
44
OPTIONS_RADIO=		RG1
50
PORTSCOUT=	limit:^3\.6\.
45
OPTIONS_RADIO_RG1=	SASLKRB5 SASLKMIT
51
52
USERS=		postfix
53
GROUPS=		mail maildrop postfix
54
55
OPTIONS_DEFINE=		BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP LMDB MYSQL \
56
			NIS PCRE PGSQL SASL SQLITE TEST TLS
46
OPTIONS_DEFAULT?=	BLACKLISTD EAI PCRE TLS
57
OPTIONS_DEFAULT?=	BLACKLISTD EAI PCRE TLS
58
OPTIONS_RADIO=		RG1
59
OPTIONS_RADIO_RG1=	SASLKMIT SASLKRB5
60
.if ${FLAVOR:U} == ldap
61
OPTIONS_SLAVE=		LDAP
62
.elif ${FLAVOR:U} == sasl
63
OPTIONS_SLAVE=		SASL
64
.endif
65
OPTIONS_SUB=		yes
47
66
48
BDB_USES=		bdb
67
.if !empty(FLAVOR) && ${FLAVOR:U} != default
49
BLACKLISTD_EXTRA_PATCHES=	${FILESDIR}/extra-patch-blacklistd
68
OPTIONS_FILE=	${PORT_DBDIR}/${OPTIONS_NAME}/${FLAVOR}-options
50
CDB_LIB_DEPENDS=	libcdb.so:databases/tinycdb
69
.endif
51
EAI_LIB_DEPENDS=	libicuuc.so:devel/icu
52
LDAP_USE=		OPENLDAP=yes
53
LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
54
MYSQL_USES?=		mysql
55
PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
56
PGSQL_USES=		pgsql
57
SASLKMIT_LIB_DEPENDS=	libkrb5.so:security/krb5
58
SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
59
SQLITE_USES=		sqlite
60
70
61
BLACKLISTD_DESC=	Enable blacklistd support
71
BLACKLISTD_DESC=	Enable blacklistd support
62
CDB_DESC=	CDB maps lookups
72
CDB_DESC=		CDB maps lookups
63
EAI_DESC=	Email Address Internationalization (SMTPUTF8) support
73
EAI_DESC=		Email Address Internationalization (SMTPUTF8) support
64
INST_BASE_DESC=	Install into /usr and /etc/postfix
74
INST_BASE_DESC=		Install into /usr and /etc/postfix
65
LDAP_DESC=	LDAP maps (uses WITH_OPENLDAP_VER)
75
LDAP_DESC=		LDAP maps (uses WITH_OPENLDAP_VER)
66
LMDB_DESC=	LMDB maps
76
LMDB_DESC=		LMDB maps
67
TEST_DESC=	SMTP/LMTP test server and generator
77
RG1_DESC=		Kerberos network authentication protocol type
68
78
SASLKMIT_DESC=		If your SASL req. MIT Kerberos5, select this
69
SASL_DESC=	Cyrus SASL support (Dovecot SASL is always built in)
79
SASLKRB5_DESC=		If your SASL req. Kerberos5, select this
70
RG1_DESC=	Kerberos network authentication protocol type
80
SASL_DESC=		Cyrus SASL support (Dovecot SASL is always built in)
71
SASLKRB5_DESC=	If your SASL req. Kerberos5, select this
81
TEST_DESC=		SMTP/LMTP test server and generator
72
SASLKMIT_DESC=	If your SASL req. MIT Kerberos5, select this
82
83
BDB_USES=			bdb
84
BLACKLISTD_EXTRA_PATCHES=	${FILESDIR}/extra-patch-blacklistd
85
CDB_LIB_DEPENDS=		libcdb.so:databases/tinycdb
86
EAI_LIB_DEPENDS=		libicuuc.so:devel/icu
87
LDAP_USE=			OPENLDAP=yes
88
LMDB_LIB_DEPENDS=		liblmdb.so:databases/lmdb
89
MYSQL_USES?=			mysql
90
PCRE_LIB_DEPENDS=		libpcre.so:devel/pcre
91
PGSQL_USES=			pgsql
92
SASLKMIT_LIB_DEPENDS=		libkrb5.so:security/krb5
93
SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
94
SQLITE_USES=			sqlite
73
95
74
.include <bsd.port.options.mk>
96
.include <bsd.port.options.mk>
75
97
76
HTML1=	body_checks.5.html bounce.5.html postfix-power.png \
98
HTML1=		body_checks.5.html bounce.5.html postfix-power.png \
77
	scache.8.html tlsmgr.8.html
99
		scache.8.html tlsmgr.8.html
78
100
79
STRIP_LIBEXEC=	anvil bounce cleanup discard dnsblog error flush lmtp local \
101
STRIP_LIBEXEC=	anvil bounce cleanup discard dnsblog error flush lmtp local \
80
		master nqmgr oqmgr pickup pipe postlogd postscreen proxymap \
102
		master nqmgr oqmgr pickup pipe postlogd postscreen proxymap \
Lines 88-99 MAKEFILEFLAGS+= DEBUG= Link Here
88
MAKEFILEFLAGS+=	pie=yes CC="${CC}" OPT="${CFLAGS}"
110
MAKEFILEFLAGS+=	pie=yes CC="${CC}" OPT="${CFLAGS}"
89
111
90
.if ${SSL_DEFAULT} == libressl
112
.if ${SSL_DEFAULT} == libressl
91
BROKEN=		error: OpenSSL-1.1.1 is the minimum supported version. \
113
BROKEN=		error: OpenSSL-1.1.1 is the minimum supported version. LibreSSL is not supported
92
		LibreSSL is not supported
93
.endif
114
.endif
94
115
95
.if ${PORT_OPTIONS:MINST_BASE}
116
.if ${PORT_OPTIONS:MINST_BASE}
96
.if defined(SASL_SLAVE)
117
.if ${FLAVOR:U} == ldap
118
PKGNAMESUFFIX=	-base-ldap
119
.elif ${FLAVOR:U} == sasl
97
PKGNAMESUFFIX=	-base-sasl
120
PKGNAMESUFFIX=	-base-sasl
98
.else
121
.else
99
PKGNAMESUFFIX=	-base
122
PKGNAMESUFFIX=	-base
Lines 109-117 PLIST_SUB+= PFETC=${ETCDIR} Link Here
109
132
110
# check if mailwrapper supports $LOCALBASE
133
# check if mailwrapper supports $LOCALBASE
111
.if ${OPSYS} == FreeBSD
134
.if ${OPSYS} == FreeBSD
112
SUB_LIST+=	USE_LOCALBASE_MAILER_CONF="yes" MC_PREFIX="${LOCALBASE}"
135
SUB_LIST+=	MC_PREFIX="${LOCALBASE}" \
136
		USE_LOCALBASE_MAILER_CONF="yes"
113
.else
137
.else
114
SUB_LIST+=	USE_LOCALBASE_MAILER_CONF="no" MC_PREFIX=""
138
SUB_LIST+=	MC_PREFIX="" \
139
		USE_LOCALBASE_MAILER_CONF="no"
115
.endif
140
.endif
116
141
117
.if ${PORT_OPTIONS:MDOCS}
142
.if ${PORT_OPTIONS:MDOCS}
Lines 122-155 READMEDIR= no Link Here
122
.endif
147
.endif
123
148
124
# dynamic direcory location
149
# dynamic direcory location
125
DAEMONDIR=	${PREFIX}/libexec/postfix
150
DAEMONDIR=		${PREFIX}/libexec/postfix
126
SHLIB_DIRECTORY=${PREFIX}/lib/postfix
151
SHLIB_DIRECTORY=	${PREFIX}/lib/postfix
127
# new proposed location is ETCDIR (see README_FILES/INSTALL)
152
# new proposed location is ETCDIR (see README_FILES/INSTALL)
128
# keep compatiblity with Postfix 2.6 .. 2.11 and use DAEMOMDIR
153
# keep compatiblity with Postfix 2.6 .. 2.11 and use DAEMOMDIR
129
META_DIRECTORY=	${DAEMONDIR}
154
META_DIRECTORY=		${DAEMONDIR}
130
155
131
SUB_LIST+=	REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" \
156
SUB_LIST+=	DAEMONDIR="${DAEMONDIR}" \
132
		DAEMONDIR="${DAEMONDIR}" META_DIRECTORY="${META_DIRECTORY}"
157
		META_DIRECTORY="${META_DIRECTORY}" \
133
SUB_FILES+=	pkg-install pkg-message mailer.conf.postfix
158
		READMEDIR="${READMEDIR}" \
134
159
		REQUIRE="${_REQUIRE}"
135
POSTFIX_CCARGS+=	-DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
160
SUB_FILES+=	mailer.conf.postfix pkg-install pkg-message
136
			-DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \
161
137
			-DDEF_META_DIR=\\\"${META_DIRECTORY}\\\" \
162
POSTFIX_CCARGS+=	-DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" -DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" -DDEF_META_DIR=\\\"${META_DIRECTORY}\\\" -DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" -DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" -DDEF_NEWALIAS_PATH=\\\"${PREFIX}/bin/newaliases\\\" -DDEF_MAILQ_PATH=\\\"${PREFIX}/bin/mailq\\\" -DDEF_MANPAGE_DIR=\\\"${MANPREFIX}/man\\\" -DDEF_README_DIR=\\\"${READMEDIR}\\\" -DDEF_HTML_DIR=\\\"${READMEDIR}\\\" -DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\" -DDEF_DATA_DIR=\\\"/var/db/postfix\\\" -DDEF_MAIL_OWNER=\\\"postfix\\\" -DDEF_SGID_GROUP=\\\"maildrop\\\" -Wmissing-prototypes -Wformat -Wno-comment
138
			-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
139
			-DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \
140
			-DDEF_NEWALIAS_PATH=\\\"${PREFIX}/bin/newaliases\\\" \
141
			-DDEF_MAILQ_PATH=\\\"${PREFIX}/bin/mailq\\\" \
142
			-DDEF_MANPAGE_DIR=\\\"${MANPREFIX}/man\\\" \
143
			-DDEF_README_DIR=\\\"${READMEDIR}\\\" \
144
			-DDEF_HTML_DIR=\\\"${READMEDIR}\\\" \
145
			-DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\" \
146
			-DDEF_DATA_DIR=\\\"/var/db/postfix\\\" \
147
			-DDEF_MAIL_OWNER=\\\"postfix\\\" \
148
			-DDEF_SGID_GROUP=\\\"maildrop\\\" \
149
			-Wmissing-prototypes -Wformat -Wno-comment
150
163
151
# Default requirement for postfix rc script
164
# Default requirement for postfix rc script
152
_REQUIRE=		LOGIN cleanvar dovecot
165
_REQUIRE=	LOGIN cleanvar dovecot
153
166
154
# always build with Dovecot SASL support, Cyrus is optional
167
# always build with Dovecot SASL support, Cyrus is optional
155
# see Postfix HISTORY 20051222
168
# see Postfix HISTORY 20051222
Lines 172-189 POSTFIX_CCARGS+= -DNO_PCRE Link Here
172
.endif
185
.endif
173
186
174
.if ${PORT_OPTIONS:MSASL}
187
.if ${PORT_OPTIONS:MSASL}
175
POSTFIX_CCARGS+=	-DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
188
POSTFIX_CCARGS+=	-DUSE_CYRUS_SASL -I${LOCALBASE}/include \
189
			-I${LOCALBASE}/include/sasl
176
POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
190
POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
177
.else
191
.else
178
POSTFIX_CCARGS+=	-DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
192
POSTFIX_CCARGS+=	-DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
179
.endif
193
.endif
180
194
181
.if ${PORT_OPTIONS:MSASLKRB5}
195
.if ${PORT_OPTIONS:MSASLKRB5}
182
POSTFIX_AUXLIBS+=	-lkrb5 -lhx509 -lcrypto -lcrypt -lcom_err -lasn1 -lroken
196
POSTFIX_AUXLIBS+=	-lkrb5 -lhx509 -lcrypto -lcrypt -lcom_err -lasn1 \
197
			-lroken
183
.endif
198
.endif
184
199
185
.if ${PORT_OPTIONS:MSASLKMIT}
200
.if ${PORT_OPTIONS:MSASLKMIT}
186
POSTFIX_AUXLIBS+=	-Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err
201
POSTFIX_AUXLIBS+=	-Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 \
202
			-lcrypto -lcrypt -lcom_err
187
.endif
203
.endif
188
204
189
.if ${PORT_OPTIONS:MTLS}
205
.if ${PORT_OPTIONS:MTLS}
Lines 203-209 POSTFIX_AUXLIBS+= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} Link Here
203
. if ${OPSYS} == FreeBSD
219
. if ${OPSYS} == FreeBSD
204
POSTFIX_AUXLIBS+=	-lblacklist
220
POSTFIX_AUXLIBS+=	-lblacklist
205
. else
221
. else
206
IGNORE=	blacklistd is only supported on FreeBSD
222
IGNORE=		blacklistd is only supported on FreeBSD
207
. endif
223
. endif
208
.endif
224
.endif
209
225
Lines 232-239 DYN_EXT+= ldap Link Here
232
. if defined(WITH_OPENLDAP_VER)
248
. if defined(WITH_OPENLDAP_VER)
233
WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
249
WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
234
. endif
250
. endif
235
POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
251
POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include \
236
POSTFIX_CCARGS+=	-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
252
			-I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL
237
POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -L${LOCALBASE}/lib -llber"
253
POSTFIX_DYN_AUXLIBS+=	"AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -L${LOCALBASE}/lib -llber"
238
_REQUIRE+=		slapd
254
_REQUIRE+=		slapd
239
.endif
255
.endif
Lines 261-280 POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LMDB=-L${LOCALBASE}/lib -llmdb" Link Here
261
.endif
277
.endif
262
278
263
# sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man
279
# sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man
264
REINPLACE=	s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!;\
280
REINPLACE=	s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!; \
265
		s!(_directory = )/usr/!\1${PREFIX}/!g;\
281
		s!(_directory = )/usr/!\1${PREFIX}/!g; s!^(data_directory = \
266
		s!^(data_directory = /var/)lib/!\1db/!g;\
282
		/var/)lib/!\1db/!g; s!^\#(mynetworks_style = host)!\1!g; \
267
		s!^\#(mynetworks_style = host)!\1!g;\
283
		s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g; \
268
		s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g;\
284
		s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g; \
269
		s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g;\
285
		s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g; s!^(setgid_group \
270
		s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\
286
		=)!\1 maildrop!g; s!^(manpage_directory =)!\1 \
271
		s!^(setgid_group =)!\1 maildrop!g;\
287
		${MANPREFIX}/man!g; s!^((html|readme)_directory =)!\1 \
272
		s!^(manpage_directory =)!\1 ${MANPREFIX}/man!g;\
288
		${READMEDIR}!g; \!^\#alias_database = \
273
		s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\
289
		dbm:/etc/mail/aliases$$!d; s!(:|= \
274
		\!^\#alias_database = dbm:/etc/mail/aliases$$!d;\
290
		)/etc/postfix!\1$$config_directory!g; \
275
		s!(:|= )/etc/postfix!\1$$config_directory!g;\
291
		s!/etc/postfix!${ETCDIR}!g; s!^(sample_directory =)!\1 \
276
		s!/etc/postfix!${ETCDIR}!g;\
292
		${ETCDIR}!g; \
277
		s!^(sample_directory =)!\1 ${ETCDIR}!g;\
278
		s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
293
		s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
279
294
280
pre-patch:
295
pre-patch:
281
- 

Return to bug 255641