upgrade to 1.3.26PL30.15

PR:		40187
Submitted by:	maintainer

5 files changed, 181 insertions, 13 deletions

diff --git a/russian/apache13/Makefile b/russian/apache13/Makefile
index 364750101219..293e90a7b1e5 100644
--- a/russian/apache13/Makefile
+++ b/russian/apache13/Makefile
@@ -31,7 +31,7 @@ PATCHFILES=	patches_${APACHE_VERSION}rusPL${RA_VERSION}.tar.gz
 
 MAINTAINER=	lev@serebryakov.spb.ru
 
-RA_VERSION=	30.14
+RA_VERSION=	30.15
 APACHE_VERSION=	1.3.26
 Y2K=		http://www.apache.org/docs/misc/FAQ.html#year2000
 
@@ -41,40 +41,140 @@ Y2K=		http://www.apache.org/docs/misc/FAQ.html#year2000
 GZCAT=sh -c 'tar -zxf $$0 -C ${WRKSRC};${CAT} ${WRKSRC}/RA-1.3rusPL${RA_VERSION}.patch'
 
 #
-# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
+# some defaults
 #
 
+DATADIR=${PREFIX}/www
+DOCUMENT_ROOT=${DATADIR}/data
+DEFAULT_PATH?=/bin:/usr/bin:${PREFIX}/bin
+
+#
+# suexec support
+#
+.if defined(WITH_APACHE_SUEXEC)
+
+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+=	SUEXEC=""
+SUEXEC_MAN=	suexec.8
+
+.else # WITH_APACHE_SUEXEC
+
+SUEXEC_CONF=
+PLIST_SUB+=	SUEXEC="@comment "
+SUEXEC_MAN=
+
+.endif # WITH_APACHE_SUEXEC
+
+
+#
+# Configutre parameters
+#
+
+USE_PERL5=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	\
 		 --prefix=${PREFIX} \
-		 --server-gid=nogroup \
+		 --server-uid=www \
+		 --server-gid=www \
 		 --with-perl=${PERL} \
 		 --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
-		 --suexec-docroot=${PREFIX}/www/data \
-		 --without-confadjust \
+		 --without-confadjust
+
+.if defined(WITH_DSO_MODULES)
+CONFIGURE_ARGS+= \
+		 --enable-shared=max \
+		 --disable-shared=so \
+		 --disable-shared=charset \
+		 --enable-module=most \
+		 --enable-module=auth_db \
+		 --enable-module=mmap_static \
+		 --disable-module=auth_dbm \
+		 ${SUEXEC_CONF}
+
+PLIST_SUB+=	 DSO_MOD=""
+.else
+CONFIGURE_ARGS+= \
 		 --enable-shared=remain \
 		 --enable-module=most \
 		 --enable-module=auth_db \
-		 --disable-module=auth_dbm
+		 --enable-module=mmap_static \
+		 --disable-module=auth_dbm \
+		 ${SUEXEC_CONF}
+
+PLIST_SUB+=	 DSO_MOD="@comment "
+.endif
 
-OPTIM=-DHARD_SERVER_LIMIT=512 \
--DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
--DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
+OPTIM=		 -DDOCUMENT_LOCATION=\\"${DOCUMENT_ROOT}\\" \
+		 -DDEFAULT_PATH=\\"${DEFAULT_PATH}\\" \
+		 -DACCEPT_FILTER_NAME=\\"httpready\\"
 
-.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
+.if defined(APACHE_HARD_SERVER_LIMIT)                                                                                   
+OPTIM+=		 -DHARD_SERVER_LIMIT=${APACHE_HARD_SERVER_LIMIT}
+.else
+OPTIM+=		 -DHARD_SERVER_LIMIT=512
+.endif
+
+
+.if defined(APACHE_PERF_TUNING)
 OPTIM+=		-DBUFFERED_LOGS
 CFLAGS+=	-O6 -fomit-frame-pointer
 .endif
 
-CONFIGURE_ENV=	OPTIM='${OPTIM}'
+CONFIGURE_ENV=	OPTIM='${OPTIM}' LD_SHLIB='${CC}'
 
 MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
-MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
+MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \
+		${SUEXEC_MAN}
+
+pre-fetch:
+	@${ECHO_MSG} ""
+.if defined(WITH_DSO_MODULES)
+	@${ECHO_MSG} "Build all modules (except mod_so and mod_charest) as DSO."
+.else
+	@${ECHO_MSG} "You could define WITH_DSO_MODULES to build all modules as DSO."
+.endif
+.if defined(APACHE_PERF_TUNING)
+	@${ECHO_MSG} "Build Apache for maximum performance."
+.else
+	@${ECHO_MSG} "You could define APACHE_PERF_TUNING to build Apache for maximum performace."
+.endif
+.if defined(APACHE_HARD_SERVER_LIMIT)
+	@${ECHO_MSG} "Build Apache with HARD_SERVER_LIMIT=${APACHE_HARD_SERVER_LIMIT}"
+.else
+	@${ECHO_MSG} "You could define APACHE_HARD_SERVER_LIMIT, default one is 512"
+.endif
+.if defined(WITH_APACHE_SUEXEC)
+	@${ECHO_MSG} "Build apache with suexec support"
+	@${ECHO_MSG} "   suexec docroot:  ${APACHE_SUEXEC_DOCROOT}"
+	@${ECHO_MSG} "   suexec userdir:  ${APACHE_SUEXEC_USERDIR}"
+	@${ECHO_MSG} "   suexec safepath: ${DEFAULT_PATH}"
+	@${ECHO_MSG} "   These values could be defined as APACHE_SUEXEC_DOCROOT, APACHE_SUEXEC_USERDIR and DEFAULT_PATH."
+.else
+	@${ECHO_MSG} "You could define WITH_APACHE_SUEXEC to build suexec support."
+.endif
+	@${ECHO_MSG} ""
 
 pre-install:
 	@if [ -f ${WRKSRC}/htdocs/index.html.orig ]; then \
 		${RM} ${WRKSRC}/htdocs/index.html.orig; \
 	fi
