diff options
author | oliver <oliver@FreeBSD.org> | 2005-01-08 10:25:05 +0000 |
---|---|---|
committer | oliver <oliver@FreeBSD.org> | 2005-01-08 10:25:05 +0000 |
commit | 7d8aa874997ea562bda35e5fa87c579846d5f214 (patch) | |
tree | b30ac5610ec4f256655d05af79abd9c96ce3a6b9 /databases | |
parent | a442977f4e66fe6157500149dff5e2aff5c9d46e (diff) | |
download | FreeBSD-ports-7d8aa874997ea562bda35e5fa87c579846d5f214.zip FreeBSD-ports-7d8aa874997ea562bda35e5fa87c579846d5f214.tar.gz |
upadate to courier-authlib 0.52, courier-imap 4.0.1 and sqwebmail 5.0.0
Special thanks for testing and sugestions to: Brian Candler <B.Candler@pobox.com>
Diffstat (limited to 'databases')
-rw-r--r-- | databases/courier-authlib-mysql/Makefile | 13 | ||||
-rw-r--r-- | databases/courier-authlib-mysql/distinfo | 4 | ||||
-rw-r--r-- | databases/courier-authlib-mysql/files/courier-authdaemond.sh | 8 | ||||
-rw-r--r-- | databases/courier-authlib-mysql/pkg-plist | 10 | ||||
-rw-r--r-- | databases/courier-authlib-pgsql/Makefile | 13 | ||||
-rw-r--r-- | databases/courier-authlib-pgsql/distinfo | 4 | ||||
-rw-r--r-- | databases/courier-authlib-pgsql/files/courier-authdaemond.sh | 8 | ||||
-rw-r--r-- | databases/courier-authlib-pgsql/pkg-plist | 10 | ||||
-rw-r--r-- | databases/courier-authlib-userdb/Makefile | 13 | ||||
-rw-r--r-- | databases/courier-authlib-userdb/distinfo | 4 | ||||
-rw-r--r-- | databases/courier-authlib-userdb/files/courier-authdaemond.sh | 8 | ||||
-rw-r--r-- | databases/courier-authlib-userdb/pkg-plist | 10 | ||||
-rw-r--r-- | databases/courier-authlib-usergdbm/Makefile | 13 | ||||
-rw-r--r-- | databases/courier-authlib-usergdbm/distinfo | 4 | ||||
-rw-r--r-- | databases/courier-authlib-usergdbm/files/courier-authdaemond.sh | 8 | ||||
-rw-r--r-- | databases/courier-authlib-usergdbm/pkg-plist | 10 |
16 files changed, 112 insertions, 28 deletions
diff --git a/databases/courier-authlib-mysql/Makefile b/databases/courier-authlib-mysql/Makefile index 6b5b5ba..fbea8f3 100644 --- a/databases/courier-authlib-mysql/Makefile +++ b/databases/courier-authlib-mysql/Makefile @@ -6,9 +6,10 @@ # PORTNAME= courier-authlib -PORTVERSION= 0.51 +PORTVERSION= 0.52 CATEGORIES= mail -MASTER_SITES= http://www.courier-mta.org/beta/courier-authlib/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= courier MAINTAINER= oliver@FreeBSD.org COMMENT= Authentication library used by courier ports @@ -41,6 +42,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --without-authshadow \ + --without-authcustom \ --enable-unicode \ --enable-ltdl-install=no @@ -108,7 +110,10 @@ MAN3= authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \ MAN8= makeuserdb.8 userdb.8 userdbpw.8 -EXTRA_DOCS= README INSTALL AUTHORS ChangeLog +EXTRA_DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README \ + README.authdebug.html README.authmysql.html \ + README.authmysql.myownquery README.authpostgres.html \ + README.ldap README_authlib.html post-patch: @${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g ; \ @@ -116,6 +121,8 @@ post-patch: @${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \ ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in \ ${WRKSRC}/liblog/Makefile.in ${WRKSRC}/userdb/Makefile.in + @${REINPLACE_CMD} -e 's|DEFAULTOPTIONS=""|DEFAULTOPTIONS="wbnodsn=1"|' \ + ${WRKSRC}/authdaemonrc.in post-install: ${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ diff --git a/databases/courier-authlib-mysql/distinfo b/databases/courier-authlib-mysql/distinfo index 7146db0..8441c7c 100644 --- a/databases/courier-authlib-mysql/distinfo +++ b/databases/courier-authlib-mysql/distinfo @@ -1,2 +1,2 @@ -MD5 (courier-authlib-0.51.tar.bz2) = 89cb2db63b3f6d402e435331e391ef80 -SIZE(courier-authlib-0.51.tar.bz2) = 1964171 +MD5 (courier-authlib-0.52.tar.bz2) = 2ad6837c1eec7582f8634c320f45b2dc +SIZE(courier-authlib-0.52.tar.bz2) = 1965591 diff --git a/databases/courier-authlib-mysql/files/courier-authdaemond.sh b/databases/courier-authlib-mysql/files/courier-authdaemond.sh index b4af4c0..ef48f16 100644 --- a/databases/courier-authlib-mysql/files/courier-authdaemond.sh +++ b/databases/courier-authlib-mysql/files/courier-authdaemond.sh @@ -24,6 +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="%%PREFIX%%/var/spool/authdaemon/pid" +procname="%%PREFIX%%/sbin/courierlogger" load_rc_config $name @@ -36,6 +38,12 @@ authdaemond_cmd () { stop) echo "Stopping ${name}." ${command} stop + if [ $? -eq 0 ] ; then + [ -f "$pidfile" ] && rm -f "$pidfile" + [ -f "$pidfile".lock ] && rm -f "$pidfile".lock + [ -S %%PREFIX%%/var/spool/authdaemon/socket ] && rm -f %%PREFIX%%/var/spool/authdaemon/socket + return 0 + fi ;; esac } diff --git a/databases/courier-authlib-mysql/pkg-plist b/databases/courier-authlib-mysql/pkg-plist index 196430c..c114541 100644 --- a/databases/courier-authlib-mysql/pkg-plist +++ b/databases/courier-authlib-mysql/pkg-plist @@ -21,8 +21,6 @@ lib/courier-authlib/libcourierauthsaslclient.a lib/courier-authlib/libcourierauthcommon.so.0 lib/courier-authlib/libcourierauthcommon.so lib/courier-authlib/libcourierauthcommon.a -lib/courier-authlib/libauthcustom.so.0 -lib/courier-authlib/libauthcustom.so lib/courier-authlib/libauthuserdb.so.0 lib/courier-authlib/libauthuserdb.so %%PAMFLAG%%lib/courier-authlib/libauthpam.so.0 @@ -48,9 +46,17 @@ sbin/userdb-test-cram-md5 sbin/userdbpw sbin/vchkpw2userdb %%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.authdebug.html +%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.html +%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.myownquery +%%PORTDOCS%%%%DOCSDIR%%/README.authpostgres.html +%%PORTDOCS%%%%DOCSDIR%%/README.ldap +%%PORTDOCS%%%%DOCSDIR%%/README_authlib.html %%PORTDOCS%%@dirrm %%DOCSDIR%% @unexec rmdir %D/var/authdaemon 2>/dev/null || true @unexec rmdir %D/var 2>/dev/null || true diff --git a/databases/courier-authlib-pgsql/Makefile b/databases/courier-authlib-pgsql/Makefile index 6b5b5ba..fbea8f3 100644 --- a/databases/courier-authlib-pgsql/Makefile +++ b/databases/courier-authlib-pgsql/Makefile @@ -6,9 +6,10 @@ # PORTNAME= courier-authlib -PORTVERSION= 0.51 +PORTVERSION= 0.52 CATEGORIES= mail -MASTER_SITES= http://www.courier-mta.org/beta/courier-authlib/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= courier MAINTAINER= oliver@FreeBSD.org COMMENT= Authentication library used by courier ports @@ -41,6 +42,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --without-authshadow \ + --without-authcustom \ --enable-unicode \ --enable-ltdl-install=no @@ -108,7 +110,10 @@ MAN3= authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \ MAN8= makeuserdb.8 userdb.8 userdbpw.8 -EXTRA_DOCS= README INSTALL AUTHORS ChangeLog +EXTRA_DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README \ + README.authdebug.html README.authmysql.html \ + README.authmysql.myownquery README.authpostgres.html \ + README.ldap README_authlib.html post-patch: @${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g ; \ @@ -116,6 +121,8 @@ post-patch: @${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \ ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in \ ${WRKSRC}/liblog/Makefile.in ${WRKSRC}/userdb/Makefile.in + @${REINPLACE_CMD} -e 's|DEFAULTOPTIONS=""|DEFAULTOPTIONS="wbnodsn=1"|' \ + ${WRKSRC}/authdaemonrc.in post-install: ${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ diff --git a/databases/courier-authlib-pgsql/distinfo b/databases/courier-authlib-pgsql/distinfo index 7146db0..8441c7c 100644 --- a/databases/courier-authlib-pgsql/distinfo +++ b/databases/courier-authlib-pgsql/distinfo @@ -1,2 +1,2 @@ -MD5 (courier-authlib-0.51.tar.bz2) = 89cb2db63b3f6d402e435331e391ef80 -SIZE(courier-authlib-0.51.tar.bz2) = 1964171 +MD5 (courier-authlib-0.52.tar.bz2) = 2ad6837c1eec7582f8634c320f45b2dc +SIZE(courier-authlib-0.52.tar.bz2) = 1965591 diff --git a/databases/courier-authlib-pgsql/files/courier-authdaemond.sh b/databases/courier-authlib-pgsql/files/courier-authdaemond.sh index b4af4c0..ef48f16 100644 --- a/databases/courier-authlib-pgsql/files/courier-authdaemond.sh +++ b/databases/courier-authlib-pgsql/files/courier-authdaemond.sh @@ -24,6 +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="%%PREFIX%%/var/spool/authdaemon/pid" +procname="%%PREFIX%%/sbin/courierlogger" load_rc_config $name @@ -36,6 +38,12 @@ authdaemond_cmd () { stop) echo "Stopping ${name}." ${command} stop + if [ $? -eq 0 ] ; then + [ -f "$pidfile" ] && rm -f "$pidfile" + [ -f "$pidfile".lock ] && rm -f "$pidfile".lock + [ -S %%PREFIX%%/var/spool/authdaemon/socket ] && rm -f %%PREFIX%%/var/spool/authdaemon/socket + return 0 + fi ;; esac } diff --git a/databases/courier-authlib-pgsql/pkg-plist b/databases/courier-authlib-pgsql/pkg-plist index 196430c..c114541 100644 --- a/databases/courier-authlib-pgsql/pkg-plist +++ b/databases/courier-authlib-pgsql/pkg-plist @@ -21,8 +21,6 @@ lib/courier-authlib/libcourierauthsaslclient.a lib/courier-authlib/libcourierauthcommon.so.0 lib/courier-authlib/libcourierauthcommon.so lib/courier-authlib/libcourierauthcommon.a -lib/courier-authlib/libauthcustom.so.0 -lib/courier-authlib/libauthcustom.so lib/courier-authlib/libauthuserdb.so.0 lib/courier-authlib/libauthuserdb.so %%PAMFLAG%%lib/courier-authlib/libauthpam.so.0 @@ -48,9 +46,17 @@ sbin/userdb-test-cram-md5 sbin/userdbpw sbin/vchkpw2userdb %%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.authdebug.html +%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.html +%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.myownquery +%%PORTDOCS%%%%DOCSDIR%%/README.authpostgres.html +%%PORTDOCS%%%%DOCSDIR%%/README.ldap +%%PORTDOCS%%%%DOCSDIR%%/README_authlib.html %%PORTDOCS%%@dirrm %%DOCSDIR%% @unexec rmdir %D/var/authdaemon 2>/dev/null || true @unexec rmdir %D/var 2>/dev/null || true diff --git a/databases/courier-authlib-userdb/Makefile b/databases/courier-authlib-userdb/Makefile index 6b5b5ba..fbea8f3 100644 --- a/databases/courier-authlib-userdb/Makefile +++ b/databases/courier-authlib-userdb/Makefile @@ -6,9 +6,10 @@ # PORTNAME= courier-authlib -PORTVERSION= 0.51 +PORTVERSION= 0.52 CATEGORIES= mail -MASTER_SITES= http://www.courier-mta.org/beta/courier-authlib/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= courier MAINTAINER= oliver@FreeBSD.org COMMENT= Authentication library used by courier ports @@ -41,6 +42,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --without-authshadow \ + --without-authcustom \ --enable-unicode \ --enable-ltdl-install=no @@ -108,7 +110,10 @@ MAN3= authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \ MAN8= makeuserdb.8 userdb.8 userdbpw.8 -EXTRA_DOCS= README INSTALL AUTHORS ChangeLog +EXTRA_DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README \ + README.authdebug.html README.authmysql.html \ + README.authmysql.myownquery README.authpostgres.html \ + README.ldap README_authlib.html post-patch: @${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g ; \ @@ -116,6 +121,8 @@ post-patch: @${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \ ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in \ ${WRKSRC}/liblog/Makefile.in ${WRKSRC}/userdb/Makefile.in + @${REINPLACE_CMD} -e 's|DEFAULTOPTIONS=""|DEFAULTOPTIONS="wbnodsn=1"|' \ + ${WRKSRC}/authdaemonrc.in post-install: ${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ diff --git a/databases/courier-authlib-userdb/distinfo b/databases/courier-authlib-userdb/distinfo index 7146db0..8441c7c 100644 --- a/databases/courier-authlib-userdb/distinfo +++ b/databases/courier-authlib-userdb/distinfo @@ -1,2 +1,2 @@ -MD5 (courier-authlib-0.51.tar.bz2) = 89cb2db63b3f6d402e435331e391ef80 -SIZE(courier-authlib-0.51.tar.bz2) = 1964171 +MD5 (courier-authlib-0.52.tar.bz2) = 2ad6837c1eec7582f8634c320f45b2dc +SIZE(courier-authlib-0.52.tar.bz2) = 1965591 diff --git a/databases/courier-authlib-userdb/files/courier-authdaemond.sh b/databases/courier-authlib-userdb/files/courier-authdaemond.sh index b4af4c0..ef48f16 100644 --- a/databases/courier-authlib-userdb/files/courier-authdaemond.sh +++ b/databases/courier-authlib-userdb/files/courier-authdaemond.sh @@ -24,6 +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="%%PREFIX%%/var/spool/authdaemon/pid" +procname="%%PREFIX%%/sbin/courierlogger" load_rc_config $name @@ -36,6 +38,12 @@ authdaemond_cmd () { stop) echo "Stopping ${name}." ${command} stop + if [ $? -eq 0 ] ; then + [ -f "$pidfile" ] && rm -f "$pidfile" + [ -f "$pidfile".lock ] && rm -f "$pidfile".lock + [ -S %%PREFIX%%/var/spool/authdaemon/socket ] && rm -f %%PREFIX%%/var/spool/authdaemon/socket + return 0 + fi ;; esac } diff --git a/databases/courier-authlib-userdb/pkg-plist b/databases/courier-authlib-userdb/pkg-plist index 196430c..c114541 100644 --- a/databases/courier-authlib-userdb/pkg-plist +++ b/databases/courier-authlib-userdb/pkg-plist @@ -21,8 +21,6 @@ lib/courier-authlib/libcourierauthsaslclient.a lib/courier-authlib/libcourierauthcommon.so.0 lib/courier-authlib/libcourierauthcommon.so lib/courier-authlib/libcourierauthcommon.a -lib/courier-authlib/libauthcustom.so.0 -lib/courier-authlib/libauthcustom.so lib/courier-authlib/libauthuserdb.so.0 lib/courier-authlib/libauthuserdb.so %%PAMFLAG%%lib/courier-authlib/libauthpam.so.0 @@ -48,9 +46,17 @@ sbin/userdb-test-cram-md5 sbin/userdbpw sbin/vchkpw2userdb %%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.authdebug.html +%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.html +%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.myownquery +%%PORTDOCS%%%%DOCSDIR%%/README.authpostgres.html +%%PORTDOCS%%%%DOCSDIR%%/README.ldap +%%PORTDOCS%%%%DOCSDIR%%/README_authlib.html %%PORTDOCS%%@dirrm %%DOCSDIR%% @unexec rmdir %D/var/authdaemon 2>/dev/null || true @unexec rmdir %D/var 2>/dev/null || true diff --git a/databases/courier-authlib-usergdbm/Makefile b/databases/courier-authlib-usergdbm/Makefile index 6b5b5ba..fbea8f3 100644 --- a/databases/courier-authlib-usergdbm/Makefile +++ b/databases/courier-authlib-usergdbm/Makefile @@ -6,9 +6,10 @@ # PORTNAME= courier-authlib -PORTVERSION= 0.51 +PORTVERSION= 0.52 CATEGORIES= mail -MASTER_SITES= http://www.courier-mta.org/beta/courier-authlib/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= courier MAINTAINER= oliver@FreeBSD.org COMMENT= Authentication library used by courier ports @@ -41,6 +42,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --without-authshadow \ + --without-authcustom \ --enable-unicode \ --enable-ltdl-install=no @@ -108,7 +110,10 @@ MAN3= authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \ MAN8= makeuserdb.8 userdb.8 userdbpw.8 -EXTRA_DOCS= README INSTALL AUTHORS ChangeLog +EXTRA_DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README \ + README.authdebug.html README.authmysql.html \ + README.authmysql.myownquery README.authpostgres.html \ + README.ldap README_authlib.html post-patch: @${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g ; \ @@ -116,6 +121,8 @@ post-patch: @${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \ ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in \ ${WRKSRC}/liblog/Makefile.in ${WRKSRC}/userdb/Makefile.in + @${REINPLACE_CMD} -e 's|DEFAULTOPTIONS=""|DEFAULTOPTIONS="wbnodsn=1"|' \ + ${WRKSRC}/authdaemonrc.in post-install: ${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ diff --git a/databases/courier-authlib-usergdbm/distinfo b/databases/courier-authlib-usergdbm/distinfo index 7146db0..8441c7c 100644 --- a/databases/courier-authlib-usergdbm/distinfo +++ b/databases/courier-authlib-usergdbm/distinfo @@ -1,2 +1,2 @@ -MD5 (courier-authlib-0.51.tar.bz2) = 89cb2db63b3f6d402e435331e391ef80 -SIZE(courier-authlib-0.51.tar.bz2) = 1964171 +MD5 (courier-authlib-0.52.tar.bz2) = 2ad6837c1eec7582f8634c320f45b2dc +SIZE(courier-authlib-0.52.tar.bz2) = 1965591 diff --git a/databases/courier-authlib-usergdbm/files/courier-authdaemond.sh b/databases/courier-authlib-usergdbm/files/courier-authdaemond.sh index b4af4c0..ef48f16 100644 --- a/databases/courier-authlib-usergdbm/files/courier-authdaemond.sh +++ b/databases/courier-authlib-usergdbm/files/courier-authdaemond.sh @@ -24,6 +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="%%PREFIX%%/var/spool/authdaemon/pid" +procname="%%PREFIX%%/sbin/courierlogger" load_rc_config $name @@ -36,6 +38,12 @@ authdaemond_cmd () { stop) echo "Stopping ${name}." ${command} stop + if [ $? -eq 0 ] ; then + [ -f "$pidfile" ] && rm -f "$pidfile" + [ -f "$pidfile".lock ] && rm -f "$pidfile".lock + [ -S %%PREFIX%%/var/spool/authdaemon/socket ] && rm -f %%PREFIX%%/var/spool/authdaemon/socket + return 0 + fi ;; esac } diff --git a/databases/courier-authlib-usergdbm/pkg-plist b/databases/courier-authlib-usergdbm/pkg-plist index 196430c..c114541 100644 --- a/databases/courier-authlib-usergdbm/pkg-plist +++ b/databases/courier-authlib-usergdbm/pkg-plist @@ -21,8 +21,6 @@ lib/courier-authlib/libcourierauthsaslclient.a lib/courier-authlib/libcourierauthcommon.so.0 lib/courier-authlib/libcourierauthcommon.so lib/courier-authlib/libcourierauthcommon.a -lib/courier-authlib/libauthcustom.so.0 -lib/courier-authlib/libauthcustom.so lib/courier-authlib/libauthuserdb.so.0 lib/courier-authlib/libauthuserdb.so %%PAMFLAG%%lib/courier-authlib/libauthpam.so.0 @@ -48,9 +46,17 @@ sbin/userdb-test-cram-md5 sbin/userdbpw sbin/vchkpw2userdb %%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.authdebug.html +%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.html +%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.myownquery +%%PORTDOCS%%%%DOCSDIR%%/README.authpostgres.html +%%PORTDOCS%%%%DOCSDIR%%/README.ldap +%%PORTDOCS%%%%DOCSDIR%%/README_authlib.html %%PORTDOCS%%@dirrm %%DOCSDIR%% @unexec rmdir %D/var/authdaemon 2>/dev/null || true @unexec rmdir %D/var 2>/dev/null || true |