diff options
Diffstat (limited to 'mail/openwebmail')
| -rw-r--r-- | mail/openwebmail/Makefile | 23 | ||||
| -rw-r--r-- | mail/openwebmail/distinfo | 4 |
2 files changed, 21 insertions, 6 deletions
diff --git a/mail/openwebmail/Makefile b/mail/openwebmail/Makefile index 587d11a89667..fd201a6cfb64 100644 --- a/mail/openwebmail/Makefile +++ b/mail/openwebmail/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openwebmail -PORTVERSION= 2.40 +PORTVERSION= 2.41 CATEGORIES= mail MASTER_SITES= http://openwebmail.org/openwebmail/download/release/ \ http://turtle.ee.ncku.edu.tw/openwebmail/download/release/ @@ -20,8 +20,8 @@ RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-T USE_PERL5= yes NO_BUILD= yes NO_WRKSUBDIR= yes -OWCGIDIR?= ${PREFIX}/www/cgi-bin/openwebmail -OWDATADIR?= ${PREFIX}/www/data/openwebmail +OWCGIDIR= ${PREFIX}/www/cgi-bin/openwebmail +OWDATADIR= ${PREFIX}/www/data/openwebmail PATCH_WRKSRC= ${WRKSRC}/cgi-bin/openwebmail PATCH_STRIP= -p1 PLIST= ${WRKDIR}/.PLIST.${PKGNAME} @@ -42,6 +42,14 @@ OPTIONS= ANTIWORD "AntiWord" off \ .include <bsd.port.pre.mk> +# WITH_SPEEDYCGI needs suidperl enabled under perl5.8 +PERL_V!= ${PERL} -V +.if ${PERL_LEVEL} > 500800 && ${PERL_V:M*dosuid*} == "" && defined(WITH_SPEEDYCGI) +DISABLE_SPEEDYCGI=yes +WITHOUT_SPEEDYCGI=yes +.undef WITH_SPEEDYCGI +.endif + .if ${PERL_LEVEL} < 500800 RUN_DEPENDS+= ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \ ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ @@ -103,6 +111,14 @@ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p .endif post-patch: +.if defined(DISABLE_SPEEDYCGI) + @${ECHO_MSG} "" + @${ECHO_MSG} "WARNING:" + @${ECHO_MSG} "Your perl doesn't support SUID, so SpeedyCGI support is disabled automatically." + @${ECHO_MSG} "If you want SpeedyCGI support, please reinstall perl with ENABLE_SUIDPERL=yes," + @${ECHO_MSG} "and reinstall ${PORTNAME} again." + @${ECHO_MSG} "" +.endif @${MV} ${PATCH_WRKSRC}/etc/openwebmail.conf ${PATCH_WRKSRC}/etc/openwebmail.conf-dist @${PERL} -pi.bak -e 's,${LOCALBASE}/www/cgi-bin/openwebmail,${OWCGIDIR},g' ${PATCH_WRKSRC}/etc/openwebmail.conf-dist @${PERL} -pi.bak -e 's,${LOCALBASE}/www/data/openwebmail,${OWDATADIR},g' ${PATCH_WRKSRC}/etc/openwebmail.conf-dist @@ -122,7 +138,6 @@ post-patch: @${ECHO} "viruscheck_source_allowed all" >> ${PATCH_WRKSRC}/etc/openwebmail.conf-dist .endif .if defined(WITH_SPEEDYCGI) - @${PERL} -pi.bak -e 's,speedy_suidperl -T,speedy_suidperl,g' ${PATCH_WRKSRC}/openwebmail*pl @${ECHO} "has_savedsuid_support no" >> ${PATCH_WRKSRC}/etc/openwebmail.conf-dist .else @${PERL} -pi.bak -e 's,/usr/bin/suidperl,${PERL},g' ${PATCH_WRKSRC}/openwebmail*pl diff --git a/mail/openwebmail/distinfo b/mail/openwebmail/distinfo index 435f5468e6dd..6320f63f5c04 100644 --- a/mail/openwebmail/distinfo +++ b/mail/openwebmail/distinfo @@ -1,2 +1,2 @@ -MD5 (openwebmail-2.40.tar.gz) = 1ad0059aca838e394c1358826c1f8a70 -SIZE (openwebmail-2.40.tar.gz) = 6232085 +MD5 (openwebmail-2.41.tar.gz) = f3df360acfeb693d648b38c55656f03f +SIZE (openwebmail-2.41.tar.gz) = 6300044 |