make LOGDIR and LOG_FILE_PATH tunable [1]

add WITH_AUTH_RADIUS support [2]

Requested by:	Lonnie Santella <lonniesantella@hotmail.com> [1]
		Jan-Peter Koopmann <Jan-Peter.Koopmann@seceidos.de> [2]

7 files changed, 28 insertions, 11 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 3981795e497c..199132c18d4b 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -88,11 +88,15 @@ POSTGRESQL_PORT?=	databases/postgresql7
 EXIM_USER?=	mailnull
 EXIM_GROUP?=	mail
 
+LOGDIR?=	/var/log/exim
+LOG_FILE_PATH?=	${LOGDIR}/%slog
+
 SED_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g' \
 		-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
 		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
 		-e 's,%%EXIM_USER%%,${EXIM_USER},g' \
-		-e 's,%%EXIM_GROUP%%,${EXIM_GROUP},g'
+		-e 's,%%EXIM_GROUP%%,${EXIM_GROUP},g' \
+		-e 's,%%LOGDIR%%,${LOGDIR},g'
 
 PLIST_SUB=	EXIM_VERSION="${EXIM_VERSION}-${PORTREVISION}" \
 		EXIM_USER=${EXIM_USER} \
@@ -170,6 +174,9 @@ WITH_DEFAULT_CHARSET?=	ISO-8859-1
 #WITHOUT_AUTH_PLAINTEXT=	yes
 #WITHOUT_AUTH_SPA=		yes
 #
+# Enable built-in Exim support for radius (RFC 2865) authentication
+#WITH_AUTH_RADIUS=		yes
+#
 # Disable built-in Exim support for additional mailbox formats.
 #WITHOUT_MAILDIR=	yes
 #WITHOUT_MAILSTORE=	yes
@@ -216,6 +223,7 @@ SEDLIST=	-e 's,XX_PREFIX_XX,${PREFIX},' \
 		-e 's,XX_EXIM_USER_XX,${EXIM_USER},' \
 		-e 's,XX_EXIM_GROUP_XX,${EXIM_GROUP},' \
 		-e 's,XX_LOCALBASE_XX,${LOCALBASE},' \
+		-e 's,XX_LOG_FILE_PATH_XX,${LOG_FILE_PATH},' \
 		-e 's,XX_DEFAULT_CHARSET_XX,${WITH_DEFAULT_CHARSET},'
 
 .if defined(WITH_EXIMON)
@@ -336,6 +344,14 @@ SEDLIST+=	-e 's,^\# AUTH_PLAINTEXT=,AUTH_PLAINTEXT=,'
 SEDLIST+=	-e 's,^\# AUTH_SPA=,AUTH_SPA=,'
 .endif
 
+.if defined(WITH_AUTH_RADIUS)
+LIB_DEPENDS+=	radiusclient.0:${PORTSDIR}/net/radiusclient
+SEDLIST+=	-e 's,XX_RADIUS_LIBS_XX,-L${LOCALBASE}/lib -lradiusclient,' \
+		-e 's,^\# RADIUS_CONFIG_FILE=,RADIUS_CONFIG_FILE=${LOCALBASE},'
+.else
+SEDLIST+=	-e 's,XX_RADIUS_LIBS_XX,,'
+.endif
+
 .if defined(WITH_PGSQL)
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 SEDLIST+=	-e 's,XX_PGSQL_LIBS_XX,-L${LOCALBASE}/lib -lpq,' \
diff --git a/mail/exim/files/460.exim-mail-rejects.sh b/mail/exim/files/460.exim-mail-rejects.sh
index f1cdc39babb9..4cffe0737d2a 100644
--- a/mail/exim/files/460.exim-mail-rejects.sh
+++ b/mail/exim/files/460.exim-mail-rejects.sh
@@ -18,7 +18,7 @@ fi
 
 exim_status_mail_rejects_enable=${exim_status_mail_rejects_enable:-"YES"}
 exim_status_mail_rejects_logs=${exim_status_mail_rejects_logs:-2}
-exim_rejectlog=${exim_rejectlog:-"/var/log/exim/rejectlog"}
+exim_rejectlog=${exim_rejectlog:-"%%LOGDIR%%/rejectlog"}
 
 case "$exim_status_mail_rejects_enable" in
     [Yy][Ee][Ss])
