update to 2.4.16

This commit is contained in:
Jan Kaluza 2015-07-15 15:29:48 +02:00
parent db205dad27
commit 1cdbc457b3
4 changed files with 7 additions and 21 deletions

1
.gitignore vendored
View File

@ -19,3 +19,4 @@ x86_64
/httpd-2.4.9.tar.bz2 /httpd-2.4.9.tar.bz2
/httpd-2.4.10.tar.bz2 /httpd-2.4.10.tar.bz2
/httpd-2.4.12.tar.bz2 /httpd-2.4.12.tar.bz2
/httpd-2.4.16.tar.bz2

View File

@ -1,16 +0,0 @@
Index: modules/lua/mod_lua.c
===================================================================
--- modules/lua/mod_lua.c (revision 1668826)
+++ modules/lua/mod_lua.c (working copy)
@@ -1072,7 +1072,11 @@
else {
luaL_Buffer b;
luaL_buffinit(lvm, &b);
+#if LUA_VERSION_NUM >= 503
+ lua_dump(lvm, ldump_writer, &b, 0);
+#else
lua_dump(lvm, ldump_writer, &b);
+#endif
luaL_pushresult(&b);
spec->bytecode_len = lua_strlen(lvm, -1);
spec->bytecode = apr_pstrmemdup(cmd->pool, lua_tostring(lvm, -1),

View File

@ -7,8 +7,8 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.12 Version: 2.4.16
Release: 3%{?dist} Release: 1%{?dist}
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@ -49,7 +49,6 @@ Patch2: httpd-2.4.9-apxs.patch
Patch3: httpd-2.4.1-deplibs.patch Patch3: httpd-2.4.1-deplibs.patch
Patch5: httpd-2.4.3-layout.patch Patch5: httpd-2.4.3-layout.patch
Patch6: httpd-2.4.3-apctl-systemd.patch Patch6: httpd-2.4.3-apctl-systemd.patch
Patch7: httpd-2.4.10-lua53.patch
# Needed for socket activation and mod_systemd patch # Needed for socket activation and mod_systemd patch
Patch19: httpd-2.4.10-detect-systemd.patch Patch19: httpd-2.4.10-detect-systemd.patch
# Features/functional changes # Features/functional changes
@ -194,7 +193,6 @@ interface for storing and accessing per-user session data.
%patch3 -p1 -b .deplibs %patch3 -p1 -b .deplibs
%patch5 -p1 -b .layout %patch5 -p1 -b .layout
%patch6 -p1 -b .apctlsystemd %patch6 -p1 -b .apctlsystemd
%patch7 -p0 -b .lua53
%patch19 -p1 -b .detectsystemd %patch19 -p1 -b .detectsystemd
@ -667,6 +665,9 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %changelog
* Wed Jul 15 2015 Jan Kaluza <jkaluza@redhat.com> - 2.4.12-4
- update to 2.4.16
* Tue Jul 7 2015 Joe Orton <jorton@redhat.com> - 2.4.12-3 * Tue Jul 7 2015 Joe Orton <jorton@redhat.com> - 2.4.12-3
- mod_ssl: use "localhost" in the dummy SSL cert if len(FQDN) > 59 chars - mod_ssl: use "localhost" in the dummy SSL cert if len(FQDN) > 59 chars

View File

@ -1 +1 @@
b8dc8367a57a8d548a9b4ce16d264a13 httpd-2.4.12.tar.bz2 2b19cd338fd526dd5a63c57b1e9bfee2 httpd-2.4.16.tar.bz2