- Update to 0.52.1

PR:		ports/86517
Submitted by:	Yarema <yds@CoolRat.org> (maintainer)

4 files changed, 94 insertions, 82 deletions

diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index a744488adce6..829c04b5fc96 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier
-PORTVERSION=	0.50.1
+PORTVERSION=	0.52.1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -15,7 +15,8 @@ MAINTAINER=	yds@CoolRat.org
 COMMENT=	Courier SMTP IMAP POP3 HTTP mail server suite
 
 BUILD_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
-LIB_DEPENDS=	fam.0:${PORTSDIR}/devel/fam
+LIB_DEPENDS=	fam:${PORTSDIR}/devel/fam \
+		pcre:${PORTSDIR}/devel/pcre
 RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base \
 		${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool \
 		${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support \
@@ -265,6 +266,9 @@ pre-everything::
 	@${ECHO_MSG} "===>	Run 'make config' to (re)configure ${PKGNAME}"
 	@${ECHO_MSG} "===> --------------------------------------------------------"
 
+pre-patch:
+	@${CP} ${TEMPLATES}/config.guess ${TEMPLATES}/config.sub ${WRKSRC}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|@datadir@|@sysconfdir@|g' \
 		${WRKSRC}/*/mk*cert.* \
diff --git a/mail/courier/distinfo b/mail/courier/distinfo
index 7e8b9979f499..716513782607 100644
--- a/mail/courier/distinfo
+++ b/mail/courier/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-0.50.1.tar.bz2) = 6fb2b188bba8fbf244f2feb80ad99a70
-SIZE (courier-0.50.1.tar.bz2) = 5913551
+MD5 (courier-0.52.1.tar.bz2) = 98005b9bacd44fa9e1a2b2100907522a
+SIZE (courier-0.52.1.tar.bz2) = 6603812
diff --git a/mail/courier/pkg-plist b/mail/courier/pkg-plist
index 6345eaa2d935..172d1ed5a7c3 100644
--- a/mail/courier/pkg-plist
+++ b/mail/courier/pkg-plist
@@ -306,168 +306,180 @@ share/courier/perlfilter-example.pl
 share/courier/perlfilter-wrapper.pl
 share/courier/pop3d
 share/courier/pop3d-ssl
+share/courier/rootcerts/02b73561.0
+share/courier/rootcerts/0481cb65.0
 share/courier/rootcerts/052e396b.0
-share/courier/rootcerts/0bb21872.0
 share/courier/rootcerts/0c364b2d.0
+share/courier/rootcerts/0dbd0096.0
 share/courier/rootcerts/0e82f83a.0
+share/courier/rootcerts/11a09b38.0
 share/courier/rootcerts/11f154d6.0
+share/courier/rootcerts/124bbd54.0
 share/courier/rootcerts/128b9c8d.0
 share/courier/rootcerts/19899da5.0
-share/courier/rootcerts/1a147d5b.0
-share/courier/rootcerts/1bb6c7e0.0
+share/courier/rootcerts/219d9499.0
+share/courier/rootcerts/23f4c490.0
 share/courier/rootcerts/256fd83b.0
-share/courier/rootcerts/2d047263.0
 share/courier/rootcerts/2edf7016.0
+share/courier/rootcerts/2fb1850a.0
 share/courier/rootcerts/31044350.0
 share/courier/rootcerts/3ad48a91.0
 share/courier/rootcerts/3c58f906.0
 share/courier/rootcerts/3e7271e8.0
 share/courier/rootcerts/412bea73.0
-share/courier/rootcerts/418882ac.0
-share/courier/rootcerts/43d4bde2.0
+share/courier/rootcerts/4166ec0c.0
+share/courier/rootcerts/4184de39.0
 share/courier/rootcerts/4643210f.0
+share/courier/rootcerts/47996b5c.0
 share/courier/rootcerts/4d654d1d.0
-share/courier/rootcerts/5480ace1.0
+share/courier/rootcerts/4fbd6bfa.0
 share/courier/rootcerts/54edfa5d.0
-share/courier/rootcerts/56e607f4.0
 share/courier/rootcerts/594f1775.0
-share/courier/rootcerts/5ee07a24.0
+share/courier/rootcerts/5a5372fc.0
+share/courier/rootcerts/5cf9d536.0
 share/courier/rootcerts/5f5e5caa.0
-share/courier/rootcerts/6166cb50.0
 share/courier/rootcerts/61f6c934.0
-share/courier/rootcerts/66eb5c17.0
-share/courier/rootcerts/66ec64da.0
-share/courier/rootcerts/6981fb07.0
-share/courier/rootcerts/6a15001a.0
+share/courier/rootcerts/635ccfd5.0
 share/courier/rootcerts/6c55cf77.0
-share/courier/rootcerts/6d6ec79c.0
-share/courier/rootcerts/700b8679.0
+share/courier/rootcerts/6e8bf996.0
+share/courier/rootcerts/6fcc125d.0
 share/courier/rootcerts/709afd2b.0
+share/courier/rootcerts/72bf6a04.0
 share/courier/rootcerts/72fa7371.0
-share/courier/rootcerts/73451336.0
-share/courier/rootcerts/739b7930.0
 share/courier/rootcerts/74c26bd0.0
+share/courier/rootcerts/755f7420.0
+share/courier/rootcerts/75680d2e.0
 share/courier/rootcerts/7651b327.0
-share/courier/rootcerts/76d6205a.0
+share/courier/rootcerts/76579174.0
 share/courier/rootcerts/788c9bfc.0
-share/courier/rootcerts/7a9820c1.0
+share/courier/rootcerts/7999be0d.0
 share/courier/rootcerts/7d3cd826.0
 share/courier/rootcerts/7d453d8f.0
-share/courier/rootcerts/7e74191f.0
-share/courier/rootcerts/81447c6e.0
-share/courier/rootcerts/843b6c51.0
-share/courier/rootcerts/878cf4c6.0
-share/courier/rootcerts/8e6e2991.0
-share/courier/rootcerts/8efac7d4.0
+share/courier/rootcerts/8470719d.0
+share/courier/rootcerts/86f32474.0
 share/courier/rootcerts/8f7b96c4.0
+share/courier/rootcerts/8fe643df.0
 share/courier/rootcerts/95750816.0
 share/courier/rootcerts/97b4211c.0
+share/courier/rootcerts/9ec3a561.0
+share/courier/rootcerts/a0bc6fbb.0
 share/courier/rootcerts/a15b3b6b.0
-share/courier/rootcerts/a2be0f54.0
 share/courier/rootcerts/a2df7ad7.0
-share/courier/rootcerts/a38484ce.0
-share/courier/rootcerts/a3c60019.0
+share/courier/rootcerts/a3896b44.0
+share/courier/rootcerts/a6776c69.0
+share/courier/rootcerts/a7605362.0
+share/courier/rootcerts/aaa-certificate-services.pem
 share/courier/rootcerts/aaa45464.0
 share/courier/rootcerts/aba-ecom-root-ca.pem
+share/courier/rootcerts/add67345.0
 share/courier/rootcerts/addtrust-class-1-ca-root.pem
 share/courier/rootcerts/addtrust-external-ca-root.pem
 share/courier/rootcerts/addtrust-public-ca-root.pem
 share/courier/rootcerts/addtrust-qualified-ca-root.pem
-share/courier/rootcerts/american-express-certificate-authority.pem
-share/courier/rootcerts/american-express-global-certificate.pem
+share/courier/rootcerts/america-online-root-certification-00.pem
+share/courier/rootcerts/america-online-root-certification-01.pem
+share/courier/rootcerts/aol-time-warner-root-certification-00.pem
+share/courier/rootcerts/aol-time-warner-root-certification-01.pem
 share/courier/rootcerts/b0f3e76e.0
 share/courier/rootcerts/b5f329fa.0
-share/courier/rootcerts/ba386118.0
-share/courier/rootcerts/baltimore-cybertrust-code-signing.pem
-share/courier/rootcerts/baltimore-cybertrust-mobile-root.pem
 share/courier/rootcerts/baltimore-cybertrust-root.pem
-share/courier/rootcerts/bankengine.pem
-share/courier/rootcerts/bb0a889c.0
 share/courier/rootcerts/bcdd5959.0
-share/courier/rootcerts/belsign-object-publishing-ca.pem
-share/courier/rootcerts/belsign-secure-server-ca.pem
+share/courier/rootcerts/bda4cc84.0
+share/courier/rootcerts/betrusted-root-ca-baltimore-implementation.pem
+share/courier/rootcerts/betrusted-root-ca-entrust-implementation.pem
+share/courier/rootcerts/betrusted-root-ca-rsa-implementation.pem
 share/courier/rootcerts/betrusted-root-ca.pem
-share/courier/rootcerts/bffe8b5d.0
+share/courier/rootcerts/bf87590f.0
 share/courier/rootcerts/c19d42c7.0
 share/courier/rootcerts/c215bc69.0
 share/courier/rootcerts/c33a80d4.0
 share/courier/rootcerts/c527e4ab.0
 share/courier/rootcerts/c9bc75ba.0
-share/courier/rootcerts/ccf7ff0e.0
-share/courier/rootcerts/certengine.pem
+share/courier/rootcerts/ccb919f9.0
+share/courier/rootcerts/cdaebb72.0
+share/courier/rootcerts/certum-ca.pem
+share/courier/rootcerts/chambers-of-commerce-root.pem
 share/courier/rootcerts/class-1-public-primary-ocsp-responder.pem
 share/courier/rootcerts/class-2-public-primary-ocsp-responder.pem
 share/courier/rootcerts/class-3-public-primary-ocsp-responder.pem
-share/courier/rootcerts/cybertrust-japan-root-ca.pem
-share/courier/rootcerts/cybertrust-japan-secure-server.pem
 share/courier/rootcerts/d2adc77d.0
-share/courier/rootcerts/d593166d.0
+share/courier/rootcerts/d537fba6.0
 share/courier/rootcerts/d78a75c7.0
-share/courier/rootcerts/db65db21.0
+share/courier/rootcerts/d8274e24.0
 share/courier/rootcerts/ddc328ff.0
-share/courier/rootcerts/deutsche-telekom-root-ca.pem
-share/courier/rootcerts/dfd0b044.0
 share/courier/rootcerts/digital-signature-trust-co-dstca-00.pem
 share/courier/rootcerts/digital-signature-trust-co-dstca-01.pem
 share/courier/rootcerts/dst-rootca-x1.pem
 share/courier/rootcerts/dst-rootca-x2.pem
-share/courier/rootcerts/e-certify-ca.pem
-share/courier/rootcerts/e-certify-ra.pem
 share/courier/rootcerts/e268a4c5.0
 share/courier/rootcerts/e28f6bbc.0
 share/courier/rootcerts/e7b8d656.0
-share/courier/rootcerts/e9aaa9de.0
 share/courier/rootcerts/ed049835.0
 share/courier/rootcerts/ed524cf5.0
 share/courier/rootcerts/ed62f4e3.0
+share/courier/rootcerts/ee7cd6fb.0
 share/courier/rootcerts/entrust-net-certification-authority.pem
 share/courier/rootcerts/entrust-net-client-certification-00.pem
 share/courier/rootcerts/entrust-net-client-certification-01.pem
 share/courier/rootcerts/entrust-net-secure-server-certification-00.pem
 share/courier/rootcerts/entrust-net-secure-server-certification-01.pem
-share/courier/rootcerts/equifax-equifax-premium-certificate.pem
 share/courier/rootcerts/equifax-equifax-secure-certificate.pem
 share/courier/rootcerts/equifax-secure-ebusiness-ca-1.pem
 share/courier/rootcerts/equifax-secure-equifax-secure-ebusiness.pem
 share/courier/rootcerts/equifax-secure-global-ebusiness.pem
-share/courier/rootcerts/f10dd942.0
+share/courier/rootcerts/f3cf1e8e.0
 share/courier/rootcerts/f4996e82.0
+share/courier/rootcerts/f64d9715.0
 share/courier/rootcerts/f73e89fd.0
-share/courier/rootcerts/fortengine.pem
-share/courier/rootcerts/globalsign-partners-ca.pem
-share/courier/rootcerts/globalsign-primary-class-1-ca.pem
-share/courier/rootcerts/globalsign-primary-class-2-ca.pem
-share/courier/rootcerts/globalsign-primary-class-3-ca.pem
+share/courier/rootcerts/f950ccc2.0
+share/courier/rootcerts/ff783690.0
+share/courier/rootcerts/geotrust-global-ca.pem
+share/courier/rootcerts/global-chambersign-root.pem
 share/courier/rootcerts/globalsign-root-ca.pem
 share/courier/rootcerts/gp-root-2.pem
-share/courier/rootcerts/gp-root-3.pem
-share/courier/rootcerts/gp-root-4.pem
-share/courier/rootcerts/gp-root-5.pem
 share/courier/rootcerts/gte-cybertrust-global-root.pem
-share/courier/rootcerts/gte-cybertrust-root-5.pem
 share/courier/rootcerts/gte-cybertrust-root.pem
 share/courier/rootcerts/http-www-valicert-com-00.pem
 share/courier/rootcerts/http-www-valicert-com-01.pem
 share/courier/rootcerts/http-www-valicert-com-02.pem
-share/courier/rootcerts/http-www-valicert-net.pem
-share/courier/rootcerts/mailengine.pem
+share/courier/rootcerts/ips-ca-chained-cas-certification.pem
+share/courier/rootcerts/ips-ca-clase1-certification-authority.pem
+share/courier/rootcerts/ips-ca-clase3-certification-authority.pem
+share/courier/rootcerts/ips-ca-clasea1-certification-authority.pem
+share/courier/rootcerts/ips-ca-clasea3-certification-authority.pem
+share/courier/rootcerts/ips-ca-timestamping-certification.pem
+share/courier/rootcerts/ips-servidores.pem
+share/courier/rootcerts/netlock-expressz-class-c-tanusitvanykiado.pem
+share/courier/rootcerts/netlock-kozjegyzoi-class-a-tanusitvanykiado.pem
+share/courier/rootcerts/netlock-uzleti-class-b-tanusitvanykiado.pem
+share/courier/rootcerts/quovadis-root-certification-authority.pem
 share/courier/rootcerts/rsa-data-security-inc-secure-server.pem
+share/courier/rootcerts/rsa-security-inc-rsa-security-1024.pem
+share/courier/rootcerts/rsa-security-inc-rsa-security-2048.pem
+share/courier/rootcerts/secom-trust-net-security-communication.pem
+share/courier/rootcerts/secure-certificate-services.pem
 share/courier/rootcerts/secure-server-ocsp-responder.pem
+share/courier/rootcerts/sonera-class1-ca.pem
+share/courier/rootcerts/sonera-class2-ca.pem
+share/courier/rootcerts/staat-der-nederlanden-root-ca.pem
+share/courier/rootcerts/starfield-technologies-inc-starfield.pem
 share/courier/rootcerts/tc-trustcenter-for-security-in-00.pem
 share/courier/rootcerts/tc-trustcenter-for-security-in-01.pem
-share/courier/rootcerts/tc-trustcenter-for-security-in-02.pem
-share/courier/rootcerts/tc-trustcenter-for-security-in-03.pem
-share/courier/rootcerts/tc-trustcenter-for-security-in-04.pem
+share/courier/rootcerts/tdc-internet-tdc-internet-root.pem
+share/courier/rootcerts/tdc-oces-ca.pem
 share/courier/rootcerts/thawte-personal-basic-ca.pem
 share/courier/rootcerts/thawte-personal-freemail-ca.pem
 share/courier/rootcerts/thawte-personal-premium-ca.pem
 share/courier/rootcerts/thawte-premium-server-ca.pem
 share/courier/rootcerts/thawte-server-ca.pem
 share/courier/rootcerts/thawte-timestamping-ca.pem
-share/courier/rootcerts/thawte-universal-ca-root.pem
-share/courier/rootcerts/traderengine.pem
-share/courier/rootcerts/usps-production-ca-1.pem
-share/courier/rootcerts/usps-root-ca.pem
+share/courier/rootcerts/the-go-daddy-group-inc-go-daddy.pem
+share/courier/rootcerts/trusted-certificate-services.pem
+share/courier/rootcerts/utn-datacorp-sgc.pem
+share/courier/rootcerts/utn-userfirst-client-authentication.pem
+share/courier/rootcerts/utn-userfirst-hardware.pem
+share/courier/rootcerts/utn-userfirst-network-applications.pem
+share/courier/rootcerts/utn-userfirst-object.pem
 share/courier/rootcerts/verisign-class-1-public-primary.pem
 share/courier/rootcerts/verisign-class-2-public-primary.pem
 share/courier/rootcerts/verisign-class-3-public-primary.pem
@@ -480,12 +492,8 @@ share/courier/rootcerts/verisign-inc-verisign-trust-network-01.pem
 share/courier/rootcerts/verisign-inc-verisign-trust-network-02.pem
 share/courier/rootcerts/verisign-inc-verisign-trust-network-03.pem
 share/courier/rootcerts/verisign-time-stamping-authority.pem
-share/courier/rootcerts/visa-visa-international-service.pem
-share/courier/rootcerts/xcert-ez-by-dst.pem
-share/courier/rootcerts/xcert-international-inc-xcert-root-00.pem
-share/courier/rootcerts/xcert-international-inc-xcert-root-01.pem
-share/courier/rootcerts/xcert-international-inc-xcert-root-02.pem
-share/courier/rootcerts/xcert-international-inc-xcert-root-03.pem
+share/courier/rootcerts/visa-ecommerce-root.pem
+share/courier/rootcerts/xramp-global-certification-authority.pem
 @dirrm share/courier/rootcerts
 share/courier/sqwebmail/cleancache.pl
 share/courier/sqwebmail/html/en-us/CHARSET
diff --git a/mail/courier/scripts/c_rehash b/mail/courier/scripts/c_rehash
index e614fb546667..5d3e3d81dde5 100644
--- a/mail/courier/scripts/c_rehash
+++ b/mail/courier/scripts/c_rehash
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 
 # Perl c_rehash script, scan all files in a directory
@@ -6,7 +6,7 @@
 
 my $openssl;
 
-my $dir = "/usr/local/ssl";
+my $dir = "/etc/ssl";
 
 if(defined $ENV{OPENSSL}) {
 	$openssl = $ENV{OPENSSL};