From c4862e0538baf7ad481b792a710f8be06725409b Mon Sep 17 00:00:00 2001 From: Carl George Date: Wed, 18 Apr 2018 09:39:22 -0500 Subject: [PATCH] Fix pid file location on EL6 resolves #19 --- SOURCES/httpd-2.4.3-layout-legacy.patch | 33 ------------------------ SOURCES/httpd-2.4.3-layout.patch | 33 ------------------------ SOURCES/httpd-2.4.33-layout-legacy.patch | 12 +++++++++ SPECS/httpd24u.spec | 12 ++++----- 4 files changed, 18 insertions(+), 72 deletions(-) delete mode 100644 SOURCES/httpd-2.4.3-layout-legacy.patch delete mode 100644 SOURCES/httpd-2.4.3-layout.patch create mode 100644 SOURCES/httpd-2.4.33-layout-legacy.patch diff --git a/SOURCES/httpd-2.4.3-layout-legacy.patch b/SOURCES/httpd-2.4.3-layout-legacy.patch deleted file mode 100644 index 184bb6c..0000000 --- a/SOURCES/httpd-2.4.3-layout-legacy.patch +++ /dev/null @@ -1,33 +0,0 @@ - -Add layout for Fedora. - ---- httpd-2.4.3/config.layout.layout -+++ httpd-2.4.3/config.layout -@@ -370,3 +370,27 @@ - logfiledir: ${localstatedir}/log/httpd - proxycachedir: ${localstatedir}/cache/httpd - -+ -+# Fedora/RHEL layout -+ -+ prefix: /usr -+ exec_prefix: ${prefix} -+ bindir: ${prefix}/bin -+ sbindir: ${prefix}/sbin -+ libdir: ${prefix}/lib -+ libexecdir: ${prefix}/libexec -+ mandir: ${prefix}/man -+ sysconfdir: /etc/httpd/conf -+ datadir: ${prefix}/share/httpd -+ installbuilddir: ${libdir}/httpd/build -+ errordir: ${datadir}/error -+ iconsdir: ${datadir}/icons -+ htdocsdir: /var/www/html -+ manualdir: ${datadir}/manual -+ cgidir: /var/www/cgi-bin -+ includedir: ${prefix}/include/httpd -+ localstatedir: /var -+ runtimedir: ${localstatedir}/run/httpd -+ logfiledir: ${localstatedir}/log/httpd -+ proxycachedir: ${localstatedir}/cache/httpd/proxy -+ diff --git a/SOURCES/httpd-2.4.3-layout.patch b/SOURCES/httpd-2.4.3-layout.patch deleted file mode 100644 index 163c66b..0000000 --- a/SOURCES/httpd-2.4.3-layout.patch +++ /dev/null @@ -1,33 +0,0 @@ - -Add layout for Fedora. - ---- httpd-2.4.3/config.layout.layout -+++ httpd-2.4.3/config.layout -@@ -370,3 +370,27 @@ - logfiledir: ${localstatedir}/log/httpd - proxycachedir: ${localstatedir}/cache/httpd - -+ -+# Fedora/RHEL layout -+ -+ prefix: /usr -+ exec_prefix: ${prefix} -+ bindir: ${prefix}/bin -+ sbindir: ${prefix}/sbin -+ libdir: ${prefix}/lib -+ libexecdir: ${prefix}/libexec -+ mandir: ${prefix}/man -+ sysconfdir: /etc/httpd/conf -+ datadir: ${prefix}/share/httpd -+ installbuilddir: ${libdir}/httpd/build -+ errordir: ${datadir}/error -+ iconsdir: ${datadir}/icons -+ htdocsdir: /var/www/html -+ manualdir: ${datadir}/manual -+ cgidir: /var/www/cgi-bin -+ includedir: ${prefix}/include/httpd -+ localstatedir: /var -+ runtimedir: /run/httpd -+ logfiledir: ${localstatedir}/log/httpd -+ proxycachedir: ${localstatedir}/cache/httpd/proxy -+ diff --git a/SOURCES/httpd-2.4.33-layout-legacy.patch b/SOURCES/httpd-2.4.33-layout-legacy.patch new file mode 100644 index 0000000..98e3225 --- /dev/null +++ b/SOURCES/httpd-2.4.33-layout-legacy.patch @@ -0,0 +1,12 @@ +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/SPECS/httpd24u.spec b/SPECS/httpd24u.spec index 2f757dd..e8d73a4 100644 --- a/SPECS/httpd24u.spec +++ b/SPECS/httpd24u.spec @@ -23,7 +23,7 @@ Summary: Apache HTTP Server Name: httpd24u Version: 2.4.33 -Release: 2.ius%{?dist} +Release: 3.ius%{?dist} URL: https://httpd.apache.org/ Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source2: httpd.logrotate @@ -67,8 +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 -Patch7: httpd-2.4.3-layout.patch -Patch8: httpd-2.4.3-layout-legacy.patch +Patch8: httpd-2.4.33-layout-legacy.patch # Needed for socket activation and mod_systemd patch Patch19: httpd-2.4.25-detect-systemd.patch # Features/functional changes @@ -275,9 +274,7 @@ interface for storing and accessing per-user session data. %patch3 -p1 -b .deplibs %{?with_systemd:%patch6 -p1 -b .apctlsystemd} -%if 0%{?rhel} >= 7 -%patch7 -p1 -b .layout -%else +%if 0%{?rhel} && 0%{?rhel} < 7 %patch8 -p1 -b .layout %endif @@ -810,6 +807,9 @@ exit $rv %changelog +* Wed Apr 18 2018 Carl George - 2.4.33-3.ius +- Fix pid file location on EL6 + * Tue Apr 17 2018 Carl George - 2.4.33-2.ius - Restore systemd conditional to ship correct files