rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

apachectl: don't read /etc/sysconfig/httpd

Browse Source
This commit is contained in:
Joe Orton 2018-09-28 08:51:19 +01:00
parent 1f748ace31
commit f201a4ebc1
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
httpd-2.4.3-apctl-systemd.patch → httpd-2.4.34-apctlsystemd.patch
View File

@ -5,17 +5,29 @@ Note: "apachectl graceful" is documented to start httpd if not running.
Upstream-Status: vendor specific patch Upstream-Status: vendor specific patch
--- httpd-2.4.18/support/apachectl.in.apctlsystemd --- httpd-2.4.34/support/apachectl.in.apctlsystemd
+++ httpd-2.4.18/support/apachectl.in +++ httpd-2.4.34/support/apachectl.in
@@ -100,9 +100,28 @@ fi @@ -58,11 +58,6 @@
# have one, then status and fullstatus will not work.
STATUSURL="http://localhost:@PORT@/server-status"
-# Source /etc/sysconfig/httpd for $HTTPD setting, etc.
-if [ -r /etc/sysconfig/httpd ]; then
- . /etc/sysconfig/httpd
-fi
-
#
# Set this variable to a command that increases the maximum
# number of file descriptors allowed per child process. This is
@@ -100,9 +95,28 @@
ERROR=$? ERROR=$?
} }
+if [ "x$2" != "x" ] ; then +if [ "x$2" != "x" ] ; then
+ echo Passing arguments to httpd using apachectl is no longer supported. + echo Passing arguments to httpd using apachectl is no longer supported.
+ echo You can only start/stop/restart httpd using this script. + echo You can only start/stop/restart httpd using this script.
+ echo If you want to pass extra arguments to httpd, edit the + echo To pass extra arguments to httpd, see the httpd.service(8)
+ echo /etc/sysconfig/httpd config file. + echo man page.
+fi +fi
+ +
case $ACMD in case $ACMD in
@ -38,7 +50,7 @@ Upstream-Status: vendor specific patch
ERROR=$? ERROR=$?
;; ;;
startssl|sslstart|start-SSL) startssl|sslstart|start-SSL)
@@ -114,10 +133,6 @@ startssl|sslstart|start-SSL) @@ -114,10 +128,6 @@
configtest) configtest)
testconfig testconfig
;; ;;

7
httpd.spec
View File

@ -13,7 +13,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.34 Version: 2.4.34
Release: 9%{?dist} Release: 10%{?dist}
URL: https://httpd.apache.org/ URL: https://httpd.apache.org/
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@ -59,7 +59,7 @@ Patch1: httpd-2.4.1-apctl.patch
Patch2: httpd-2.4.9-apxs.patch Patch2: httpd-2.4.9-apxs.patch
Patch3: httpd-2.4.1-deplibs.patch Patch3: httpd-2.4.1-deplibs.patch
Patch4: httpd-2.4.34-layfix.patch Patch4: httpd-2.4.34-layfix.patch
Patch6: httpd-2.4.3-apctl-systemd.patch Patch6: httpd-2.4.34-apctlsystemd.patch
# Needed for socket activation and mod_systemd patch # Needed for socket activation and mod_systemd patch
Patch19: httpd-2.4.25-detect-systemd.patch Patch19: httpd-2.4.25-detect-systemd.patch
# Features/functional changes # Features/functional changes
@ -733,6 +733,9 @@ exit $rv
%{_rpmconfigdir}/macros.d/macros.httpd %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %changelog
* Fri Sep 28 2018 Joe Orton <jorton@redhat.com> - 2.4.34-10
- apachectl: don't read /etc/sysconfig/httpd
* Tue Sep 25 2018 Joe Orton <jorton@redhat.com> - 2.4.34-9 * Tue Sep 25 2018 Joe Orton <jorton@redhat.com> - 2.4.34-9
- fix build if OpenSSL built w/o SSLv3 support - fix build if OpenSSL built w/o SSLv3 support