Hello community, here is the log from the commit of package apache2 for openSUSE:Factory checked in at 2015-07-23 15:21:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2 (Old) and /work/SRC/openSUSE:Factory/.apache2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2" Changes: -------- --- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2015-07-20 11:21:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apache2.new/apache2.changes 2015-07-23 15:21:30.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Jul 20 13:35:21 UTC 2015 - [email protected] + +- update to 2.4.16 + * changes http://www.apache.org/dist/httpd/CHANGES_2.4.16 + * remove the following patches (fixed in 2.4.16) + * httpd-2.4.x-mod_lua_websocket_DoS.patch + * httpd-2.4.12-CVE-2015-0253.patch + * update httpd-2.4.12-lua-5.2.patch + +------------------------------------------------------------------- Old: ---- httpd-2.4.12-CVE-2015-0253.patch httpd-2.4.12.tar.bz2 httpd-2.4.x-mod_lua_websocket_DoS.patch New: ---- httpd-2.4.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.TVBZVi/_old 2015-07-23 15:21:31.000000000 +0200 +++ /var/tmp/diff_new_pack.TVBZVi/_new 2015-07-23 15:21:31.000000000 +0200 @@ -50,7 +50,7 @@ %define mods_static unixd %endif Name: apache2 -Version: 2.4.12 +Version: 2.4.16 Release: 0 Summary: The Apache Web Server Version 2.4 License: Apache-2.0 @@ -120,9 +120,6 @@ # PATCH-FEATURE-UPSTREAM httpd-2.4.3-mod_systemd.patch [email protected] simple module provides systemd integration. Patch109: httpd-2.4.3-mod_systemd.patch Patch111: httpd-visibility.patch -# PATCH-FIX-UPSTREAM bnc#918352 [email protected] -- fix mod_lua - maliciously crafted websockets PING after a script calls r:wsupgrade() can cause a child process crash -Patch112: httpd-2.4.x-mod_lua_websocket_DoS.patch -Patch113: httpd-2.4.12-CVE-2015-0253.patch # PATCH-FIX-UPSTREAM [email protected] -- compability for lua 5.2+ Patch114: httpd-2.4.12-lua-5.2.patch BuildRequires: automake @@ -306,8 +303,6 @@ %patch109 -p1 %endif %patch111 -p1 -%patch112 -p1 -%patch113 -p3 %patch114 -p1 cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE # install READMEs ++++++ httpd-2.4.12-lua-5.2.patch ++++++ --- /var/tmp/diff_new_pack.TVBZVi/_old 2015-07-23 15:21:32.000000000 +0200 +++ /var/tmp/diff_new_pack.TVBZVi/_new 2015-07-23 15:21:32.000000000 +0200 @@ -1,29 +1,23 @@ -Index: httpd-2.4.12/modules/lua/mod_lua.c +Index: httpd-2.4.16/modules/lua/mod_lua.c =================================================================== ---- httpd-2.4.12.orig/modules/lua/mod_lua.c -+++ httpd-2.4.12/modules/lua/mod_lua.c -@@ -1072,9 +1072,17 @@ static const char *register_named_block_ - else { - luaL_Buffer b; - luaL_buffinit(lvm, &b); -+#if LUA_VERSION_NUM < 503 +--- httpd-2.4.16.orig/modules/lua/mod_lua.c ++++ httpd-2.4.16/modules/lua/mod_lua.c +@@ -1078,7 +1078,11 @@ static const char *register_named_block_ lua_dump(lvm, ldump_writer, &b); -+#else -+ lua_dump(lvm, ldump_writer, &b, 0); -+#endif + #endif luaL_pushresult(&b); +#if LUA_VERSION_NUM < 502 spec->bytecode_len = lua_strlen(lvm, -1); +#else -+ spec->bytecode_len = lua_rawlen(lvm, -1); ++ spec->bytecode_len = lua_rawlen(lvm, -1); +#endif spec->bytecode = apr_pstrmemdup(cmd->pool, lua_tostring(lvm, -1), spec->bytecode_len); lua_close(lvm); -Index: httpd-2.4.12/modules/lua/lua_apr.c +Index: httpd-2.4.16/modules/lua/lua_apr.c =================================================================== ---- httpd-2.4.12.orig/modules/lua/lua_apr.c -+++ httpd-2.4.12/modules/lua/lua_apr.c +--- httpd-2.4.16.orig/modules/lua/lua_apr.c ++++ httpd-2.4.16/modules/lua/lua_apr.c @@ -82,7 +82,11 @@ static const luaL_Reg lua_table_methods[ int ap_lua_init(lua_State *L, apr_pool_t *p) { @@ -36,10 +30,10 @@ lua_pushstring(L, "__index"); lua_pushstring(L, "get"); lua_gettable(L, 2); -Index: httpd-2.4.12/modules/lua/lua_config.c +Index: httpd-2.4.16/modules/lua/lua_config.c =================================================================== ---- httpd-2.4.12.orig/modules/lua/lua_config.c -+++ httpd-2.4.12/modules/lua/lua_config.c +--- httpd-2.4.16.orig/modules/lua/lua_config.c ++++ httpd-2.4.16/modules/lua/lua_config.c @@ -263,13 +263,20 @@ void ap_lua_load_config_lmodule(lua_Stat lua_pushvalue(L, -1); @@ -62,10 +56,10 @@ +#endif } -Index: httpd-2.4.12/modules/lua/lua_request.c +Index: httpd-2.4.16/modules/lua/lua_request.c =================================================================== ---- httpd-2.4.12.orig/modules/lua/lua_request.c -+++ httpd-2.4.12/modules/lua/lua_request.c +--- httpd-2.4.16.orig/modules/lua/lua_request.c ++++ httpd-2.4.16/modules/lua/lua_request.c @@ -149,7 +149,11 @@ static int req_aprtable2luatable_cb(void } case LUA_TTABLE:{ @@ -126,7 +120,7 @@ lua_pop(L, 1); /* secure */ -@@ -2878,7 +2886,11 @@ void ap_lua_load_request_lmodule(lua_Sta +@@ -2889,7 +2897,11 @@ void ap_lua_load_request_lmodule(lua_Sta lua_pushvalue(L, -1); lua_setfield(L, -2, "__index"); @@ -138,7 +132,7 @@ lua_pop(L, 2); -@@ -2886,7 +2898,11 @@ void ap_lua_load_request_lmodule(lua_Sta +@@ -2897,7 +2909,11 @@ void ap_lua_load_request_lmodule(lua_Sta lua_pushvalue(L, -1); lua_setfield(L, -2, "__index"); @@ -150,7 +144,7 @@ lua_pop(L, 2); -@@ -2894,7 +2910,11 @@ void ap_lua_load_request_lmodule(lua_Sta +@@ -2905,7 +2921,11 @@ void ap_lua_load_request_lmodule(lua_Sta lua_pushvalue(L, -1); lua_setfield(L, -2, "__index"); ++++++ httpd-2.4.12.tar.bz2 -> httpd-2.4.16.tar.bz2 ++++++ ++++ 51408 lines of diff (skipped)
