diff options
59 files changed, 532 insertions, 712 deletions
@@ -6,6 +6,40 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20050108: + AFFECTS: users of mail/courier-imap, mail/sqwebmail + AUTHOR: oliver@FreeBSD.org + + Courier-imap and sqwebmail are now dependent on courier-authlib. If + you've changed the default authentication config for courier-imap or + sqwebmail, you will have to redo the changes for courier-authlib. + You may wish to deinstall courier-imap and/or sqwebmail before you + install courier-authlib. Since courier-authlib replaces parts of both + ports, some of courier-authlib's files are listed as sqwebmail and + courier-imap files and deinstalling old courier-imap and/or sqwebmail + port may cause the deinstallation of the freshly installed + courier-authlib files. + +20050108: + AFFECTS: users of mail/sqwebmail + AUTHOR: oliver@FreeBSD.org + + Sqwebmail now installs it's files directly under PREFIX. That means for + instance that files that were formerly found under + PREFIX/share/sqwebmail/etc/ are now located under PREFIX/etc/sqwebmail. + Furthermore you need to set sqwebmaild_enable=YES in your rc.conf + because + the rc.d script has been migrated to use the rc.sub Subsystem + +20050108: + AFFECTS: users of mail/courier-imap + AUTHOR: oliver@FreeBSD.org + + The variable courier_imap_imapdssl_enable have been renamed to + courier_imap_imapd_ssl_enable. + The variable courier_imap_pop3dssl_enable have been renamed to + courier_imap_pop3d_ssl_enable. + 20041231: AFFECTS: users of www/awstats AUTHOR: webmaster@lightningfire.net diff --git a/databases/courier-authlib-mysql/Makefile b/databases/courier-authlib-mysql/Makefile index 6b5b5baa743c..fbea8f3245a3 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 7146db0d7dff..8441c7ca4ab1 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 b4af4c0b40fd..ef48f1629b24 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 196430c46515..c114541d6d19 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 6b5b5baa743c..fbea8f3245a3 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 7146db0d7dff..8441c7ca4ab1 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 b4af4c0b40fd..ef48f1629b24 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 196430c46515..c114541d6d19 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 6b5b5baa743c..fbea8f3245a3 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 7146db0d7dff..8441c7ca4ab1 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 b4af4c0b40fd..ef48f1629b24 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 196430c46515..c114541d6d19 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 6b5b5baa743c..fbea8f3245a3 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 7146db0d7dff..8441c7ca4ab1 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 b4af4c0b40fd..ef48f1629b24 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 196430c46515..c114541d6d19 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 diff --git a/mail/courier-authlib-vchkpw/Makefile b/mail/courier-authlib-vchkpw/Makefile index 6b5b5baa743c..fbea8f3245a3 100644 --- a/mail/courier-authlib-vchkpw/Makefile +++ b/mail/courier-authlib-vchkpw/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/mail/courier-authlib-vchkpw/distinfo b/mail/courier-authlib-vchkpw/distinfo index 7146db0d7dff..8441c7ca4ab1 100644 --- a/mail/courier-authlib-vchkpw/distinfo +++ b/mail/courier-authlib-vchkpw/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/mail/courier-authlib-vchkpw/files/courier-authdaemond.sh b/mail/courier-authlib-vchkpw/files/courier-authdaemond.sh index b4af4c0b40fd..ef48f1629b24 100644 --- a/mail/courier-authlib-vchkpw/files/courier-authdaemond.sh +++ b/mail/courier-authlib-vchkpw/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/mail/courier-authlib-vchkpw/pkg-plist b/mail/courier-authlib-vchkpw/pkg-plist index 196430c46515..c114541d6d19 100644 --- a/mail/courier-authlib-vchkpw/pkg-plist +++ b/mail/courier-authlib-vchkpw/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/mail/courier-authlib/Makefile b/mail/courier-authlib/Makefile index 6b5b5baa743c..fbea8f3245a3 100644 --- a/mail/courier-authlib/Makefile +++ b/mail/courier-authlib/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/mail/courier-authlib/distinfo b/mail/courier-authlib/distinfo index 7146db0d7dff..8441c7ca4ab1 100644 --- a/mail/courier-authlib/distinfo +++ b/mail/courier-authlib/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/mail/courier-authlib/files/courier-authdaemond.sh b/mail/courier-authlib/files/courier-authdaemond.sh index b4af4c0b40fd..ef48f1629b24 100644 --- a/mail/courier-authlib/files/courier-authdaemond.sh +++ b/mail/courier-authlib/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/mail/courier-authlib/pkg-plist b/mail/courier-authlib/pkg-plist index 196430c46515..c114541d6d19 100644 --- a/mail/courier-authlib/pkg-plist +++ b/mail/courier-authlib/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/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index a83ebf01dadc..7404fe9f5f7f 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -6,14 +6,18 @@ # PORTNAME= courier-imap -PORTVERSION= 3.0.8 +PORTVERSION= 4.0.1 PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= courier +BUILD_DEPENDS= ${LOCALBASE}/bin/courierauthconfig:${PORTSDIR}/mail/courier-authlib +RUN_DEPENDS= ${LOCALBASE}/bin/courierauthconfig:${PORTSDIR}/mail/courier-authlib + .if defined(WITH_DRAC) +BROKEN= DRAC support doesn't work with 4.0.0 right now PATCH_SITES= http://www.smalltown.ne.jp/~usata/pub/patch/ PATCHFILES= courier-imap-3.0.6-drac.patch PATCH_DIST_STRIP= -p1 @@ -38,13 +42,6 @@ CONFIGURE_ENV= CFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ # options available: # # WITHOUT_OPENSSL: Don't build in TLS support -# WITHOUT_PAM: Don't build in PAM support -# WITHOUT_AUTHDAEMON Don't build the authdaemon -# WITH_CRAM: Build in CRAM-MD5 authentication support -# WITH_VPOPMAIL: Build in vpopmail support -# WITH_MYSQL: Build in mysql support -# WITH_POSTGRESQL: Build in postgresql support -# WITH_LDAP: Build in ldap support with openldap # WITH_FAM: Build in fam support for IDLE command # WITH_DRAC: Build in DRAC support # WITH_TRASHQUOTA: Include deleted mails in the quota @@ -56,23 +53,13 @@ RCDIR?= ${PREFIX}/etc/rc.d USERDB?= ${PREFIX}/etc/userdb LIBEXECDIR?= ${PREFIX}/libexec/${PORTNAME} -VPOPMAILDIR?= ${LOCALBASE}/vpopmail - PLIST_SUB= CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \ RCDIR=${RCDIR:S,^${PREFIX}/,,} \ USERDB=${USERDB:S,^${PREFIX}/,,} \ LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,} -.if !defined(WITHOUT_OPENSSL) -USE_OPENSSL= YES -PLIST_SUB+= OPENSSLFLAG= -.else -PLIST_SUB+= OPENSSLFLAG="@comment " -.endif - CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --without-authshadow \ - --sysconfdir=${CONFDIR} \ +CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ --with-userdb=${USERDB} \ --datadir=${DATADIR} \ --libexecdir=${LIBEXECDIR} \ @@ -92,72 +79,17 @@ CONFIGURE_ARGS+= --with-db=gdbm CONFIGURE_ARGS+= --with-db=db .endif -.if !defined(WITH_VPOPMAIL) -CONFIGURE_ARGS+=--without-authvchkpw -PLIST_SUB+= VPOPMAILFLAG="@comment " +.if !defined(WITHOUT_OPENSSL) +USE_OPENSSL= YES +PLIST_SUB+= OPENSSLFLAG= .else -CONFIGURE_ARGS+=--with-authvchkpw -BUILD_DEPENDS+= ${VPOPMAILDIR}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail -PLIST_SUB+= VPOPMAILFLAG="" +PLIST_SUB+= OPENSSLFLAG="@comment " .endif .if defined(WITH_TRASHQUOTA) CONFIGURE_ARGS+=--with-trashquota .endif -.if defined(WITH_LDAP) -USE_OPENLDAP= yes -CONFIGURE_ARGS+=--with-authldap -PLIST_SUB+= LDAPFLAG="" -.else -CONFIGURE_ARGS+=--without-authldap -PLIST_SUB+= LDAPFLAG="@comment " -.endif - -.if !defined(WITH_MYSQL) -CONFIGURE_ARGS+=--without-authmysql -PLIST_SUB+= MYSQLFLAG="@comment " -.else -USE_MYSQL= YES -PLIST_SUB+= MYSQLFLAG="" -CONFIGURE_ARGS+=--with-authmysql \ - --with-mysql-libs=${LOCALBASE}/lib/mysql \ - --with-mysql-includes=${LOCALBASE}/include/mysql -.endif - -.if !defined(WITH_POSTGRESQL) -CONFIGURE_ARGS+=--without-authpgsql -PLIST_SUB+= PGSQLFLAG="@comment " -.else -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} -PLIST_SUB+= PGSQLFLAG="" -.endif - -.if !defined(WITHOUT_AUTHDAEMON) -CONFIGURE_ARGS+=--with-authdaemon -PLIST_SUB+= AUTHDFLAG="" -.else -CONFIGURE_ARGS+=--without-authdaemon -PLIST_SUB+= AUTHDFLAG="@comment " -.endif - -.if !defined(WITHOUT_PAM) -CONFIGURE_ARGS+=--with-authpam -PLIST_SUB+= PAMFLAG="" PWDFLAG="@comment " -.else -CONFIGURE_ARGS+=--without-authpam -PLIST_SUB+= PAMFLAG="@comment " PWDFLAG="" -.endif - -.if !defined(WITH_CRAM) -CONFIGURE_ARGS+=--without-authcram -.else -CONFIGURE_ARGS+=--with-authcram -.endif - -.include <bsd.port.pre.mk> - RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} .if defined(WITH_FAM) || exists(${LOCALBASE}/lib/libfam.so) @@ -172,39 +104,27 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-drac BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac .endif -MAN1= courierlogger.1 couriertcpd.1 maildiracl.1 maildirkw.1 \ +MAN1= couriertcpd.1 maildiracl.1 maildirkw.1 \ maildirmake.1 -MAN7= authlib.7 -MAN8= makeuserdb.8 userdb.8 userdbpw.8 \ - deliverquota.8 imapd.8 mkimapdcert.8 mkpop3dcert.8 - -MLINKS= authlib.7 authpwd.7 \ - authlib.7 authuserdb.7 \ - authlib.7 authshadow.7 \ - authlib.7 authpam.7 \ - authlib.7 authvchkpw.7 \ - authlib.7 authcram.7 \ - authlib.7 authldap.7 \ - authlib.7 authmysql.7 \ - authlib.7 authdaemon.7 \ - authlib.7 authdaemond.7 \ - makeuserdb.8 pw2userdb.8 \ - makeuserdb.8 vchkpw2userdb.8 - -EXTRA_DOCS= README INSTALL AUTHORS imap/ChangeLog + +MAN8= deliverquota.8 imapd.8 mkimapdcert.8 mkpop3dcert.8 + +EXTRA_DOCS= AUTHORS INSTALL NEWS imap/ChangeLog imap/README \ + imap/README.proxy maildir/README.imapkeywords.html \ + maildir/README.maildirfilter.html \ + maildir/README.maildirquota.txt \ + maildir/README.sharedfolders.txt tcpd/README.couriertls \ + post-patch: @${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \ ${WRKSRC}/liblock/configure - @${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/authlib/configure - @${REINPLACE_CMD} -e 's|^@INSTALLAUTHMODULES@$$|& @AUTHMODULES@|' \ - ${WRKSRC}/authlib/installlist.in @${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \ - ${WRKSRC}/Makefile.in ${WRKSRC}/authlib/Makefile.in + ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ -rpath=:${LOCALBASE}/lib/courier-authlib|' \ + ${WRKSRC}/imap/Makefile.in post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/authlib/authtest ${PREFIX}/bin/ .for i in imapd pop3d ${INSTALL_DATA} ${WRKSRC}/imap/${i}.cnf ${CONFDIR}/${i}.cnf.dist .endfor @@ -219,30 +139,14 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${a} ${DOCSDIR} .endfor .endif + + cd ${WRKSRC} && ( ${GMAKE} install-configure ; cd - ) + @${ECHO_MSG} "" @${ECHO_MSG} "You will have to run ${DATADIR}/mkimapdcert to create" @${ECHO_MSG} "a self-signed certificate if you want to use imapd-ssl." @${ECHO_MSG} "And you will have to copy and edit the *.dist files to *" @${ECHO_MSG} "in ${CONFDIR}." @${ECHO_MSG} "" - @${ECHO_MSG} "In case you use authpam, you should put the following lines" -.if ${OSVERSION} >= 500000 - @${ECHO_MSG} "in your /etc/pam.d/imap" - @${ECHO_MSG} "auth required pam_unix.so try_first_pass" - @${ECHO_MSG} "account required pam_unix.so try_first_pass" - @${ECHO_MSG} "session required pam_permit.so" -.else - @${ECHO_MSG} "in your /etc/pam.conf" - @${ECHO_MSG} "imap auth required pam_unix.so try_first_pass" - @${ECHO_MSG} "imap account required pam_unix.so try_first_pass" - @${ECHO_MSG} "imap session required pam_permit.so" -.endif - @${ECHO_MSG} "" - @${ECHO_MSG} "In case you are upgrading an existing Installation, you need to run" - @${ECHO_MSG} "'make install-configure' to update your old configuration files." - @${ECHO_MSG} "" - -install-configure: - cd ${WRKSRC} && ${GMAKE} install-configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo index ac2c37537e14..b830f2133ffd 100644 --- a/mail/courier-imap/distinfo +++ b/mail/courier-imap/distinfo @@ -1,4 +1,2 @@ -MD5 (courier-imap-3.0.8.tar.bz2) = 1b431e6dac39ed728d839ceb35474040 -SIZE(courier-imap-3.0.8.tar.bz2) = 1713447 -MD5 (courier-imap-3.0.6-drac.patch) = f369ea8f9d26012e6ae1220f12c07fff -SIZE (courier-imap-3.0.6-drac.patch) = 10538 +MD5 (courier-imap-4.0.1.tar.bz2) = f8578d1a3d04ffdb99c75b550dd190a7 +SIZE(courier-imap-4.0.1.tar.bz2) = 3032350 diff --git a/mail/courier-imap/files/courier-imap-imapd-ssl.in b/mail/courier-imap/files/courier-imap-imapd-ssl.in index dcdd0a4ca6c8..d54c97023180 100644 --- a/mail/courier-imap/files/courier-imap-imapd-ssl.in +++ b/mail/courier-imap/files/courier-imap-imapd-ssl.in @@ -2,32 +2,34 @@ # # An rc.subr-style startup script for Courier-IMAP's IMAP over SSL service. -# PROVIDE: courier_imap_imapdssl -# REQUIRE: LOGIN +# PROVIDE: courier_imap_imapd_ssl +# REQUIRE: LOGIN courier_authdaemond # KEYWORD: FreeBSD shutdown -# Define these courier_imap_imapdssl_* variables in one of these files: +# Define these courier_imap_imapd_ssl_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local -# /etc/rc.conf.d/courier_imap_imapdssl +# /etc/rc.conf.d/courier_imap_imapd_ssl # # DO NOT CHANGE THESE DEFAULT VALUES HERE -courier_imap_imapdssl_enable=${courier_imap_imapdssl_enable-"NO"} +courier_imap_imapd_ssl_enable=${courier_imap_imapd_ssl_enable-"NO"} . %%RC_SUBR%% -name="courier_imap_imapdssl" +name="courier_imap_imapd_ssl" rcvar=`set_rcvar` command="%%PREFIX%%/libexec/courier-imap/imapd-ssl.rc" +pidfile="/var/run/imapd-ssl.pid" +procname="%%PREFIX%%/libexec/courier-imap/couriertcpd" -start_cmd="imapdssl_cmd start" -stop_cmd="imapdssl_cmd stop" -restart_cmd="imapdssl_cmd stop && imapdssl_cmd start" +start_cmd="imapd_ssl_cmd start" +stop_cmd="imapd_ssl_cmd stop" +restart_cmd="imapd_ssl_cmd stop && imapd_ssl_cmd start" load_rc_config $name -imapdssl_cmd () { +imapd_ssl_cmd () { case $1 in start) echo "Starting ${name}." diff --git a/mail/courier-imap/files/courier-imap-imapd-ssl.sh b/mail/courier-imap/files/courier-imap-imapd-ssl.sh index dcdd0a4ca6c8..d54c97023180 100644 --- a/mail/courier-imap/files/courier-imap-imapd-ssl.sh +++ b/mail/courier-imap/files/courier-imap-imapd-ssl.sh @@ -2,32 +2,34 @@ # # An rc.subr-style startup script for Courier-IMAP's IMAP over SSL service. -# PROVIDE: courier_imap_imapdssl -# REQUIRE: LOGIN +# PROVIDE: courier_imap_imapd_ssl +# REQUIRE: LOGIN courier_authdaemond # KEYWORD: FreeBSD shutdown -# Define these courier_imap_imapdssl_* variables in one of these files: +# Define these courier_imap_imapd_ssl_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local -# /etc/rc.conf.d/courier_imap_imapdssl +# /etc/rc.conf.d/courier_imap_imapd_ssl # # DO NOT CHANGE THESE DEFAULT VALUES HERE -courier_imap_imapdssl_enable=${courier_imap_imapdssl_enable-"NO"} +courier_imap_imapd_ssl_enable=${courier_imap_imapd_ssl_enable-"NO"} . %%RC_SUBR%% -name="courier_imap_imapdssl" +name="courier_imap_imapd_ssl" rcvar=`set_rcvar` command="%%PREFIX%%/libexec/courier-imap/imapd-ssl.rc" +pidfile="/var/run/imapd-ssl.pid" +procname="%%PREFIX%%/libexec/courier-imap/couriertcpd" -start_cmd="imapdssl_cmd start" -stop_cmd="imapdssl_cmd stop" -restart_cmd="imapdssl_cmd stop && imapdssl_cmd start" +start_cmd="imapd_ssl_cmd start" +stop_cmd="imapd_ssl_cmd stop" +restart_cmd="imapd_ssl_cmd stop && imapd_ssl_cmd start" load_rc_config $name -imapdssl_cmd () { +imapd_ssl_cmd () { case $1 in start) echo "Starting ${name}." diff --git a/mail/courier-imap/files/courier-imap-imapd.in b/mail/courier-imap/files/courier-imap-imapd.in index 4985a3fea151..42c776b830ed 100644 --- a/mail/courier-imap/files/courier-imap-imapd.in +++ b/mail/courier-imap/files/courier-imap-imapd.in @@ -3,7 +3,7 @@ # An rc.subr-style startup script for Courier-IMAP's IMAP service. # PROVIDE: courier_imap_imapd -# REQUIRE: LOGIN +# REQUIRE: LOGIN courier_authdaemond # KEYWORD: FreeBSD shutdown # Define these courier_imap_imapd_* variables in one of these files: @@ -20,6 +20,8 @@ courier_imap_imapd_enable=${courier_imap_imapd_enable-"NO"} name="courier_imap_imapd" rcvar=`set_rcvar` command="%%PREFIX%%/libexec/courier-imap/imapd.rc" +pidfile="/var/run/imapd.pid" +procname="%%PREFIX%%/libexec/courier-imap/couriertcpd" start_cmd="imapd_cmd start" stop_cmd="imapd_cmd stop" diff --git a/mail/courier-imap/files/courier-imap-imapd.sh b/mail/courier-imap/files/courier-imap-imapd.sh index 4985a3fea151..42c776b830ed 100644 --- a/mail/courier-imap/files/courier-imap-imapd.sh +++ b/mail/courier-imap/files/courier-imap-imapd.sh @@ -3,7 +3,7 @@ # An rc.subr-style startup script for Courier-IMAP's IMAP service. # PROVIDE: courier_imap_imapd -# REQUIRE: LOGIN +# REQUIRE: LOGIN courier_authdaemond # KEYWORD: FreeBSD shutdown # Define these courier_imap_imapd_* variables in one of these files: @@ -20,6 +20,8 @@ courier_imap_imapd_enable=${courier_imap_imapd_enable-"NO"} name="courier_imap_imapd" rcvar=`set_rcvar` command="%%PREFIX%%/libexec/courier-imap/imapd.rc" +pidfile="/var/run/imapd.pid" +procname="%%PREFIX%%/libexec/courier-imap/couriertcpd" start_cmd="imapd_cmd start" stop_cmd="imapd_cmd stop" diff --git a/mail/courier-imap/files/courier-imap-pop3d-ssl.in b/mail/courier-imap/files/courier-imap-pop3d-ssl.in index 30636bd73879..b594235905f5 100644 --- a/mail/courier-imap/files/courier-imap-pop3d-ssl.in +++ b/mail/courier-imap/files/courier-imap-pop3d-ssl.in @@ -2,32 +2,34 @@ # # An rc.subr-style startup script for Courier-IMAP's POP3 over SSL service. -# PROVIDE: courier_imap_pop3dssl -# REQUIRE: LOGIN +# PROVIDE: courier_imap_pop3d_ssl +# REQUIRE: LOGIN courier_authdaemond # KEYWORD: FreeBSD shutdown -# Define these courier_imap_pop3dssl_* variables in one of these files: +# Define these courier_imap_pop3d_ssl_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local -# /etc/rc.conf.d/courier_imap_pop3dssl +# /etc/rc.conf.d/courier_imap_pop3d_ssl # # DO NOT CHANGE THESE DEFAULT VALUES HERE -courier_imap_pop3dssl_enable=${courier_imap_pop3dssl_enable-"NO"} +courier_imap_pop3d_ssl_enable=${courier_imap_pop3d_ssl_enable-"NO"} . %%RC_SUBR%% -name="courier_imap_pop3dssl" +name="courier_imap_pop3d_ssl" rcvar=`set_rcvar` command="%%PREFIX%%/libexec/courier-imap/pop3d-ssl.rc" +pidfile="/var/run/pop3d-ssl.pid" +procname="%%PREFIX%%/libexec/courier-imap/couriertcpd" -start_cmd="pop3dssl_cmd start" -stop_cmd="pop3dssl_cmd stop" -restart_cmd="pop3dssl_cmd stop && pop3dssl_cmd start" +start_cmd="pop3d_ssl_cmd start" +stop_cmd="pop3d_ssl_cmd stop" +restart_cmd="pop3d_ssl_cmd stop && pop3d_ssl_cmd start" load_rc_config $name -pop3dssl_cmd () { +pop3d_ssl_cmd () { case $1 in start) echo "Starting ${name}." diff --git a/mail/courier-imap/files/courier-imap-pop3d-ssl.sh b/mail/courier-imap/files/courier-imap-pop3d-ssl.sh index 30636bd73879..b594235905f5 100644 --- a/mail/courier-imap/files/courier-imap-pop3d-ssl.sh +++ b/mail/courier-imap/files/courier-imap-pop3d-ssl.sh @@ -2,32 +2,34 @@ # # An rc.subr-style startup script for Courier-IMAP's POP3 over SSL service. -# PROVIDE: courier_imap_pop3dssl -# REQUIRE: LOGIN +# PROVIDE: courier_imap_pop3d_ssl +# REQUIRE: LOGIN courier_authdaemond # KEYWORD: FreeBSD shutdown -# Define these courier_imap_pop3dssl_* variables in one of these files: +# Define these courier_imap_pop3d_ssl_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local -# /etc/rc.conf.d/courier_imap_pop3dssl +# /etc/rc.conf.d/courier_imap_pop3d_ssl # # DO NOT CHANGE THESE DEFAULT VALUES HERE -courier_imap_pop3dssl_enable=${courier_imap_pop3dssl_enable-"NO"} +courier_imap_pop3d_ssl_enable=${courier_imap_pop3d_ssl_enable-"NO"} . %%RC_SUBR%% -name="courier_imap_pop3dssl" +name="courier_imap_pop3d_ssl" rcvar=`set_rcvar` command="%%PREFIX%%/libexec/courier-imap/pop3d-ssl.rc" +pidfile="/var/run/pop3d-ssl.pid" +procname="%%PREFIX%%/libexec/courier-imap/couriertcpd" -start_cmd="pop3dssl_cmd start" -stop_cmd="pop3dssl_cmd stop" -restart_cmd="pop3dssl_cmd stop && pop3dssl_cmd start" +start_cmd="pop3d_ssl_cmd start" +stop_cmd="pop3d_ssl_cmd stop" +restart_cmd="pop3d_ssl_cmd stop && pop3d_ssl_cmd start" load_rc_config $name -pop3dssl_cmd () { +pop3d_ssl_cmd () { case $1 in start) echo "Starting ${name}." diff --git a/mail/courier-imap/files/courier-imap-pop3d.in b/mail/courier-imap/files/courier-imap-pop3d.in index 29d1762ed665..886d21eaa3e1 100644 --- a/mail/courier-imap/files/courier-imap-pop3d.in +++ b/mail/courier-imap/files/courier-imap-pop3d.in @@ -3,7 +3,7 @@ # An rc.subr-style startup script for Courier-IMAP's POP3 service. # PROVIDE: courier_imap_pop3d -# REQUIRE: LOGIN +# REQUIRE: LOGIN courier_authdaemond # KEYWORD: FreeBSD shutdown # Define these courier_imap_pop3d_* variables in one of these files: @@ -20,6 +20,8 @@ courier_imap_pop3d_enable=${courier_imap_pop3d_enable-"NO"} name="courier_imap_pop3d" rcvar=`set_rcvar` command="%%PREFIX%%/libexec/courier-imap/pop3d.rc" +pidfile="/var/run/pop3d.pid" +procname="%%PREFIX%%/libexec/courier-imap/couriertcpd" start_cmd="pop3d_cmd start" stop_cmd="pop3d_cmd stop" diff --git a/mail/courier-imap/files/courier-imap-pop3d.sh b/mail/courier-imap/files/courier-imap-pop3d.sh index 29d1762ed665..886d21eaa3e1 100644 --- a/mail/courier-imap/files/courier-imap-pop3d.sh +++ b/mail/courier-imap/files/courier-imap-pop3d.sh @@ -3,7 +3,7 @@ # An rc.subr-style startup script for Courier-IMAP's POP3 service. # PROVIDE: courier_imap_pop3d -# REQUIRE: LOGIN +# REQUIRE: LOGIN courier_authdaemond # KEYWORD: FreeBSD shutdown # Define these courier_imap_pop3d_* variables in one of these files: @@ -20,6 +20,8 @@ courier_imap_pop3d_enable=${courier_imap_pop3d_enable-"NO"} name="courier_imap_pop3d" rcvar=`set_rcvar` command="%%PREFIX%%/libexec/courier-imap/pop3d.rc" +pidfile="/var/run/pop3d.pid" +procname="%%PREFIX%%/libexec/courier-imap/couriertcpd" start_cmd="pop3d_cmd start" stop_cmd="pop3d_cmd stop" diff --git a/mail/courier-imap/files/patch-Makefile.in b/mail/courier-imap/files/patch-Makefile.in index 7ed74c9ea2b1..7bb398f7c107 100644 --- a/mail/courier-imap/files/patch-Makefile.in +++ b/mail/courier-imap/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Tue Jul 20 01:54:19 2004 -+++ Makefile.in Tue Jul 20 19:31:37 2004 -@@ -218,7 +218,7 @@ +--- Makefile.in.orig Thu Dec 9 03:07:01 2004 ++++ Makefile.in Sun Jan 2 21:17:35 2005 +@@ -248,7 +248,7 @@ COPYING.GPL NEWS.html $(TEMPLFILES)\ sysconftool sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \ @@ -9,7 +9,7 @@ libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc HTML2TXT = `which lynx 2>/dev/null && echo "lynx -dump -nolist" && exit; echo "links -dump"` -@@ -433,8 +433,8 @@ +@@ -506,8 +506,8 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -20,7 +20,7 @@ done uninstall-man1: @$(NORMAL_UNINSTALL) -@@ -478,8 +478,8 @@ +@@ -551,8 +551,8 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -31,11 +31,3 @@ done uninstall-man8: @$(NORMAL_UNINSTALL) -@@ -1055,6 +1055,7 @@ - - install-data-local: install-man - for f in `cat authlib/modulelist ; . authlib/authdaemonrc ; echo $$authmodulelist ` ; do \ -+ continue ; \ - test "$$f" = "authpam" || continue ; \ - test -d $(DESTDIR)/etc/pam.d || continue ; \ - test -w $(DESTDIR)/etc/pam.d || continue ; \ diff --git a/mail/courier-imap/files/patch-authlib::Makefile.in b/mail/courier-imap/files/patch-authlib::Makefile.in deleted file mode 100644 index ed065c7d873e..000000000000 --- a/mail/courier-imap/files/patch-authlib::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- authlib/Makefile.in.orig Sun Jul 20 12:01:18 2003 -+++ authlib/Makefile.in Sun Jul 20 12:56:12 2003 -@@ -1341,7 +1341,7 @@ - $(mkinstalldirs) $(DESTDIR)$(man7dir) ; \ - for f in $(man_MANS) "" ; do \ - test "$$f" = "" && continue ; \ -- $(INSTALL_DATA) $$f $(DESTDIR)$(man7dir) ; done ; \ -+ %%INSTALL_MAN%% $$f $(DESTDIR)$(man7dir) ; done ; \ - cd $(DESTDIR)$(man7dir) || exit 1 ; \ - for f in $(man_LINKS) "" ; do \ - test "$$f" = "" && continue ; \ diff --git a/mail/courier-imap/files/patch-ldap b/mail/courier-imap/files/patch-ldap deleted file mode 100644 index df479a4cbbfe..000000000000 --- a/mail/courier-imap/files/patch-ldap +++ /dev/null @@ -1,13 +0,0 @@ ---- authlib/configure.orig Wed Mar 3 05:54:13 2004 -+++ authlib/configure Tue Mar 16 19:36:40 2004 -@@ -1268,6 +1268,10 @@ - { (exit 1); exit 1; }; } - fi - -+CFLAGS="$CFLAGS -I%%LOCALBASE%%/include" -+CPPFLAGS="$CPPFLAGS -I%%LOCALBASE%%/include" -+LDFLAGS="-L%%LOCALBASE%%/lib $LDFLAGS" -+ - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/mail/courier-imap/files/patch-mysql b/mail/courier-imap/files/patch-mysql deleted file mode 100644 index 029829ef7a5d..000000000000 --- a/mail/courier-imap/files/patch-mysql +++ /dev/null @@ -1,182 +0,0 @@ ---- authlib/configure.orig Tue Jul 20 19:37:46 2004 -+++ authlib/configure Tue Jul 20 19:37:22 2004 -@@ -7337,9 +7337,9 @@ - if test "$doauthmysql" = "" - then - LIBS="$MYSQL_LIBS $LIBS" -- echo "$as_me:$LINENO: checking for mysql_connect" >&5 --echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6 --if test "${ac_cv_func_mysql_connect+set}" = set; then -+ echo "$as_me:$LINENO: checking for mysql_real_connect" >&5 -+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6 -+if test "${ac_cv_func_mysql_real_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -7348,12 +7348,12 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect. -+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define mysql_connect innocuous_mysql_connect -+#define mysql_real_connect innocuous_mysql_real_connect - - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char mysql_connect (); below. -+ which can conflict with char mysql_real_connect (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -@@ -7363,7 +7363,7 @@ - # include <assert.h> - #endif - --#undef mysql_connect -+#undef mysql_real_connect - - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -7372,14 +7372,14 @@ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char mysql_connect (); -+char mysql_real_connect (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect) -+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect) - choke me - #else --char (*f) () = mysql_connect; -+char (*f) () = mysql_real_connect; - #endif - #ifdef __cplusplus - } -@@ -7388,7 +7388,7 @@ - int - main () - { --return f != mysql_connect; -+return f != mysql_real_connect; - ; - return 0; - } -@@ -7415,19 +7415,19 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_func_mysql_connect=yes -+ ac_cv_func_mysql_real_connect=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_func_mysql_connect=no -+ac_cv_func_mysql_real_connect=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5 --echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6 --if test $ac_cv_func_mysql_connect = yes; then -+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5 -+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6 -+if test $ac_cv_func_mysql_real_connect = yes; then - doauthmysql="yes" - - fi -@@ -7537,9 +7537,9 @@ - else - saveLIBS="$LIBS" - LIBS="$MYSQL_LIBS $LIBS" -- echo "$as_me:$LINENO: checking for mysql_connect" >&5 --echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6 --if test "${ac_cv_func_mysql_connect+set}" = set; then -+ echo "$as_me:$LINENO: checking for mysql_real_connect" >&5 -+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6 -+if test "${ac_cv_func_mysql_real_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -7548,12 +7548,12 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect. -+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define mysql_connect innocuous_mysql_connect -+#define mysql_real_connect innocuous_mysql_real_connect - - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char mysql_connect (); below. -+ which can conflict with char mysql_real_connect (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -@@ -7563,7 +7563,7 @@ - # include <assert.h> - #endif - --#undef mysql_connect -+#undef mysql_real_connect - - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -7572,14 +7572,14 @@ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char mysql_connect (); -+char mysql_real_connect (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect) -+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect) - choke me - #else --char (*f) () = mysql_connect; -+char (*f) () = mysql_real_connect; - #endif - #ifdef __cplusplus - } -@@ -7588,7 +7588,7 @@ - int - main () - { --return f != mysql_connect; -+return f != mysql_real_connect; - ; - return 0; - } -@@ -7615,19 +7615,19 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_func_mysql_connect=yes -+ ac_cv_func_mysql_real_connect=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_func_mysql_connect=no -+ac_cv_func_mysql_real_connect=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5 --echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6 --if test $ac_cv_func_mysql_connect = yes; then -+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5 -+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6 -+if test $ac_cv_func_mysql_real_connect = yes; then - AUTHMYSQL="authmysql${EXEEXT}" - HAVE_AUTHMYSQL=1 - else diff --git a/mail/courier-imap/pkg-plist b/mail/courier-imap/pkg-plist index 2ed587584f1c..bd8f1c24161d 100644 --- a/mail/courier-imap/pkg-plist +++ b/mail/courier-imap/pkg-plist @@ -1,4 +1,3 @@ -bin/authtest %%OPENSSLFLAG%%bin/couriertls bin/deliverquota bin/imapd @@ -6,10 +5,6 @@ bin/maildiracl bin/maildirkw bin/maildirmake bin/pop3d -%%AUTHDFLAG%%%%CONFDIR%%/authdaemonrc.dist -%%LDAPFLAG%%%%CONFDIR%%/authldaprc.dist -%%MYSQLFLAG%%%%CONFDIR%%/authmysqlrc.dist -%%PGSQLFLAG%%%%CONFDIR%%/authpgsqlrc.dist %%CONFDIR%%/imapd-ssl.dist %%CONFDIR%%/imapd.cnf.dist %%CONFDIR%%/imapd.dist @@ -21,51 +16,33 @@ bin/pop3d %%RCDIR%%/courier-imap-imapd-ssl.sh %%RCDIR%%/courier-imap-pop3d.sh %%RCDIR%%/courier-imap-pop3d-ssl.sh -%%LIBEXECDIR%%/authlib/authcustom -%%AUTHDFLAG%%%%LIBEXECDIR%%/authlib/authdaemon -%%AUTHDFLAG%%%%LIBEXECDIR%%/authlib/authdaemond -%%LDAPFLAG%%%%LIBEXECDIR%%/authlib/authdaemond.ldap -%%LDAPFLAG%%%%LIBEXECDIR%%/authlib/authldap -%%MYSQLFLAG%%%%LIBEXECDIR%%/authlib/authdaemond.mysql -%%MYSQLFLAG%%%%LIBEXECDIR%%/authlib/authmysql -%%PGSQLFLAG%%%%LIBEXECDIR%%/authlib/authdaemond.pgsql -%%AUTHDFLAG%%%%LIBEXECDIR%%/authlib/authdaemond.plain -%%PAMFLAG%%%%LIBEXECDIR%%/authlib/authpam -%%PWDFLAG%%%%LIBEXECDIR%%/authlib/authpwd -%%LIBEXECDIR%%/authlib/authuserdb -%%VPOPMAILFLAG%%%%LIBEXECDIR%%/authlib/authvchkpw %%LIBEXECDIR%%/couriertcpd %%LIBEXECDIR%%/imapd-ssl.rc %%LIBEXECDIR%%/imapd.rc %%LIBEXECDIR%%/makedatprog %%LIBEXECDIR%%/pop3d-ssl.rc %%LIBEXECDIR%%/pop3d.rc -sbin/authenumerate -sbin/courierlogger sbin/imaplogin -sbin/makeuserdb sbin/mkimapdcert sbin/mkpop3dcert sbin/pop3login -sbin/pw2userdb sbin/sharedindexinstall sbin/sharedindexsplit -sbin/userdb -sbin/userdbpw -sbin/vchkpw2userdb -share/courier-imap/makeuserdb share/courier-imap/mkimapdcert share/courier-imap/mkpop3dcert -share/courier-imap/pw2userdb -share/courier-imap/userdb -share/courier-imap/vchkpw2userdb -%%DOCSDIR%%/AUTHORS -%%DOCSDIR%%/ChangeLog -%%DOCSDIR%%/INSTALL -%%DOCSDIR%%/README -%%AUTHDFLAG%%@unexec rmdir %D/var/authdaemon 2>/dev/null || true +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.proxy +%%PORTDOCS%%%%DOCSDIR%%/README.imapkeywords.html +%%PORTDOCS%%%%DOCSDIR%%/README.maildirfilter.html +%%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt +%%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt +%%PORTDOCS%%%%DOCSDIR%%/README.couriertls @unexec rmdir %D/var 2>/dev/null || true -@dirrm %%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm share/courier-imap @unexec rmdir %D/%%LIBEXECDIR%%/authlib 2>/dev/null || true @dirrm %%LIBEXECDIR%% diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index ad5523d5fe2a..5489b38c9bc6 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -6,8 +6,8 @@ # PORTNAME= sqwebmail -PORTVERSION= 4.0.7 -PORTREVISION= 1 +PORTVERSION= 5.0.0 +PORTREVISION= 0 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= courier @@ -15,6 +15,11 @@ MASTER_SITE_SUBDIR= courier MAINTAINER= oliver@FreeBSD.org COMMENT= CGI Webmail client for Maildirs +BUILD_DEPENDS= ${LOCALBASE}/bin/courierauthconfig:${PORTSDIR}/mail/courier-authlib +RUN_DEPENDS= ${LOCALBASE}/bin/courierauthconfig:${PORTSDIR}/mail/courier-authlib + +CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" + # # User-serviceable variables # @@ -25,6 +30,8 @@ COMMENT= CGI Webmail client for Maildirs # set WEBDATADIR to where you'd like web pages to be placed # set WEBDATASUBDIR to where you'd like web pages to be placed # set IMAGEURL to where on the web server URL the images are found +# set CACHEOWNER to who you'd like to own the cache files +# set CACHEDIR to where you'd like your cache directory to be # CGIBINDIR?= www/cgi-bin-dist @@ -32,23 +39,21 @@ CGIBINSUBDIR?= sqwebmail WEBDATADIR?= www/data-dist WEBDATASUBDIR?= sqwebmail IMAGEURL?= ${WEBDATASUBDIR} +RCDIR?= ${PREFIX}/etc/rc.d +CACHEDIR?= ${PREFIX}/var/sqwebmail/cache +CACHEOWNER?= bin # -# set WITHOUT_CACHEDIR to disable the cache dir (can't set it with WITH_LDAP) -# set WITHOUT_AUTHDAEMON to disable the usage of authdaemond -# set CACHEOWNER to who you'd like to own the cache files -# set CACHEDIR to where you'd like your cache directory to be -# set WITH_LDAP for LDAP authentication and addressbook support +# set WITHOUT_CACHEDIR to disable the cache dir # set WITH_HTTPS to generate https:// URLs for all accesses # set WITH_HTTPS=login to generate https:// URLs for only password access -# set WITH_VCHKPW for vpopmail authentication # set WITH_ISPELL to provide spell-checking # set WITH_MIMETYPES to enable the search for a mime.types file # set WITH_TIMEOUTHARD to something other than 7200 seconds (2hr) # set WITH_TIMEOUTSOFT to something other than 1200 seconds (20m) # set WITHOUT_SENTRENAME to turn off periodic renaming of the Sent folder # set WITHOUT_IMAP if you don't use the Courier IMAP server -# set VCHKPWLOC to the home of the vpopmail user, if necessary +# set WITHOUT_GZIP for not using gzip to compress messages # # The following settings are in bytes: # set WITH_MAXMSGSIZE to max size of messages (including attachments) @@ -57,11 +62,11 @@ IMAGEURL?= ${WEBDATASUBDIR} # # set WITH_CHARSET=chset,chset,... to enable charsets. # Set it to "all" will enable all unicode charset mappings. -# For available charsets just type "iconv -l" - -CACHEDIR?= /var/sqwebmail/cache -CACHEOWNER?= bin -VCHKPWLOC?= ${LOCALBASE}/vpopmail +# "iconv -l" may give you an idea of some usable character sets, although +# this is not exactly the same as the set which sqwebmail provides. +# Do not forget the template character set and UTF-8. For example, to be +# able to read ISO-8859-15 correctly, you need at least +# WITH_CHARSET=ISO-8859-15,ISO-8859-1,UTF-8 # End of user variables @@ -71,19 +76,24 @@ HAS_CONFIGURE= YES USE_BZIP2= YES USE_REINPLACE= YES USE_GETTEXT= YES -USE_LIBTOOL_VER=13 - -CONFIGURE_ARGS= \ - --enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \ - --enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \ - --libexecdir=${PREFIX}/libexec/sqwebmail \ - --mandir=${PREFIX}/man \ - --enable-imageurl=/${IMAGEURL} \ - --with-locking-method=fcntl \ - --with-libintl-prefix=${LOCALBASE} \ - --with-libiconv-prefix=${LOCALBASE} - -PLIST_SUB+= CGIBINDIR=${CGIBINDIR} CGIBINSUBDIR=${CGIBINSUBDIR} WEBDATADIR=${WEBDATADIR} WEBDATASUBDIR=${WEBDATASUBDIR} +USE_GMAKE= YES +USE_RC_SUBR= YES +USE_LIBTOOL_VER=15 + +CONFIGURE_ARGS= --enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \ + --enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \ + --localstatedir=${PREFIX}/var/sqwebmail \ + --sysconfdir=${PREFIX}/etc/sqwebmail \ + --mandir=${PREFIX}/man \ + --enable-imageurl=/${IMAGEURL} \ + --with-locking-method=fcntl \ + --with-libintl-prefix=${LOCALBASE} \ + --with-libiconv-prefix=${LOCALBASE} + +PLIST_SUB+= CGIBINDIR=${CGIBINDIR} \ + CGIBINSUBDIR=${CGIBINSUBDIR} \ + WEBDATADIR=${WEBDATADIR} \ + WEBDATASUBDIR=${WEBDATASUBDIR} .if defined(WITHOUT_CACHEDIR) PLIST_SUB+= CACHE="@comment " @@ -92,36 +102,6 @@ CONFIGURE_ARGS+= --without-cachedir PLIST_SUB+= CACHE="" CONFIGURE_ARGS+= --with-cachedir=${CACHEDIR} \ --with-cacheowner=${CACHEOWNER} - -.endif -.if !defined(WITHOUT_AUTHDAEMON) -CONFIGURE_ARGS+= --with-authdaemon -PLIST_SUB+= AUTHDFLAG="" -.else -CONFIGURE_ARGS+= --without-authdaemon -PLIST_SUB+= AUTHDFLAG="@comment " -.endif - -.if defined(WITH_LDAP) -USE_OPENLDAP= YES -CONFIGURE_ARGS+= --with-authldap -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" -PLIST_SUB+= LDAPFLAG="" -.else -CONFIGURE_ARGS+= --without-authldap -PLIST_SUB+= LDAPFLAG="@comment " -.endif - -.if defined(WITH_VCHKPW) -BUILD_DEPENDS+= ${VCHKPWLOC}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail -RUN_DEPENDS+= ${VCHKPWLOC}/bin/vchkpw:${PORTSDIR}/mail/vpopmail - -CONFIGURE_ARGS+= --with-authvchkpw -PLIST_SUB+= VPOPMAILFLAG="" -.else -CONFIGURE_ARGS+= --without-authvchkpw -PLIST_SUB+= VPOPMAILFLAG="@comment " .endif .if defined(WITH_HTTPS) @@ -140,26 +120,13 @@ CONFIGURE_ARGS+= --disable-autorenamesent CONFIGURE_ARGS+= --disable-utf7-folder-encoding .endif -.if defined(WITH_MYSQL) -CONFIGURE_ARGS+= --with-authmysql -PLIST_SUB+= MYSQLFLAG="" -.else -CONFIGURE_ARGS+= --without-authmysql -PLIST_SUB+= MYSQLFLAG="@comment " -.endif - -.if defined(WITH_POSTGRESQL) -CONFIGURE_ARGS+= --with-authpgsql -PLIST_SUB+= PGSQLFLAG="" -.else -CONFIGURE_ARGS+= --without-authpgsql -PLIST_SUB+= PGSQLFLAG="@comment " +.if defined(WITHOUT_GZIP) +CONFIGURE_ARGS+= --without-gzip .endif .if defined(WITH_ISPELL) BUILD_DEPENDS+= ${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell RUN_DEPENDS+= ${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell - CONFIGURE_ARGS+= --with-ispell=${LOCALBASE}/bin/ispell .else CONFIGURE_ARGS+= --without-ispell @@ -197,34 +164,20 @@ CONFIGURE_ARGS+= --enable-unicode=${WITH_CHARSET} .endif .endif +RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} + MAN1= maildirmake.1 -MAN7= authlib.7 -MAN8= deliverquota.8 makeuserdb.8 userdb.8 userdbpw.8 - -MLINKS= authlib.7 authcram.7 \ - authlib.7 authdaemon.7 \ - authlib.7 authdaemond.7 \ - authlib.7 authldap.7 \ - authlib.7 authpam.7 \ - authlib.7 authpwd.7 \ - authlib.7 authshadow.7 \ - authlib.7 authuserdb.7 \ - authlib.7 authvchkpw.7 \ - authlib.7 authmysql.7 \ - makeuserdb.8 pw2userdb.8 \ - makeuserdb.8 vchkpw2userdb.8 - -CONFIGURE_ARGS+= ${CONFIGURE_TARGET} +MAN8= deliverquota.8 -post-patch: - @${REINPLACE_CMD} -e 's|^@INSTALLAUTHMODULES@$$|& @AUTHMODULES@|' \ - ${WRKSRC}/authlib/installlist.in +EXTRA_DOCS= README README.logindomainlist.html README.pam sqwebmail/ChangeLog \ + maildir/README.maildirquota.txt maildir/README.sharedfolders.txt +post-patch: @${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \ ${WRKSRC}/liblock/configure - @${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} \ - -e 's|prefix=\$$ac_optarg|&/share/sqwebmail|g' + @${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ -rpath=:${LOCALBASE}/lib/courier-authlib|' \ + ${WRKSRC}/sqwebmail/Makefile.in @${REINPLACE_CMD} -e 's|mkdir -p|${MKDIR}|g' ${WRKSRC}/pcp/configure @@ -233,19 +186,22 @@ post-patch: ${WRKSRC}/pcp/intl/Makefile.in post-install: - ${INSTALL_SCRIPT} ${FILESDIR}/sqwebmail-sqwebmaild.sh \ - ${PREFIX}/etc/rc.d/ -.if !defined(WITHOUT_AUTHDAEMON) - ${INSTALL_SCRIPT} ${FILESDIR}/sqwebmail-authdaemond.sh \ - ${PREFIX}/etc/rc.d/ + ${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ + ${FILESDIR}/sqwebmail-sqwebmaild.sh > ${WRKDIR}/sqwebmail-sqwebmaild.sh + ${INSTALL_SCRIPT} ${WRKDIR}/sqwebmail-sqwebmaild.sh ${RCDIR}/sqwebmail-sqwebmaild.sh + +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} +.for a in ${EXTRA_DOCS} + ${INSTALL_DATA} ${WRKSRC}/${a} ${DOCSDIR} +.endfor .endif + cd ${WRKSRC} && ( ${MAKE} install-configure ; cd - ) + @${ECHO_MSG} "" - @${ECHO_MSG} "*************************************************************************" - @${ECHO_MSG} "******* Make shure to run 'make install-configure' now! *******" - @${ECHO_MSG} "*************************************************************************" + @${ECHO_MSG} "Add the following line to your /etc/crontab to make shure the" + @${ECHO_MSG} "sqwebmail cache directory gets cleaned up." + @${ECHO_MSG} "0 * * * * ${CACHEOWNER} ${PREFIX}/share/sqwebmail/cleancache.pl" @${ECHO_MSG} "" -install-configure: - cd ${WRKSRC} && ${GMAKE} install-configure - .include <bsd.port.mk> diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo index cf18233c1dba..f37da547d719 100644 --- a/mail/sqwebmail/distinfo +++ b/mail/sqwebmail/distinfo @@ -1,2 +1,2 @@ -MD5 (sqwebmail-4.0.7.tar.bz2) = 656e5d22cecab535f57a24407d39cd55 -SIZE(sqwebmail-4.0.7.tar.bz2) = 1972370 +MD5 (sqwebmail-5.0.0.tar.bz2) = f6d57fd7b1cbf7044d5d20e89d147b22 +SIZE(sqwebmail-5.0.0.tar.bz2) = 3146311 diff --git a/mail/sqwebmail/files/patch-ldap b/mail/sqwebmail/files/patch-ldap deleted file mode 100644 index df479a4cbbfe..000000000000 --- a/mail/sqwebmail/files/patch-ldap +++ /dev/null @@ -1,13 +0,0 @@ ---- authlib/configure.orig Wed Mar 3 05:54:13 2004 -+++ authlib/configure Tue Mar 16 19:36:40 2004 -@@ -1268,6 +1268,10 @@ - { (exit 1); exit 1; }; } - fi - -+CFLAGS="$CFLAGS -I%%LOCALBASE%%/include" -+CPPFLAGS="$CPPFLAGS -I%%LOCALBASE%%/include" -+LDFLAGS="-L%%LOCALBASE%%/lib $LDFLAGS" -+ - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/mail/sqwebmail/files/patch-sqwebmail::maildir.c b/mail/sqwebmail/files/patch-sqwebmail::maildir.c deleted file mode 100644 index 43363edd05e1..000000000000 --- a/mail/sqwebmail/files/patch-sqwebmail::maildir.c +++ /dev/null @@ -1,13 +0,0 @@ ---- sqwebmail/maildir.c.orig Fri May 28 21:22:37 2004 -+++ sqwebmail/maildir.c Fri May 28 21:23:00 2004 -@@ -1488,8 +1488,8 @@ - as=rfc2047_decode_unicode(a, &unicode_UTF8, 0); - bs=rfc2047_decode_unicode(b, &unicode_UTF8, 0); - #else -- as=rfc2047_decode_simple(a, &unicode_UTF8); -- bs=rfc2047_decode_simple(b, &unicode_UTF8); -+ as=rfc2047_decode_simple(a); -+ bs=rfc2047_decode_simple(b); - #endif - - if (as) diff --git a/mail/sqwebmail/files/sqwebmail-authdaemond.sh b/mail/sqwebmail/files/sqwebmail-authdaemond.sh deleted file mode 100644 index cd05b44900b1..000000000000 --- a/mail/sqwebmail/files/sqwebmail-authdaemond.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 1 -fi - -case "$1" in -start) - [ -r ${PREFIX}/share/sqwebmail/authdaemonrc ] && ${PREFIX}/libexec/sqwebmail/authlib/authdaemond start > /dev/null && echo -n ' authdaemond' - ;; -stop) - ${PREFIX}/libexec/sqwebmail/authlib/authdaemond stop > /dev/null && echo -n ' authdaemond' - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - ;; -esac - -exit 0 - diff --git a/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh b/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh index 8ca408ee3096..a8b3a2eb325a 100644 --- a/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh +++ b/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh @@ -1,21 +1,52 @@ #!/bin/sh +# +# An rc.subr-style startup script for courier-authdaemond service. -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 1 -fi - -case "$1" in -start) - ${PREFIX}/libexec/sqwebmail/sqwebmaild.rc start && echo -n ' sqwebmaild' - ;; -stop) - ${PREFIX}/libexec/sqwebmail/sqwebmaild.rc stop && echo -n ' sqwebmaild' - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - ;; -esac - -exit 0 +# PROVIDE: sqwebmaild +# REQUIRE: LOGIN sqwebmaild +# KEYWORD: FreeBSD shutdown + +# Define these sqwebmaild_* variables in one of these files: +# /etc/rc.conf +# /etc/rc.conf.local +# /etc/rc.conf.d/sqwebmaild +# +# DO NOT CHANGE THESE DEFAULT VALUES HERE + +sqwebmaild_enable=${sqwebmaild_enable-"NO"} + +. %%RC_SUBR%% + +name="sqwebmaild" +rcvar=`set_rcvar` +command="%%PREFIX%%/libexec/sqwebmaild.rc" + +start_cmd="sqwebmaild_cmd start" +stop_cmd="sqwebmaild_cmd stop" +restart_cmd="sqwebmaild_cmd stop && sqwebmaild_cmd start" +pidfile="%%PREFIX%%/var/sqwebmail/run/sqwebmaild.pid" +procname="%%PREFIX%%/sbin/courierlogger" + +load_rc_config $name + +sqwebmaild_cmd () { + case $1 in + start) + echo "Starting ${name}." + ${command} start + ;; + stop) + echo "Stopping ${name}." + ${command} stop + if [ $? -eq 0 ] ; then + for file in "$pidfile" "$pidfile".lock "$pidfile".pcp.lock %%PREFIX%%/var/sqwebmail/sqwebmail.sock ; do + [ -f "$file" -o -S "$file" ] && rm -f "$file" + done + return 0 + fi + ;; + esac +} + +run_rc_command "$1" diff --git a/mail/sqwebmail/pkg-plist b/mail/sqwebmail/pkg-plist index 513d8d606048..f8f3bee6c002 100644 --- a/mail/sqwebmail/pkg-plist +++ b/mail/sqwebmail/pkg-plist @@ -1,34 +1,18 @@ -%%AUTHDFLAG%%etc/rc.d/sqwebmail-authdaemond.sh +etc/sqwebmail/ldapaddressbook.dist +etc/sqwebmail/sqwebmaild.dist +etc/sqwebmail/nodsn etc/rc.d/sqwebmail-sqwebmaild.sh -libexec/sqwebmail/authlib/authcram -libexec/sqwebmail/authlib/authcustom -%%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemon -%%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemon.passwd -%%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemond -%%LDAPFLAG%%libexec/sqwebmail/authlib/authdaemond.ldap -%%LDAPFLAG%%libexec/sqwebmail/authlib/authldap -%%PGSQLFLAG%%libexec/sqwebmail/authlib/authdaemond.pgsql -%%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemond.plain -%%MYSQLFLAG%%libexec/sqwebmail/authlib/authdaemond.mysql -%%MYSQLFLAG%%libexec/sqwebmail/authlib/authmysql -%%VPOPMAILFLAG%%libexec/sqwebmail/authlib/authvchkpw -libexec/sqwebmail/authlib/authpam -libexec/sqwebmail/authlib/authsystem.passwd -libexec/sqwebmail/authlib/authuserdb -libexec/sqwebmail/sqwebmail/authenumerate -libexec/sqwebmail/sqwebmail/deliverquota -libexec/sqwebmail/sqwebmail/maildirmake -libexec/sqwebmail/sqwebmail/makedatprog -libexec/sqwebmail/sqwebmail/makemime -libexec/sqwebmail/sqwebmail/pcpd -libexec/sqwebmail/sqwebmail/reformime -libexec/sqwebmail/sqwebmail/sqwebmaild -libexec/sqwebmail/sqwebmaild.rc -%%AUTHDFLAG%%share/sqwebmail/authdaemonrc.dist -%%LDAPFLAG%%share/sqwebmail/authldaprc.dist -%%MYSQLFLAG%%share/sqwebmail/authmysqlrc.dist -%%PGSQLFLAG%%share/sqwebmail/authpgsqlrc.dist +libexec/sqwebmail/deliverquota +libexec/sqwebmail/maildirmake +libexec/sqwebmail/makemime +libexec/sqwebmail/pcpd +libexec/sqwebmail/reformime +libexec/sqwebmail/sqwebmaild +libexec/sqwebmail/sqwebpasswd +libexec/sqwebmaild.rc %%CACHE%%@unexec %D/share/sqwebmail/cleancache.pl +sbin/sharedindexinstall +sbin/sharedindexsplit share/sqwebmail/cleancache.pl share/sqwebmail/html/en share/sqwebmail/html/en-us/CHARSET @@ -79,36 +63,28 @@ share/sqwebmail/html/en-us/readmsg.html share/sqwebmail/html/en-us/redirect.html share/sqwebmail/html/en-us/smileys.txt share/sqwebmail/html/en-us/spellchk.html -share/sqwebmail/ldapaddressbook.dist share/sqwebmail/ldapsearch -share/sqwebmail/nodsn -share/sqwebmail/sbin/courierlogger -share/sqwebmail/sbin/makeuserdb -share/sqwebmail/sbin/pw2userdb -share/sqwebmail/sbin/sharedindexinstall -share/sqwebmail/sbin/sharedindexsplit -share/sqwebmail/sbin/userdb -share/sqwebmail/sbin/userdbpw -share/sqwebmail/sbin/vchkpw2userdb share/sqwebmail/sendit.sh -share/sqwebmail/sqwebmaild.dist share/sqwebmail/webgpg -@dirrm share/sqwebmail/var/calendar/public -@dirrm share/sqwebmail/var/calendar/private -@dirrm share/sqwebmail/var/calendar/localcache -@dirrm share/sqwebmail/var/calendar -%%AUTHDFLAG%%@dirrm share/sqwebmail/var/authdaemon -@dirrm share/sqwebmail/var -@dirrm share/sqwebmail/share -@dirrm share/sqwebmail/sbin +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.logindomainlist.html +%%PORTDOCS%%%%DOCSDIR%%/README.pam +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt +%%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm etc/sqwebmail +%%CACHE%%@dirrm var/sqwebmail/cache +@dirrm var/sqwebmail/calendar/public +@dirrm var/sqwebmail/calendar/private +@dirrm var/sqwebmail/calendar/localcache +@dirrm var/sqwebmail/calendar +@dirrm var/sqwebmail/run +@dirrm var/sqwebmail @dirrm share/sqwebmail/html/en-us @dirrm share/sqwebmail/html @dirrm share/sqwebmail -@dirrm libexec/sqwebmail/sqwebmail -@dirrm libexec/sqwebmail/authlib @dirrm libexec/sqwebmail -%%CACHE%%@unexec rmdir /var/sqwebmail/cache 2> /dev/null || true -%%CACHE%%@unexec rmdir /var/sqwebmail 2> /dev/null || true %%CGIBINDIR%%/%%CGIBINSUBDIR%%/sqwebmail @unexec /bin/rmdir %D/%%CGIBINDIR%%/%%CGIBINSUBDIR%% 2> /dev/null || true @unexec /bin/rmdir %D/%%CGIBINDIR%% 2> /dev/null || true diff --git a/net/courier-authlib-ldap/Makefile b/net/courier-authlib-ldap/Makefile index 6b5b5baa743c..fbea8f3245a3 100644 --- a/net/courier-authlib-ldap/Makefile +++ b/net/courier-authlib-ldap/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/net/courier-authlib-ldap/distinfo b/net/courier-authlib-ldap/distinfo index 7146db0d7dff..8441c7ca4ab1 100644 --- a/net/courier-authlib-ldap/distinfo +++ b/net/courier-authlib-ldap/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/net/courier-authlib-ldap/files/courier-authdaemond.sh b/net/courier-authlib-ldap/files/courier-authdaemond.sh index b4af4c0b40fd..ef48f1629b24 100644 --- a/net/courier-authlib-ldap/files/courier-authdaemond.sh +++ b/net/courier-authlib-ldap/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/net/courier-authlib-ldap/pkg-plist b/net/courier-authlib-ldap/pkg-plist index 196430c46515..c114541d6d19 100644 --- a/net/courier-authlib-ldap/pkg-plist +++ b/net/courier-authlib-ldap/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/security/courier-authlib-base/Makefile b/security/courier-authlib-base/Makefile index 6b5b5baa743c..fbea8f3245a3 100644 --- a/security/courier-authlib-base/Makefile +++ b/security/courier-authlib-base/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/security/courier-authlib-base/distinfo b/security/courier-authlib-base/distinfo index 7146db0d7dff..8441c7ca4ab1 100644 --- a/security/courier-authlib-base/distinfo +++ b/security/courier-authlib-base/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/security/courier-authlib-base/files/courier-authdaemond.sh b/security/courier-authlib-base/files/courier-authdaemond.sh index b4af4c0b40fd..ef48f1629b24 100644 --- a/security/courier-authlib-base/files/courier-authdaemond.sh +++ b/security/courier-authlib-base/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/security/courier-authlib-base/pkg-plist b/security/courier-authlib-base/pkg-plist index 196430c46515..c114541d6d19 100644 --- a/security/courier-authlib-base/pkg-plist +++ b/security/courier-authlib-base/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/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index 6b5b5baa743c..fbea8f3245a3 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/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/security/courier-authlib/distinfo b/security/courier-authlib/distinfo index 7146db0d7dff..8441c7ca4ab1 100644 --- a/security/courier-authlib/distinfo +++ b/security/courier-authlib/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/security/courier-authlib/files/courier-authdaemond.sh b/security/courier-authlib/files/courier-authdaemond.sh index b4af4c0b40fd..ef48f1629b24 100644 --- a/security/courier-authlib/files/courier-authdaemond.sh +++ b/security/courier-authlib/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/security/courier-authlib/pkg-plist b/security/courier-authlib/pkg-plist index 196430c46515..c114541d6d19 100644 --- a/security/courier-authlib/pkg-plist +++ b/security/courier-authlib/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 |