Attachment #89319 for bug #126228

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




#

PORTNAME=	courier
PORTVERSION=	0.60.0
PORTREVISION=	1
CATEGORIES=	mail ipv6
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	courier

RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base \
		${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool \
		${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support \
		${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
		ca_root_nss>=3.*:${PORTSDIR}/security/ca_root_nss

CONFLICTS=	courier-imap-2.* couriermlm-0.* \
		exim-4.* maildrop-1.* \
		postfix-1.* postfix-2.* \
		qmail-*-1.* qmail-1.* \
		sendmail-*-8.* sendmail-8.* \
		smail-3.* sqwebmail-3.* \
		zmailer-2.*

.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
IS_INTERACTIVE=	yes


CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib
CONFIGURE_ENV=	CPPFLAGS='${CPPFLAGS}' \
		CPPFLAGS='${CPPFLAGS}' \
		LDFLAGS='${LDFLAGS}'
MAKE_ENV:=	${CONFIGURE_ENV}


post-patch:
	@${REINPLACE_CMD} -e 's|^PROG=\./|PROG=exec ./|g' \
		${WRKSRC}/courier/module.*/courier.config
	@${REINPLACE_CMD} -e 's|@mydatadir@|@sysconfdir@|g' \
		${WRKSRC}/*/mk*cert.* \
		${WRKSRC}/*/*/mk*cert.*
	@${REINPLACE_CMD} -e 's|^\(TLS_CERTFILE=\)@mydatadir@|\1@sysconfdir@|g' \
		${WRKSRC}/*/*.dist.in \
		${WRKSRC}/*/*/*.dist.in
	@${REINPLACE_CMD} -e 's|^\(RANDFILE[[:space:]]*=[[:space:]]*\)@mydatadir@|\1@sysconfdir@|g' \
		${WRKSRC}/*/*.cnf.openssl.in \
		${WRKSRC}/*/*/*.cnf.openssl.in
	@${REINPLACE_CMD} -e 's|$$(INSTALL_DATA) \(.$$$$file.\)|${INSTALL_MAN} \1|' \
		${WRKSRC}/Makefile.in \
		${WRKSRC}/*/Makefile.in \

Lines 18-24 Link Here

(-)courier/Makefile.man (-1 / +2 lines)
18	reformail.1 \	18	reformail.1 \
19	reformime.1 \	19	reformime.1 \
20	sendmail.1 \	20	sendmail.1 \
21	testmxlookup.1	21	testmxlookup.1 \
		22	webmlmd.1
22	MAN5= \	23	MAN5= \
23	dot-courier.5 \	24	dot-courier.5 \
24	maildir.5	25	maildir.5

Lines 16-21 Link Here

(-)courier/Makefile.own (+4 lines)
16	bin/reformime \	16	bin/reformime \
17	bin/sendmail \	17	bin/sendmail \
18	bin/testmxlookup \	18	bin/testmxlookup \
		19	bin/webmlmd \
		20	bin/webmlmd.rc \
19	etc/courier/courierd.dist \	21	etc/courier/courierd.dist \
20	etc/courier/enablefiltering \	22	etc/courier/enablefiltering \
21	etc/courier/esmtp.authpam \	23	etc/courier/esmtp.authpam \
Lines 42-47 Link Here
42	etc/courier/rfcerrheader.txt \	44	etc/courier/rfcerrheader.txt \
43	etc/courier/smtpaccess/default \	45	etc/courier/smtpaccess/default \
44	etc/courier/webmail.authpam \	46	etc/courier/webmail.authpam \
		47	etc/courier/webmlmrc.dist \
45	libexec/courier/courierpop3d \	48	libexec/courier/courierpop3d \
46	libexec/courier/courierpop3login \	49	libexec/courier/courierpop3login \
47	libexec/courier/imaplogin \	50	libexec/courier/imaplogin \
Lines 51-56 Link Here
51	libexec/courier/sqwebmaild \	54	libexec/courier/sqwebmaild \
52	libexec/courier/webmail/webadmin \	55	libexec/courier/webmail/webadmin \
53	libexec/courier/webmail/webmail \	56	libexec/courier/webmail/webmail \
		57	libexec/courier/webmail/webmlm \
54	libexec/filters/dupfilter \	58	libexec/filters/dupfilter \
55	libexec/filters/perlfilter \	59	libexec/filters/perlfilter \
56	sbin/courier \	60	sbin/courier \

Lines 1-3 Link Here

(-)courier/distinfo (-3 / +3 lines)
1	MD5 (courier-0.54.0.tar.bz2) = 9495a444ecaa7920da478584969d8e4e	1	MD5 (courier-0.60.0.tar.bz2) = 688d4b44c0d7438c5c47c0a65835846d
2	SHA256 (courier-0.54.0.tar.bz2) = 63c860edd57f61ae93e1bcb3cf1739c14fc6c28c22e9913938a70459e68718e3	2	SHA256 (courier-0.60.0.tar.bz2) = c13da0a0b76c4a59aa219d037129b8305293d1091143027f2dfd631b9e470e64
3	SIZE (courier-0.54.0.tar.bz2) = 7028765	3	SIZE (courier-0.60.0.tar.bz2) = 7067430




		esac
	fi
	echo "."

	LISTS=""
	if [ -f ${sysconfdir}/webmlmrc ]; then 
		. ${sysconfdir}/webmlmrc
		if [ -n "$LISTS" ];then
			if [ -x ${bindir}/webmlmd \
			  -a -x ${bindir}/webmlmd.rc ]; then
				echo -n " webmlmd"
				${bindir}/webmlmd.rc start ${sysconfdir}/webmlmrc
			fi
		fi
	fi
}

courier_stop()
{	# kill courier services in the reverse order of starting them
	echo -n "Stopping"

	if [ -x ${bindir}/webmlmd \
	  -a -x ${bindir}/webmlmd.rc ]; then
		echo -n " webmlmd"
		${bindir}/webmlmd.rc stop ${sysconfdir}/webmlmrc
	fi

	if [ -x ${sbindir}/pop3d-ssl ]; then
		echo -n " pop3d-ssl"
		${sbindir}/pop3d-ssl stop

Line 0 Link Here

(-)courier/files/patch-courier__cmlm.h (+11 lines)
	1	--- courier/cmlm.h.orig 2007-04-29 11:59:40.000000000 -0400
	2	+++ courier/cmlm.h 2007-04-29 11:59:40.000000000 -0400
	3	@@ -56,7 +56,7 @@
	4
	5	#include "bindir.h"
	6
	7	-#define SENDMAIL BINDIR "/sendmail"
	8	+#define SENDMAIL "/usr/sbin/sendmail"
	9	#define REFORMIME BINDIR "/reformime"
	10	#define MAXRCPTS 20
	11




--- courier/perms.sh.in.orig	2007-07-01 11:36:31.000000000 -0400
+++ courier/perms.sh.in	2007-07-01 11:36:31.000000000 -0400
@@ -11,9 +11,6 @@
 datarootdir="@datarootdir@"
 
 PERMS="
-.			755

 @localstatedir@/tmp	770
 @localstatedir@/msgs	750
 @localstatedir@/msgq	750
@@ -47,7 +44,6 @@
 @sysconfdir@/rfcerr2046.txt	444	config
 @sysconfdir@/rfcerr2047.txt	444	config
 

 @libexecdir@/courier	755	x	bin	bin
 @libexecdir@/courier/modules	755	x	bin	bin
 @libexecdir@/courier/submitmkdir	4550
@@ -61,14 +57,13 @@
 @libexecdir@/courier/makedatprog	555
 @libexecdir@/courier/imaplogin		555	x	bin	bin
 @libexecdir@/courier/pcpd		555	x	bin	bin
-@libexecdir@/courier/webmail		700	x	root	bin
+@libexecdir@/courier/webmail		500	x	root	bin
 @libexecdir@/courier/webmail/webmail	555	x	root	bin
 @libexecdir@/courier/webmail/webmlm	555	x	root	bin
 @libexecdir@/courier/sqwebmaild		555
-@libexecdir@/courier/sqwebpasswd	2755
-@libexecdir@/courier/webmail/webadmin	4555	x	root	bin

 @sbindir@/courier		555
 @sbindir@/showconfig		555
 @sbindir@/showmodules		550
@@ -82,7 +77,6 @@
 @datadir@/imapd			555	x	bin	bin
 @datadir@/imapd-ssl		555	x	bin	bin
 

 @bindir@/cancelmsg		6555
 @bindir@/courier-config		555
 @bindir@/mailq			2555
@@ -111,10 +105,10 @@
 @sbindir@/makealiases		550
 @datadir@/makehosteddomains	555
 @sbindir@/makehosteddomains	555

 @sbindir@/webgpg		555
 
 @datadir@			755	x	bin	bin
@@ -226,7 +220,7 @@
 if test "@HAVE_LDAP@" != 0
 then
 	echo @sysconfdir@/ldapaliasrc.dist 640 @mailuser@ @mailgroup@ config

Lines 36-41 Link Here

(-)courier/pkg-plist (-192 / +27 lines)
36	@unexec cmp -s %D/etc/courier/pop3d-ssl %D/etc/courier/pop3d-ssl.dist && rm -f %D/etc/courier/pop3d-ssl 2>/dev/null \|\| true	36	@unexec cmp -s %D/etc/courier/pop3d-ssl %D/etc/courier/pop3d-ssl.dist && rm -f %D/etc/courier/pop3d-ssl 2>/dev/null \|\| true
37	@unexec cmp -s %D/etc/courier/pop3d %D/etc/courier/pop3d.dist && rm -f %D/etc/courier/pop3d 2>/dev/null \|\| true	37	@unexec cmp -s %D/etc/courier/pop3d %D/etc/courier/pop3d.dist && rm -f %D/etc/courier/pop3d 2>/dev/null \|\| true
38	@unexec cmp -s %D/etc/courier/sqwebmaild %D/etc/courier/sqwebmaild.dist && rm -f %D/etc/courier/sqwebmaild 2>/dev/null \|\| true	38	@unexec cmp -s %D/etc/courier/sqwebmaild %D/etc/courier/sqwebmaild.dist && rm -f %D/etc/courier/sqwebmaild 2>/dev/null \|\| true
		39	@unexec cmp -s %D/etc/courier/webmlmrc %D/etc/courier/webmlmrc.dist && rm -f %D/etc/courier/webmlmrc 2>/dev/null \|\| true
39	bin/addcr	40	bin/addcr
40	bin/cancelmsg	41	bin/cancelmsg
41	bin/courier-config	42	bin/courier-config
Lines 60-65 Link Here
60	bin/rmail	61	bin/rmail
61	bin/sendmail	62	bin/sendmail
62	bin/testmxlookup	63	bin/testmxlookup
		64	bin/webmlmd
		65	bin/webmlmd.rc
63	etc/courier/aliases/system	66	etc/courier/aliases/system
64	etc/courier/courierd.dist	67	etc/courier/courierd.dist
65	etc/courier/crontab	68	etc/courier/crontab
Lines 107-112 Link Here
107	etc/courier/smtpaccess/default	110	etc/courier/smtpaccess/default
108	etc/courier/sqwebmaild.dist	111	etc/courier/sqwebmaild.dist
109	etc/courier/webmail.authpam	112	etc/courier/webmail.authpam
		113	etc/courier/webmlmrc.dist
110	@exec [ -e /etc/aliases ] && ln -sf /etc/aliases %D/etc/courier/aliases/system	114	@exec [ -e /etc/aliases ] && ln -sf /etc/aliases %D/etc/courier/aliases/system
111	@exec [ -f %D/etc/courier/courierd.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/courierd.dist	115	@exec [ -f %D/etc/courier/courierd.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/courierd.dist
112	@exec [ -f %D/etc/courier/esmtpd-msa.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/esmtpd-msa.dist	116	@exec [ -f %D/etc/courier/esmtpd-msa.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/esmtpd-msa.dist
Lines 122-127 Link Here
122	@exec [ -f %D/etc/courier/pop3d-ssl.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/pop3d-ssl.dist	126	@exec [ -f %D/etc/courier/pop3d-ssl.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/pop3d-ssl.dist
123	@exec [ -f %D/etc/courier/pop3d.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/pop3d.dist	127	@exec [ -f %D/etc/courier/pop3d.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/pop3d.dist
124	@exec [ -f %D/etc/courier/sqwebmaild.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/sqwebmaild.dist	128	@exec [ -f %D/etc/courier/sqwebmaild.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/sqwebmaild.dist
		129	@exec [ -f %D/etc/courier/webmlmrc.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/webmlmrc.dist
125	@dirrmtry etc/courier/aliasdir	130	@dirrmtry etc/courier/aliasdir
126	@dirrmtry etc/courier/aliases	131	@dirrmtry etc/courier/aliases
127	@dirrmtry etc/courier/esmtpacceptmailfor.dir	132	@dirrmtry etc/courier/esmtpacceptmailfor.dir
Lines 158-163 Link Here
158	libexec/courier/submitmkdir	163	libexec/courier/submitmkdir
159	libexec/courier/webmail/webadmin	164	libexec/courier/webmail/webadmin
160	libexec/courier/webmail/webmail	165	libexec/courier/webmail/webmail
		166	libexec/courier/webmail/webmlm
161	libexec/filters/dupfilter	167	libexec/filters/dupfilter
162	libexec/filters/perlfilter	168	libexec/filters/perlfilter
163	%%WITHUUCP%%@dirrm libexec/courier/modules/uucp	169	%%WITHUUCP%%@dirrm libexec/courier/modules/uucp
Lines 211-226 Link Here
211	share/courier/couriermlm/idxheadertxt.tmpl	217	share/courier/couriermlm/idxheadertxt.tmpl
212	share/courier/couriermlm/idxsubject.tmpl	218	share/courier/couriermlm/idxsubject.tmpl
213	share/courier/couriermlm/modrejbody.tmpl	219	share/courier/couriermlm/modrejbody.tmpl
214	share/courier/couriermlm/modreject.tmpl
215	share/courier/couriermlm/modrejheader.tmpl	220	share/courier/couriermlm/modrejheader.tmpl
216	share/courier/couriermlm/modsubject.tmpl	221	share/courier/couriermlm/modsubject.tmpl
217	share/courier/couriermlm/modtext.tmpl	222	share/courier/couriermlm/modtext.tmpl
218	share/courier/couriermlm/modtext2.tmpl	223	share/courier/couriermlm/modtext2.tmpl
		224	share/courier/couriermlm/style.css.tmpl
219	share/courier/couriermlm/sub.tmpl	225	share/courier/couriermlm/sub.tmpl
220	share/courier/couriermlm/sub2.tmpl	226	share/courier/couriermlm/sub2.tmpl
221	share/courier/couriermlm/sub3.tmpl	227	share/courier/couriermlm/sub3.tmpl
222	share/courier/couriermlm/sub4.tmpl	228	share/courier/couriermlm/sub4.tmpl
223	share/courier/couriermlm/sub5.tmpl	229	share/courier/couriermlm/sub5.tmpl
		230	share/courier/couriermlm/suback.tmpl
		231	share/courier/couriermlm/subjrequest.tmpl
224	share/courier/couriermlm/subreportfooter.tmpl	232	share/courier/couriermlm/subreportfooter.tmpl
225	share/courier/couriermlm/subreporthdr.tmpl	233	share/courier/couriermlm/subreporthdr.tmpl
226	share/courier/couriermlm/subreporthdr1.tmpl	234	share/courier/couriermlm/subreporthdr1.tmpl
Lines 233-238 Link Here
233	share/courier/couriermlm/warn1text.tmpl	241	share/courier/couriermlm/warn1text.tmpl
234	share/courier/couriermlm/warn1text2.tmpl	242	share/courier/couriermlm/warn1text2.tmpl
235	share/courier/couriermlm/warn2msg.tmpl	243	share/courier/couriermlm/warn2msg.tmpl
		244	share/courier/couriermlm/webmlm.tmpl
		245	share/courier/couriermlm/webmlm.tmpl.html
		246	share/courier/couriermlm/webmlmconfirm.html
		247	share/courier/couriermlm/webmlmerror.tmpl.html
		248	share/courier/couriermlm/webmlmidx.html
		249	share/courier/couriermlm/webmlmlistadmin.tmpl.html
		250	share/courier/couriermlm/webmlmlistadminmod.tmpl.html
		251	share/courier/couriermlm/webmlmlistadminpw.tmpl.html
		252	share/courier/couriermlm/webmlmlistindex.tmpl.html
		253	share/courier/couriermlm/webmlmnotprocessed.html
		254	share/courier/couriermlm/webmlmpleasewait.tmpl.html
		255	share/courier/couriermlm/webmlmprocessed.html
		256	share/courier/couriermlm/webmlmrequestreceived.tmpl.html
		257	share/courier/couriermlm/webmlmsubinfo.tmpl.html
		258	share/courier/couriermlm/webmlmsublist.tmpl.html
236	@dirrm share/courier/couriermlm	259	@dirrm share/courier/couriermlm
237	share/courier/courierwebadmin/admin-00machine.html	260	share/courier/courierwebadmin/admin-00machine.html
238	share/courier/courierwebadmin/admin-00machine.pl	261	share/courier/courierwebadmin/admin-00machine.pl
Lines 309-503 Link Here
309	share/courier/perlfilter-wrapper.pl	332	share/courier/perlfilter-wrapper.pl
310	share/courier/pop3d	333	share/courier/pop3d
311	share/courier/pop3d-ssl	334	share/courier/pop3d-ssl
312	share/courier/rootcerts/02b73561.0
313	share/courier/rootcerts/0481cb65.0
314	share/courier/rootcerts/052e396b.0
315	share/courier/rootcerts/0c364b2d.0
316	share/courier/rootcerts/0dbd0096.0
317	share/courier/rootcerts/0e82f83a.0
318	share/courier/rootcerts/11a09b38.0
319	share/courier/rootcerts/11f154d6.0
320	share/courier/rootcerts/124bbd54.0
321	share/courier/rootcerts/128b9c8d.0
322	share/courier/rootcerts/19899da5.0
323	share/courier/rootcerts/219d9499.0
324	share/courier/rootcerts/23f4c490.0
325	share/courier/rootcerts/256fd83b.0
326	share/courier/rootcerts/2edf7016.0
327	share/courier/rootcerts/2fb1850a.0
328	share/courier/rootcerts/31044350.0
329	share/courier/rootcerts/3ad48a91.0
330	share/courier/rootcerts/3c58f906.0
331	share/courier/rootcerts/3e7271e8.0
332	share/courier/rootcerts/412bea73.0
333	share/courier/rootcerts/4166ec0c.0
334	share/courier/rootcerts/4184de39.0
335	share/courier/rootcerts/4643210f.0
336	share/courier/rootcerts/47996b5c.0
337	share/courier/rootcerts/4d654d1d.0
338	share/courier/rootcerts/4fbd6bfa.0
339	share/courier/rootcerts/54edfa5d.0
340	share/courier/rootcerts/594f1775.0
341	share/courier/rootcerts/5a5372fc.0
342	share/courier/rootcerts/5cf9d536.0
343	share/courier/rootcerts/5f5e5caa.0
344	share/courier/rootcerts/61f6c934.0
345	share/courier/rootcerts/635ccfd5.0
346	share/courier/rootcerts/6c55cf77.0
347	share/courier/rootcerts/6e8bf996.0
348	share/courier/rootcerts/6fcc125d.0
349	share/courier/rootcerts/709afd2b.0
350	share/courier/rootcerts/72bf6a04.0
351	share/courier/rootcerts/72fa7371.0
352	share/courier/rootcerts/74c26bd0.0
353	share/courier/rootcerts/755f7420.0
354	share/courier/rootcerts/75680d2e.0
355	share/courier/rootcerts/7651b327.0
356	share/courier/rootcerts/76579174.0
357	share/courier/rootcerts/788c9bfc.0
358	share/courier/rootcerts/7999be0d.0
359	share/courier/rootcerts/7d3cd826.0
360	share/courier/rootcerts/7d453d8f.0
361	share/courier/rootcerts/8470719d.0
362	share/courier/rootcerts/86f32474.0
363	share/courier/rootcerts/8f7b96c4.0
364	share/courier/rootcerts/8fe643df.0
365	share/courier/rootcerts/95750816.0
366	share/courier/rootcerts/97b4211c.0
367	share/courier/rootcerts/9ec3a561.0
368	share/courier/rootcerts/a0bc6fbb.0
369	share/courier/rootcerts/a15b3b6b.0
370	share/courier/rootcerts/a2df7ad7.0
371	share/courier/rootcerts/a3896b44.0
372	share/courier/rootcerts/a6776c69.0
373	share/courier/rootcerts/a7605362.0
374	share/courier/rootcerts/aaa-certificate-services.pem
375	share/courier/rootcerts/aaa45464.0
376	share/courier/rootcerts/aba-ecom-root-ca.pem
377	share/courier/rootcerts/add67345.0
378	share/courier/rootcerts/addtrust-class-1-ca-root.pem
379	share/courier/rootcerts/addtrust-external-ca-root.pem
380	share/courier/rootcerts/addtrust-public-ca-root.pem
381	share/courier/rootcerts/addtrust-qualified-ca-root.pem
382	share/courier/rootcerts/america-online-root-certification-00.pem
383	share/courier/rootcerts/america-online-root-certification-01.pem
384	share/courier/rootcerts/aol-time-warner-root-certification-00.pem
385	share/courier/rootcerts/aol-time-warner-root-certification-01.pem
386	share/courier/rootcerts/b0f3e76e.0
387	share/courier/rootcerts/b5f329fa.0
388	share/courier/rootcerts/baltimore-cybertrust-root.pem
389	share/courier/rootcerts/bcdd5959.0
390	share/courier/rootcerts/bda4cc84.0
391	share/courier/rootcerts/betrusted-root-ca-baltimore-implementation.pem
392	share/courier/rootcerts/betrusted-root-ca-entrust-implementation.pem
393	share/courier/rootcerts/betrusted-root-ca-rsa-implementation.pem
394	share/courier/rootcerts/betrusted-root-ca.pem
395	share/courier/rootcerts/bf87590f.0
396	share/courier/rootcerts/c19d42c7.0
397	share/courier/rootcerts/c215bc69.0
398	share/courier/rootcerts/c33a80d4.0
399	share/courier/rootcerts/c527e4ab.0
400	share/courier/rootcerts/c9bc75ba.0
401	share/courier/rootcerts/ccb919f9.0
402	share/courier/rootcerts/cdaebb72.0
403	share/courier/rootcerts/certum-ca.pem
404	share/courier/rootcerts/chambers-of-commerce-root.pem
405	share/courier/rootcerts/class-1-public-primary-ocsp-responder.pem
406	share/courier/rootcerts/class-2-public-primary-ocsp-responder.pem
407	share/courier/rootcerts/class-3-public-primary-ocsp-responder.pem
408	share/courier/rootcerts/d2adc77d.0
409	share/courier/rootcerts/d537fba6.0
410	share/courier/rootcerts/d78a75c7.0
411	share/courier/rootcerts/d8274e24.0
412	share/courier/rootcerts/ddc328ff.0
413	share/courier/rootcerts/digital-signature-trust-co-dstca-00.pem
414	share/courier/rootcerts/digital-signature-trust-co-dstca-01.pem
415	share/courier/rootcerts/dst-rootca-x1.pem
416	share/courier/rootcerts/dst-rootca-x2.pem
417	share/courier/rootcerts/e268a4c5.0
418	share/courier/rootcerts/e28f6bbc.0
419	share/courier/rootcerts/e7b8d656.0
420	share/courier/rootcerts/ed049835.0
421	share/courier/rootcerts/ed524cf5.0
422	share/courier/rootcerts/ed62f4e3.0
423	share/courier/rootcerts/ee7cd6fb.0
424	share/courier/rootcerts/entrust-net-certification-authority.pem
425	share/courier/rootcerts/entrust-net-client-certification-00.pem
426	share/courier/rootcerts/entrust-net-client-certification-01.pem
427	share/courier/rootcerts/entrust-net-secure-server-certification-00.pem
428	share/courier/rootcerts/entrust-net-secure-server-certification-01.pem
429	share/courier/rootcerts/equifax-equifax-secure-certificate.pem
430	share/courier/rootcerts/equifax-secure-ebusiness-ca-1.pem
431	share/courier/rootcerts/equifax-secure-equifax-secure-ebusiness.pem
432	share/courier/rootcerts/equifax-secure-global-ebusiness.pem
433	share/courier/rootcerts/f3cf1e8e.0
434	share/courier/rootcerts/f4996e82.0
435	share/courier/rootcerts/f64d9715.0
436	share/courier/rootcerts/f73e89fd.0
437	share/courier/rootcerts/f950ccc2.0
438	share/courier/rootcerts/ff783690.0
439	share/courier/rootcerts/geotrust-global-ca.pem
440	share/courier/rootcerts/global-chambersign-root.pem
441	share/courier/rootcerts/globalsign-root-ca.pem
442	share/courier/rootcerts/gp-root-2.pem
443	share/courier/rootcerts/gte-cybertrust-global-root.pem
444	share/courier/rootcerts/gte-cybertrust-root.pem
445	share/courier/rootcerts/http-www-valicert-com-00.pem
446	share/courier/rootcerts/http-www-valicert-com-01.pem
447	share/courier/rootcerts/http-www-valicert-com-02.pem
448	share/courier/rootcerts/ips-ca-chained-cas-certification.pem
449	share/courier/rootcerts/ips-ca-clase1-certification-authority.pem
450	share/courier/rootcerts/ips-ca-clase3-certification-authority.pem
451	share/courier/rootcerts/ips-ca-clasea1-certification-authority.pem
452	share/courier/rootcerts/ips-ca-clasea3-certification-authority.pem
453	share/courier/rootcerts/ips-ca-timestamping-certification.pem
454	share/courier/rootcerts/ips-servidores.pem
455	share/courier/rootcerts/netlock-expressz-class-c-tanusitvanykiado.pem
456	share/courier/rootcerts/netlock-kozjegyzoi-class-a-tanusitvanykiado.pem
457	share/courier/rootcerts/netlock-uzleti-class-b-tanusitvanykiado.pem
458	share/courier/rootcerts/quovadis-root-certification-authority.pem
459	share/courier/rootcerts/rsa-data-security-inc-secure-server.pem
460	share/courier/rootcerts/rsa-security-inc-rsa-security-1024.pem
461	share/courier/rootcerts/rsa-security-inc-rsa-security-2048.pem
462	share/courier/rootcerts/secom-trust-net-security-communication.pem
463	share/courier/rootcerts/secure-certificate-services.pem
464	share/courier/rootcerts/secure-server-ocsp-responder.pem
465	share/courier/rootcerts/sonera-class1-ca.pem
466	share/courier/rootcerts/sonera-class2-ca.pem
467	share/courier/rootcerts/staat-der-nederlanden-root-ca.pem
468	share/courier/rootcerts/starfield-technologies-inc-starfield.pem
469	share/courier/rootcerts/tc-trustcenter-for-security-in-00.pem
470	share/courier/rootcerts/tc-trustcenter-for-security-in-01.pem
471	share/courier/rootcerts/tdc-internet-tdc-internet-root.pem
472	share/courier/rootcerts/tdc-oces-ca.pem
473	share/courier/rootcerts/thawte-personal-basic-ca.pem
474	share/courier/rootcerts/thawte-personal-freemail-ca.pem
475	share/courier/rootcerts/thawte-personal-premium-ca.pem
476	share/courier/rootcerts/thawte-premium-server-ca.pem
477	share/courier/rootcerts/thawte-server-ca.pem
478	share/courier/rootcerts/thawte-timestamping-ca.pem
479	share/courier/rootcerts/the-go-daddy-group-inc-go-daddy.pem
480	share/courier/rootcerts/trusted-certificate-services.pem
481	share/courier/rootcerts/utn-datacorp-sgc.pem
482	share/courier/rootcerts/utn-userfirst-client-authentication.pem
483	share/courier/rootcerts/utn-userfirst-hardware.pem
484	share/courier/rootcerts/utn-userfirst-network-applications.pem
485	share/courier/rootcerts/utn-userfirst-object.pem
486	share/courier/rootcerts/verisign-class-1-public-primary.pem
487	share/courier/rootcerts/verisign-class-2-public-primary.pem
488	share/courier/rootcerts/verisign-class-3-public-primary.pem
489	share/courier/rootcerts/verisign-class-4-public-primary.pem
490	share/courier/rootcerts/verisign-inc-class-1-public-primary.pem
491	share/courier/rootcerts/verisign-inc-class-2-public-primary.pem
492	share/courier/rootcerts/verisign-inc-class-3-public-primary.pem
493	share/courier/rootcerts/verisign-inc-verisign-trust-network-00.pem
494	share/courier/rootcerts/verisign-inc-verisign-trust-network-01.pem
495	share/courier/rootcerts/verisign-inc-verisign-trust-network-02.pem
496	share/courier/rootcerts/verisign-inc-verisign-trust-network-03.pem
497	share/courier/rootcerts/verisign-time-stamping-authority.pem
498	share/courier/rootcerts/visa-ecommerce-root.pem
499	share/courier/rootcerts/xramp-global-certification-authority.pem
500	@dirrm share/courier/rootcerts
501	share/courier/sharedindexupdate	335	share/courier/sharedindexupdate
502	share/courier/sqwebmail/cleancache.pl	336	share/courier/sqwebmail/cleancache.pl
503	share/courier/sqwebmail/html/en-us/CHARSET	337	share/courier/sqwebmail/html/en-us/CHARSET
Lines 642-647 Link Here
642	%%PORTDOCS%%%%DOCSDIR%%/html/bg.gif	476	%%PORTDOCS%%%%DOCSDIR%%/html/bg.gif
643	%%PORTDOCS%%%%DOCSDIR%%/html/cancelmsg.html	477	%%PORTDOCS%%%%DOCSDIR%%/html/cancelmsg.html
644	%%PORTDOCS%%%%DOCSDIR%%/html/changelog.html	478	%%PORTDOCS%%%%DOCSDIR%%/html/changelog.html
		479	%%PORTDOCS%%%%DOCSDIR%%/html/chinese_flag.png
645	%%PORTDOCS%%%%DOCSDIR%%/html/courier.html	480	%%PORTDOCS%%%%DOCSDIR%%/html/courier.html
646	%%PORTDOCS%%%%DOCSDIR%%/html/courierd.html	481	%%PORTDOCS%%%%DOCSDIR%%/html/courierd.html
647	%%PORTDOCS%%%%DOCSDIR%%/html/courierdsn.html	482	%%PORTDOCS%%%%DOCSDIR%%/html/courierdsn.html
Lines 659-665 Link Here
659	%%PORTDOCS%%%%DOCSDIR%%/html/documentation.html	494	%%PORTDOCS%%%%DOCSDIR%%/html/documentation.html
660	%%PORTDOCS%%%%DOCSDIR%%/html/dot-courier.html	495	%%PORTDOCS%%%%DOCSDIR%%/html/dot-courier.html
661	%%PORTDOCS%%%%DOCSDIR%%/html/dot-forward.html	496	%%PORTDOCS%%%%DOCSDIR%%/html/dot-forward.html
662	%%PORTDOCS%%%%DOCSDIR%%/html/download.php
663	%%PORTDOCS%%%%DOCSDIR%%/html/draft-varshavchik-exdata-smtpext.txt	497	%%PORTDOCS%%%%DOCSDIR%%/html/draft-varshavchik-exdata-smtpext.txt
664	%%PORTDOCS%%%%DOCSDIR%%/html/draft-varshavchik-security-smtpext.txt	498	%%PORTDOCS%%%%DOCSDIR%%/html/draft-varshavchik-security-smtpext.txt
665	%%PORTDOCS%%%%DOCSDIR%%/html/draft-varshavchik-verp-smtpext.txt	499	%%PORTDOCS%%%%DOCSDIR%%/html/draft-varshavchik-verp-smtpext.txt
Lines 672-677 Link Here
672	%%PORTDOCS%%%%DOCSDIR%%/html/icon.gif	506	%%PORTDOCS%%%%DOCSDIR%%/html/icon.gif
673	%%PORTDOCS%%%%DOCSDIR%%/html/imapd.html	507	%%PORTDOCS%%%%DOCSDIR%%/html/imapd.html
674	%%PORTDOCS%%%%DOCSDIR%%/html/index.html	508	%%PORTDOCS%%%%DOCSDIR%%/html/index.html
		509	%%PORTDOCS%%%%DOCSDIR%%/html/index2.html
675	%%PORTDOCS%%%%DOCSDIR%%/html/install.html	510	%%PORTDOCS%%%%DOCSDIR%%/html/install.html
676	%%PORTDOCS%%%%DOCSDIR%%/html/intro.html	511	%%PORTDOCS%%%%DOCSDIR%%/html/intro.html
677	%%PORTDOCS%%%%DOCSDIR%%/html/japanese_flag.png	512	%%PORTDOCS%%%%DOCSDIR%%/html/japanese_flag.png
Lines 721-726 Link Here
721	%%PORTDOCS%%%%DOCSDIR%%/html/style.css	556	%%PORTDOCS%%%%DOCSDIR%%/html/style.css
722	%%PORTDOCS%%%%DOCSDIR%%/html/submit.html	557	%%PORTDOCS%%%%DOCSDIR%%/html/submit.html
723	%%PORTDOCS%%%%DOCSDIR%%/html/testmxlookup.html	558	%%PORTDOCS%%%%DOCSDIR%%/html/testmxlookup.html
		559	%%PORTDOCS%%%%DOCSDIR%%/html/webmlmd.html
724	%%PORTDOCS%%@dirrm %%DOCSDIR%%/html	560	%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
725	%%PORTDOCS%%@dirrm %%DOCSDIR%%	561	%%PORTDOCS%%@dirrm %%DOCSDIR%%
726	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/bin/cancelmsg	562	@exec chown %%MAILOWN%%:%%MAILGRP%% %D/bin/cancelmsg
Lines 753-759 Link Here
753	@exec chmod 0555 %D/share/courier/couriermlm	589	@exec chmod 0555 %D/share/courier/couriermlm
754	@exec chmod 0555 %D/share/courier/courierwebadmin	590	@exec chmod 0555 %D/share/courier/courierwebadmin
755	%%WITHFAX%%@exec chmod 0555 %D/share/courier/faxmail	591	%%WITHFAX%%@exec chmod 0555 %D/share/courier/faxmail
756	@exec chmod 0555 %D/share/courier/rootcerts
757	@exec chmod 0555 %D/share/courier/sqwebmail	592	@exec chmod 0555 %D/share/courier/sqwebmail
758	@exec chmod 0555 %D/share/courier/sqwebmail/html	593	@exec chmod 0555 %D/share/courier/sqwebmail/html
759	@exec chmod 0555 %D/share/courier/sqwebmail/html/en-us	594	@exec chmod 0555 %D/share/courier/sqwebmail/html/en-us




#!/usr/bin/env perl


# Perl c_rehash script, scan all files in a directory
# and add symbolic links to their hash values.

my $openssl;

my $dir = "/etc/ssl";

if(defined $ENV{OPENSSL}) {
	$openssl = $ENV{OPENSSL};
} else {
	$openssl = "openssl";
	$ENV{OPENSSL} = $openssl;
}

$ENV{PATH} .= ":$dir/bin";

if(! -x $openssl) {
	my $found = 0;
	foreach (split /:/, $ENV{PATH}) {
		if(-x "$_/$openssl") {
			$found = 1;
			last;
		}	
	}
	if($found == 0) {
		print STDERR "c_rehash: rehashing skipped ('openssl' program not available)\n";
		exit 0;
	}
}

if(@ARGV) {
	@dirlist = @ARGV;
} elsif($ENV{SSL_CERT_DIR}) {
	@dirlist = split /:/, $ENV{SSL_CERT_DIR};
} else {
	$dirlist[0] = "$dir/certs";
}


foreach (@dirlist) {
	if(-d $_ and -w $_) {
		hash_dir($_);
	}
}

sub hash_dir {
	my %hashlist;
	print "Doing $_[0]\n";
	chdir $_[0];
	opendir(DIR, ".");
	my @flist = readdir(DIR);
	# Delete any existing symbolic links
	foreach (grep {/^[\da-f]+\.r{0,1}\d+$/} @flist) {
		if(-l $_) {
			unlink $_;
		}
	}
	closedir DIR;
	FILE: foreach $fname (grep {/\.pem$/} @flist) {
		# Check to see if certificates and/or CRLs present.
		my ($cert, $crl) = check_file($fname);
		if(!$cert && !$crl) {
			print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
			next;
		}
		link_hash_cert($fname) if($cert);
		link_hash_crl($fname) if($crl);
	}
}

sub check_file {
	my ($is_cert, $is_crl) = (0,0);
	my $fname = $_[0];
	open IN, $fname;
	while(<IN>) {
		if(/^-----BEGIN (.*)-----/) {
			my $hdr = $1;
			if($hdr =~ /^(X509 |TRUSTED |)CERTIFICATE$/) {
				$is_cert = 1;
				last if($is_crl);
			} elsif($hdr eq "X509 CRL") {
				$is_crl = 1;
				last if($is_cert);
			}
		}
	}
	close IN;
	return ($is_cert, $is_crl);
}


# Link a certificate to its subject name hash value, each hash is of
# the form <hash>.<n> where n is an integer. If the hash value already exists
# then we need to up the value of n, unless its a duplicate in which
# case we skip the link. We check for duplicates by comparing the
# certificate fingerprints

sub link_hash_cert {
		my $fname = $_[0];
		$fname =~ s/'/'\\''/g;
		my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname'`;
		chomp $hash;
		chomp $fprint;
		$fprint =~ s/^.*=//;
		$fprint =~ tr/://d;
		my $suffix = 0;
		# Search for an unused hash filename
		while(exists $hashlist{"$hash.$suffix"}) {
			# Hash matches: if fingerprint matches its a duplicate cert
			if($hashlist{"$hash.$suffix"} eq $fprint) {
				print STDERR "WARNING: Skipping duplicate certificate $fname\n";
				return;
			}
			$suffix++;
		}
		$hash .= ".$suffix";
		print "$fname => $hash\n";
		$symlink_exists=eval {symlink("",""); 1};
		if ($symlink_exists) {
			symlink $fname, $hash;
		} else {
			system ("cp", $fname, $hash);
		}
		$hashlist{$hash} = $fprint;
}

# Same as above except for a CRL. CRL links are of the form <hash>.r<n>

sub link_hash_crl {
		my $fname = $_[0];
		$fname =~ s/'/'\\''/g;
		my ($hash, $fprint) = `"$openssl" crl -hash -fingerprint -noout -in '$fname'`;
		chomp $hash;
		chomp $fprint;
		$fprint =~ s/^.*=//;
		$fprint =~ tr/://d;
		my $suffix = 0;
		# Search for an unused hash filename
		while(exists $hashlist{"$hash.r$suffix"}) {
			# Hash matches: if fingerprint matches its a duplicate cert
			if($hashlist{"$hash.r$suffix"} eq $fprint) {
				print STDERR "WARNING: Skipping duplicate CRL $fname\n";
				return;
			}
			$suffix++;
		}
		$hash .= ".r$suffix";
		print "$fname => $hash\n";
		$symlink_exists=eval {symlink("",""); 1};
		if ($symlink_exists) {
			symlink $fname, $hash;
		} else {
			system ("cp", $fname, $hash);
		}
		$hashlist{$hash} = $fprint;
}


Return to bug 126228

Lines 6-13 Link Here

(-)courier/Makefile (-14 / +15 lines)
6	#	6	#
7		7
8	PORTNAME= courier	8	PORTNAME= courier
9	PORTVERSION= 0.54.0	9	PORTVERSION= 0.60.0
10	PORTREVISION= 1
11	CATEGORIES= mail ipv6	10	CATEGORIES= mail ipv6
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= courier	12	MASTER_SITE_SUBDIR= courier
Lines 20-32 Link Here
20	RUN_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base \	19	RUN_DEPENDS= courierauthconfig:${PORTSDIR}/security/courier-authlib-base \
21	${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool \	20	${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool \
22	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support \	21	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support \
23	${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net-mgmt/p5-Net-CIDR	22	${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
		23	ca_root_nss>=3.*:${PORTSDIR}/security/ca_root_nss
24		24
25	CONFLICTS= exim-4.* courier-imap-2.* maildrop-1.* \	25	CONFLICTS= courier-imap-2.* couriermlm-0.* \
		26	exim-4.* maildrop-1.* \
26	postfix-1.* postfix-2.* \	27	postfix-1.* postfix-2.* \
27	qmail-1.* qmail--1. \	28	qmail--1. qmail-1.* \
28	sendmail-8.* sendmail--8. \	29	sendmail--8. sendmail-8.* \
29	smail-3.* sqwebmail-3.* zmailer-2.*	30	smail-3.* sqwebmail-3.* \
		31	zmailer-2.*
30		32
31	.if !defined(BATCH) && !defined(PACKAGE_BUILDING)	33	.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
32	IS_INTERACTIVE= yes	34	IS_INTERACTIVE= yes
Lines 73-80 Link Here
73		75
74	CPPFLAGS+= -I${LOCALBASE}/include	76	CPPFLAGS+= -I${LOCALBASE}/include
75	LDFLAGS+= -L${LOCALBASE}/lib	77	LDFLAGS+= -L${LOCALBASE}/lib
76	CONFIGURE_ENV= REHASH=${SCRIPTDIR}/c_rehash \	78	CONFIGURE_ENV= CPPFLAGS='${CPPFLAGS}' \
77	CPPFLAGS='${CPPFLAGS}' \
78	LDFLAGS='${LDFLAGS}'	79	LDFLAGS='${LDFLAGS}'
79	MAKE_ENV:= ${CONFIGURE_ENV}	80	MAKE_ENV:= ${CONFIGURE_ENV}
80		81
Lines 269-283 Link Here
269	post-patch:	270	post-patch:
270	@${REINPLACE_CMD} -e 's\|^PROG=\./\|PROG=exec ./\|g' \	271	@${REINPLACE_CMD} -e 's\|^PROG=\./\|PROG=exec ./\|g' \
271	${WRKSRC}/courier/module.*/courier.config	272	${WRKSRC}/courier/module.*/courier.config
272	@${REINPLACE_CMD} -e 's\|@datadir@\|@sysconfdir@\|g' \	273	@${REINPLACE_CMD} -e 's\|@mydatadir@\|@sysconfdir@\|g' \
273	${WRKSRC}//mkcert.* \	274	${WRKSRC}//mkcert.* \
274	${WRKSRC}///mkcert.	275	${WRKSRC}///mkcert.
275	@${REINPLACE_CMD} -e 's\|^\(TLS_CERTFILE=\)@datadir@\|\1@sysconfdir@\|g' \	276	@${REINPLACE_CMD} -e 's\|^\(TLS_CERTFILE=\)@mydatadir@\|\1@sysconfdir@\|g' \
276	${WRKSRC}//.dist.in \	277	${WRKSRC}//.dist.in \
277	${WRKSRC}///*.dist.in	278	${WRKSRC}///*.dist.in
278	@${REINPLACE_CMD} -e 's\|^\(RANDFILE = \)@datadir@[^[:space:]]*\|\1@sysconfdir@/random.tmp\|g' \	279	@${REINPLACE_CMD} -e 's\|^\(RANDFILE[[:space:]]=[[:space:]]\)@mydatadir@\|\1@sysconfdir@\|g' \
279	${WRKSRC}//.cnf.in \	280	${WRKSRC}//.cnf.openssl.in \
280	${WRKSRC}///*.cnf.in	281	${WRKSRC}///*.cnf.openssl.in
281	@${REINPLACE_CMD} -e 's\|$$(INSTALL_DATA) \(.$$$$file.\)\|${INSTALL_MAN} \1\|' \	282	@${REINPLACE_CMD} -e 's\|$$(INSTALL_DATA) \(.$$$$file.\)\|${INSTALL_MAN} \1\|' \
282	${WRKSRC}/Makefile.in \	283	${WRKSRC}/Makefile.in \
283	${WRKSRC}/*/Makefile.in \	284	${WRKSRC}/*/Makefile.in \

Lines 247-258 Link Here

(-)courier/files/courier.sh.in (+18 lines)
247	esac	247	esac
248	fi	248	fi
249	echo "."	249	echo "."
		250
		251	LISTS=""
		252	if [ -f ${sysconfdir}/webmlmrc ]; then
		253	. ${sysconfdir}/webmlmrc
		254	if [ -n "$LISTS" ];then
		255	if [ -x ${bindir}/webmlmd \
		256	-a -x ${bindir}/webmlmd.rc ]; then
		257	echo -n " webmlmd"
		258	${bindir}/webmlmd.rc start ${sysconfdir}/webmlmrc
		259	fi
		260	fi
		261	fi
250	}	262	}
251		263
252	courier_stop()	264	courier_stop()
253	{ # kill courier services in the reverse order of starting them	265	{ # kill courier services in the reverse order of starting them
254	echo -n "Stopping"	266	echo -n "Stopping"
255		267
		268	if [ -x ${bindir}/webmlmd \
		269	-a -x ${bindir}/webmlmd.rc ]; then
		270	echo -n " webmlmd"
		271	${bindir}/webmlmd.rc stop ${sysconfdir}/webmlmrc
		272	fi
		273
256	if [ -x ${sbindir}/pop3d-ssl ]; then	274	if [ -x ${sbindir}/pop3d-ssl ]; then
257	echo -n " pop3d-ssl"	275	echo -n " pop3d-ssl"
258	${sbindir}/pop3d-ssl stop	276	${sbindir}/pop3d-ssl stop

Lines 1-7 Link Here

(-)courier/files/patch-courier__perms.sh.in (-9 / +10 lines)
1	--- courier/perms.sh.in.orig Thu Jan 27 21:53:58 2005	1	--- courier/perms.sh.in.orig 2007-07-01 11:36:31.000000000 -0400
2	+++ courier/perms.sh.in Thu Jan 27 21:53:58 2005	2	+++ courier/perms.sh.in 2007-07-01 11:36:31.000000000 -0400
3	@@ -10,9 +10,6 @@	3	@@ -11,9 +11,6 @@
4	exec_prefix="@exec_prefix@"	4	datarootdir="@datarootdir@"
5		5
6	PERMS="	6	PERMS="
7	-. 755	7	-. 755
Lines 10-16 Link Here
10	@localstatedir@/tmp 770	10	@localstatedir@/tmp 770
11	@localstatedir@/msgs 750	11	@localstatedir@/msgs 750
12	@localstatedir@/msgq 750	12	@localstatedir@/msgq 750
13	@@ -45,7 +42,6 @@	13	@@ -47,7 +44,6 @@
14	@sysconfdir@/rfcerr2046.txt 444 config	14	@sysconfdir@/rfcerr2046.txt 444 config
15	@sysconfdir@/rfcerr2047.txt 444 config	15	@sysconfdir@/rfcerr2047.txt 444 config
16		16
Lines 18-30 Link Here
18	@libexecdir@/courier 755 x bin bin	18	@libexecdir@/courier 755 x bin bin
19	@libexecdir@/courier/modules 755 x bin bin	19	@libexecdir@/courier/modules 755 x bin bin
20	@libexecdir@/courier/submitmkdir 4550	20	@libexecdir@/courier/submitmkdir 4550
21	@@ -59,13 +55,12 @@	21	@@ -61,14 +57,13 @@
22	@libexecdir@/courier/makedatprog 555	22	@libexecdir@/courier/makedatprog 555
23	@libexecdir@/courier/imaplogin 555 x bin bin	23	@libexecdir@/courier/imaplogin 555 x bin bin
24	@libexecdir@/courier/pcpd 555 x bin bin	24	@libexecdir@/courier/pcpd 555 x bin bin
25	-@libexecdir@/courier/webmail 700 x root bin	25	-@libexecdir@/courier/webmail 700 x root bin
26	+@libexecdir@/courier/webmail 500 x root bin	26	+@libexecdir@/courier/webmail 500 x root bin
27	@libexecdir@/courier/webmail/webmail 555 x root bin	27	@libexecdir@/courier/webmail/webmail 555 x root bin
		28	@libexecdir@/courier/webmail/webmlm 555 x root bin
28	@libexecdir@/courier/sqwebmaild 555	29	@libexecdir@/courier/sqwebmaild 555
29	-@libexecdir@/courier/sqwebpasswd 2755	30	-@libexecdir@/courier/sqwebpasswd 2755
30	-@libexecdir@/courier/webmail/webadmin 4555 x root bin	31	-@libexecdir@/courier/webmail/webadmin 4555 x root bin
Lines 35-41 Link Here
35	@sbindir@/courier 555	36	@sbindir@/courier 555
36	@sbindir@/showconfig 555	37	@sbindir@/showconfig 555
37	@sbindir@/showmodules 550	38	@sbindir@/showmodules 550
38	@@ -78,7 +73,6 @@	39	@@ -82,7 +77,6 @@
39	@datadir@/imapd 555 x bin bin	40	@datadir@/imapd 555 x bin bin
40	@datadir@/imapd-ssl 555 x bin bin	41	@datadir@/imapd-ssl 555 x bin bin
41		42
Lines 43-49 Link Here
43	@bindir@/cancelmsg 6555	44	@bindir@/cancelmsg 6555
44	@bindir@/courier-config 555	45	@bindir@/courier-config 555
45	@bindir@/mailq 2555	46	@bindir@/mailq 2555
46	@@ -105,10 +99,10 @@	47	@@ -111,10 +105,10 @@
47	@sbindir@/makealiases 550	48	@sbindir@/makealiases 550
48	@datadir@/makehosteddomains 555	49	@datadir@/makehosteddomains 555
49	@sbindir@/makehosteddomains 555	50	@sbindir@/makehosteddomains 555
Lines 58-64 Link Here
58	@sbindir@/webgpg 555	59	@sbindir@/webgpg 555
59		60
60	@datadir@ 755 x bin bin	61	@datadir@ 755 x bin bin
61	@@ -202,7 +196,7 @@	62	@@ -226,7 +220,7 @@
62	if test "@HAVE_LDAP@" != 0	63	if test "@HAVE_LDAP@" != 0
63	then	64	then
64	echo @sysconfdir@/ldapaliasrc.dist 640 @mailuser@ @mailgroup@ config	65	echo @sysconfdir@/ldapaliasrc.dist 640 @mailuser@ @mailgroup@ config

Lines 1-160 Link Here

(-)courier/scripts/c_rehash (-160 lines)
1	#!/usr/bin/env perl
2
3
4	# Perl c_rehash script, scan all files in a directory
5	# and add symbolic links to their hash values.
6
7	my $openssl;
8
9	my $dir = "/etc/ssl";
10
11	if(defined $ENV{OPENSSL}) {
12	$openssl = $ENV{OPENSSL};
13	} else {
14	$openssl = "openssl";
15	$ENV{OPENSSL} = $openssl;
16	}
17
18	$ENV{PATH} .= ":$dir/bin";
19
20	if(! -x $openssl) {
21	my $found = 0;
22	foreach (split /:/, $ENV{PATH}) {
23	if(-x "$_/$openssl") {
24	$found = 1;
25	last;
26	}
27	}
28	if($found == 0) {
29	print STDERR "c_rehash: rehashing skipped ('openssl' program not available)\n";
30	exit 0;
31	}
32	}
33
34	if(@ARGV) {
35	@dirlist = @ARGV;
36	} elsif($ENV{SSL_CERT_DIR}) {
37	@dirlist = split /:/, $ENV{SSL_CERT_DIR};
38	} else {
39	$dirlist[0] = "$dir/certs";
40	}
41
42
43	foreach (@dirlist) {
44	if(-d $_ and -w $_) {
45	hash_dir($_);
46	}
47	}
48
49	sub hash_dir {
50	my %hashlist;
51	print "Doing $_[0]\n";
52	chdir $_[0];
53	opendir(DIR, ".");
54	my @flist = readdir(DIR);
55	# Delete any existing symbolic links
56	foreach (grep {/^[\da-f]+\.r{0,1}\d+$/} @flist) {
57	if(-l $_) {
58	unlink $_;
59	}
60	}
61	closedir DIR;
62	FILE: foreach $fname (grep {/\.pem$/} @flist) {
63	# Check to see if certificates and/or CRLs present.
64	my ($cert, $crl) = check_file($fname);
65	if(!$cert && !$crl) {
66	print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
67	next;
68	}
69	link_hash_cert($fname) if($cert);
70	link_hash_crl($fname) if($crl);
71	}
72	}
73
74	sub check_file {
75	my ($is_cert, $is_crl) = (0,0);
76	my $fname = $_[0];
77	open IN, $fname;
78	while(<IN>) {
79	if(/^-----BEGIN (.*)-----/) {
80	my $hdr = $1;
81	if($hdr =~ /^(X509 \|TRUSTED \|)CERTIFICATE$/) {
82	$is_cert = 1;
83	last if($is_crl);
84	} elsif($hdr eq "X509 CRL") {
85	$is_crl = 1;
86	last if($is_cert);
87	}
88	}
89	}
90	close IN;
91	return ($is_cert, $is_crl);
92	}
93
94
95	# Link a certificate to its subject name hash value, each hash is of
96	# the form <hash>.<n> where n is an integer. If the hash value already exists
97	# then we need to up the value of n, unless its a duplicate in which
98	# case we skip the link. We check for duplicates by comparing the
99	# certificate fingerprints
100
101	sub link_hash_cert {
102	my $fname = $_[0];
103	$fname =~ s/'/'\\''/g;
104	my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname'`;
105	chomp $hash;
106	chomp $fprint;
107	$fprint =~ s/^.*=//;
108	$fprint =~ tr/://d;
109	my $suffix = 0;
110	# Search for an unused hash filename
111	while(exists $hashlist{"$hash.$suffix"}) {
112	# Hash matches: if fingerprint matches its a duplicate cert
113	if($hashlist{"$hash.$suffix"} eq $fprint) {
114	print STDERR "WARNING: Skipping duplicate certificate $fname\n";
115	return;
116	}
117	$suffix++;
118	}
119	$hash .= ".$suffix";
120	print "$fname => $hash\n";
121	$symlink_exists=eval {symlink("",""); 1};
122	if ($symlink_exists) {
123	symlink $fname, $hash;
124	} else {
125	system ("cp", $fname, $hash);
126	}
127	$hashlist{$hash} = $fprint;
128	}
129
130	# Same as above except for a CRL. CRL links are of the form <hash>.r<n>
131
132	sub link_hash_crl {
133	my $fname = $_[0];
134	$fname =~ s/'/'\\''/g;
135	my ($hash, $fprint) = `"$openssl" crl -hash -fingerprint -noout -in '$fname'`;
136	chomp $hash;
137	chomp $fprint;
138	$fprint =~ s/^.*=//;
139	$fprint =~ tr/://d;
140	my $suffix = 0;
141	# Search for an unused hash filename
142	while(exists $hashlist{"$hash.r$suffix"}) {
143	# Hash matches: if fingerprint matches its a duplicate cert
144	if($hashlist{"$hash.r$suffix"} eq $fprint) {
145	print STDERR "WARNING: Skipping duplicate CRL $fname\n";
146	return;
147	}
148	$suffix++;
149	}
150	$hash .= ".r$suffix";
151	print "$fname => $hash\n";
152	$symlink_exists=eval {symlink("",""); 1};
153	if ($symlink_exists) {
154	symlink $fname, $hash;
155	} else {
156	system ("cp", $fname, $hash);
157	}
158	$hashlist{$hash} = $fprint;
159	}
160