From 30fa2731ba2e42517c243c00018379281456200c Mon Sep 17 00:00:00 2001 From: Carl George Date: Tue, 16 Oct 2018 15:57:16 -0500 Subject: [PATCH] Latest upstream 2.4.35 --- SOURCES/httpd-2.4.33-layout-legacy.patch | 12 ------------ SOURCES/httpd-2.4.35-layout-legacy.patch | 12 ++++++++++++ SPECS/httpd24u.spec | 7 +++++-- 3 files changed, 17 insertions(+), 14 deletions(-) delete mode 100644 SOURCES/httpd-2.4.33-layout-legacy.patch create mode 100644 SOURCES/httpd-2.4.35-layout-legacy.patch diff --git a/SOURCES/httpd-2.4.33-layout-legacy.patch b/SOURCES/httpd-2.4.33-layout-legacy.patch deleted file mode 100644 index 98e3225..0000000 --- a/SOURCES/httpd-2.4.33-layout-legacy.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nurp httpd-2.4.33.orig/config.layout httpd-2.4.33/config.layout ---- httpd-2.4.33.orig/config.layout 2018-02-09 04:30:35.000000000 -0600 -+++ httpd-2.4.33/config.layout 2018-04-18 09:22:51.903851417 -0500 -@@ -149,7 +149,7 @@ - cgidir: /var/www/cgi-bin - includedir: ${prefix}/include/httpd - localstatedir: /var -- runtimedir: /run/httpd -+ runtimedir: ${localstatedir}/run/httpd - logfiledir: ${localstatedir}/log/httpd - proxycachedir: ${localstatedir}/cache/httpd/proxy - diff --git a/SOURCES/httpd-2.4.35-layout-legacy.patch b/SOURCES/httpd-2.4.35-layout-legacy.patch new file mode 100644 index 0000000..637bf26 --- /dev/null +++ b/SOURCES/httpd-2.4.35-layout-legacy.patch @@ -0,0 +1,12 @@ +diff -Nurp httpd-2.4.35.orig/config.layout httpd-2.4.35/config.layout +--- httpd-2.4.35.orig/config.layout 2018-10-16 15:17:32.404691594 -0500 ++++ httpd-2.4.35/config.layout 2018-10-16 15:22:26.928631251 -0500 +@@ -149,7 +149,7 @@ + manualdir: ${datadir}/manual + cgidir: ${localstatedir}/www/cgi-bin + includedir: ${prefix}/include/httpd +- runtimedir: /run/httpd ++ runtimedir: ${localstatedir}/run/httpd + logfiledir: ${localstatedir}/log/httpd + proxycachedir: ${localstatedir}/cache/httpd/proxy + diff --git a/SPECS/httpd24u.spec b/SPECS/httpd24u.spec index dfdc4b8..d11de1f 100644 --- a/SPECS/httpd24u.spec +++ b/SPECS/httpd24u.spec @@ -22,7 +22,7 @@ Summary: Apache HTTP Server Name: httpd24u -Version: 2.4.34 +Version: 2.4.35 Release: 1.ius%{?dist} URL: https://httpd.apache.org/ Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 @@ -67,7 +67,7 @@ Patch1: httpd-2.4.1-apctl.patch Patch2: httpd-2.4.9-apxs.patch Patch3: httpd-2.4.1-deplibs.patch Patch6: httpd-2.4.3-apctl-systemd.patch -Patch8: httpd-2.4.33-layout-legacy.patch +Patch8: httpd-2.4.35-layout-legacy.patch # Needed for socket activation and mod_systemd patch Patch19: httpd-2.4.25-detect-systemd.patch # Features/functional changes @@ -807,6 +807,9 @@ exit $rv %changelog +* Tue Oct 16 2018 Carl George - 2.4.35-1.ius +- Latest upstream + * Tue Aug 07 2018 Carl George - 2.4.34-1.ius - Latest upstream - mod_systemd: show bound ports in status and log to journal at startup (Fedora)