+	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
diff --git a/russian/apache13/distinfo b/russian/apache13/distinfo
index 1988ad043d38..18f93de06f81 100644
--- a/russian/apache13/distinfo
+++ b/russian/apache13/distinfo
@@ -1,2 +1,2 @@
 MD5 (apache_1.3.26.tar.gz) = 52e9b875597a208fca9d393e710087b6
-MD5 (patches_1.3.26rusPL30.14.tar.gz) = 6fbe1a4dc2b14911dc1bbe9b22e639bd
+MD5 (patches_1.3.26rusPL30.15.tar.gz) = 5ccfb76804631e4cf1c9df71eb1f96e2
diff --git a/russian/apache13/pkg-deinstall b/russian/apache13/pkg-deinstall
new file mode 100644
index 000000000000..dbb48b3c4f83
--- /dev/null
+++ b/russian/apache13/pkg-deinstall
@@ -0,0 +1,15 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/russian/apache13/Attic/pkg-deinstall,v 1.1 2002-07-08 09:27:37 ijliao Exp $
+#
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+    exit 0
+fi
+
+USER=www
+
+if pw usershow "${USER}" 2>/dev/null 1>&2; then
+	echo "To delete Apache user permanently, use 'pw userdel ${USER}'"
+fi
+
+exit 0
diff --git a/russian/apache13/pkg-install b/russian/apache13/pkg-install
new file mode 100644
index 000000000000..f79df472b417
--- /dev/null
+++ b/russian/apache13/pkg-install
@@ -0,0 +1,34 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/russian/apache13/Attic/pkg-install,v 1.1 2002-07-08 09:27:37 ijliao Exp $
+#
+
+if [ "$2" != "PRE-INSTALL" ]; then
+    exit 0
+fi
+
+USER=www
+GROUP=${USER}
+UID=80
+GID=${UID}
+
+if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
+	if pw groupadd ${GROUP} -g ${GID}; then
+		echo "Added group \"${GROUP}\"."
+	else
+		echo "Adding group \"${GROUP}\" failed..."
+		exit 1
+	fi
+fi
+
+if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
+	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+		-s "/sbin/nologin" -d "/nonexistent" \
+		-c "World Wide Web Owner"; \
+	then
+		echo "Added user \"${USER}\"."
+	else
+		echo "Adding user \"${USER}\" failed..."
+		exit 1
+	fi
+fi
+exit 0
diff --git a/russian/apache13/pkg-plist b/russian/apache13/pkg-plist
index 4a5e21e85cc4..1219aee953c5 100644
--- a/russian/apache13/pkg-plist
+++ b/russian/apache13/pkg-plist
@@ -221,17 +221,36 @@ libexec/apache/mod_expires.so
 libexec/apache/mod_headers.so
 libexec/apache/mod_info.so
 libexec/apache/mod_mime_magic.so
+libexec/apache/mod_mmap_static.so
 libexec/apache/mod_rewrite.so
 libexec/apache/mod_speling.so
 libexec/apache/mod_unique_id.so
 libexec/apache/mod_usertrack.so
 libexec/apache/mod_vhost_alias.so
+%%DSO_MOD%%libexec/apache/mod_access.so
+%%DSO_MOD%%libexec/apache/mod_actions.so
+%%DSO_MOD%%libexec/apache/mod_alias.so
+%%DSO_MOD%%libexec/apache/mod_asis.so
+%%DSO_MOD%%libexec/apache/mod_auth.so
+%%DSO_MOD%%libexec/apache/mod_autoindex.so
+%%DSO_MOD%%libexec/apache/mod_cgi.so
+%%DSO_MOD%%libexec/apache/mod_dir.so
+%%DSO_MOD%%libexec/apache/mod_env.so
+%%DSO_MOD%%libexec/apache/mod_imap.so
+%%DSO_MOD%%libexec/apache/mod_include.so
+%%DSO_MOD%%libexec/apache/mod_log_config.so
+%%DSO_MOD%%libexec/apache/mod_mime.so
+%%DSO_MOD%%libexec/apache/mod_negotiation.so
+%%DSO_MOD%%libexec/apache/mod_setenvif.so
+%%DSO_MOD%%libexec/apache/mod_status.so
+%%DSO_MOD%%libexec/apache/mod_userdir.so
 sbin/ab
 sbin/apachectl
 sbin/apxs
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
+%%SUEXEC%%sbin/suexec
 share/doc/apache/apache_pb.gif
 share/doc/apache/ra-powered.gif
 @exec mkdir -p %D/www