- option WITH_APACHE_IPV6

PR:             42427
Submitted by:   sec@42.org

- fix Usage

www/apache13-modssl/Makefile

@@ -14,14 +14,18 @@ DISTNAME=	apache_${VERSION_APACHE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}:modssl
 
-.if defined(APACHE_WITH_MODSNMP)
+.if defined(APACHE_WITH_MODSNMP) || make(makesum) || defined(FETCH_ALL)
 PATCH_SITES=	http://www.simpleweb.org/software/packages/mod-snmp/distr/
 PATCHFILES=	mod_snmp_${VERSION_MODSNMP}.tar.gz
 EXTRA_PATCH=	${WRKSRC}/src/module/snmp_agt/mod_snmp.patch
 .endif
+.if defined(APACHE_WITH_IPV6) || make(makesum) || defined(FETCH_ALL)
+PATCH_SITES+=	ftp://ftp.42.org/pub/orphan/
+PATCHFILES+=	apache-1.3.29modssl-v6-20031204.diff.gz
+.endif
 
 MAINTAINER=	dinoex@FreeBSD.org
-COMMENT=	The Apache 1.3 webserver with SSL/TLS functionality
+COMMENT?=	The Apache 1.3 webserver with SSL/TLS functionality
 
 LIB_DEPENDS=	mm.13:${PORTSDIR}/devel/mm
 PATCH_DEPENDS=	${BUILD_DEPENDS}
@@ -134,6 +138,13 @@ PLIST_SUB+=	WITHSNMP=""
 PLIST_SUB+=	WITHSNMP="@comment "
 .endif
 
+.if defined(APACHE_WITH_IPV6)
+CONFIGURE_ARGS+=	--enable-rule=INET6
+PLIST_SUB+=	WITHIPV6=""
+.else
+PLIST_SUB+=	WITHIPV6="@comment "
+.endif
+
 CONFIGURE_ENV=	CFLAGS='${CFLAGS}' \
 		OPTIM='${OPTIM}' \
 		SSL_BASE='${OPENSSLBASE}' \
@@ -188,6 +199,10 @@ pre-fetch:
 	@${ECHO_MSG} "				is not recommended for production servers."
 	@${ECHO_MSG} "				[default is no]"
 	@${ECHO_MSG} ""
+	@${ECHO_MSG} "  APACHE_WITH_IPV6=yes		IPv6 support."
+	@${ECHO_MSG} "				This setting turns IPv6 support on."
+	@${ECHO_MSG} "				[default is no]"
+	@${ECHO_MSG} ""
 
 post-extract:
 	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/apache.sh \

www/apache13-modssl/distinfo

@@ -1,3 +1,4 @@
 MD5 (apache_1.3.29.tar.gz) = e97fe9bf51dc2c9c233d53f63b1347e3
 MD5 (mod_ssl-2.8.16-1.3.29.tar.gz) = 4f6c580ffa07d33e8584406132b98e86
 MD5 (mod_snmp_1.3.14.12.tar.gz) = b0bddbb4e5ff4c6a46d114998f12740a
+MD5 (apache-1.3.29modssl-v6-20031204.diff.gz) = d84056da5795f7d0ba80df9e8105a94c

www/apache13-modssl/files/apache.sh

@@ -8,7 +8,8 @@ stop)
 	[ -r /var/run/httpd.pid ] && %%PREFIX%%/sbin/apachectl stop > /dev/null && echo -n ' apache'
 	;;
 *)
-	echo "Usage: `basename $0` {start|stop}" >&2
+	echo "Usage: ${0##*/} { start | stop }" >&2
+	exit 64
 	;;
 esac
 

www/apache13-modssl/pkg-plist

@@ -72,7 +72,9 @@ include/apache/multithread.h
 include/apache/os-inline.c
 include/apache/os.h
 include/apache/rfc1413.h
+%%WITHIPV6%%include/apache/sa_len.h
 include/apache/scoreboard.h
+%%WITHIPV6%%include/apache/sockaddr_storage.h
 include/apache/util_date.h
 include/apache/util_md5.h
 include/apache/util_script.h