From f355b093825fa5809dcab0c46b7ed5400262e3deaf969dbcf9ad35f1808818be Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 14 Dec 2015 16:45:30 +0000 Subject: [PATCH] - fix build for SLE_11_SP4: + httpd-2.4.18-missing-semicolon.patch OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=471 --- apache2.changes | 6 ++++++ apache2.spec | 4 ++++ httpd-2.4.18-missing-semicolon.patch | 13 +++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 httpd-2.4.18-missing-semicolon.patch diff --git a/apache2.changes b/apache2.changes index c5de21f..2d622ae 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 14 16:44:55 UTC 2015 - pgajdos@suse.com + +- fix build for SLE_11_SP4: + + httpd-2.4.18-missing-semicolon.patch + ------------------------------------------------------------------- Sat Dec 12 15:57:21 UTC 2015 - crrodriguez@opensuse.org diff --git a/apache2.spec b/apache2.spec index 5c4fdd2..50d5169 100644 --- a/apache2.spec +++ b/apache2.spec @@ -124,7 +124,10 @@ Patch109: httpd-2.4.3-mod_systemd.patch Patch111: httpd-visibility.patch # PATCH-FIX-UPSTREAM marguerite@opensuse.org -- compability for lua 5.2+ https://bz.apache.org/bugzilla/show_bug.cgi?id=58188 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 @@ -313,6 +316,7 @@ 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.18-missing-semicolon.patch b/httpd-2.4.18-missing-semicolon.patch new file mode 100644 index 0000000..7bc6678 --- /dev/null +++ b/httpd-2.4.18-missing-semicolon.patch @@ -0,0 +1,13 @@ +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