This is an adjustment of the existing apache13-modssl port, with additions from the vanilla www/apache13 port. This brings the www/apache13 www/apache13-modssl, and www/apache13+ipv6 port base configurations into synch, with www/apache13-modssl providing the same general configuration and options as www/apache13 itself. I believe no change is required to pkg-plist, and the only edited portion of this port is Makefile. Possible enhancements to the apache ports would be a Makefile.common, which I will submit in another PR. How-To-Repeat: Apply patch and install. Options added to this port were tested by me.
Re-worked patch, cleaned up with the help of portlint and some experienced assistance. -- // -- http://www.BRAD-X.com/ -- //
I'll get it right this time, I promise. :( diff -ru /usr/ports/www/apache13-modssl/Makefile apache13-modssl/Makefile --- /usr/ports/www/apache13-modssl/Makefile Mon Jul 1 12:08:37 2002 +++ apache13-modssl/Makefile Thu Jul 11 17:38:13 2002 @@ -24,6 +24,11 @@ ftp://ftp.iodynamics.com/pub/mirror/apache/dist/httpd/ \ ftp://apache.nextpath.com/pub/apache/dist/httpd/ \ ${MASTER_SITES_MODSSL:S/$/:modssl/} + +DISTNAME= apache_${VERSION_APACHE} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}:modssl + MASTER_SITES_MODSSL= http://www.modssl.org/source/ \ ftp://ftp.modssl.org/source/ \ ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/ \ @@ -36,29 +41,62 @@ ftp://ftp.blatzheim.com/pub/mod_ssl/ \ ftp://ftp.fu-berlin.de/unix/security/mod_ssl/ \ ftp://ftp.ntrl.net/pub/mirror/ralfsw/mod_ssl/ -DISTNAME= apache_${VERSION_APACHE} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}:modssl MAINTAINER= ports@FreeBSD.org +LIB_DEPENDS= mm.11:${PORTSDIR}/devel/mm + USE_OPENSSL= YES +INSTALLS_SHLIB= YES .include <bsd.port.pre.mk> -LIB_DEPENDS= mm.11:${PORTSDIR}/devel/mm - VERSION_APACHE= 1.3.26 VERSION_MODSSL= 2.8.10 +DATADIR=${PREFIX}/www +DOCUMENT_ROOT=${DATADIR}/data +DEFAULT_PATH=/bin:/usr/bin:${PREFIX}/bin + +.if defined(WITH_APACHE_SUEXEC) && ${WITH_APACHE_SUEXEC} == yes + +APACHE_SUEXEC_DOCROOT?=${DOCUMENT_ROOT} +APACHE_SUEXEC_USERDIR?=public_html + +SUEXEC_CONF= \ + --enable-suexec \ + --suexec-docroot=${APACHE_SUEXEC_DOCROOT} \ + --suexec-caller=www \ + --suexec-uidmin=1000 \ + --suexec-gidmin=1000 \ + --suexec-logfile=/var/log/httpd-suexec.log \ + --suexec-userdir=${APACHE_SUEXEC_USERDIR} \ + --suexec-safepath=${DEFAULT_PATH} + +.if defined(APACHE_SUEXEC_UMASK) +SUEXEC_CONF+= \ + --suexec-umask=${APACHE_SUEXEC_UMASK} +.endif + +PLIST_SUB+= SUB_SUEXEC="" +SUEXEC_MAN= suexec.8 + +.else # !SUEXEC + +SUEXEC_CONF= +PLIST_SUB+= SUB_SUEXEC="@comment " +SUEXEC_MAN= + +.endif # !SUEXEC + USE_PERL5= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS+=--prefix=${PREFIX} \ +CONFIGURE_ARGS+= \ + --prefix=${PREFIX} \ --server-uid=www \ --server-gid=www \ --with-perl=${PERL} \ --with-layout=FreeBSD \ - --suexec-docroot=${PREFIX}/www/data \ --without-confadjust \ --enable-module=most \ --enable-module=auth_db \ @@ -66,7 +104,7 @@ --disable-module=auth_dbm \ --enable-shared=max \ --enable-module=ssl \ - --enable-module=define + ${SUEXEC_CONF} OPTIM= -DHARD_SERVER_LIMIT=512 \ -DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \ @@ -139,5 +177,4 @@ ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ ${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \ fi - .include <bsd.port.post.mk> // -- http://www.BRAD-X.com/ -- //
Replacing the 'define' module portion of mod_ssl. diff -ru /usr/ports/www/apache13-modssl/Makefile apache13-modssl/Makefile --- /usr/ports/www/apache13-modssl/Makefile Mon Jul 1 12:08:37 2002 +++ apache13-modssl/Makefile Thu Jul 11 18:26:57 2002 @@ -24,6 +24,11 @@ ftp://ftp.iodynamics.com/pub/mirror/apache/dist/httpd/ \ ftp://apache.nextpath.com/pub/apache/dist/httpd/ \ ${MASTER_SITES_MODSSL:S/$/:modssl/} + +DISTNAME= apache_${VERSION_APACHE} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}:modssl + MASTER_SITES_MODSSL= http://www.modssl.org/source/ \ ftp://ftp.modssl.org/source/ \ ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/ \ @@ -36,29 +41,62 @@ ftp://ftp.blatzheim.com/pub/mod_ssl/ \ ftp://ftp.fu-berlin.de/unix/security/mod_ssl/ \ ftp://ftp.ntrl.net/pub/mirror/ralfsw/mod_ssl/ -DISTNAME= apache_${VERSION_APACHE} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}:modssl MAINTAINER= ports@FreeBSD.org +LIB_DEPENDS= mm.11:${PORTSDIR}/devel/mm + USE_OPENSSL= YES +INSTALLS_SHLIB= YES .include <bsd.port.pre.mk> -LIB_DEPENDS= mm.11:${PORTSDIR}/devel/mm - VERSION_APACHE= 1.3.26 VERSION_MODSSL= 2.8.10 +DATADIR=${PREFIX}/www +DOCUMENT_ROOT=${DATADIR}/data +DEFAULT_PATH=/bin:/usr/bin:${PREFIX}/bin + +.if defined(WITH_APACHE_SUEXEC) && ${WITH_APACHE_SUEXEC} == yes + +APACHE_SUEXEC_DOCROOT?=${DOCUMENT_ROOT} +APACHE_SUEXEC_USERDIR?=public_html + +SUEXEC_CONF= \ + --enable-suexec \ + --suexec-docroot=${APACHE_SUEXEC_DOCROOT} \ + --suexec-caller=www \ + --suexec-uidmin=1000 \ + --suexec-gidmin=1000 \ + --suexec-logfile=/var/log/httpd-suexec.log \ + --suexec-userdir=${APACHE_SUEXEC_USERDIR} \ + --suexec-safepath=${DEFAULT_PATH} + +.if defined(APACHE_SUEXEC_UMASK) +SUEXEC_CONF+= \ + --suexec-umask=${APACHE_SUEXEC_UMASK} +.endif + +PLIST_SUB+= SUB_SUEXEC="" +SUEXEC_MAN= suexec.8 + +.else # !SUEXEC + +SUEXEC_CONF= +PLIST_SUB+= SUB_SUEXEC="@comment " +SUEXEC_MAN= + +.endif # !SUEXEC + USE_PERL5= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS+=--prefix=${PREFIX} \ +CONFIGURE_ARGS+= \ + --prefix=${PREFIX} \ --server-uid=www \ --server-gid=www \ --with-perl=${PERL} \ --with-layout=FreeBSD \ - --suexec-docroot=${PREFIX}/www/data \ --without-confadjust \ --enable-module=most \ --enable-module=auth_db \ @@ -66,7 +104,8 @@ --disable-module=auth_dbm \ --enable-shared=max \ --enable-module=ssl \ - --enable-module=define + --enable-module=define \ + ${SUEXEC_CONF} OPTIM= -DHARD_SERVER_LIMIT=512 \ -DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \ @@ -139,5 +178,4 @@ ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ ${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \ fi - .include <bsd.port.post.mk> // -- http://www.BRAD-X.com/ -- //
State Changed From-To: open->closed Committed, Thanks!