diff options
| -rw-r--r-- | security/cyrus-sasl2-saslauthd/Makefile | 8 | ||||
| -rw-r--r-- | security/cyrus-sasl2-saslauthd/pkg-plist | 11 | ||||
| -rw-r--r-- | security/cyrus-sasl2/Makefile | 4 |
3 files changed, 11 insertions, 12 deletions
diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile index a8b99d5685d1..aadf477e998d 100644 --- a/security/cyrus-sasl2-saslauthd/Makefile +++ b/security/cyrus-sasl2-saslauthd/Makefile @@ -7,7 +7,7 @@ PORTNAME= saslauthd PORTVERSION= 2.1.21 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \ ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \ @@ -109,8 +109,8 @@ CONFIGURE_ARGS+=--with-openssl=yes CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} .endif -SASLAUTHD_RUNPATH?= /var/state/saslauthd -.if ${SASLAUTHD_RUNPATH} != /var/state/saslauthd +SASLAUTHD_RUNPATH?= /var/run/saslauthd +.if ${SASLAUTHD_RUNPATH} != /var/run/saslauthd RUNPATH= "@comment " .endif @@ -138,7 +138,7 @@ post-install: @${INSTALL_PROGRAM} ${WRKSRC}/saslauthd/testsaslauthd \ ${PREFIX}/sbin/testsaslauthd ${GZIP_CMD} ${MAN8PREFIX}/man/cat8/saslauthd.8 -.if ${SASLAUTHD_RUNPATH} != /var/state/saslauthd +.if ${SASLAUTHD_RUNPATH} != /var/run/saslauthd @${ECHO_MSG} "" @${ECHO_MSG} "SASLAUTHD_RUNPATH was specified." @${ECHO_MSG} "Make sure to have ${SASLAUTHD_RUNPATH} by yourself." diff --git a/security/cyrus-sasl2-saslauthd/pkg-plist b/security/cyrus-sasl2-saslauthd/pkg-plist index b2a3758dab34..76348f502181 100644 --- a/security/cyrus-sasl2-saslauthd/pkg-plist +++ b/security/cyrus-sasl2-saslauthd/pkg-plist @@ -11,10 +11,9 @@ sbin/testsaslauthd %%PORTDOCS%%%%DOCSDIR%%/saslauthd/README %%PORTDOCS%%@dirrm %%DOCSDIR%%/saslauthd %%RUNPATH%%@mode ug=rwx,o= -%%RUNPATH%%@exec mkdir -p /var/state/saslauthd -%%RUNPATH%%@exec chown -R cyrus:mail /var/state/saslauthd -%%RUNPATH%%@exec chmod -R ug=rwx,o= /var/state/saslauthd -%%RUNPATH%%@comment This file gets created by the state/saslauthd program -%%RUNPATH%%@unexec rm -fr /var/state/saslauthd -%%RUNPATH%%@unexec rmdir /var/state +%%RUNPATH%%@exec mkdir -p /var/run/saslauthd +%%RUNPATH%%@exec chown -R cyrus:mail /var/run/saslauthd +%%RUNPATH%%@exec chmod -R ug=rwx,o= /var/run/saslauthd +%%RUNPATH%%@comment This file gets created by the run/saslauthd program +%%RUNPATH%%@unexec rm -fr /var/run/saslauthd @cwd %%PREFIX%% diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index 67effd0f864b..e8f680b91e96 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -7,7 +7,7 @@ PORTNAME= cyrus-sasl PORTVERSION= 2.1.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \ ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \ @@ -190,7 +190,7 @@ CONFIGURE_ARGS+=--with-openssl=yes CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} .endif -SASLAUTHD_RUNPATH?= /var/state/saslauthd +SASLAUTHD_RUNPATH?= /var/run/saslauthd CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus |