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

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

Return to bug 143974