From 230a8ed7fac863243fa002a0423f95569c35e05abe5f1f918aad17738800086e Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 11 Apr 2016 06:22:40 +0000 Subject: [PATCH] Accepting request 387252 from home:elvigia:branches:Apache - Update to version 2.4.20 (2.4.19 was never released) * Drop httpd-2.4.18-missing-semicolon.patch now upstream - Big changelog available, see: http://www.apache.org/dist/httpd/CHANGES_2.4.20 for details. OBS-URL: https://build.opensuse.org/request/show/387252 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=473 --- apache2.changes | 8 +++++++ apache2.spec | 5 +--- httpd-2.4.17-debug-crash.patch | 34 ++++++++-------------------- httpd-2.4.18-missing-semicolon.patch | 13 ----------- httpd-2.4.18.tar.bz2 | 3 --- httpd-2.4.20.tar.bz2 | 3 +++ httpd-2.4.9-bnc690734.patch | 12 +++++----- 7 files changed, 28 insertions(+), 50 deletions(-) delete mode 100644 httpd-2.4.18-missing-semicolon.patch delete mode 100644 httpd-2.4.18.tar.bz2 create mode 100644 httpd-2.4.20.tar.bz2 diff --git a/apache2.changes b/apache2.changes index 98c5e62..832326f 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 11 04:43:21 UTC 2016 - crrodriguez@opensuse.org + +- Update to version 2.4.20 (2.4.19 was never released) +* Drop httpd-2.4.18-missing-semicolon.patch now upstream +- Big changelog available, see: + http://www.apache.org/dist/httpd/CHANGES_2.4.20 for details. + ------------------------------------------------------------------- Mon Apr 4 11:19:14 UTC 2016 - pgajdos@suse.com diff --git a/apache2.spec b/apache2.spec index 93541d4..38dd0ec 100644 --- a/apache2.spec +++ b/apache2.spec @@ -51,7 +51,7 @@ %endif Name: apache2 -Version: 2.4.18 +Version: 2.4.20 Release: 0 Summary: The Apache Web Server Version 2.4 License: Apache-2.0 @@ -126,8 +126,6 @@ Patch111: httpd-visibility.patch Patch114: httpd-2.4.12-lua-5.2.patch # http://svn.apache.org/viewvc?view=revision&revision=1711479 Patch115: httpd-2.4.17-debug-crash.patch -# reported to ylavic.dev gmail.com -Patch116: httpd-2.4.18-missing-semicolon.patch BuildRequires: automake BuildRequires: apache-rpm-macros-control BuildRequires: db-devel @@ -316,7 +314,6 @@ to administrators of web servers in general. %patch111 -p1 %patch114 -p1 %patch115 -p1 -%patch116 cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE # install READMEs a=$(basename %{SOURCE22}) diff --git a/httpd-2.4.17-debug-crash.patch b/httpd-2.4.17-debug-crash.patch index a44cfc6..7072557 100644 --- a/httpd-2.4.17-debug-crash.patch +++ b/httpd-2.4.17-debug-crash.patch @@ -1,9 +1,9 @@ http://permalink.gmane.org/gmane.comp.apache.cvs/44631 -diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c -index cd70b7d..94813af 100644 ---- a/server/mpm/event/event.c -+++ b/server/mpm/event/event.c -@@ -3042,8 +3042,7 @@ static int event_open_logs(apr_pool_t * p, apr_pool_t * plog, +Index: httpd-2.4.20/server/mpm/event/event.c +=================================================================== +--- httpd-2.4.20.orig/server/mpm/event/event.c ++++ httpd-2.4.20/server/mpm/event/event.c +@@ -3094,8 +3094,7 @@ static int event_open_logs(apr_pool_t * all_buckets = apr_pcalloc(pconf, num_buckets * sizeof(*all_buckets)); for (i = 0; i < num_buckets; i++) { @@ -13,25 +13,11 @@ index cd70b7d..94813af 100644 ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv, (startup ? NULL : s), "could not open pipe-of-death"); -diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c -index 343e51d..f4c3dbe 100644 ---- a/server/mpm/prefork/prefork.c -+++ b/server/mpm/prefork/prefork.c -@@ -1326,8 +1326,7 @@ static int prefork_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, - all_buckets = apr_pcalloc(pconf, num_buckets * - sizeof(prefork_child_bucket)); - for (i = 0; i < num_buckets; i++) { -- if (!one_process && /* no POD in one_process mode */ -- (rv = ap_mpm_pod_open(pconf, &all_buckets[i].pod))) { -+ if (rv = ap_mpm_pod_open(pconf, &all_buckets[i].pod)) { - ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv, - (startup ? NULL : s), - "could not open pipe-of-death"); -diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c -index 4a729c0..8a59219 100644 ---- a/server/mpm/worker/worker.c -+++ b/server/mpm/worker/worker.c -@@ -2051,8 +2051,7 @@ static int worker_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, +Index: httpd-2.4.20/server/mpm/worker/worker.c +=================================================================== +--- httpd-2.4.20.orig/server/mpm/worker/worker.c ++++ httpd-2.4.20/server/mpm/worker/worker.c +@@ -2051,8 +2051,7 @@ static int worker_open_logs(apr_pool_t * all_buckets = apr_pcalloc(pconf, num_buckets * sizeof(*all_buckets)); for (i = 0; i < num_buckets; i++) { diff --git a/httpd-2.4.18-missing-semicolon.patch b/httpd-2.4.18-missing-semicolon.patch deleted file mode 100644 index 7bc6678..0000000 --- a/httpd-2.4.18-missing-semicolon.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: modules/ssl/ssl_engine_io.c -=================================================================== ---- modules/ssl/ssl_engine_io.c.orig 2015-11-19 20:55:25.000000000 +0100 -+++ modules/ssl/ssl_engine_io.c 2015-12-14 17:36:04.787124154 +0100 -@@ -217,7 +217,7 @@ - * so limit the performance impact to handshake time. - */ - #if OPENSSL_VERSION_NUMBER < 0x0009080df -- need_flush = !SSL_is_init_finished(outctx->filter_ctx->pssl) -+ need_flush = !SSL_is_init_finished(outctx->filter_ctx->pssl); - #else - need_flush = SSL_in_connect_init(outctx->filter_ctx->pssl); - #endif diff --git a/httpd-2.4.18.tar.bz2 b/httpd-2.4.18.tar.bz2 deleted file mode 100644 index f7eaf34..0000000 --- a/httpd-2.4.18.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0644b050de41f5c9f67c825285049b144690421acb709b06fe53eddfa8a9fd4c -size 5181291 diff --git a/httpd-2.4.20.tar.bz2 b/httpd-2.4.20.tar.bz2 new file mode 100644 index 0000000..9699f6b --- /dev/null +++ b/httpd-2.4.20.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e76a375ed3dbac636f50ac39de966ece443751fe4d62392f9a360a19d94d0da +size 6331344 diff --git a/httpd-2.4.9-bnc690734.patch b/httpd-2.4.9-bnc690734.patch index b1381cf..ebeb61d 100644 --- a/httpd-2.4.9-bnc690734.patch +++ b/httpd-2.4.9-bnc690734.patch @@ -1,8 +1,8 @@ Index: server/util_script.c =================================================================== ---- server/util_script.c.orig 2015-06-25 09:15:54.539638460 +0200 -+++ server/util_script.c 2015-06-25 09:20:48.554424220 +0200 -@@ -422,11 +422,20 @@ +--- server/util_script.c.orig ++++ server/util_script.c +@@ -448,11 +448,20 @@ AP_DECLARE(int) ap_scan_script_header_er apr_table_t *cookie_table; int trace_log = APLOG_R_MODULE_IS_LEVEL(r, module_index, APLOG_TRACE1); int first_header = 1; @@ -24,7 +24,7 @@ Index: server/util_script.c /* temporary place to hold headers to merge in later */ merge = apr_table_make(r->pool, 10); -@@ -442,7 +451,7 @@ +@@ -468,7 +477,7 @@ AP_DECLARE(int) ap_scan_script_header_er while (1) { @@ -33,7 +33,7 @@ Index: server/util_script.c if (rv == 0) { const char *msg = "Premature end of script headers"; if (first_header) -@@ -555,10 +564,13 @@ +@@ -583,10 +592,13 @@ AP_DECLARE(int) ap_scan_script_header_er if (!(l = strchr(w, ':'))) { if (!buffer) { /* Soak up all the script output - may save an outright kill */ @@ -47,5 +47,5 @@ Index: server/util_script.c + buffer[MAX_STRING_LEN - 1] = 0; + } + /* Intentional no APLOGNO */ ap_log_rerror(SCRIPT_LOG_MARK, APLOG_ERR|APLOG_TOCLIENT, 0, r, - "malformed header from script '%s': Bad header: %.30s",