summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-10-19 19:14:05 +0000
committer Eric Hameleers <alien@slackware.com>2023-10-20 13:30:46 +0200
commit6f8267e616b0d23914ca4f900bbcba261281447b (patch)
tree85fd7a45a899d112215e5436a74b7641e64b0781 /patches
parent4940fc9a4273c92b6b8639dd7586f6c7ce57cc19 (diff)
downloadcurrent-6f8267e616b0d23914ca4f900bbcba261281447b.tar.gz
current-6f8267e616b0d23914ca4f900bbcba261281447b.tar.xz
Thu Oct 19 19:14:05 UTC 202320231019191405_15.0
patches/packages/httpd-2.4.58-x86_64-1_slack15.0.txz: Upgraded. This update fixes bugs and security issues: moderate: Apache HTTP Server: HTTP/2 stream memory not reclaimed right away on RST. low: mod_macro buffer over-read. low: Apache HTTP Server: DoS in HTTP/2 with initial windows size 0. For more information, see: https://downloads.apache.org/httpd/CHANGES_2.4.58 https://www.cve.org/CVERecord?id=CVE-2023-45802 https://www.cve.org/CVERecord?id=CVE-2023-31122 https://www.cve.org/CVERecord?id=CVE-2023-43622 (* Security fix *) patches/packages/mozilla-thunderbird-115.3.3-x86_64-1_slack15.0.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/thunderbird/115.3.3/releasenotes/
Diffstat (limited to 'patches')
-rw-r--r--patches/packages/httpd-2.4.58-x86_64-1_slack15.0.txt (renamed from patches/packages/httpd-2.4.57-x86_64-1_slack15.0.txt)0
-rw-r--r--patches/packages/mozilla-thunderbird-115.3.3-x86_64-1_slack15.0.txt (renamed from patches/packages/mozilla-thunderbird-115.3.2-x86_64-1_slack15.0.txt)0
-rw-r--r--patches/source/httpd/httpd.url4
-rw-r--r--patches/source/httpd/rc.httpd25
4 files changed, 16 insertions, 13 deletions
diff --git a/patches/packages/httpd-2.4.57-x86_64-1_slack15.0.txt b/patches/packages/httpd-2.4.58-x86_64-1_slack15.0.txt
index 3185f84d3..3185f84d3 100644
--- a/patches/packages/httpd-2.4.57-x86_64-1_slack15.0.txt
+++ b/patches/packages/httpd-2.4.58-x86_64-1_slack15.0.txt
diff --git a/patches/packages/mozilla-thunderbird-115.3.2-x86_64-1_slack15.0.txt b/patches/packages/mozilla-thunderbird-115.3.3-x86_64-1_slack15.0.txt
index 5acb7b92e..5acb7b92e 100644
--- a/patches/packages/mozilla-thunderbird-115.3.2-x86_64-1_slack15.0.txt
+++ b/patches/packages/mozilla-thunderbird-115.3.3-x86_64-1_slack15.0.txt
diff --git a/patches/source/httpd/httpd.url b/patches/source/httpd/httpd.url
index a6083e679..fdbabad99 100644
--- a/patches/source/httpd/httpd.url
+++ b/patches/source/httpd/httpd.url
@@ -1,2 +1,2 @@
-http://www.apache.org/dist/httpd/httpd-2.4.57.tar.bz2
-http://www.apache.org/dist/httpd/httpd-2.4.57.tar.bz2.asc
+http://www.apache.org/dist/httpd/httpd-2.4.58.tar.bz2
+http://www.apache.org/dist/httpd/httpd-2.4.58.tar.bz2.asc
diff --git a/patches/source/httpd/rc.httpd b/patches/source/httpd/rc.httpd
index 6b251d90d..afacffb34 100644
--- a/patches/source/httpd/rc.httpd
+++ b/patches/source/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