sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-02 03:16:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- stop creatng /var/run/authdaemond during the package installation

Browse source 
- create /var/run/authdaemond within the rc.subr Script in case the
  directory doesn't exist.
- Bump PORTREVISION

Suggested By:	brooks
This commit is contained in:
Oliver Lehmann 2005-03-15 19:41:41 +00:00
parent 15f66ab5b1
commit 10eea892dd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=131330
27 changed files with 126 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
databases/courier-authlib-mysql/Makefile
View file

@ -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

16
databases/courier-authlib-mysql/files/courier-authdaemond.sh
View file

@ -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
;;

2
databases/courier-authlib-mysql/pkg-plist
View file

@ -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

6
databases/courier-authlib-pgsql/Makefile
View file

@ -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

16
databases/courier-authlib-pgsql/files/courier-authdaemond.sh
View file

@ -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
;;

2
databases/courier-authlib-pgsql/pkg-plist
View file

@ -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

6
databases/courier-authlib-userdb/Makefile
View file

@ -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

16
databases/courier-authlib-userdb/files/courier-authdaemond.sh
View file

@ -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
;;

2
databases/courier-authlib-userdb/pkg-plist
View file

@ -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

6
databases/courier-authlib-usergdbm/Makefile
View file

@ -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

16
databases/courier-authlib-usergdbm/files/courier-authdaemond.sh
View file

@ -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
;;

2
databases/courier-authlib-usergdbm/pkg-plist
View file

@ -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

6
mail/courier-authlib-vchkpw/Makefile
View file

@ -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

16
mail/courier-authlib-vchkpw/files/courier-authdaemond.sh
View file

@ -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
;;

2
mail/courier-authlib-vchkpw/pkg-plist
View file

@ -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

6
mail/courier-authlib/Makefile
View file

@ -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

16
mail/courier-authlib/files/courier-authdaemond.sh
View file

@ -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
;;

2
mail/courier-authlib/pkg-plist
View file

@ -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

6
net/courier-authlib-ldap/Makefile
View file

@ -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

16
net/courier-authlib-ldap/files/courier-authdaemond.sh
View file

@ -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
;;

2
net/courier-authlib-ldap/pkg-plist
View file

@ -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

6
security/courier-authlib-base/Makefile
View file

@ -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

16
security/courier-authlib-base/files/courier-authdaemond.sh
View file

@ -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
;;

2
security/courier-authlib-base/pkg-plist
View file

@ -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

6
security/courier-authlib/Makefile
View file

@ -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

16
security/courier-authlib/files/courier-authdaemond.sh
View file

@ -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
;;

2
security/courier-authlib/pkg-plist
View file

@ -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