Don't check if perl5 is suid-enabled, just warn the users.
Noticed by: kris@ and tobez@
This commit is contained in:
parent
1db29d0ac9
commit
745e3e74f9
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=93817
1 changed files with 10 additions and 8 deletions
|
@ -30,11 +30,6 @@ OWDATADIR= ${PREFIX}/www/data/openwebmail
|
|||
PATCH_WRKSRC= ${WRKSRC}/cgi-bin/openwebmail
|
||||
PATCH_STRIP= -p1
|
||||
PLIST= ${WRKDIR}/.PLIST.${PKGNAME}
|
||||
_SUIDPERL_ENABLED!= ${PERL5} -V | ${GREP} d_dosuid | wc -l
|
||||
|
||||
.if ${PERL_LEVEL} > 500800 && !defined(_SUIDPERL_ENABLED)
|
||||
WITHOUT_SPEEDYCGI=yes
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_SPEEDYCGI)
|
||||
BUILD_DEPENDS+= speedy_suid:${PORTSDIR}/www/p5-CGI-SpeedyCGI
|
||||
|
@ -70,6 +65,13 @@ _CUSTOMIZED= yes
|
|||
.endif
|
||||
|
||||
pre-fetch:
|
||||
.if ${PERL_LEVEL} > 500800
|
||||
@${ECHO} ""
|
||||
@${ECHO} "WARNING:"
|
||||
@${ECHO} "Please make sure that your perl is built with -DSUIDPERL_ENABLED,"
|
||||
@${ECHO} "otherwise please build openwebmail with WITHOUT_SPEEDYCGI=yes"
|
||||
@${ECHO} ""
|
||||
.endif
|
||||
.if defined(WITH_PAM)
|
||||
@${ECHO} "PAM support will be added."
|
||||
.endif
|
||||
|
@ -102,11 +104,11 @@ pre-fetch:
|
|||
|
||||
post-patch:
|
||||
@${MV} ${PATCH_WRKSRC}/etc/openwebmail.conf ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
|
||||
@${PERL} -pi.bak -e 's,/usr/local/www/cgi-bin/openwebmail,${OWCGIDIR},g' ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
|
||||
@${PERL} -pi.bak -e 's,/usr/local/www/data/openwebmail,${OWDATADIR},g' ${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
|
||||
.if !defined(WITHOUT_SPEEDYCGI)
|
||||
@${ECHO} "savedsuid_support no" >> ${PATCH_WRKSRC}/etc/openwebmail.conf-dist
|
||||
@${PERL} -pi.bak -e 's,/usr/local/bin/speedy,${LOCALBASE}/bin/speedy_suid,g' ${PATCH_WRKSRC}/openwebmail*pl
|
||||
@${PERL} -pi.bak -e 's,${LOCALBASE}/bin/speedy,${LOCALBASE}/bin/speedy_suid,g' ${PATCH_WRKSRC}/openwebmail*pl
|
||||
.else
|
||||
@${PERL} -pi.bak -e 's,/usr/bin/suidperl,${PERL},g' ${PATCH_WRKSRC}/openwebmail*pl
|
||||
.endif
|
||||
|
|
Loading…
Reference in a new issue