diff -urN courier.orig/Makefile courier/Makefile --- courier.orig/Makefile 2009-08-22 08:15:12.000000000 +0200 +++ courier/Makefile 2009-10-03 07:55:58.000000000 +0200 @@ -6,7 +6,7 @@ # PORTNAME= courier -PORTVERSION= 0.62.0 +PORTVERSION= 0.63.0 CATEGORIES= mail ipv6 MASTER_SITES= SF diff -urN courier.orig/distinfo courier/distinfo --- courier.orig/distinfo 2009-08-08 21:49:46.000000000 +0200 +++ courier/distinfo 2009-10-03 07:56:14.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (courier-0.62.0.tar.bz2) = 2b7acca41c778c241ed08f3ea633d8ea -SHA256 (courier-0.62.0.tar.bz2) = af826d6759be544127bcee95e4812649defdb4d4ff55193955b2c5d911d8e755 -SIZE (courier-0.62.0.tar.bz2) = 7314085 +MD5 (courier-0.63.0.tar.bz2) = a4d12aa593a52aee90373fad9eb9ff17 +SHA256 (courier-0.63.0.tar.bz2) = 3a52363605f75f4156105aefa6bd375626f742033fbf09b5592179f274322044 +SIZE (courier-0.63.0.tar.bz2) = 7133009 diff -urN courier.orig/files/courier.sh.in courier/files/courier.sh.in --- courier.orig/files/courier.sh.in 2009-08-08 21:49:46.000000000 +0200 +++ courier/files/courier.sh.in 2009-10-03 22:11:56.000000000 +0200 @@ -246,19 +246,18 @@ ;; 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 + if [ -n "$LISTS" \ + -a -x ${bindir}/webmlmd \ + -a -x ${bindir}/webmlmd.rc ]; then + echo -n " webmlmd" + ${bindir}/webmlmd.rc start ${sysconfdir}/webmlmrc fi fi + echo "." } courier_stop() diff -urN courier.orig/files/extra-patch-webmail__images__sqwebmail.css courier/files/extra-patch-webmail__images__sqwebmail.css --- courier.orig/files/extra-patch-webmail__images__sqwebmail.css 2009-08-09 06:15:27.000000000 +0200 +++ courier/files/extra-patch-webmail__images__sqwebmail.css 2010-01-11 14:48:49.000000000 +0100 @@ -15,7 +15,7 @@ .message-number { } -.message-status { } -+.message-flag { padding: 0} ++.message-flag { padding: 0 } +.message-select { padding: 0 } +.message-status { padding: 0 } .message-date { } diff -urN courier.orig/files/patch-courier__Makefile.in courier/files/patch-courier__Makefile.in --- courier.orig/files/patch-courier__Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ courier/files/patch-courier__Makefile.in 2010-02-15 19:12:00.000000000 +0100 @@ -0,0 +1,10 @@ +--- courier/Makefile.in.orig 2010-02-15 18:58:00.000000000 +0100 ++++ courier/Makefile.in 2010-02-15 19:11:12.000000000 +0100 +@@ -441,6 +441,7 @@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ ++piddir = @piddir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ diff -urN courier.orig/files/patch-courier__configure courier/files/patch-courier__configure --- courier.orig/files/patch-courier__configure 2006-12-12 21:32:45.000000000 +0100 +++ courier/files/patch-courier__configure 2010-02-15 20:15:21.000000000 +0100 @@ -1,6 +1,63 @@ ---- courier/configure.orig Sun Jul 3 00:06:22 2005 -+++ courier/configure Sun Jul 3 00:06:22 2005 -@@ -22109,9 +22109,9 @@ +--- courier/configure.orig 2009-09-05 13:59:59.000000000 +0200 ++++ courier/configure 2010-02-15 20:05:20.000000000 +0100 +@@ -819,6 +819,7 @@ + dirlist + transport + MODE ++piddir + COPYRIGHT + testmode + COURIERAUTHCONFIG +@@ -954,6 +955,7 @@ + enable_libtool_lock + with_softlinkdir + with_testmode ++with_piddir + with_transport + with_db + with_courierlogger +@@ -1629,6 +1631,7 @@ + --with-softlinks=dir:link,dir:link... specify soft links for + installation subdirectories. + -- This space intentionally left blank -- ++ --with-piddir Directory where webmlm.pid is created + --with-transport='local esmtp ...' + Specify list of modules to install + +@@ -2553,7 +2556,7 @@ + fi + + fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="install -s -o root -g wheel -m 555 -s" + + { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 + $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +@@ -15882,6 +15885,14 @@ + esac + + ++# Check whether --with-piddir was given. ++if test "${with_piddir+set}" = set; then ++ withval=$with_piddir; piddir="$withval" ++ else ++ piddir=$localstatedir/run ++fi ++ ++ + 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" then @@ -12,4 +69,4 @@ + INSTALL_DATA='${BSD_INSTALL_DATA}' fi - ac_ext=cc + ac_ext=cpp diff -urN courier.orig/files/patch-courier__configure.in courier/files/patch-courier__configure.in --- courier.orig/files/patch-courier__configure.in 1970-01-01 01:00:00.000000000 +0100 +++ courier/files/patch-courier__configure.in 2010-02-15 19:48:02.000000000 +0100 @@ -0,0 +1,13 @@ +--- courier/configure.in.orig 2009-09-05 13:59:26.000000000 +0200 ++++ courier/configure.in 2010-02-15 19:44:35.000000000 +0100 +@@ -77,6 +77,10 @@ + esac + AC_SUBST(testmode) + ++AC_ARG_WITH(piddir, [ --with-piddir Directory where imapd.pid is created ], piddir="$withval", piddir=$localstatedir/run) ++ ++AC_SUBST(piddir) ++ + version=`cat ../version` + + COPYRIGHT="Courier $version Copyright 1999-2008 Double Precision, Inc." diff -urN courier.orig/files/patch-courier__module.esmtp__mkesmtpdcert.in courier/files/patch-courier__module.esmtp__mkesmtpdcert.in --- courier.orig/files/patch-courier__module.esmtp__mkesmtpdcert.in 1970-01-01 01:00:00.000000000 +0100 +++ courier/files/patch-courier__module.esmtp__mkesmtpdcert.in 2010-02-15 21:41:18.000000000 +0100 @@ -0,0 +1,11 @@ +--- courier/module.esmtp/mkesmtpdcert.in.orig 2010-02-15 21:37:57.000000000 +0100 ++++ courier/module.esmtp/mkesmtpdcert.in 2010-02-15 21:37:16.000000000 +0100 +@@ -36,7 +36,7 @@ + then + cp /dev/null @mydatadir@/esmtpd.pem + chmod 600 @mydatadir@/esmtpd.pem +- chown @mailuser@ @mydatadir@/esmtpd.pem ++ /usr/sbin/chown @mailuser@ @mydatadir@/esmtpd.pem + dd if=@RANDOMV@ of=@mydatadir@/esmtpd.rand count=1 2>/dev/null + @OPENSSL@ req -new -x509 -days 365 -nodes \ + -config @sysconfdir@/esmtpd.cnf -out @mydatadir@/esmtpd.pem -keyout @mydatadir@/esmtpd.pem || cleanup diff -urN courier.orig/files/patch-courier__submit2.C courier/files/patch-courier__submit2.C --- courier.orig/files/patch-courier__submit2.C 1970-01-01 01:00:00.000000000 +0100 +++ courier/files/patch-courier__submit2.C 2009-10-03 22:35:46.000000000 +0200 @@ -0,0 +1,11 @@ +--- courier/submit2.C.orig 2008-01-29 13:06:47.000000000 +0100 ++++ courier/submit2.C 2009-10-03 22:34:47.000000000 +0200 +@@ -860,7 +860,7 @@ + if (sizelimit && bytecount > sizelimit) + { + std::cout << "523 Message length (" << +- sizelimit << " bytes) exceeds administrative limit." ++ bytecount << " bytes) exceeds administrative limit(" << sizelimit << ")." + << std::endl << std::flush; + return (1); + } diff -urN courier.orig/files/patch-courier__webmlmd.rc.in courier/files/patch-courier__webmlmd.rc.in --- courier.orig/files/patch-courier__webmlmd.rc.in 1970-01-01 01:00:00.000000000 +0100 +++ courier/files/patch-courier__webmlmd.rc.in 2009-10-03 22:19:40.000000000 +0200 @@ -0,0 +1,61 @@ +--- courier/webmlmd.rc.in.orig 2007-03-05 05:43:24.000000000 +0100 ++++ courier/webmlmd.rc.in 2009-10-03 22:18:39.000000000 +0200 +@@ -1,48 +1,48 @@ + #! @SHELL@ + +-case "$1" in ++case "$0" in + + /*) +- prog="$1" ++ prog="$0" + ;; + *) +- prog="`which $1`" ++ prog="`which $0`" + ;; + esac + + set -e + +-case "$2" in ++case "$1" in + start) +- if test "$3" = "" ++ if test "$2" = "" + then + echo "Usage: $prog start [configfile]" >&2 + exit 1 + fi + +- @SETENV@ -i @SHELL@ -c "set -a; . $3; $prog check || exit 1; \ ++ @SETENV@ -i @SHELL@ -c "set -a; . $2; $prog check || exit 1; \ + @courierlogger@ -pid="'"${PIDFILE}"'" $LOGGEROPTS -start $prog" + exit $? + ;; + stop) +- if test "$3" = "" ++ if test "$2" = "" + then + echo "Usage: $prog stop [configfile]" >&2 + exit 1 + fi + +- @SETENV@ -i @SHELL@ -c "set -a; . $3;\ ++ @SETENV@ -i @SHELL@ -c "set -a; . $2;\ + @courierlogger@ -pid="'"${PIDFILE}"'" $LOGGEROPTS -stop $prog" + exit $? + ;; + restart) +- if test "$3" = "" ++ if test "$2" = "" + then + echo "Usage: $prog restart [configfile]" >&2 + exit 1 + fi + +- @SETENV@ -i @SHELL@ -c "set -a; . $3; $prog check || exit 1; \ ++ @SETENV@ -i @SHELL@ -c "set -a; . $2; $prog check || exit 1; \ + @courierlogger@ -pid="'"${PIDFILE}"'" $LOGGEROPTS -restart $prog" + exit $? + ;; diff -urN courier.orig/files/patch-courier__webmlmrc.dist.in courier/files/patch-courier__webmlmrc.dist.in --- courier.orig/files/patch-courier__webmlmrc.dist.in 1970-01-01 01:00:00.000000000 +0100 +++ courier/files/patch-courier__webmlmrc.dist.in 2010-02-15 20:27:23.000000000 +0100 @@ -0,0 +1,11 @@ +--- courier/webmlmrc.dist.in.orig Sun Apr 8 21:03:03 2007 ++++ courier/webmlmrc.dist.in Sun Jun 10 11:54:35 2007 +@@ -19,7 +19,7 @@ + # + # The PID file. Don't change unless you know what you're doing. + +-PIDFILE="${PORT}.pid" ++PIDFILE=@piddir@/webmlm.pid + + + ##NAME: PREFORK:0 diff -urN courier.orig/files/patch-imap__mkimapdcert.in courier/files/patch-imap__mkimapdcert.in --- courier.orig/files/patch-imap__mkimapdcert.in 1970-01-01 01:00:00.000000000 +0100 +++ courier/files/patch-imap__mkimapdcert.in 2010-02-15 21:44:02.000000000 +0100 @@ -0,0 +1,11 @@ +--- imap/mkimapdcert.in.orig 2010-02-15 21:42:15.000000000 +0100 ++++ 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 + + dd if=@RANDOMV@ of=@mydatadir@/imapd.rand count=1 2>/dev/null + @OPENSSL@ req -new -x509 -days 365 -nodes \ diff -urN courier.orig/files/patch-imap__mkpop3dcert.in courier/files/patch-imap__mkpop3dcert.in --- courier.orig/files/patch-imap__mkpop3dcert.in 1970-01-01 01:00:00.000000000 +0100 +++ courier/files/patch-imap__mkpop3dcert.in 2010-02-15 21:45:36.000000000 +0100 @@ -0,0 +1,11 @@ +--- imap/mkpop3dcert.in.orig 2010-02-15 21:45:23.000000000 +0100 ++++ 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 + + dd if=@RANDOMV@ of=@mydatadir@/pop3d.rand count=1 2>/dev/null + @OPENSSL@ req -new -x509 -days 365 -nodes \ diff -urN courier.orig/files/patch-imap__outbox.c courier/files/patch-imap__outbox.c --- courier.orig/files/patch-imap__outbox.c 2007-01-01 01:00:22.000000000 +0100 +++ courier/files/patch-imap__outbox.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ ---- imap/outbox.c.orig Tue Jul 13 00:35:27 2004 -+++ imap/outbox.c Sun Dec 31 13:24:50 2006 -@@ -92,10 +92,10 @@ - argv[5]=NULL; - } - -- return (sendmsg(message, argv, errlogger)); -+ return (ci_sendmsg(message, argv, errlogger)); - } - --int sendmsg(const char *message, char **argv, void (*err_func)(char *)) -+int ci_sendmsg(const char *message, char **argv, void (*err_func)(char *)) - { - char buffer[512]; - int i; diff -urN courier.orig/files/patch-imap__outbox.h courier/files/patch-imap__outbox.h --- courier.orig/files/patch-imap__outbox.h 2007-01-01 01:00:22.000000000 +0100 +++ courier/files/patch-imap__outbox.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- imap/outbox.h.orig Tue May 27 17:55:10 2003 -+++ imap/outbox.h Sun Dec 31 13:24:27 2006 -@@ -10,7 +10,7 @@ - - int check_outbox(const char *message, const char *mailbox); - int is_outbox(const char *mailbox); --int sendmsg(const char *message, char **argv, void (*err_func)(char *)); -+int ci_sendmsg(const char *message, char **argv, void (*err_func)(char *)); - const char *defaultSendFrom(); - - #endif diff -urN courier.orig/files/patch-imap__smap.c courier/files/patch-imap__smap.c --- courier.orig/files/patch-imap__smap.c 2007-01-01 01:00:22.000000000 +0100 +++ courier/files/patch-imap__smap.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- imap/smap.c.orig Tue Nov 22 02:17:31 2005 -+++ imap/smap.c Sun Dec 31 13:25:19 2006 -@@ -3496,7 +3496,7 @@ - } - argvec[i]=0; - -- i=sendmsg(tmpname, argvec, -+ i=ci_sendmsg(tmpname, argvec, - &senderr); - free(argvec); - if (i) diff -urN courier.orig/files/pkg-install.in courier/files/pkg-install.in --- courier.orig/files/pkg-install.in 2009-08-08 21:49:46.000000000 +0200 +++ courier/files/pkg-install.in 2009-10-11 11:07:06.000000000 +0200 @@ -52,16 +52,16 @@ } if [ ":$2" = ":POST-INSTALL" ]; then - if yesno "Would you like to activate Courier in /etc/mail/mailer.conf" n; then - mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - echo "#" > /etc/mail/mailer.conf - echo -n "# Execute the Courier sendmail program" >> /etc/mail/mailer.conf - echo ", named ${PKG_PREFIX}/bin/sendmail" >> /etc/mail/mailer.conf - echo "#" >> /etc/mail/mailer.conf - echo "sendmail ${PKG_PREFIX}/bin/sendmail" >> /etc/mail/mailer.conf - echo "send-mail ${PKG_PREFIX}/bin/sendmail" >> /etc/mail/mailer.conf - echo "mailq ${PKG_PREFIX}/bin/mailq" >> /etc/mail/mailer.conf - echo "newaliases ${PKG_PREFIX}/sbin/makealiases" >> /etc/mail/mailer.conf - echo "Done." - fi + if yesno "Would you like to activate Courier in /etc/mail/mailer.conf" n; then + mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old + echo "#" > /etc/mail/mailer.conf + echo -n "# Execute the Courier sendmail program" >> /etc/mail/mailer.conf + echo ", named ${PKG_PREFIX}/bin/sendmail" >> /etc/mail/mailer.conf + echo "#" >> /etc/mail/mailer.conf + echo "sendmail ${PKG_PREFIX}/bin/sendmail" >> /etc/mail/mailer.conf + echo "send-mail ${PKG_PREFIX}/bin/sendmail" >> /etc/mail/mailer.conf + echo "mailq ${PKG_PREFIX}/bin/mailq" >> /etc/mail/mailer.conf + echo "newaliases ${PKG_PREFIX}/sbin/makealiases" >> /etc/mail/mailer.conf + echo "Done." + fi fi diff -urN courier.orig/files/pkg-message.in courier/files/pkg-message.in --- courier.orig/files/pkg-message.in 2009-08-08 21:49:46.000000000 +0200 +++ courier/files/pkg-message.in 2010-01-11 13:43:22.000000000 +0100 @@ -26,6 +26,16 @@ courier_enable="YES" sendmail_enable="NONE" + Note: in newer OS versions you should change variables + used in /etc/rc.conf file, as NONE for sendmail_enable + is deprecated and will be not supported in future: + + courier_enable="YES" + sendmail_enable="NO" + sendmail_submit_enable="NO" + sendmail_outbound_enable="NO" + sendmail_msp_queue_enable="NO" + Also, you will want to disable some Sendmail specific daily maintenance routines in your /etc/periodic.conf file: