diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/courier-authlib-ldap/Makefile | 6 | ||||
| -rw-r--r-- | net/courier-authlib-ldap/files/courier-authdaemond.sh | 16 | ||||
| -rw-r--r-- | net/courier-authlib-ldap/pkg-plist | 2 |
3 files changed, 14 insertions, 10 deletions
diff --git a/net/courier-authlib-ldap/Makefile b/net/courier-authlib-ldap/Makefile index a9de1f3..8be4fa9 100644 --- a/net/courier-authlib-ldap/Makefile +++ b/net/courier-authlib-ldap/Makefile @@ -7,7 +7,7 @@ PORTNAME= courier-authlib PORTVERSION= 0.55 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= courier @@ -57,8 +57,6 @@ CONFIGURE_ARGS= --without-authshadow \ --with-mailgroup=${WITH_MAILGROUP} \ --with-authdaemonvar=/var/run/authdaemond -PLIST_SUB= MAILUSER=${WITH_MAILUSER} MAILGROUP=${WITH_MAILGROUP} - .include <bsd.port.pre.mk> .if defined(WITH_SYSLOG_FACILITY) @@ -124,7 +122,7 @@ PLIST_SUB+= AUTHUSERDBFLAG="@comment " PLIST_SUB+= AUTHUSERDBFLAG="" .endif -RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} +RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} MAILUSER=${WITH_MAILUSER} MAILGROUP=${WITH_MAILGROUP} MAN1= courierlogger.1 diff --git a/net/courier-authlib-ldap/files/courier-authdaemond.sh b/net/courier-authlib-ldap/files/courier-authdaemond.sh index 88c9b91..c13b5d9 100644 --- a/net/courier-authlib-ldap/files/courier-authdaemond.sh +++ b/net/courier-authlib-ldap/files/courier-authdaemond.sh @@ -24,7 +24,8 @@ command="%%PREFIX%%/sbin/authdaemond" start_cmd="authdaemond_cmd start" stop_cmd="authdaemond_cmd stop" restart_cmd="authdaemond_cmd stop && authdaemond_cmd start" -pidfile="/var/run/authdaemond/pid" +rundir=/var/run/authdaemond +pidfile="${rundir}/pid" procname="%%PREFIX%%/sbin/courierlogger" load_rc_config $name @@ -32,6 +33,13 @@ load_rc_config $name authdaemond_cmd () { case $1 in start) + if [ ! -d "${rundir}" ] ; then + mkdir -p -m 0750 "${rundir}" && chown %%MAILUSER%%:%%MAILGROUP%% "${rundir}" + if [ $? -ne 0 ] ; then + echo "creating ${rundir} with the correct permissions was not possible!" + return 1 + fi + fi echo "Starting ${name}." ${command} start ;; @@ -39,9 +47,9 @@ authdaemond_cmd () { echo "Stopping ${name}." ${command} stop if [ $? -eq 0 ] ; then - [ -f "$pidfile" ] && rm -f "$pidfile" - [ -f "$pidfile".lock ] && rm -f "$pidfile".lock - [ -S /var/run/authdaemond/socket ] && rm -f /var/run/authdaemond/socket + [ -f "${pidfile}" ] && rm -f "$pidfile" + [ -f "${pidfile}.lock" ] && rm -f "${pidfile}.lock" + [ -S "${rundir}/socket" ] && rm -f "${rundir}/socket" return 0 fi ;; diff --git a/net/courier-authlib-ldap/pkg-plist b/net/courier-authlib-ldap/pkg-plist index 2a5e280..d3e729f 100644 --- a/net/courier-authlib-ldap/pkg-plist +++ b/net/courier-authlib-ldap/pkg-plist @@ -61,8 +61,6 @@ sbin/courierlogger %%PORTDOCS%%%%DOCSDIR%%/README.ldap %%PORTDOCS%%%%DOCSDIR%%/README_authlib.html %%PORTDOCS%%@dirrm %%DOCSDIR%% -@exec mkdir -m 0750 /var/run/authdaemond 2>/dev/null || true -@exec chown %%MAILUSER%%:%%MAILGROUP%% /var/run/authdaemond 2>/dev/null || true @unexec rmdir /var/run/authdaemond 2>/dev/null || true @unexec rmdir %D/etc/authlib 2>/dev/null || true @dirrm lib/courier-authlib |
