diff options
| author | lev <lev@FreeBSD.org> | 2003-10-09 11:25:41 +0000 |
|---|---|---|
| committer | lev <lev@FreeBSD.org> | 2003-10-09 11:25:41 +0000 |
| commit | 4f855eac9f0b69afbc8d18703633278b3a03320d (patch) | |
| tree | 01bf1e94eeb2a99e38b5dcdf5277fb30adf7264e /russian | |
| parent | 2890549ae4833a7da8a9d8b9d97b125b4061bc60 (diff) | |
| download | FreeBSD-ports-4f855eac9f0b69afbc8d18703633278b3a03320d.zip FreeBSD-ports-4f855eac9f0b69afbc8d18703633278b3a03320d.tar.gz | |
Fix building of suexec with Russian and SLL patches.
Now mod_ssl patches are applied clean.
Diffstat (limited to 'russian')
| -rw-r--r-- | russian/apache13-modssl/Makefile | 7 | ||||
| -rw-r--r-- | russian/apache13-modssl/files/mod_ssl-fix | 13 |
2 files changed, 17 insertions, 3 deletions
diff --git a/russian/apache13-modssl/Makefile b/russian/apache13-modssl/Makefile index 7052f3f..2daebef 100644 --- a/russian/apache13-modssl/Makefile +++ b/russian/apache13-modssl/Makefile @@ -7,6 +7,7 @@ PORTNAME= apache+mod_ssl PORTVERSION= ${VERSION_APACHE}+${VERSION_RA}+${VERSION_MODSSL} +PORTREVISION= 1 CATEGORIES= russian www security MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ ${MASTER_SITES_MODSSL:S/$/:modssl/} \ @@ -206,6 +207,9 @@ pre-patch: @cd ${WRKDIR} \ && tar cf - src conf htdocs | tar xf - -C ${WRKDIR}/apache_${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" \ && ./configure --with-apache=../${DISTNAME} --expert @@ -232,8 +236,5 @@ post-install: ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \ fi -.if defined(WITH_SUEXEC) - @${ECHO_CMD} "sbin/suexec" >> ${TMPPLIST} -.endif .include <bsd.port.post.mk> diff --git a/russian/apache13-modssl/files/mod_ssl-fix b/russian/apache13-modssl/files/mod_ssl-fix new file mode 100644 index 0000000..60d5d06 --- /dev/null +++ b/russian/apache13-modssl/files/mod_ssl-fix @@ -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_", |