diff --git a/mail/exim/files/POST-INSTALL-NOTES b/mail/exim/files/POST-INSTALL-NOTES
index d7660f460a1b..2fb1da256326 100644
--- a/mail/exim/files/POST-INSTALL-NOTES
+++ b/mail/exim/files/POST-INSTALL-NOTES
@@ -31,8 +31,8 @@ To use Exim instead of sendmail on startup:
 
 You may also want to configure newsyslog(8) to rotate Exim log files:
 
-/var/log/exim/mainlog	mailnull:mail 640 7 * @T00 ZN
-/var/log/exim/rejectlog	mailnull:mail 640 7 * @T00 ZN
+%%LOGDIR%%/mainlog	mailnull:mail 640 7 * @T00 ZN
+%%LOGDIR%%/rejectlog	mailnull:mail 640 7 * @T00 ZN
 
 NOTE TO OPERATORS UPGRADING FROM exim-3.xx:
 
diff --git a/mail/exim/files/exim.sh b/mail/exim/files/exim.sh
index cac669b06d41..58254cfab384 100644
--- a/mail/exim/files/exim.sh
+++ b/mail/exim/files/exim.sh
@@ -24,7 +24,7 @@ rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/exim
 pidfile=/var/run/exim.pid
-required_dirs=/var/log/exim
+required_dirs=%%LOGDIR%%
 required_files=%%PREFIX%%/etc/exim/configure
 
 start_precmd=start_precmd
diff --git a/mail/exim/files/patch-src::EDITME b/mail/exim/files/patch-src::EDITME
index 0eec7df6cf76..5fe41bbd1c4b 100644
--- a/mail/exim/files/patch-src::EDITME
+++ b/mail/exim/files/patch-src::EDITME
@@ -106,7 +106,7 @@
  # to form the final file names. Some installations may want something like this:
  
 -# LOG_FILE_PATH=/var/log/exim_%slog
-+LOG_FILE_PATH=/var/log/exim/%slog
++LOG_FILE_PATH=XX_LOG_FILE_PATH_XX
  
  # which results in files with names /var/log/exim_mainlog, etc. The directory
  # in which the log files are placed must exist; Exim does not try to create
@@ -116,7 +116,7 @@
  # CFLAGS=-O -I/usr/local/include
 -# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
 -#
-+EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX XX_SPF_LIBS_XX
++EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX XX_SPF_LIBS_XX XX_RADIUS_LIBS_XX
 +
  # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
  # as well.
diff --git a/mail/exim/pkg-install b/mail/exim/pkg-install
index d68718153f20..9011e4b69514 100644
--- a/mail/exim/pkg-install
+++ b/mail/exim/pkg-install
@@ -15,18 +15,19 @@ PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
 
 user=%%EXIM_USER%%
 group=%%EXIM_GROUP%%
+logdir=%%LOGDIR%%
 
 if [ "$2" = "PRE-INSTALL" ]; then
 	if ! /usr/bin/id ${user} > /dev/null; then
 		echo "Exim requires user ${user}.  Please update your system." 1>&2
 		exit 1
 	fi
-	if ! /usr/bin/grep -q "^${group}:" < /etc/group; then
+	if ! /usr/bin/grep -q "^${group}:" /etc/group; then
 		echo "Exim requires group ${group}.  Please update your system." 1>&2
 		exit 1
 	fi
-	/bin/mkdir -p /var/log/exim
-	/usr/sbin/chown ${user}:${group} /var/log/exim
+	/bin/mkdir -p ${logdir}
+	/usr/sbin/chown ${user}:${group} ${logdir}
 fi
 
 if [ "$2" = "POST-INSTALL" ]; then
diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist
index 65ec208f715f..f4cf537b3eca 100644
--- a/mail/exim/pkg-plist
+++ b/mail/exim/pkg-plist
@@ -52,4 +52,4 @@ etc/exim/configure.default
 @unexec rmdir %B 2>/dev/null || true
 @cwd %%RC_DIR%%
 exim%%RC_SUFX%%
-@unexec rmdir /var/log/exim 2>/dev/null || true
+@unexec rmdir %%LOGDIR%% 2>/dev/null || true