[httpd] update to 2.4.7 (#1034071)
jorton
jorton at fedoraproject.org
Wed Nov 27 17:19:20 UTC 2013
commit ed353d03f2edd87d74f46a73af1d671f3869686c
Author: Joe Orton <jorton at redhat.com>
Date: Wed Nov 27 17:19:09 2013 +0000
update to 2.4.7 (#1034071)
.gitignore | 1 +
httpd-2.4.6-r1332643+.patch | 313 --------------------
httpd-2.4.6-r1530793.patch | 17 -
....6-r1537535.patch => httpd-2.4.7-r1537535.patch | 14 +-
...lsninotreq.patch => httpd-2.4.7-sninotreq.patch | 46 ++--
httpd-2.4.7-sslsninotreq.patch | 2 +
httpd.spec | 17 +-
sources | 2 +-
8 files changed, 38 insertions(+), 374 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4e0c552..28521d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ x86_64
/httpd-2.4.3.tar.bz2
/httpd-2.4.4.tar.bz2
/httpd-2.4.6.tar.bz2
+/httpd-2.4.7.tar.bz2
diff --git a/httpd-2.4.6-r1537535.patch b/httpd-2.4.7-r1537535.patch
similarity index 76%
rename from httpd-2.4.6-r1537535.patch
rename to httpd-2.4.7-r1537535.patch
index dc2c6c9..8e51302 100644
--- a/httpd-2.4.6-r1537535.patch
+++ b/httpd-2.4.7-r1537535.patch
@@ -2,9 +2,9 @@
http://svn.apache.org/viewvc?view=revision&revision=1537535
---- httpd-2.4.6/modules/ssl/ssl_engine_config.c.r1537535
-+++ httpd-2.4.6/modules/ssl/ssl_engine_config.c
-@@ -198,7 +198,7 @@ static SSLSrvConfigRec *ssl_config_serve
+--- httpd-2.4.7/modules/ssl/ssl_engine_config.c.r1537535
++++ httpd-2.4.7/modules/ssl/ssl_engine_config.c
+@@ -196,7 +196,7 @@ static SSLSrvConfigRec *ssl_config_serve
SSLSrvConfigRec *sc = apr_palloc(p, sizeof(*sc));
sc->mc = NULL;
@@ -13,9 +13,9 @@ http://svn.apache.org/viewvc?view=revision&revision=1537535
sc->proxy_enabled = UNSET;
sc->vhost_id = NULL; /* set during module init */
sc->vhost_id_len = 0; /* set during module init */
---- httpd-2.4.6/modules/ssl/ssl_engine_init.c.r1537535
-+++ httpd-2.4.6/modules/ssl/ssl_engine_init.c
-@@ -289,13 +289,16 @@ int ssl_init_Module(apr_pool_t *p, apr_p
+--- httpd-2.4.7/modules/ssl/ssl_engine_init.c.r1537535
++++ httpd-2.4.7/modules/ssl/ssl_engine_init.c
+@@ -115,13 +115,16 @@ int ssl_init_Module(apr_pool_t *p, apr_p
sc->vhost_id = ssl_util_vhostid(p, s);
sc->vhost_id_len = strlen(sc->vhost_id);
@@ -29,7 +29,7 @@ http://svn.apache.org/viewvc?view=revision&revision=1537535
sc->enabled = SSL_ENABLED_TRUE;
}
-- /* If sc->enabled is UNSET, then SSL is optional on this vhost */
+- /* If sc->enabled is UNSET, then SSL is optional on this vhost */
- /* Fix up stuff that may not have been set */
+ /* Fix up stuff that may not have been set. If sc->enabled is
+ * UNSET, then SSL is disabled on this vhost. */
diff --git a/httpd-2.4.3-sslsninotreq.patch b/httpd-2.4.7-sninotreq.patch
similarity index 61%
rename from httpd-2.4.3-sslsninotreq.patch
rename to httpd-2.4.7-sninotreq.patch
index 6e158c6..bb1f3d1 100644
--- a/httpd-2.4.3-sslsninotreq.patch
+++ b/httpd-2.4.7-sninotreq.patch
@@ -1,8 +1,6 @@
-diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
-index 15993f1..53ed6f1 100644
---- a/modules/ssl/ssl_engine_config.c
-+++ b/modules/ssl/ssl_engine_config.c
-@@ -55,6 +55,7 @@ SSLModConfigRec *ssl_config_global_create(server_rec *s)
+--- httpd-2.4.7/modules/ssl/ssl_engine_config.c.sninotreq
++++ httpd-2.4.7/modules/ssl/ssl_engine_config.c
+@@ -55,6 +55,7 @@ SSLModConfigRec *ssl_config_global_creat
mc = (SSLModConfigRec *)apr_palloc(pool, sizeof(*mc));
mc->pPool = pool;
mc->bFixed = FALSE;
@@ -10,11 +8,9 @@ index 15993f1..53ed6f1 100644
/*
* initialize per-module configuration
-diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
-index bf1f0e4..a7523de 100644
---- a/modules/ssl/ssl_engine_init.c
-+++ b/modules/ssl/ssl_engine_init.c
-@@ -409,7 +409,7 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
+--- httpd-2.4.7/modules/ssl/ssl_engine_init.c.sninotreq
++++ httpd-2.4.7/modules/ssl/ssl_engine_init.c
+@@ -234,7 +234,7 @@ int ssl_init_Module(apr_pool_t *p, apr_p
/*
* Configuration consistency checks
*/
@@ -23,7 +19,7 @@ index bf1f0e4..a7523de 100644
/*
* Announce mod_ssl and SSL library in HTTP Server field
-@@ -1475,7 +1475,7 @@ void ssl_init_ConfigureServer(server_rec *s,
+@@ -1327,7 +1327,7 @@ void ssl_init_ConfigureServer(server_rec
}
}
@@ -32,27 +28,25 @@ index bf1f0e4..a7523de 100644
{
server_rec *s, *ps;
SSLSrvConfigRec *sc;
-@@ -1557,6 +1557,7 @@ void ssl_init_CheckServers(server_rec *base_server, apr_pool_t *p)
+@@ -1409,6 +1409,7 @@ void ssl_init_CheckServers(server_rec *b
}
if (conflict) {
+ mc->sni_required = TRUE;
- #ifdef OPENSSL_NO_TLSEXT
+ #ifndef HAVE_TLSEXT
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, base_server, APLOGNO(01917)
"Init: You should not use name-based "
-diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
-index bc9e26b..2460f01 100644
---- a/modules/ssl/ssl_engine_kernel.c
-+++ b/modules/ssl/ssl_engine_kernel.c
+--- httpd-2.4.7/modules/ssl/ssl_engine_kernel.c.sninotreq
++++ httpd-2.4.7/modules/ssl/ssl_engine_kernel.c
@@ -164,6 +164,7 @@ int ssl_hook_ReadReq(request_rec *r)
- return DECLINED;
}
- #ifndef OPENSSL_NO_TLSEXT
-+ if (myModConfig(r->server)->sni_required) {
+ #ifdef HAVE_TLSEXT
if ((servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name))) {
++ if (myModConfig(r->server)->sni_required) {
char *host, *scope_id;
apr_port_t port;
-@@ -206,6 +207,7 @@ int ssl_hook_ReadReq(request_rec *r)
+ apr_status_t rv;
+@@ -205,6 +206,7 @@ int ssl_hook_ReadReq(request_rec *r)
" virtual host");
return HTTP_FORBIDDEN;
}
@@ -60,11 +54,9 @@ index bc9e26b..2460f01 100644
#endif
SSL_set_app_data2(ssl, r);
-diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
-index 75fc0e3..31dbfa9 100644
---- a/modules/ssl/ssl_private.h
-+++ b/modules/ssl/ssl_private.h
-@@ -554,6 +554,7 @@ typedef struct {
+--- httpd-2.4.7/modules/ssl/ssl_private.h.sninotreq
++++ httpd-2.4.7/modules/ssl/ssl_private.h
+@@ -533,6 +533,7 @@ typedef struct {
struct {
void *pV1, *pV2, *pV3, *pV4, *pV5, *pV6, *pV7, *pV8, *pV9, *pV10;
} rCtx;
@@ -72,7 +64,7 @@ index 75fc0e3..31dbfa9 100644
} SSLModConfigRec;
/** Structure representing configured filenames for certs and keys for
-@@ -786,7 +787,7 @@ const char *ssl_cmd_SSLFIPS(cmd_parms *cmd, void *dcfg, int flag);
+@@ -778,7 +779,7 @@ const char *ssl_cmd_SSLFIPS(cmd_parms *c
int ssl_init_Module(apr_pool_t *, apr_pool_t *, apr_pool_t *, server_rec *);
void ssl_init_Engine(server_rec *, apr_pool_t *);
void ssl_init_ConfigureServer(server_rec *, apr_pool_t *, apr_pool_t *, SSLSrvConfigRec *);
diff --git a/httpd-2.4.7-sslsninotreq.patch b/httpd-2.4.7-sslsninotreq.patch
new file mode 100644
index 0000000..a5d124b
--- /dev/null
+++ b/httpd-2.4.7-sslsninotreq.patch
@@ -0,0 +1,2 @@
+diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
+index 15993f1..53ed6f1 100644
diff --git a/httpd.spec b/httpd.spec
index 83b109c..c448ddc 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -14,8 +14,8 @@
Summary: Apache HTTP Server
Name: httpd
-Version: 2.4.6
-Release: 10%{?dist}
+Version: 2.4.7
+Release: 1%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@@ -59,23 +59,21 @@ Patch24: httpd-2.4.1-corelimit.patch
Patch25: httpd-2.4.1-selinux.patch
Patch26: httpd-2.4.4-r1337344+.patch
Patch27: httpd-2.4.2-icons.patch
-Patch28: httpd-2.4.6-r1332643+.patch
Patch29: httpd-2.4.3-mod_systemd.patch
Patch30: httpd-2.4.4-cachehardmax.patch
Patch31: httpd-2.4.6-sslmultiproxy.patch
-Patch32: httpd-2.4.6-r1537535.patch
+Patch32: httpd-2.4.7-r1537535.patch
# Bug fixes
-Patch51: httpd-2.4.3-sslsninotreq.patch
+Patch51: httpd-2.4.7-sslsninotreq.patch
Patch55: httpd-2.4.4-malformed-host.patch
Patch56: httpd-2.4.4-mod_unique_id.patch
-Patch57: httpd-2.4.6-r1530793.patch
Patch58: httpd-2.4.6-r1534321.patch
License: ASL 2.0
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: autoconf, perl, pkgconfig, findutils, xmlto
BuildRequires: zlib-devel, libselinux-devel, lua-devel
-BuildRequires: apr-devel >= 1.4.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0
+BuildRequires: apr-devel >= 1.5.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0
BuildRequires: systemd-devel
Requires: /etc/mime.types, system-logos-httpd
Obsoletes: httpd-suexec
@@ -187,7 +185,6 @@ interface for storing and accessing per-user session data.
%patch25 -p1 -b .selinux
%patch26 -p1 -b .r1337344+
%patch27 -p1 -b .icons
-%patch28 -p1 -b .r1332643+
%patch29 -p1 -b .systemd
%patch30 -p1 -b .cachehardmax
%patch31 -p1 -b .sslmultiproxy
@@ -196,7 +193,6 @@ interface for storing and accessing per-user session data.
%patch51 -p1 -b .sninotreq
%patch55 -p1 -b .malformedhost
%patch56 -p1 -b .uniqueid
-%patch57 -p1 -b .r1530793
%patch58 -p1 -b .r1534321
# Patch in the vendor string
@@ -624,6 +620,9 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.httpd
%changelog
+* Wed Nov 27 2013 Joe Orton <jorton at redhat.com> - 2.4.7-1
+- update to 2.4.7 (#1034071)
+
* Fri Nov 22 2013 Joe Orton <jorton at redhat.com> - 2.4.6-10
- switch to requiring system-logos-httpd (#1031288)
diff --git a/sources b/sources
index 35e4d06..f460c94 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea5e361ca37b8d7853404419dd502efe httpd-2.4.6.tar.bz2
+170d7fb6fe5f28b87d1878020a9ab94e httpd-2.4.7.tar.bz2
More information about the scm-commits
mailing list