apache2/httpd-2.0.54-envvars.dif

--- httpd-2.4.6.orig/support/envvars-std.in
+++ httpd-2.4.6/support/envvars-std.in
@@ -18,11 +18,9 @@
 #
 # This file is generated from envvars-std.in
 #
-if test "x$@SHLIBPATH_VAR@" != "x" ; then
-  @SHLIBPATH_VAR@="@exp_libdir@:$@SHLIBPATH_VAR@"
-else
-  @SHLIBPATH_VAR@="@exp_libdir@"
-fi
+
+@SHLIBPATH_VAR@="@exp_libdir@${@SHLIBPATH_VAR@+:$@SHLIBPATH_VAR@}"
+
 export @SHLIBPATH_VAR@
 #
 @OS_SPECIFIC_VARS@
Accepting request 184014 from home:elvigia:branches:Apache - Update to version 2.4.6 * SECURITY: CVE-2013-1896 (cve.mitre.org) * SECURITY: CVE-2013-2249 (cve.mitre.org) * Major updates to mod_lua * Support for proxying websocket requests * Higher performant shm-based cache implementation * Addition of mod_macro for easier configuration management * As well as several exciting fixes, especially those related to RFC edge cases in mod_cache and mod_proxy. - IMPORTANT : With the current packaging scheme, we can no longer Include the ITK MPM, therefore it has been disabled. This is because this MPM can now only be provided as a loadable module but we do not currently build MPMs as shared modules but as independant binaries and all helpers/startup scripts depend on that behaviour. It will be fixed in the upcoming weeks/months. OBS-URL: https://build.opensuse.org/request/show/184014 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=382 2013-07-22 19:04:27 +02:00			`--- httpd-2.4.6.orig/support/envvars-std.in`
			`+++ httpd-2.4.6/support/envvars-std.in`
Accepting request 129508 from home:elvigia:branches:Apache - Upgrade to apache 2.4.2 ** ATTENTION, before installing this update YOU MUST READ http://httpd.apache.org/docs/2.4/upgrading.html CAREFULLY otherwise your server will most likely fail to start due to backward incompatible changes. * You can read the huge complete list of changes at http://httpd.apache.org/docs/2.4/new_features_2_4.html OBS-URL: https://build.opensuse.org/request/show/129508 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=370 2012-08-01 03:54:19 +02:00			`@@ -18,11 +18,9 @@`
			`#`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=1 2006-12-20 18:01:15 +01:00			`# This file is generated from envvars-std.in`
			`#`
Accepting request 129508 from home:elvigia:branches:Apache - Upgrade to apache 2.4.2 ** ATTENTION, before installing this update YOU MUST READ http://httpd.apache.org/docs/2.4/upgrading.html CAREFULLY otherwise your server will most likely fail to start due to backward incompatible changes. * You can read the huge complete list of changes at http://httpd.apache.org/docs/2.4/new_features_2_4.html OBS-URL: https://build.opensuse.org/request/show/129508 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=370 2012-08-01 03:54:19 +02:00			`-if test "x$@SHLIBPATH_VAR@" != "x" ; then`
			`- @SHLIBPATH_VAR@="@exp_libdir@:$@SHLIBPATH_VAR@"`
			`-else`
			`- @SHLIBPATH_VAR@="@exp_libdir@"`
			`-fi`
			`+`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=1 2006-12-20 18:01:15 +01:00			`+@SHLIBPATH_VAR@="@exp_libdir@${@SHLIBPATH_VAR@+:$@SHLIBPATH_VAR@}"`
Accepting request 129508 from home:elvigia:branches:Apache - Upgrade to apache 2.4.2 ** ATTENTION, before installing this update YOU MUST READ http://httpd.apache.org/docs/2.4/upgrading.html CAREFULLY otherwise your server will most likely fail to start due to backward incompatible changes. * You can read the huge complete list of changes at http://httpd.apache.org/docs/2.4/new_features_2_4.html OBS-URL: https://build.opensuse.org/request/show/129508 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=370 2012-08-01 03:54:19 +02:00			`+`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=1 2006-12-20 18:01:15 +01:00			`export @SHLIBPATH_VAR@`
			`#`
			`@OS_SPECIFIC_VARS@`