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

httpd dependency on initscripts is unspecified (#1705188)

Browse Source 
- substitute "service" cmd by "httpd" with -t arg

Resolves: #1705188
This commit is contained in:
Lubos Uhliarik 2019-05-02 14:46:02 +00:00
parent db62736588
commit bc95575bf5
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apachectl.sh
View File

@ -22,6 +22,7 @@ fi
ACMD="$1" ACMD="$1"
ARGV="$@" ARGV="$@"
SVC='httpd.service' SVC='httpd.service'
HTTPD='@HTTPDBIN@'
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.
@ -49,7 +50,7 @@ graceful-stop)
ERROR=$? ERROR=$?
;; ;;
configtest) configtest)
/usr/sbin/service ${SVC/.service//} $ACMD $HTTPD -t
ERROR=$? ERROR=$?
;; ;;
*) *)

8
httpd.spec
View File

@ -13,7 +13,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.39 Version: 2.4.39
Release: 3%{?dist} Release: 4%{?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
@ -414,6 +414,9 @@ sed -i \
s,@@Port@@,80,;" \ s,@@Port@@,80,;" \
docs/conf/extra/*.conf docs/conf/extra/*.conf
# Set correct path for httpd binary in apachectl script
sed -i 's,@HTTPDBIN@,%{_sbindir}/httpd,g' $RPM_SOURCE_DIR/apachectl.sh
# Create cache directory # Create cache directory
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd \ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd \
$RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/proxy \ $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/proxy \
@ -734,6 +737,9 @@ exit $rv
%{_rpmconfigdir}/macros.d/macros.httpd %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %changelog
* Thu May 02 2019 Lubos Uhliarik <luhliari@redhat.com> - 2.4.39-4
- httpd dependency on initscripts is unspecified (#1705188)
* Tue Apr 9 2019 Joe Orton <jorton@redhat.com> - 2.4.39-3 * Tue Apr 9 2019 Joe Orton <jorton@redhat.com> - 2.4.39-3
- fix statedir symlink to point to /var/lib/httpd (#1697662) - fix statedir symlink to point to /var/lib/httpd (#1697662)
- mod_reqtimeout: fix default values regression (PR 63325) - mod_reqtimeout: fix default values regression (PR 63325)