rpm/apache2
SHA256
1
0
Fork 0
forked from pool/apache2
Code Pull Requests Activity

Accepting request 387291 from Apache

Browse Source 
- 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. (forwarded request 387252 from elvigia)

OBS-URL: https://build.opensuse.org/request/show/387291
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=120
This commit is contained in:
Dominique Leuenberger 2016-04-12 16:58:07 +00:00 committed by Git OBS Bridge
commit 6edbd83e21
7 changed files with 37 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apache2.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
- enable authnz_fcgi module
-------------------------------------------------------------------
Mon Dec 14 16:44:55 UTC 2015 - pgajdos@suse.com

9
apache2.spec
View File

@ -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})
@ -380,6 +377,7 @@ function configure {
--with-ldap \
--enable-ldap \
--enable-authnz_ldap \
--enable-authnz-fcgi \
--enable-proxy \
--enable-proxy-connect \
--enable-proxy-ftp \
@ -854,6 +852,7 @@ mv %{buildroot}/%{sysconfdir}/original .
%{_libdir}/%{name}-prefork/mod_authn_file.so
%{_libdir}/%{name}-prefork/mod_authn_socache.so
%{_libdir}/%{name}-prefork/mod_authnz_ldap.so
%{_libdir}/%{name}-prefork/mod_authnz_fcgi.so
%{_libdir}/%{name}-prefork/mod_authz_core.so
%{_libdir}/%{name}-prefork/mod_authz_dbd.so
%{_libdir}/%{name}-prefork/mod_authz_dbm.so
@ -977,6 +976,7 @@ mv %{buildroot}/%{sysconfdir}/original .
%{_libdir}/%{name}-worker/mod_authn_file.so
%{_libdir}/%{name}-worker/mod_authn_socache.so
%{_libdir}/%{name}-worker/mod_authnz_ldap.so
%{_libdir}/%{name}-worker/mod_authnz_fcgi.so
%{_libdir}/%{name}-worker/mod_authz_core.so
%{_libdir}/%{name}-worker/mod_authz_dbd.so
%{_libdir}/%{name}-worker/mod_authz_dbm.so
@ -1100,6 +1100,7 @@ mv %{buildroot}/%{sysconfdir}/original .
%{_libdir}/%{name}-event/mod_authn_file.so
%{_libdir}/%{name}-event/mod_authn_socache.so
%{_libdir}/%{name}-event/mod_authnz_ldap.so
%{_libdir}/%{name}-event/mod_authnz_fcgi.so
%{_libdir}/%{name}-event/mod_authz_core.so
%{_libdir}/%{name}-event/mod_authz_dbd.so
%{_libdir}/%{name}-event/mod_authz_dbm.so

34
httpd-2.4.17-debug-crash.patch
View File

@ -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++) {

13
httpd-2.4.18-missing-semicolon.patch
View File

@ -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

3
httpd-2.4.18.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0644b050de41f5c9f67c825285049b144690421acb709b06fe53eddfa8a9fd4c
size 5181291

3
httpd-2.4.20.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0e76a375ed3dbac636f50ac39de966ece443751fe4d62392f9a360a19d94d0da
size 6331344

12
httpd-2.4.9-bnc690734.patch
View File

@ -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",