SHA256
1
0
forked from pool/apache2

Accepting request 127551 from Apache

- modified apache2.2-mpm-itk-20090414-00.patch to fix
  itk running as root. bnc#681176 / CVE-2011-1176 (forwarded request 127274 from msmeissn)

OBS-URL: https://build.opensuse.org/request/show/127551
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=61
This commit is contained in:
Ismail Dönmez 2012-07-12 08:37:14 +00:00 committed by Git OBS Bridge
commit 053c872a1c
3 changed files with 14 additions and 3 deletions

View File

@ -1716,7 +1716,7 @@ unchanged:
+static void *itk_merge_dir_config(apr_pool_t *p, void *parent_ptr, void *child_ptr) +static void *itk_merge_dir_config(apr_pool_t *p, void *parent_ptr, void *child_ptr)
+{ +{
+ itk_per_dir_conf *c = (itk_per_dir_conf *) + itk_per_dir_conf *c = (itk_per_dir_conf *)
+ apr_pcalloc(p, sizeof(itk_per_dir_conf)); + itk_create_dir_config(p, NULL);
+ itk_per_dir_conf *parent = (itk_per_dir_conf *) parent_ptr; + itk_per_dir_conf *parent = (itk_per_dir_conf *) parent_ptr;
+ itk_per_dir_conf *child = (itk_per_dir_conf *) child_ptr; + itk_per_dir_conf *child = (itk_per_dir_conf *) child_ptr;
+ +

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Jul 6 11:58:03 UTC 2012 - meissner@suse.com
- modified apache2.2-mpm-itk-20090414-00.patch to fix
itk running as root. bnc#681176 / CVE-2011-1176
-------------------------------------------------------------------
Fri Jul 6 09:42:00 UTC 2012 - meissner@suse.com
- remove the insecure LD_LIBRARY_PATH line. bnc#757710
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Apr 22 20:14:22 UTC 2012 - dimstar@opensuse.org Sun Apr 22 20:14:22 UTC 2012 - dimstar@opensuse.org

View File

@ -1,10 +1,10 @@
diff -uNr httpd-2.0.54.orig/support/envvars-std.in httpd-2.0.54/support/envvars-std.in diff -uNr httpd-2.0.54.orig/support/envvars-std.in httpd-2.0.54/support/envvars-std.in
--- httpd-2.0.54.orig/support/envvars-std.in 2005-02-04 21:21:18.000000000 +0100 --- httpd-2.0.54.orig/support/envvars-std.in 2005-02-04 21:21:18.000000000 +0100
+++ httpd-2.0.54/support/envvars-std.in 2005-10-07 13:56:49.223546288 +0200 +++ httpd-2.0.54/support/envvars-std.in 2005-10-07 13:56:49.223546288 +0200
@@ -19,6 +19,7 @@ @@ -19,6 +19,6 @@
# This file is generated from envvars-std.in # This file is generated from envvars-std.in
# #
@SHLIBPATH_VAR@="@exp_libdir@:$@SHLIBPATH_VAR@" -@SHLIBPATH_VAR@="@exp_libdir@:$@SHLIBPATH_VAR@"
+@SHLIBPATH_VAR@="@exp_libdir@${@SHLIBPATH_VAR@+:$@SHLIBPATH_VAR@}" +@SHLIBPATH_VAR@="@exp_libdir@${@SHLIBPATH_VAR@+:$@SHLIBPATH_VAR@}"
export @SHLIBPATH_VAR@ export @SHLIBPATH_VAR@
# #