diff --git a/apachectl.sh b/apachectl.sh index e0f6f78..766cfba 100755 --- a/apachectl.sh +++ b/apachectl.sh @@ -39,14 +39,14 @@ start|stop|restart|status) ;; graceful) if /usr/bin/systemctl -q is-active $SVC; then - /usr/bin/systemctl kill --signal=SIGUSR1 $SVC + /usr/bin/systemctl kill --signal=SIGUSR1 --kill-who=main $SVC else /usr/bin/systemctl start $SVC fi ERROR=$? ;; graceful-stop) - /usr/bin/systemctl kill --signal=SIGWINCH $SVC + /usr/bin/systemctl kill --signal=SIGWINCH --kill-who=main $SVC ERROR=$? ;; configtest|-t) diff --git a/httpd.spec b/httpd.spec index 5181a15..46d518f 100644 --- a/httpd.spec +++ b/httpd.spec @@ -13,7 +13,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.41 -Release: 7%{?dist} +Release: 8%{?dist} URL: https://httpd.apache.org/ Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2.asc @@ -747,6 +747,9 @@ exit $rv %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Wed Nov 13 2019 Joe Orton - 2.4.41-8 +- apachectl: in graceful/graceful-stop, only signal main process (#1758798) + * Mon Nov 11 2019 Lubos Uhliarik - 2.4.41-7 - add automatic source tarball signature verification in %prep section