This repository has been archived by the owner on Sep 23, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
4 changed files
with
18 additions
and
72 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
</Layout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 <[email protected]> - 2.4.33-3.ius | ||
- Fix pid file location on EL6 | ||
|
||
* Tue Apr 17 2018 Carl George <[email protected]> - 2.4.33-2.ius | ||
- Restore systemd conditional to ship correct files | ||
|
||
|