From 1cdbc457b36e41ba161579bb34dec3892c6b479f Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Jul 15 2015 13:29:48 +0000 Subject: update to 2.4.16 --- diff --git a/.gitignore b/.gitignore index 6499062..654f469 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ x86_64 /httpd-2.4.9.tar.bz2 /httpd-2.4.10.tar.bz2 /httpd-2.4.12.tar.bz2 +/httpd-2.4.16.tar.bz2 diff --git a/httpd-2.4.10-lua53.patch b/httpd-2.4.10-lua53.patch deleted file mode 100644 index 9578111..0000000 --- a/httpd-2.4.10-lua53.patch +++ /dev/null @@ -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), diff --git a/httpd.spec b/httpd.spec index 2295813..1d62390 100644 --- a/httpd.spec +++ b/httpd.spec @@ -7,8 +7,8 @@ Summary: Apache HTTP Server Name: httpd -Version: 2.4.12 -Release: 3%{?dist} +Version: 2.4.16 +Release: 1%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html @@ -49,7 +49,6 @@ Patch2: httpd-2.4.9-apxs.patch Patch3: httpd-2.4.1-deplibs.patch Patch5: httpd-2.4.3-layout.patch Patch6: httpd-2.4.3-apctl-systemd.patch -Patch7: httpd-2.4.10-lua53.patch # Needed for socket activation and mod_systemd patch Patch19: httpd-2.4.10-detect-systemd.patch # Features/functional changes @@ -194,7 +193,6 @@ interface for storing and accessing per-user session data. %patch3 -p1 -b .deplibs %patch5 -p1 -b .layout %patch6 -p1 -b .apctlsystemd -%patch7 -p0 -b .lua53 %patch19 -p1 -b .detectsystemd @@ -667,6 +665,9 @@ rm -rf $RPM_BUILD_ROOT %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Wed Jul 15 2015 Jan Kaluza - 2.4.12-4 +- update to 2.4.16 + * Tue Jul 7 2015 Joe Orton - 2.4.12-3 - mod_ssl: use "localhost" in the dummy SSL cert if len(FQDN) > 59 chars diff --git a/sources b/sources index 839c2b5..820ee71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8dc8367a57a8d548a9b4ce16d264a13 httpd-2.4.12.tar.bz2 +2b19cd338fd526dd5a63c57b1e9bfee2 httpd-2.4.16.tar.bz2