mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
Fix building of suexec with Russian and SLL patches.
Now mod_ssl patches are applied clean.
This commit is contained in:
parent
7b4b5cc22b
commit
ebd8be7d06
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=90706
2 changed files with 17 additions and 3 deletions
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
PORTNAME= apache+mod_ssl
|
PORTNAME= apache+mod_ssl
|
||||||
PORTVERSION= ${VERSION_APACHE}+${VERSION_RA}+${VERSION_MODSSL}
|
PORTVERSION= ${VERSION_APACHE}+${VERSION_RA}+${VERSION_MODSSL}
|
||||||
|
PORTREVISION= 1
|
||||||
CATEGORIES= russian www security
|
CATEGORIES= russian www security
|
||||||
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \
|
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \
|
||||||
${MASTER_SITES_MODSSL:S/$/:modssl/} \
|
${MASTER_SITES_MODSSL:S/$/:modssl/} \
|
||||||
|
@ -206,6 +207,9 @@ pre-patch:
|
||||||
@cd ${WRKDIR} \
|
@cd ${WRKDIR} \
|
||||||
&& tar cf - src conf htdocs | tar xf - -C ${WRKDIR}/apache_${VERSION_APACHE}
|
&& tar cf - src conf htdocs | tar xf - -C ${WRKDIR}/apache_${VERSION_APACHE}
|
||||||
@cd ${WRKDIR}/mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE} \
|
@cd ${WRKDIR}/mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE} \
|
||||||
|
&& ${ECHO_MSG} "===> Fix mod_ssl-${VERSION_MODSSL} extension for compatibility with Russian Apache" \
|
||||||
|
&& ${PATCH} --quiet < ${FILESDIR}/mod_ssl-fix
|
||||||
|
@cd ${WRKDIR}/mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE} \
|
||||||
&& ${ECHO_MSG} "===> Applying mod_ssl-${VERSION_MODSSL} extension" \
|
&& ${ECHO_MSG} "===> Applying mod_ssl-${VERSION_MODSSL} extension" \
|
||||||
&& ./configure --with-apache=../${DISTNAME} --expert
|
&& ./configure --with-apache=../${DISTNAME} --expert
|
||||||
|
|
||||||
|
@ -232,8 +236,5 @@ post-install:
|
||||||
${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
|
${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
|
||||||
${INSTALL_SCRIPT} -m 751 ${FILESDIR}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \
|
${INSTALL_SCRIPT} -m 751 ${FILESDIR}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \
|
||||||
fi
|
fi
|
||||||
.if defined(WITH_SUEXEC)
|
|
||||||
@${ECHO_CMD} "sbin/suexec" >> ${TMPPLIST}
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.include <bsd.port.post.mk>
|
.include <bsd.port.post.mk>
|
||||||
|
|
13
russian/apache13-modssl/files/mod_ssl-fix
Normal file
13
russian/apache13-modssl/files/mod_ssl-fix
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
--- pkg.sslsup/sslsup.patch.orig Thu Oct 9 15:08:28 2003
|
||||||
|
+++ pkg.sslsup/sslsup.patch Thu Oct 9 15:08:56 2003
|
||||||
|
@@ -480,6 +480,10 @@
|
||||||
|
{
|
||||||
|
/* variable name starts with */
|
||||||
|
"HTTP_",
|
||||||
|
+#ifdef RUSSIAN_APACHE
|
||||||
|
+ "CHARSET",
|
||||||
|
+ "CHARSET_",
|
||||||
|
+#endif
|
||||||
|
+#ifdef MOD_SSL
|
||||||
|
+ "HTTPS_",
|
||||||
|
+ "SSL_",
|
Loading…
Add table
Reference in a new issue