diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2023-08-16 20:45:00 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2023-08-16 23:44:50 +0200 |
| commit | 4eb488d6f955a0130cc4db4ec8a60e849f117447 (patch) | |
| tree | 5e6b8f7d3a102632f42b17971e7c747aca1022f8 /source/n/httpd | |
| parent | 253aa8f96223c6e1176fcf9684161bd1ae717bb3 (diff) | |
| download | current-4eb488d6f955a0130cc4db4ec8a60e849f117447.tar.gz current-4eb488d6f955a0130cc4db4ec8a60e849f117447.tar.xz | |
Wed Aug 16 20:45:00 UTC 202320230816204500
a/kernel-firmware-20230814_0e048b0-noarch-1.txz: Upgraded.
a/kernel-generic-6.1.46-x86_64-1.txz: Upgraded.
a/kernel-huge-6.1.46-x86_64-1.txz: Upgraded.
a/kernel-modules-6.1.46-x86_64-1.txz: Upgraded.
ap/inxi-3.3.29_1-noarch-1.txz: Upgraded.
d/kernel-headers-6.1.46-x86-1.txz: Upgraded.
k/kernel-source-6.1.46-noarch-1.txz: Upgraded.
-ACPI_TINY_POWER_BUTTON n
ACPI_AC m -> y
ACPI_BATTERY m -> y
ACPI_BUTTON m -> y
ACPI_FAN m -> y
ACPI_THERMAL m -> y
kde/kirigami-addons-0.11.0-x86_64-1.txz: Upgraded.
n/bind-9.18.18-x86_64-1.txz: Upgraded.
n/httpd-2.4.57-x86_64-2.txz: Rebuilt.
rc.httpd: wait using pwait after stopping, fix usage to show force-restart.
Thanks to metaed.
n/net-snmp-5.9.4-x86_64-1.txz: Upgraded.
n/openvpn-2.6.6-x86_64-1.txz: Upgraded.
n/php-8.2.9-x86_64-1.txz: Upgraded.
This update fixes bugs and security issues:
Security issue with external entity loading in XML without enabling it.
Buffer mismanagement in phar_dir_read().
For more information, see:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-3823
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-3824
(* Security fix *)
x/xorg-server-xwayland-23.2.0-x86_64-1.txz: Upgraded.
xap/mozilla-thunderbird-115.1.1-x86_64-1.txz: Upgraded.
This is a bugfix release.
For more information, see:
https://www.mozilla.org/en-US/thunderbird/115.1.1/releasenotes/
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/n/httpd')
| -rwxr-xr-x | source/n/httpd/httpd.SlackBuild | 2 | ||||
| -rw-r--r-- | source/n/httpd/rc.httpd | 25 |
2 files changed, 15 insertions, 12 deletions
diff --git a/source/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild index 438525eef..36a3a91e3 100755 --- a/source/n/httpd/httpd.SlackBuild +++ b/source/n/httpd/httpd.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=httpd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/httpd/rc.httpd b/source/n/httpd/rc.httpd index 6b251d90d..afacffb34 100644 --- a/source/n/httpd/rc.httpd +++ b/source/n/httpd/rc.httpd @@ -2,7 +2,7 @@ # # /etc/rc.d/rc.httpd # -# Start/stop/restart/graceful[ly restart]/graceful[ly]-stop +# Start/stop/force-restart/restart/graceful[ly restart]/graceful[ly]-stop # the Apache (httpd) web server. # # To make Apache start automatically at boot, make this @@ -15,17 +15,20 @@ case "$1" in /usr/sbin/apachectl -k start ;; 'stop') - /usr/sbin/apachectl -k stop - pkill -f /usr/sbin/httpd - # Remove both old and new .pid locations: - rm -f /var/run/httpd.pid /var/run/httpd/httpd.pid + if [ ! -r /run/httpd.pid ]; then + pkill -f /usr/sbin/httpd + else + /usr/sbin/apachectl -k stop + fi + pwait -f /usr/sbin/httpd ;; 'force-restart') - # Because sometimes restarting through apachectl just doesn't do the trick... - /usr/sbin/apachectl -k stop - pkill -f /usr/sbin/httpd - # Remove both old and new .pid locations: - rm -f /var/run/httpd.pid /var/run/httpd/httpd.pid + if [ ! -r /run/httpd.pid ]; then + pkill -f /usr/sbin/httpd + else + /usr/sbin/apachectl -k stop + fi + pwait -f /usr/sbin/httpd /usr/sbin/apachectl -k start ;; 'restart') @@ -38,7 +41,7 @@ case "$1" in /usr/sbin/apachectl -k graceful-stop ;; *) - echo "Usage: $0 {start|stop|restart|graceful|graceful-stop}" + echo "Usage: $0 {start|stop|force-restart|restart|graceful|graceful-stop}" ;; esac |