- Sync with www/apache2:

  - mod_ssl fix
  - make envvars modular
- Try to make pointyhat happy [1]

Obtained from:  devel/apr [1]

12 files changed, 116 insertions, 14 deletions

diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index ddf2284..fff6374 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -193,7 +193,7 @@ post-patch:
 	@${RM} -f ${WRKSRC}/docs/conf/highperformance-std.conf
 	@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
 			${WRKSRC}/server/core.c
-	@${REINPLACE_CMD} -e 's,freebsd\[2345\],freebsd\[23456\],' \
+	@${REINPLACE_CMD} -e "s,%%OSVERSION%%,${OSVERSION}," \
 			${WRKSRC}/srclib/apr/build/apr_hints.m4
 	@${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual
 
diff --git a/www/apache21/files/patch-Makefile.in b/www/apache21/files/patch-Makefile.in
index b9b6ecb..382e3f0 100644
--- a/www/apache21/files/patch-Makefile.in
+++ b/www/apache21/files/patch-Makefile.in
@@ -1,5 +1,5 @@
 --- Makefile.in.orig	Thu Dec  2 08:34:20 2004
-+++ Makefile.in	Mon Dec 13 19:35:54 2004
++++ Makefile.in	Sat Dec 18 11:51:59 2004
 @@ -31,15 +31,22 @@
  	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
  	    $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \
@@ -33,7 +33,7 @@
  	    				if test $$j != "^EOL^"; then \
  	    					echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
  	    				fi; \
-@@ -70,14 +80,15 @@
+@@ -70,23 +80,18 @@
  	    				-e 's#@@Port@@#$(PORT)#g' \
  	    				< $$i; \
  	    		fi \
@@ -52,8 +52,18 @@
 +	    		$(INSTALL_DATA) $(DESTDIR)$(EXAMPLESDIR)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
  	    	fi; \
  	    done ; \
- 	done ; \
-@@ -108,44 +119,40 @@
+-	done ; \
+-	if test -f "$(builddir)/envvars-std"; then \
+-	    cp -p envvars-std $(DESTDIR)$(sbindir); \
+-	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+-	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+-	    fi ; \
+-	fi
++	done ;
+ 
+ install-build:
+ 	@echo Installing build system files 
+@@ -108,44 +113,40 @@
  	doxygen $(top_srcdir)/docs/doxygen.conf
  
  install-htdocs:
@@ -126,7 +136,7 @@
  
  install-other:
  	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
-@@ -189,11 +196,13 @@
+@@ -189,11 +190,13 @@
  	@test -d $(DESTDIR)$(mandir)      || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
  	@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
  	@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
diff --git a/www/apache21/files/patch-modules:ssl:ssl_engine_io.c b/www/apache21/files/patch-modules:ssl:ssl_engine_io.c
new file mode 100644
index 0000000..48681d5
--- /dev/null
+++ b/www/apache21/files/patch-modules:ssl:ssl_engine_io.c
@@ -0,0 +1,11 @@
+--- modules/ssl/ssl_engine_io.c.orig	Tue Dec  7 23:49:54 2004
++++ modules/ssl/ssl_engine_io.c	Sat Dec 18 11:56:00 2004
+@@ -155,7 +155,7 @@
+                                  outctx->bb);
+     /* create new brigade ready for next time through */
+     outctx->bb = apr_brigade_create(outctx->c->pool, outctx->c->bucket_alloc);
+-    return (outctx->rc == APR_SUCCESS) ? 1 : -1;
++    return (outctx->rc == APR_SUCCESS && !outctx->c->aborted) ? 1 : -1;
+ }
+ 
+ static int bio_filter_create(BIO *bio)
diff --git a/www/apache21/files/patch-srclib:apr:build:apr_hints.m4 b/www/apache21/files/patch-srclib:apr:build:apr_hints.m4
new file mode 100644
index 0000000..6a1445d
--- /dev/null
+++ b/www/apache21/files/patch-srclib:apr:build:apr_hints.m4
@@ -0,0 +1,16 @@
+--- srclib/apr/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
++++ srclib/apr/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
+@@ -137,11 +137,7 @@
+ 	;;
+     *-freebsd*)
+         APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])
+-        if test -x /sbin/sysctl; then
+-            os_version=`/sbin/sysctl -n kern.osreldate`
+-        else
+-            os_version=000000
+-        fi
++        os_version="%%OSVERSION%%"
+         # 502102 is when libc_r switched to libpthread (aka libkse).
+         if test $os_version -ge "502102"; then
+           apr_cv_pthreads_cflags="none"
+
diff --git a/www/apache21/files/patch-support:envvars-std.in b/www/apache21/files/patch-support:envvars-std.in
new file mode 100644
index 0000000..26a094f
--- /dev/null
+++ b/www/apache21/files/patch-support:envvars-std.in
@@ -0,0 +1,13 @@
+--- support/envvars-std.in.orig	Fri Dec 17 14:39:21 2004
++++ support/envvars-std.in	Fri Dec 17 14:41:06 2004
+@@ -21,3 +21,10 @@
+ export @SHLIBPATH_VAR@
+ #
+ @OS_SPECIFIC_VARS@
++
++ENVVARS_DIR=%%PREFIX%%/etc/apache2/envvars.d
++
++for envvars_file in $(ls ${ENVVARS_DIR}/*.env 2>/dev/null)
++do
++	. ${envvars_file}
++done
diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index 204d135..ffafdef 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -208,7 +208,6 @@ sbin/apxs
 sbin/checkgid
 sbin/dbmmanage
 sbin/envvars
-sbin/envvars-std
 sbin/htcacheclean
 sbin/htdbm
 sbin/htdigest
@@ -505,6 +504,8 @@ share/apache21/build/special.mk
 @unexec rmdir %D/libexec/apache21 2> /dev/null || true
 @dirrm include/apache21
 @exec mkdir -p %D/etc/apache21/Includes 2> /dev/null || true
+@exec mkdir -p %D/etc/apache2/envvars.d 2> /dev/null || true
 @unexec rmdir %D/etc/apache21/Includes 2> /dev/null || true
+@unexec rmdir %D/etc/apache2/envvars.d 2> /dev/null || true
 @unexec rm -f %D/etc/apache21/httpd.conf.bak 2> /dev/null || true
 @unexec rmdir %D/etc/apache21 2> /dev/null || echo "===> If you plan to do not reinstall apache21, you can safely remove %D/etc/apache21."
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index ddf2284..fff6374 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -193,7 +193,7 @@ post-patch:
 	@${RM} -f ${WRKSRC}/docs/conf/highperformance-std.conf
 	@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
 			${WRKSRC}/server/core.c
-	@${REINPLACE_CMD} -e 's,freebsd\[2345\],freebsd\[23456\],' \
+	@${REINPLACE_CMD} -e "s,%%OSVERSION%%,${OSVERSION}," \
 			${WRKSRC}/srclib/apr/build/apr_hints.m4
 	@${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual
 
diff --git a/www/apache22/files/patch-Makefile.in b/www/apache22/files/patch-Makefile.in
index b9b6ecb..382e3f0 100644
--- a/www/apache22/files/patch-Makefile.in
+++ b/www/apache22/files/patch-Makefile.in
@@ -1,5 +1,5 @@
 --- Makefile.in.orig	Thu Dec  2 08:34:20 2004
-+++ Makefile.in	Mon Dec 13 19:35:54 2004
++++ Makefile.in	Sat Dec 18 11:51:59 2004
 @@ -31,15 +31,22 @@
  	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
  	    $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \
@@ -33,7 +33,7 @@
  	    				if test $$j != "^EOL^"; then \
  	    					echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
  	    				fi; \
-@@ -70,14 +80,15 @@
+@@ -70,23 +80,18 @@
  	    				-e 's#@@Port@@#$(PORT)#g' \
  	    				< $$i; \
  	    		fi \
@@ -52,8 +52,18 @@
 +	    		$(INSTALL_DATA) $(DESTDIR)$(EXAMPLESDIR)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
  	    	fi; \
  	    done ; \
- 	done ; \
-@@ -108,44 +119,40 @@
+-	done ; \
+-	if test -f "$(builddir)/envvars-std"; then \
+-	    cp -p envvars-std $(DESTDIR)$(sbindir); \
+-	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+-	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+-	    fi ; \
+-	fi
++	done ;
+ 
+ install-build:
+ 	@echo Installing build system files 
+@@ -108,44 +113,40 @@
  	doxygen $(top_srcdir)/docs/doxygen.conf
  
  install-htdocs:
@@ -126,7 +136,7 @@
  
  install-other:
  	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
-@@ -189,11 +196,13 @@
+@@ -189,11 +190,13 @@
  	@test -d $(DESTDIR)$(mandir)      || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
  	@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
  	@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
diff --git a/www/apache22/files/patch-modules:ssl:ssl_engine_io.c b/www/apache22/files/patch-modules:ssl:ssl_engine_io.c
new file mode 100644
index 0000000..48681d5
--- /dev/null
+++ b/www/apache22/files/patch-modules:ssl:ssl_engine_io.c
@@ -0,0 +1,11 @@
+--- modules/ssl/ssl_engine_io.c.orig	Tue Dec  7 23:49:54 2004
++++ modules/ssl/ssl_engine_io.c	Sat Dec 18 11:56:00 2004
+@@ -155,7 +155,7 @@
+                                  outctx->bb);
+     /* create new brigade ready for next time through */
+     outctx->bb = apr_brigade_create(outctx->c->pool, outctx->c->bucket_alloc);
+-    return (outctx->rc == APR_SUCCESS) ? 1 : -1;
++    return (outctx->rc == APR_SUCCESS && !outctx->c->aborted) ? 1 : -1;
+ }
+ 
+ static int bio_filter_create(BIO *bio)
diff --git a/www/apache22/files/patch-srclib:apr:build:apr_hints.m4 b/www/apache22/files/patch-srclib:apr:build:apr_hints.m4
new file mode 100644
index 0000000..6a1445d
--- /dev/null
+++ b/www/apache22/files/patch-srclib:apr:build:apr_hints.m4
@@ -0,0 +1,16 @@
+--- srclib/apr/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
++++ srclib/apr/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
+@@ -137,11 +137,7 @@
+ 	;;
+     *-freebsd*)
+         APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])
+-        if test -x /sbin/sysctl; then
+-            os_version=`/sbin/sysctl -n kern.osreldate`
+-        else
+-            os_version=000000
+-        fi
++        os_version="%%OSVERSION%%"
+         # 502102 is when libc_r switched to libpthread (aka libkse).
+         if test $os_version -ge "502102"; then
+           apr_cv_pthreads_cflags="none"
+
diff --git a/www/apache22/files/patch-support:envvars-std.in b/www/apache22/files/patch-support:envvars-std.in
new file mode 100644
index 0000000..26a094f
--- /dev/null
+++ b/www/apache22/files/patch-support:envvars-std.in
@@ -0,0 +1,13 @@
+--- support/envvars-std.in.orig	Fri Dec 17 14:39:21 2004
++++ support/envvars-std.in	Fri Dec 17 14:41:06 2004
+@@ -21,3 +21,10 @@
+ export @SHLIBPATH_VAR@
+ #
+ @OS_SPECIFIC_VARS@
++
++ENVVARS_DIR=%%PREFIX%%/etc/apache2/envvars.d
++
++for envvars_file in $(ls ${ENVVARS_DIR}/*.env 2>/dev/null)
++do
++	. ${envvars_file}
++done
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index 204d135..ffafdef 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -208,7 +208,6 @@ sbin/apxs
 sbin/checkgid
 sbin/dbmmanage
 sbin/envvars
-sbin/envvars-std
 sbin/htcacheclean
 sbin/htdbm
 sbin/htdigest
@@ -505,6 +504,8 @@ share/apache21/build/special.mk
 @unexec rmdir %D/libexec/apache21 2> /dev/null || true
 @dirrm include/apache21
 @exec mkdir -p %D/etc/apache21/Includes 2> /dev/null || true
+@exec mkdir -p %D/etc/apache2/envvars.d 2> /dev/null || true
 @unexec rmdir %D/etc/apache21/Includes 2> /dev/null || true
+@unexec rmdir %D/etc/apache2/envvars.d 2> /dev/null || true
 @unexec rm -f %D/etc/apache21/httpd.conf.bak 2> /dev/null || true
 @unexec rmdir %D/etc/apache21 2> /dev/null || echo "===> If you plan to do not reinstall apache21, you can safely remove %D/etc/apache21."