From 6f8267e616b0d23914ca4f900bbcba261281447b Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 19 Oct 2023 19:14:05 +0000 Subject: [PATCH] Thu Oct 19 19:14:05 UTC 2023 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/ --- ChangeLog.rss | 30 +++++++++- ChangeLog.txt | 18 ++++++ FILELIST.TXT | 60 +++++++++---------- ...xt => httpd-2.4.58-x86_64-1_slack15.0.txt} | 0 ...hunderbird-115.3.3-x86_64-1_slack15.0.txt} | 0 patches/source/httpd/httpd.url | 4 +- patches/source/httpd/rc.httpd | 25 ++++---- 7 files changed, 92 insertions(+), 45 deletions(-) rename patches/packages/{httpd-2.4.57-x86_64-1_slack15.0.txt => httpd-2.4.58-x86_64-1_slack15.0.txt} (100%) rename patches/packages/{mozilla-thunderbird-115.3.2-x86_64-1_slack15.0.txt => mozilla-thunderbird-115.3.3-x86_64-1_slack15.0.txt} (100%) diff --git a/ChangeLog.rss b/ChangeLog.rss index fa11da5c6..a5dca709f 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,35 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Tue, 17 Oct 2023 19:34:56 GMT - Wed, 18 Oct 2023 11:30:26 GMT + Thu, 19 Oct 2023 19:14:05 GMT + Fri, 20 Oct 2023 11:30:31 GMT maintain_current_git.sh v 1.17 + + Thu, 19 Oct 2023 19:14:05 GMT + Thu, 19 Oct 2023 19:14:05 GMT + https://git.slackware.nl/current/tag/?h=20231019191405 + 20231019191405 + + +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/ + ]]> + + Tue, 17 Oct 2023 19:34:56 GMT Tue, 17 Oct 2023 19:34:56 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index fc2e0eb67..7d5e2abca 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,21 @@ +Thu Oct 19 19:14:05 UTC 2023 +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/ ++--------------------------+ Tue Oct 17 19:34:56 UTC 2023 patches/packages/util-linux-2.37.4-x86_64-2_slack15.0.txz: Rebuilt. Copy /etc/pam.d/login to /etc/pam.d/remote. This is needed for /bin/login's diff --git a/FILELIST.TXT b/FILELIST.TXT index b0e2d6ea5..9c601f270 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Tue Oct 17 19:37:44 UTC 2023 +Thu Oct 19 19:20:38 UTC 2023 Here is the file list for this directory. If you are using a mirror site and find missing or extra files in the disk subdirectories, please have the archive administrator refresh the mirror. -drwxr-xr-x 12 root root 4096 2023-10-17 19:34 . +drwxr-xr-x 12 root root 4096 2023-10-19 19:14 . -rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0 -rw-r--r-- 1 root root 16609 2022-03-30 19:03 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 1194346 2023-10-11 22:25 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-10-11 22:25 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1194346 2023-10-17 19:38 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-10-17 19:38 ./CHECKSUMS.md5.asc -rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING -rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3 -rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT -rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT --rw-r--r-- 1 root root 2053412 2023-10-17 19:34 ./ChangeLog.txt +-rw-r--r-- 1 root root 2054239 2023-10-19 19:14 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./EFI/BOOT -rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi @@ -25,7 +25,7 @@ drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./EFI/BOOT -rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh -rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg -rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg --rw-r--r-- 1 root root 1561939 2023-10-11 22:25 ./FILELIST.TXT +-rw-r--r-- 1 root root 1561939 2023-10-17 19:37 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY -rw-r--r-- 1 root root 864745 2022-02-02 08:25 ./PACKAGES.TXT -rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT @@ -752,13 +752,13 @@ drwxr-xr-x 2 root root 4096 2022-12-17 19:52 ./pasture/source/samba -rw-r--r-- 1 root root 7921 2018-04-29 17:31 ./pasture/source/samba/smb.conf.default -rw-r--r-- 1 root root 7933 2018-01-14 20:41 ./pasture/source/samba/smb.conf.default.orig -rw-r--r-- 1 root root 536 2017-03-23 19:18 ./pasture/source/samba/smb.conf.diff.gz -drwxr-xr-x 4 root root 4096 2023-10-17 19:37 ./patches --rw-r--r-- 1 root root 85550 2023-10-17 19:37 ./patches/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-10-17 19:37 ./patches/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 116859 2023-10-17 19:37 ./patches/FILE_LIST --rw-r--r-- 1 root root 13170420 2023-10-17 19:37 ./patches/MANIFEST.bz2 --rw-r--r-- 1 root root 61884 2023-10-17 19:37 ./patches/PACKAGES.TXT -drwxr-xr-x 3 root root 24576 2023-10-17 19:37 ./patches/packages +drwxr-xr-x 4 root root 4096 2023-10-19 19:20 ./patches +-rw-r--r-- 1 root root 85550 2023-10-19 19:20 ./patches/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-10-19 19:20 ./patches/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 116859 2023-10-19 19:20 ./patches/FILE_LIST +-rw-r--r-- 1 root root 13182579 2023-10-19 19:20 ./patches/MANIFEST.bz2 +-rw-r--r-- 1 root root 61884 2023-10-19 19:20 ./patches/PACKAGES.TXT +drwxr-xr-x 3 root root 24576 2023-10-19 19:20 ./patches/packages -rw-r--r-- 1 root root 360 2023-09-26 19:28 ./patches/packages/Cython-0.29.36-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 2389564 2023-09-26 19:28 ./patches/packages/Cython-0.29.36-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2023-09-26 19:28 ./patches/packages/Cython-0.29.36-x86_64-1_slack15.0.txz.asc @@ -834,9 +834,9 @@ drwxr-xr-x 3 root root 24576 2023-10-17 19:37 ./patches/packages -rw-r--r-- 1 root root 314 2022-04-14 21:04 ./patches/packages/gzip-1.12-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 111208 2022-04-14 21:04 ./patches/packages/gzip-1.12-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-04-14 21:04 ./patches/packages/gzip-1.12-x86_64-1_slack15.0.txz.asc --rw-r--r-- 1 root root 513 2023-04-07 18:27 ./patches/packages/httpd-2.4.57-x86_64-1_slack15.0.txt --rw-r--r-- 1 root root 3898104 2023-04-07 18:27 ./patches/packages/httpd-2.4.57-x86_64-1_slack15.0.txz --rw-r--r-- 1 root root 163 2023-04-07 18:27 ./patches/packages/httpd-2.4.57-x86_64-1_slack15.0.txz.asc +-rw-r--r-- 1 root root 513 2023-10-19 19:02 ./patches/packages/httpd-2.4.58-x86_64-1_slack15.0.txt +-rw-r--r-- 1 root root 3907716 2023-10-19 19:02 ./patches/packages/httpd-2.4.58-x86_64-1_slack15.0.txz +-rw-r--r-- 1 root root 163 2023-10-19 19:02 ./patches/packages/httpd-2.4.58-x86_64-1_slack15.0.txz.asc -rw-r--r-- 1 root root 513 2022-08-23 03:07 ./patches/packages/hunspell-1.7.1-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 312136 2022-08-23 03:07 ./patches/packages/hunspell-1.7.1-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-08-23 03:07 ./patches/packages/hunspell-1.7.1-x86_64-1_slack15.0.txz.asc @@ -925,9 +925,9 @@ drwxr-xr-x 2 root root 4096 2023-06-23 18:50 ./patches/packages/linux-5.15 -rw-r--r-- 1 root root 564 2023-01-06 19:37 ./patches/packages/mozilla-nss-3.87-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 1838968 2023-01-06 19:37 ./patches/packages/mozilla-nss-3.87-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2023-01-06 19:37 ./patches/packages/mozilla-nss-3.87-x86_64-1_slack15.0.txz.asc --rw-r--r-- 1 root root 663 2023-10-11 00:34 ./patches/packages/mozilla-thunderbird-115.3.2-x86_64-1_slack15.0.txt --rw-r--r-- 1 root root 60728288 2023-10-11 00:34 ./patches/packages/mozilla-thunderbird-115.3.2-x86_64-1_slack15.0.txz --rw-r--r-- 1 root root 163 2023-10-11 00:34 ./patches/packages/mozilla-thunderbird-115.3.2-x86_64-1_slack15.0.txz.asc +-rw-r--r-- 1 root root 663 2023-10-19 06:33 ./patches/packages/mozilla-thunderbird-115.3.3-x86_64-1_slack15.0.txt +-rw-r--r-- 1 root root 60734204 2023-10-19 06:33 ./patches/packages/mozilla-thunderbird-115.3.3-x86_64-1_slack15.0.txz +-rw-r--r-- 1 root root 163 2023-10-19 06:33 ./patches/packages/mozilla-thunderbird-115.3.3-x86_64-1_slack15.0.txz.asc -rw-r--r-- 1 root root 451 2022-07-21 17:53 ./patches/packages/net-snmp-5.9.3-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 1598024 2022-07-21 17:53 ./patches/packages/net-snmp-5.9.3-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-07-21 17:53 ./patches/packages/net-snmp-5.9.3-x86_64-1_slack15.0.txz.asc @@ -1057,7 +1057,7 @@ drwxr-xr-x 2 root root 4096 2023-06-23 18:50 ./patches/packages/linux-5.15 -rw-r--r-- 1 root root 463 2023-04-05 18:16 ./patches/packages/zstd-1.5.5-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 459652 2023-04-05 18:16 ./patches/packages/zstd-1.5.5-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2023-04-05 18:16 ./patches/packages/zstd-1.5.5-x86_64-1_slack15.0.txz.asc -drwxr-xr-x 92 root root 4096 2023-10-17 19:34 ./patches/source +drwxr-xr-x 92 root root 4096 2023-10-19 19:13 ./patches/source drwxr-xr-x 2 root root 4096 2023-09-26 19:22 ./patches/source/Cython -rw-r--r-- 1 root root 1623580 2023-07-04 19:24 ./patches/source/Cython/Cython-0.29.36.tar.lz -rwxr-xr-x 1 root root 3041 2023-09-26 19:23 ./patches/source/Cython/Cython.SlackBuild @@ -1246,15 +1246,15 @@ drwxr-xr-x 2 root root 4096 2022-04-07 21:51 ./patches/source/gzip -rw-r--r-- 1 root root 833 2022-04-07 17:00 ./patches/source/gzip/gzip-1.12.tar.xz.sig -rwxr-xr-x 1 root root 5170 2022-04-14 20:41 ./patches/source/gzip/gzip.SlackBuild -rw-r--r-- 1 root root 766 2018-02-27 06:13 ./patches/source/gzip/slack-desc -drwxr-xr-x 2 root root 4096 2023-04-07 18:25 ./patches/source/httpd +drwxr-xr-x 2 root root 4096 2023-10-19 18:58 ./patches/source/httpd -rw-r--r-- 1 root root 931 2018-09-24 18:58 ./patches/source/httpd/doinst.sh.gz --rw-r--r-- 1 root root 7457022 2023-04-06 14:46 ./patches/source/httpd/httpd-2.4.57.tar.bz2 --rw-r--r-- 1 root root 833 2023-04-06 14:46 ./patches/source/httpd/httpd-2.4.57.tar.bz2.asc +-rw-r--r-- 1 root root 7485817 2023-10-19 09:09 ./patches/source/httpd/httpd-2.4.58.tar.bz2 +-rw-r--r-- 1 root root 874 2023-10-19 09:09 ./patches/source/httpd/httpd-2.4.58.tar.bz2.asc -rwxr-xr-x 1 root root 9115 2022-03-14 17:38 ./patches/source/httpd/httpd.SlackBuild -rw-r--r-- 1 root root 260 2012-04-13 02:17 ./patches/source/httpd/httpd.runasapache.diff.gz --rw-r--r-- 1 root root 112 2023-04-07 18:23 ./patches/source/httpd/httpd.url +-rw-r--r-- 1 root root 112 2023-10-19 18:51 ./patches/source/httpd/httpd.url -rw-r--r-- 1 root root 171 2021-05-23 19:15 ./patches/source/httpd/logrotate.httpd --rw-r--r-- 1 root root 1083 2018-03-20 18:37 ./patches/source/httpd/rc.httpd +-rw-r--r-- 1 root root 1001 2023-08-16 16:41 ./patches/source/httpd/rc.httpd -rw-r--r-- 1 root root 966 2018-02-27 06:13 ./patches/source/httpd/slack-desc drwxr-xr-x 2 root root 4096 2022-08-23 03:03 ./patches/source/hunspell -rw-r--r-- 1 root root 360684 2022-08-22 13:53 ./patches/source/hunspell/hunspell-1.7.1.tar.lz @@ -1520,7 +1520,7 @@ drwxr-xr-x 2 root root 4096 2023-01-06 19:30 ./patches/source/mozilla-nss -rw-r--r-- 1 root root 37770371 2023-01-05 18:00 ./patches/source/mozilla-nss/nss-3.87.tar.lz -rw-r--r-- 1 root root 2488 2012-04-29 21:05 ./patches/source/mozilla-nss/nss-config.in -rw-r--r-- 1 root root 1023 2018-02-27 06:12 ./patches/source/mozilla-nss/slack-desc -drwxr-xr-x 4 root root 4096 2023-10-10 23:47 ./patches/source/mozilla-thunderbird +drwxr-xr-x 4 root root 4096 2023-10-19 04:33 ./patches/source/mozilla-thunderbird drwxr-xr-x 2 root root 4096 2016-07-03 18:05 ./patches/source/mozilla-thunderbird/autoconf -rw-r--r-- 1 root root 5869 2016-07-03 18:04 ./patches/source/mozilla-thunderbird/autoconf/autoconf-2.13-consolidated_fixes-1.patch.gz -rw-r--r-- 1 root root 300116 1999-01-15 21:03 ./patches/source/mozilla-thunderbird/autoconf/autoconf-2.13.tar.xz @@ -1535,8 +1535,8 @@ drwxr-xr-x 2 root root 4096 2023-09-13 18:47 ./patches/source/mozilla-thun -rw-r--r-- 1 root root 163871 2023-09-13 09:14 ./patches/source/mozilla-thunderbird/build-deps/cbindgen/cbindgen-0.26.0.tar.lz -rwxr-xr-x 1 root root 2032 2022-06-14 16:39 ./patches/source/mozilla-thunderbird/build-deps/cbindgen/cbindgen.build -rw-r--r-- 1 root root 35 2021-06-25 03:11 ./patches/source/mozilla-thunderbird/build-deps/cbindgen/cbindgen.url -drwxr-xr-x 2 root root 4096 2023-09-29 17:32 ./patches/source/mozilla-thunderbird/build-deps/nodejs --rw-r--r-- 1 root root 41855692 2023-09-28 23:26 ./patches/source/mozilla-thunderbird/build-deps/nodejs/node-v20.8.0.tar.xz +drwxr-xr-x 2 root root 4096 2023-10-18 19:42 ./patches/source/mozilla-thunderbird/build-deps/nodejs +-rw-r--r-- 1 root root 42309260 2023-10-17 05:36 ./patches/source/mozilla-thunderbird/build-deps/nodejs/node-v21.0.0.tar.xz -rwxr-xr-x 1 root root 3013 2021-08-13 18:10 ./patches/source/mozilla-thunderbird/build-deps/nodejs/nodejs.build -rw-r--r-- 1 root root 86 2019-07-08 21:02 ./patches/source/mozilla-thunderbird/build-deps/nodejs/nodejs.url -rw-r--r-- 1 root root 263 2022-06-30 18:42 ./patches/source/mozilla-thunderbird/double_t.x86.diff.gz @@ -1545,8 +1545,8 @@ drwxr-xr-x 2 root root 4096 2023-09-29 17:32 ./patches/source/mozilla-thun -rw-r--r-- 1 root root 3378 2005-03-08 05:13 ./patches/source/mozilla-thunderbird/mozilla-thunderbird.desktop -rw-r--r-- 1 root root 1130 2018-02-27 06:47 ./patches/source/mozilla-thunderbird/slack-desc -rw-r--r-- 1 root root 330 2019-08-27 16:35 ./patches/source/mozilla-thunderbird/tb.ui.scrollToClick.diff.gz --rw-r--r-- 1 root root 533609600 2023-10-10 20:12 ./patches/source/mozilla-thunderbird/thunderbird-115.3.2.source.tar.xz --rw-r--r-- 1 root root 833 2023-10-10 20:12 ./patches/source/mozilla-thunderbird/thunderbird-115.3.2.source.tar.xz.asc +-rw-r--r-- 1 root root 540032900 2023-10-18 15:54 ./patches/source/mozilla-thunderbird/thunderbird-115.3.3.source.tar.xz +-rw-r--r-- 1 root root 833 2023-10-18 15:54 ./patches/source/mozilla-thunderbird/thunderbird-115.3.3.source.tar.xz.asc drwxr-xr-x 2 root root 4096 2022-07-21 17:44 ./patches/source/net-snmp -rw-r--r-- 1 root root 356 2021-12-21 18:38 ./patches/source/net-snmp/doinst.sh.gz -rw-r--r-- 1 root root 607 2018-07-20 09:39 ./patches/source/net-snmp/net-snmp-5.7.2-cert-path.patch.gz 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 similarity index 100% rename from patches/packages/httpd-2.4.57-x86_64-1_slack15.0.txt rename to 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 similarity index 100% rename from patches/packages/mozilla-thunderbird-115.3.2-x86_64-1_slack15.0.txt rename to 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