summaryrefslogtreecommitdiff
path: root/source/n/httpd
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-09-24 21:37:09 +0000
committerEric Hameleers <alien@slackware.com>2018-09-25 09:00:30 +0200
commit6371ee337f229ef7fd9dc4800b593589def96747 (patch)
tree2ddf87d1103ba7e80960636029cc61e480093532 /source/n/httpd
parent89d895f1ff30ec2a473919179e995715d0ddf23a (diff)
downloadcurrent-6371ee337f229ef7fd9dc4800b593589def96747.tar.gz
Mon Sep 24 21:37:09 UTC 201820180924213709
d/Cython-0.28.5-x86_64-1.txz: Upgraded. d/help2man-1.47.7-x86_64-1.txz: Upgraded. d/meson-0.48.0-x86_64-1.txz: Upgraded. d/python-setuptools-40.4.3-x86_64-1.txz: Upgraded. l/M2Crypto-0.30.1-x86_64-1.txz: Upgraded. l/cairo-1.15.14-x86_64-1.txz: Upgraded. l/librsvg-2.44.4-x86_64-1.txz: Upgraded. l/pycairo-1.17.1-x86_64-1.txz: Upgraded. l/pycurl-7.43.0.2-x86_64-1.txz: Upgraded. l/pyparsing-2.2.1-x86_64-1.txz: Upgraded. n/ModemManager-1.8.2-x86_64-1.txz: Upgraded. n/bind-9.12.2_P2-x86_64-1.txz: Upgraded. This update fixes security issues: There was a long-existing flaw in the documentation for ms-self, krb5-self, ms-subdomain, and krb5-subdomain rules in update-policy statements. Though the policies worked as intended, operators who configured their servers according to the misleading documentation may have thought zone updates were more restricted than they were; users of these rule types are advised to review the documentation and correct their configurations if necessary. New rule types matching the previously documented behavior will be introduced in a future maintenance release. named could crash during recursive processing of DNAME records when deny-answer-aliases was in use. This flaw is disclosed in CVE-2018-5740. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-5740 (* Security fix *) n/httpd-2.4.35-x86_64-1.txz: Upgraded. This release fixes bugs and regressions in httpd-2.4.34, adds an apache2ctl -> apachectl symlink, and no longer automatically overwrites rc.httpd when upgraded.
Diffstat (limited to 'source/n/httpd')
-rw-r--r--source/n/httpd/doinst.sh5
-rwxr-xr-xsource/n/httpd/httpd.SlackBuild5
-rw-r--r--source/n/httpd/httpd.url4
3 files changed, 8 insertions, 6 deletions
diff --git a/source/n/httpd/doinst.sh b/source/n/httpd/doinst.sh
index e233c362..b45fd2aa 100644
--- a/source/n/httpd/doinst.sh
+++ b/source/n/httpd/doinst.sh
@@ -20,8 +20,7 @@ preserve_perms() {
cat ${NEW} > ${NEW}.incoming
mv ${NEW}.incoming ${NEW}
fi
- # Don't use config() -- we always want to install this, changed or unchanged.
- #config ${NEW}
+ config ${NEW}
}
if [ ! -e var/log/httpd ]; then
@@ -55,8 +54,6 @@ fi
# Keep same perms when installing rc.httpd.new:
preserve_perms etc/rc.d/rc.httpd.new
-# Always install the new rc.httpd:
-mv etc/rc.d/rc.httpd.new etc/rc.d/rc.httpd
# Handle config files. Unless this is a fresh installation, the
# admin will have to move the .new files into place to complete
diff --git a/source/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild
index cb7db3d7..3c15fd8f 100755
--- a/source/n/httpd/httpd.SlackBuild
+++ b/source/n/httpd/httpd.SlackBuild
@@ -191,6 +191,11 @@ cat $CWD/rc.httpd > $PKG/etc/rc.d/rc.httpd.new
mkdir -p $PKG/etc/logrotate.d
cat $CWD/logrotate.httpd > $PKG/etc/logrotate.d/httpd.new
+# Add symlink that letsencrypt wants:
+( cd $PKG/usr/sbin
+ ln -sf apachectl apache2ctl
+)
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
diff --git a/source/n/httpd/httpd.url b/source/n/httpd/httpd.url
index 152982ae..f9402a47 100644
--- a/source/n/httpd/httpd.url
+++ b/source/n/httpd/httpd.url
@@ -1,2 +1,2 @@
-http://www.apache.org/dist/httpd/httpd-2.4.34.tar.bz2
-http://www.apache.org/dist/httpd/httpd-2.4.34.tar.bz2.asc
+http://www.apache.org/dist/httpd/httpd-2.4.35.tar.bz2
+http://www.apache.org/dist/httpd/httpd-2.4.35.tar.bz2.asc