From 2fa14eded508bce407d4c70ce1a1b983f5cfc55d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Uhliarik?= Date: Wed, 7 Nov 2018 12:38:50 +0100 Subject: [PATCH] Resolves: #1647241 - fix apachectl script --- httpd-2.4.34-apctlsystemd.patch | 2 +- httpd.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/httpd-2.4.34-apctlsystemd.patch b/httpd-2.4.34-apctlsystemd.patch index 996978c..20d7101 100644 --- a/httpd-2.4.34-apctlsystemd.patch +++ b/httpd-2.4.34-apctlsystemd.patch @@ -26,7 +26,7 @@ Upstream-Status: vendor specific patch +if [ "x$2" != "x" ] ; then + echo Passing arguments to httpd using apachectl is no longer supported. + echo You can only start/stop/restart httpd using this script. -+ echo To pass extra arguments to httpd, see the httpd.service(8) ++ echo "To pass extra arguments to httpd, see the httpd.service(8)" + echo man page. +fi + diff --git a/httpd.spec b/httpd.spec index e40e04d..f242ddb 100644 --- a/httpd.spec +++ b/httpd.spec @@ -13,7 +13,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.37 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://httpd.apache.org/ Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html @@ -729,6 +729,9 @@ exit $rv %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Wed Nov 07 2018 Luboš Uhliarik - 2.4.37-3 +- Resolves: #1647241 - fix apachectl script + * Wed Oct 31 2018 Joe Orton - 2.4.37-2 - add DefaultStateDir/ap_state_dir_relative() - mod_dav_fs: use state dir for default DAVLockDB