Hello community,
here is the log from the commit of package apache2 for openSUSE:Factory checked in at 2017-06-21 13:52:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2 (Old)
and /work/SRC/openSUSE:Factory/.apache2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2"
Wed Jun 21 13:52:48 2017 rev:134 rq:505095 version:2.4.26
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2017-06-05 18:48:52.793584240 +0200
+++ /work/SRC/openSUSE:Factory/.apache2.new/apache2.changes 2017-06-21 13:52:49.768289620 +0200
@@ -1,0 +2,19 @@
+Tue Jun 20 13:57:18 UTC 2017 - pgajdos@suse.com
+
+- remove /usr/bin/http2 symlink only during apache2 package
+ uninstall, not upgrade [bsc#1041830]
+
+-------------------------------------------------------------------
+Mon Jun 19 08:15:40 UTC 2017 - pgajdos@suse.com
+
+- updated to 2.4.26: This release of Apache is a security, feature,
+ and bug fix release. For details, see
+ http://httpd.apache.org/dev/dist/CHANGES_2.4.26
+- refreshed patches:
+ . httpd-2.4.12-lua-5.2.patch
+ . httpd-2.4.x-fate317766-config-control-two-protocol-options.diff
+- removed patches (upstreamed)
+ . httpd-cache-forward-http-proxy.patch
+ . httpd-cache-revert-svn1773397.patch
+
+-------------------------------------------------------------------
Old:
----
httpd-2.4.25.tar.bz2
httpd-2.4.25.tar.bz2.asc
httpd-cache-forward-http-proxy.patch
httpd-cache-revert-svn1773397.patch
New:
----
httpd-2.4.26.tar.bz2
httpd-2.4.26.tar.bz2.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2.spec ++++++
--- /var/tmp/diff_new_pack.VaZnn8/_old 2017-06-21 13:52:52.183948867 +0200
+++ /var/tmp/diff_new_pack.VaZnn8/_new 2017-06-21 13:52:52.191947738 +0200
@@ -53,7 +53,7 @@
%define mods_static unixd
%endif
Name: apache2
-Version: 2.4.25
+Version: 2.4.26
Release: 0
Summary: The Apache Web Server Version 2.4
License: Apache-2.0
@@ -129,10 +129,6 @@
Patch114: httpd-2.4.12-lua-5.2.patch
# PATCH-FEATURE-UPSTREAM kstreitova@suse.com -- backport of HttpContentLengthHeadZero and HttpExpectStrict
Patch115: httpd-2.4.x-fate317766-config-control-two-protocol-options.diff
-# https://bz.apache.org/bugzilla/show_bug.cgi?id=60577 comment 5
-Patch116: httpd-cache-forward-http-proxy.patch
-# http://svn.apache.org/viewvc?view=revision&revision=1781324
-Patch117: httpd-cache-revert-svn1773397.patch
BuildRequires: apache-rpm-macros-control
BuildRequires: automake
BuildRequires: db-devel
@@ -322,8 +318,6 @@
%patch111 -p1
%patch114 -p1
%patch115 -p1
-%patch116 -p0
-%patch117 -p1
cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE
# install READMEs
a=$(basename %{SOURCE22})
@@ -1380,11 +1374,14 @@
%if 0%{?suse_version} >= 1210
%service_del_preun apache2.target
%endif
-for i in %{_sbindir}/httpd \
+# removing the symlink in case of uninstall (not upgrade) [bsc#1041830]
+if [ $1 -eq 0 ]; then
+ for i in %{_sbindir}/httpd \
%{installbuilddir}/config_vars.mk
-do
+ do
test -L $i && rm $i
-done
+ done
+fi
exit 0
%postun
++++++ httpd-2.4.12-lua-5.2.patch ++++++
--- /var/tmp/diff_new_pack.VaZnn8/_old 2017-06-21 13:52:52.987835470 +0200
+++ /var/tmp/diff_new_pack.VaZnn8/_new 2017-06-21 13:52:52.987835470 +0200
@@ -1,8 +1,8 @@
-Index: httpd-2.4.16/modules/lua/mod_lua.c
+Index: httpd-2.4.26/modules/lua/mod_lua.c
===================================================================
---- 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_
+--- httpd-2.4.26.orig/modules/lua/mod_lua.c 2017-03-01 17:54:35.000000000 +0100
++++ httpd-2.4.26/modules/lua/mod_lua.c 2017-06-19 10:04:42.413328131 +0200
+@@ -1086,7 +1086,11 @@ static const char *register_named_block_
lua_dump(lvm, ldump_writer, &b);
#endif
luaL_pushresult(&b);
@@ -14,10 +14,10 @@
spec->bytecode = apr_pstrmemdup(cmd->pool, lua_tostring(lvm, -1),
spec->bytecode_len);
lua_close(lvm);
-Index: httpd-2.4.16/modules/lua/lua_apr.c
+Index: httpd-2.4.26/modules/lua/lua_apr.c
===================================================================
---- httpd-2.4.16.orig/modules/lua/lua_apr.c
-+++ httpd-2.4.16/modules/lua/lua_apr.c
+--- httpd-2.4.26.orig/modules/lua/lua_apr.c 2014-09-05 16:20:27.000000000 +0200
++++ httpd-2.4.26/modules/lua/lua_apr.c 2017-06-19 10:04:42.413328131 +0200
@@ -82,7 +82,11 @@ static const luaL_Reg lua_table_methods[
int ap_lua_init(lua_State *L, apr_pool_t *p)
{
@@ -30,11 +30,11 @@
lua_pushstring(L, "__index");
lua_pushstring(L, "get");
lua_gettable(L, 2);
-Index: httpd-2.4.16/modules/lua/lua_config.c
+Index: httpd-2.4.26/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
+--- httpd-2.4.26.orig/modules/lua/lua_config.c 2017-03-01 17:54:35.000000000 +0100
++++ httpd-2.4.26/modules/lua/lua_config.c 2017-06-19 10:04:42.413328131 +0200
+@@ -265,13 +265,20 @@ void ap_lua_load_config_lmodule(lua_Stat
lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index");
@@ -56,35 +56,35 @@
+#endif
}
-Index: httpd-2.4.16/modules/lua/lua_request.c
+Index: httpd-2.4.26/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
+--- httpd-2.4.26.orig/modules/lua/lua_request.c 2017-03-01 17:54:35.000000000 +0100
++++ httpd-2.4.26/modules/lua/lua_request.c 2017-06-19 10:09:16.137841283 +0200
+@@ -150,7 +150,11 @@ static int req_aprtable2luatable_cb(void
}
case LUA_TTABLE:{
/* [array, table, table] */
+#if LUA_VERSION_NUM < 502
- int size = lua_objlen(L, -1);
++ int size = lua_objlen(L, -1);
+#else
-+ int size = lua_rawlen(L, -1);
+ int size = lua_rawlen(L, -1);
+#endif
lua_pushnumber(L, size + 1); /* [#, array, table, table] */
lua_pushstring(L, value); /* [string, #, array, table, table] */
lua_settable(L, -3); /* [array, table, table] */
-@@ -198,7 +202,11 @@ static int req_aprtable2luatable_cb_len(
- }
+@@ -200,7 +204,11 @@ static int req_aprtable2luatable_cb_len(
+
case LUA_TTABLE:{
/* [array, table, table] */
+#if LUA_VERSION_NUM < 502
- int size = lua_objlen(L, -1);
++ int size = lua_objlen(L, -1);
+#else
-+ int size = lua_rawlen(L, -1);
+ int size = lua_rawlen(L, -1);
+#endif
lua_pushnumber(L, size + 1); /* [#, array, table, table] */
lua_pushlstring(L, value, len); /* [string, #, array, table, table] */
lua_settable(L, -3); /* [array, table, table] */
-@@ -346,7 +354,7 @@ static int req_parsebody(lua_State *L)
+@@ -345,7 +353,7 @@ static int req_parsebody(lua_State *L)
char *multipart;
const char *contentType;
request_rec *r = ap_lua_check_request_rec(L, 1);
@@ -93,7 +93,7 @@
multipart = apr_pcalloc(r->pool, 256);
contentType = apr_table_get(r->headers_in, "Content-Type");
lua_newtable(L);
-@@ -419,7 +427,7 @@ static int lua_ap_requestbody(lua_State
+@@ -418,7 +426,7 @@ static int lua_ap_requestbody(lua_State
r = ap_lua_check_request_rec(L, 1);
filename = luaL_optstring(L, 2, 0);
@@ -102,7 +102,7 @@
if (r) {
apr_off_t size;
-@@ -1709,7 +1717,7 @@ static int lua_ap_make_etag(lua_State *L
+@@ -1708,7 +1716,7 @@ static int lua_ap_make_etag(lua_State *L
luaL_checktype(L, 1, LUA_TUSERDATA);
r = ap_lua_check_request_rec(L, 1);
luaL_checktype(L, 2, LUA_TBOOLEAN);
@@ -120,7 +120,7 @@
lua_pop(L, 1);
/* secure */
-@@ -2889,7 +2897,11 @@ void ap_lua_load_request_lmodule(lua_Sta
+@@ -2959,7 +2967,11 @@ void ap_lua_load_request_lmodule(lua_Sta
lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index");
@@ -132,7 +132,7 @@
lua_pop(L, 2);
-@@ -2897,7 +2909,11 @@ void ap_lua_load_request_lmodule(lua_Sta
+@@ -2967,7 +2979,11 @@ void ap_lua_load_request_lmodule(lua_Sta
lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index");
@@ -144,7 +144,7 @@
lua_pop(L, 2);
-@@ -2905,7 +2921,11 @@ void ap_lua_load_request_lmodule(lua_Sta
+@@ -2975,7 +2991,11 @@ void ap_lua_load_request_lmodule(lua_Sta
lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index");
++++++ httpd-2.4.25.tar.bz2 -> httpd-2.4.26.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/apache2/httpd-2.4.25.tar.bz2 /work/SRC/openSUSE:Factory/.apache2.new/httpd-2.4.26.tar.bz2 differ: char 11, line 1
++++++ httpd-2.4.x-fate317766-config-control-two-protocol-options.diff ++++++
--- /var/tmp/diff_new_pack.VaZnn8/_old 2017-06-21 13:52:53.075823059 +0200
+++ /var/tmp/diff_new_pack.VaZnn8/_new 2017-06-21 13:52:53.075823059 +0200
@@ -42,19 +42,11 @@
server/protocol.c | 25 +++++++++++++++++--------
6 files changed, 77 insertions(+), 10 deletions(-)
-Index: httpd-2.4.25/modules/http/http_filters.c
+Index: httpd-2.4.26/modules/http/http_filters.c
===================================================================
---- httpd-2.4.25.orig/modules/http/http_filters.c 2016-12-15 13:18:59.000000000 +0100
-+++ httpd-2.4.25/modules/http/http_filters.c 2017-01-02 10:54:37.608517377 +0100
-@@ -1260,6 +1260,7 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_
- const char *ctype;
- ap_bucket_error *eb = NULL;
- apr_bucket *eos = NULL;
-+ core_server_config *conf;
-
- AP_DEBUG_ASSERT(!r->main);
-
-@@ -1441,10 +1442,17 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_
+--- httpd-2.4.26.orig/modules/http/http_filters.c 2017-01-09 22:17:08.000000000 +0100
++++ httpd-2.4.26/modules/http/http_filters.c 2017-06-19 13:02:30.698399025 +0200
+@@ -1472,10 +1472,17 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_
* zero C-L to the client. We can't just remove the C-L filter,
* because well behaved 2.0 handlers will send their data down the stack,
* and we will compute a real C-L for the head request. RBB
@@ -64,7 +56,7 @@
+ *
+ * The default (unset) behavior is to squelch the C-L in this case.
*/
-+ conf = ap_get_core_module_config(r->server->module_config);
++ core_server_config *conf = ap_get_core_module_config(r->server->module_config);
if (r->header_only
&& (clheader = apr_table_get(r->headers_out, "Content-Length"))
- && !strcmp(clheader, "0")) {
@@ -73,10 +65,10 @@
apr_table_unset(r->headers_out, "Content-Length");
}
-Index: httpd-2.4.25/server/core.c
+Index: httpd-2.4.26/server/core.c
===================================================================
---- httpd-2.4.25.orig/server/core.c 2016-12-05 15:34:29.000000000 +0100
-+++ httpd-2.4.25/server/core.c 2017-01-02 10:54:37.608517377 +0100
+--- httpd-2.4.26.orig/server/core.c 2016-12-05 15:34:29.000000000 +0100
++++ httpd-2.4.26/server/core.c 2017-06-19 12:54:26.353988343 +0200
@@ -528,6 +528,12 @@ static void *merge_core_server_configs(a
if (virt->http_methods != AP_HTTP_METHODS_UNSET)
conf->http_methods = virt->http_methods;
@@ -134,10 +126,10 @@
AP_INIT_ITERATE("Protocols", set_protocols, NULL, RSRC_CONF,
"Controls which protocols are allowed"),
AP_INIT_TAKE1("ProtocolsHonorOrder", set_protocols_honor_order, NULL, RSRC_CONF,
-Index: httpd-2.4.25/server/protocol.c
+Index: httpd-2.4.26/server/protocol.c
===================================================================
---- httpd-2.4.25.orig/server/protocol.c 2016-12-12 16:22:49.000000000 +0100
-+++ httpd-2.4.25/server/protocol.c 2017-01-02 10:54:37.608517377 +0100
+--- httpd-2.4.26.orig/server/protocol.c 2017-05-30 14:27:41.000000000 +0200
++++ httpd-2.4.26/server/protocol.c 2017-06-19 12:54:26.353988343 +0200
@@ -1416,14 +1416,23 @@ request_rec *ap_read_request(conn_rec *c
r->expecting_100 = 1;
}
@@ -170,10 +162,10 @@
}
}
-Index: httpd-2.4.25/include/http_core.h
+Index: httpd-2.4.26/include/http_core.h
===================================================================
---- httpd-2.4.25.orig/include/http_core.h 2016-12-05 15:34:29.000000000 +0100
-+++ httpd-2.4.25/include/http_core.h 2017-01-02 10:55:18.613603512 +0100
+--- httpd-2.4.26.orig/include/http_core.h 2016-12-05 15:34:29.000000000 +0100
++++ httpd-2.4.26/include/http_core.h 2017-06-19 12:54:26.353988343 +0200
@@ -723,6 +723,16 @@ typedef struct {
#define AP_MERGE_TRAILERS_DISABLE 2
int merge_trailers;