>Number: 158669
>Category: ports
>Synopsis: [maintainer update] mail/courier upgrade to 0.65.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Jul 05 14:20:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Milan Obuch
>Release: 7.4-STABLE, 8.2-STABLE, 9.0-CURRENT
>Organization:
>Environment:
>Description:
It's time to upgrade again. New version builds and works for me on both i386 and amd64 architectures, 7.4-stable, 8.2-stable and 9.0-current systems
>How-To-Repeat:
>Fix:
Apply patch attached
Patch attached with submission follows:
diff -urN courier/Makefile courier-0.65.3/Makefile
--- courier/Makefile 2010-12-04 08:32:28.000000000 +0100
+++ courier-0.65.3/Makefile 2011-06-14 22:06:01.000000000 +0200
@@ -6,8 +6,7 @@
#
PORTNAME= courier
-PORTVERSION= 0.63.0
-PORTREVISION= 1
+PORTVERSION= 0.65.3
CATEGORIES= mail ipv6
MASTER_SITES= SF
@@ -98,6 +97,7 @@
--with-cachedir=${CACHEDIR} \
--with-cacheowner=${CACHEOWN} \
--with-calendardir=${CALENDIR} \
+ --with-certsdir=${SYSCONFDIR} \
--with-transport='${WITH_TRANSPORT}' \
--with-default-maildrop=${MAILDROPDEFAULT} \
--with-paranoid-smtpext \
@@ -372,6 +372,11 @@
@if [ -f "${WRKDIR}/courier.cache" -a -s "${WRKDIR}/courier.cache" ]; then \
${RM} -f "${WRKDIR}/courier.cache"; \
fi
+ @cp ${LOCALBASE}/share/gettext/po/Makefile.in.in ${WRKSRC}/pcp/po
+ @cp ${LOCALBASE}/share/libtool/config/ltmain.sh ${WRKSRC}
+.for oldlt in . bdbobj cgi courier courier/libs courier/filters courier/filters/perlfilter courier/module.dsn courier/module.esmtp courier/module.local courier/module.uucp gdbmobj gpglib http11 imap ldapaddressbook libhmac liblock maildir maildrop makedat md5 numlib pcp random128 rfc822 rfc1035 rfc2045 sha1 tcpd unicode webmail
+ @cd ${WRKSRC}/${oldlt} && ${SETENV} ${SCRIPTS_ENV} ${SH} /usr/local/bin/aclocal
+.endfor
post-build:
@${PERL} -pi -e 's|^(auth)\s+(required).*|$$1\t\t$$2\tpam_unix.so\ttry_first_pass|g;' \
diff -urN courier/distinfo courier-0.65.3/distinfo
--- courier/distinfo 2011-07-04 08:15:23.000000000 +0200
+++ courier-0.65.3/distinfo 2011-03-07 07:33:57.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (courier-0.63.0.tar.bz2) = 3a52363605f75f4156105aefa6bd375626f742033fbf09b5592179f274322044
-SIZE (courier-0.63.0.tar.bz2) = 7133009
+SHA256 (courier-0.65.3.tar.bz2) = a743ba01137230165b00d726cf0faef3998d43edc0bfb00d8358eeefd96c7d60
+SIZE (courier-0.65.3.tar.bz2) = 7152828
diff -urN courier/files/patch-courier__configure courier-0.65.3/files/patch-courier__configure
--- courier/files/patch-courier__configure 2010-03-13 01:51:31.000000000 +0100
+++ courier-0.65.3/files/patch-courier__configure 2011-01-24 21:47:32.000000000 +0100
@@ -48,15 +48,6 @@
version=`cat ../version`
COPYRIGHT="Courier $version Copyright 1999-2008 Double Precision, Inc."
-@@ -17008,7 +17019,7 @@
-
- # Check whether --with-ldapaliasd was given.
- if test "${with_ldapaliasd+set}" = set; then
-- withval=$with_ldapaliasd; ldapaliasd="$withval"; ldapaliasd="yes"
-+ withval=$with_ldapaliasd; ldapaliasd="$withval"
- fi
-
-
@@ -18397,9 +18408,9 @@
if test "$testmode" = "0"
diff -urN courier/files/patch-imap__mkimapdcert.in courier-0.65.3/files/patch-imap__mkimapdcert.in
--- courier/files/patch-imap__mkimapdcert.in 2010-03-13 01:51:31.000000000 +0100
+++ courier-0.65.3/files/patch-imap__mkimapdcert.in 2011-01-24 21:54:16.000000000 +0100
@@ -2,10 +2,10 @@
+++ imap/mkimapdcert.in 2010-02-15 21:36:46.000000000 +0100
@@ -40,7 +40,7 @@
then
- cp /dev/null @mydatadir@/imapd.pem
- chmod 600 @mydatadir@/imapd.pem
-- chown @mailuser@ @mydatadir@/imapd.pem
-+ /usr/sbin/chown @mailuser@ @mydatadir@/imapd.pem
+ cp /dev/null @certsdir@/imapd.pem
+ chmod 600 @certsdir@/imapd.pem
+- chown @mailuser@ @certsdir@/imapd.pem
++ /usr/sbin/chown @mailuser@ @certsdir@/imapd.pem
- dd if=@RANDOMV@ of=@mydatadir@/imapd.rand count=1 2>/dev/null
+ dd if=@RANDOMV@ of=@certsdir@/imapd.rand count=1 2>/dev/null
@OPENSSL@ req -new -x509 -days 365 -nodes \
diff -urN courier/files/patch-imap__mkpop3dcert.in courier-0.65.3/files/patch-imap__mkpop3dcert.in
--- courier/files/patch-imap__mkpop3dcert.in 2010-03-13 01:51:31.000000000 +0100
+++ courier-0.65.3/files/patch-imap__mkpop3dcert.in 2011-01-24 21:55:33.000000000 +0100
@@ -2,10 +2,10 @@
+++ imap/mkpop3dcert.in 2010-02-15 21:37:01.000000000 +0100
@@ -40,7 +40,7 @@
then
- cp /dev/null @mydatadir@/pop3d.pem
- chmod 600 @mydatadir@/pop3d.pem
-- chown @mailuser@ @mydatadir@/pop3d.pem
-+ /usr/sbin/chown @mailuser@ @mydatadir@/pop3d.pem
+ cp /dev/null @certsdir@/pop3d.pem
+ chmod 600 @certsdir@/pop3d.pem
+- chown @mailuser@ @certsdir@/pop3d.pem
++ /usr/sbin/chown @mailuser@ @certsdir@/pop3d.pem
- dd if=@RANDOMV@ of=@mydatadir@/pop3d.rand count=1 2>/dev/null
+ dd if=@RANDOMV@ of=@certsdir@/pop3d.rand count=1 2>/dev/null
@OPENSSL@ req -new -x509 -days 365 -nodes \
>Release-Note:
>Audit-Trail:
>Unformatted: