aboutsummaryrefslogtreecommitdiff
path: root/www/apache22
diff options
context:
space:
mode:
authorWesley Shields <wxs@FreeBSD.org>2012-08-02 03:17:26 +0000
committerWesley Shields <wxs@FreeBSD.org>2012-08-02 03:17:26 +0000
commit15b1814bf525e039a19dad55a61c4061d4907dfe (patch)
treec832a1c4b1d3ec872421dba798af2553d768ae1f /www/apache22
parent7db352ae2c2bd0e5788e55271d8202ff1cda8d2b (diff)
downloadports-15b1814bf525e039a19dad55a61c4061d4907dfe.tar.gz
ports-15b1814bf525e039a19dad55a61c4061d4907dfe.zip
Document Apache 2.2.x insecure handling of LD_LIBRARY_PATH.
Add patch[1] to address problem to apache port. [1]: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/envvars-std.in?view=log&pathrev=1296428 Approved by: apache@ (pgollucci@) Obtained from: Apache SVN
Notes
Notes: svn path=/head/; revision=301849
Diffstat (limited to 'www/apache22')
-rw-r--r--www/apache22/Makefile2
-rw-r--r--www/apache22/files/patch-support__envvars-std.in15
2 files changed, 13 insertions, 4 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 666aef50172a..8e4b6e7c8e4b 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -9,7 +9,7 @@
PORTNAME= apache
PORTVERSION= 2.2.22
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
DISTNAME= httpd-${PORTVERSION}
diff --git a/www/apache22/files/patch-support__envvars-std.in b/www/apache22/files/patch-support__envvars-std.in
index 2e6811e0ef9a..657bba5991b8 100644
--- a/www/apache22/files/patch-support__envvars-std.in
+++ b/www/apache22/files/patch-support__envvars-std.in
@@ -1,6 +1,15 @@
---- ./support/envvars-std.in.orig 2006-07-11 23:38:44.000000000 -0400
-+++ ./support/envvars-std.in 2010-05-06 19:37:54.270732510 -0400
-@@ -22,3 +22,10 @@
+--- support/envvars-std.in.orig 2006-07-11 23:38:44.000000000 -0400
++++ support/envvars-std.in 2012-08-01 23:11:16.000000000 -0400
+@@ -18,7 +18,18 @@
+ #
+ # This file is generated from envvars-std.in
+ #
+-@SHLIBPATH_VAR@="@exp_libdir@:$@SHLIBPATH_VAR@"
++if test "x$@SHLIBPATH_VAR@" != "x" ; then
++ @SHLIBPATH_VAR@="@exp_libdir@:$@SHLIBPATH_VAR@"
++else
++ @SHLIBPATH_VAR@="@exp_libdir@"
++fi
export @SHLIBPATH_VAR@
#
@OS_SPECIFIC_VARS@