summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-12-05apache2 (2.4.23-8+dyson1)HEADdyson/2.4.23-8+dyson1masterIgor Pashev1-0/+6
2016-12-05Merge branch 'master' of git://anonscm.debian.org/pkg-apache/apache2Igor Pashev1568-26019/+137466
2016-11-20release 2.4.23-8Stefan Fritsch1-2/+2
2016-11-20Introduce apache2-ssl-dev packageStefan Fritsch5-3/+33
This allows most modules to build without dealing with the libssl-dev mess.
2016-11-13release 2.4.23-7Stefan Fritsch1-2/+2
2016-11-13Fix systemd unit naming for multi-instances.Stefan Fritsch3-4/+5
%I will unescape '-' to '/'. This means an instance name like proxy-balancer would try to use /etc/apache2-proxy/balancer which is not what we want. Use %i to avoid unescaping.
2016-11-13multi-instance: Move stuff to /var/run/apache2-xxxStefan Fritsch3-1/+10
/var/run/apache2 may not be created if the default apache2 instance is not started. Make sure that nothing uses it.
2016-11-13use gzip -n for tgz in postinstStefan Fritsch2-1/+2
2016-11-13Make apache2-dev depend on openssl 1.0Stefan Fritsch2-1/+8
2016-11-09release 2.4.23-6Stefan Fritsch1-2/+2
2016-11-09avoid building with openssl 1.1 for nowStefan Fritsch2-1/+2
2016-11-01set timezone in embedded tarball for reproducible buildStefan Fritsch2-1/+8
2016-09-29Add missing pattern to make the lintian override effectiveRaphaël Hertzog1-1/+1
2016-09-29Add some lintian overrides for non-problemsRaphaël Hertzog3-0/+7
* two update-rc.d calls in postinst * a .js file with a very long line
2016-09-29Drop the manual "update-rc.d apache-htcacheclean remove" callRaphaël Hertzog1-2/+0
It's now again generated by dh_installinit. Thanks to lintian for catching this.
2016-09-29Prepare upload to unstableRaphaël Hertzog1-2/+4
2016-09-21Update apache-htcacheclean.init to have sensible Default-Start valuesRaphaël Hertzog5-23/+46
With the old value, "systemctl enable apache-htcacheclean" would fail like this: Synchronizing state of apache-htcacheclean.service with SysV service script with /lib/systemd/systemd-sysv-install. Executing: /lib/systemd/systemd-sysv-install enable apache-htcacheclean update-rc.d: error: apache-htcacheclean Default-Start contains no runlevels, aborting. So we add meta-data to make the script enabled by default but we actually disable it immediately in the postinst. And we can clean up some hacks that we introduced to cover for the Default-Start value being empty.
2016-09-20Drop /lib/systemd/system/apache2.service.d/forking.confRaphaël Hertzog3-4/+2
We have proper native systemd support now.
2016-09-20setup-instance: better systemd supportRaphaël Hertzog3-14/+41
Rely on the systemd apache2@instance.service for multi-instance support. Update the associated README.
2016-09-20a2enmod: implement systemd supportRaphaël Hertzog2-11/+33
Use systemctl when systemd is in use and make it aware of the apache-htcacheclean@instance.service generic service for multi-instance support.
2016-09-20Add systemd unit files. Closes: #798430Raphaël Hertzog7-2/+75
Partly based on former work of Timo Aaltonen <tjaalton@debian.org>.
2016-09-20Make it obvious that the init script reads a different default file ↵Raphaël Hertzog1-1/+1
depending on its name
2016-08-21Improve preinst for reproducible buildStefan Fritsch2-1/+15
The timestamps inside the tar file are not used for anything. Set them to an arbitrary fixed value. Same for permissions (because of umask), user, umask.
2016-08-12releases 2.4.23-4Stefan Fritsch1-2/+2
2016-08-12Fix pre-inst script for new installations.Stefan Fritsch2-1/+7
2016-08-11release 2.4.23-3Stefan Fritsch1-2/+2
2016-08-11dh_ apache2: Be less strict with versioned recommendsStefan Fritsch2-1/+3
It will just make backports harder and there is no reason to recommend the current version. Instead use the last version with significant changes to apache2-maintscript-helper.
2016-08-11apache2_switch_mpm: check if admin has disabled the mpmStefan Fritsch2-7/+20
Don't override the local admin's action if the requested mpm has been disabled by the admin. This may not be perfect, because we don't check if the current mpm has been enabled by the admin. But on the other hand, the admin-installed state is also set for the mpm that has been active during the 2.2 -> 2.4 update. So there may not be an alternative.
2016-08-11Fix info messageStefan Fritsch1-2/+2
rc=32 means local admin made the change
2016-08-11Also restore re-introduced *.load filesStefan Fritsch3-1/+22
These may have gone missing due to dpkg thinking they still belong to apache2.2-common. dpkg really should offer an explicit API to make it forget about removed obsolete conffiles.
2016-08-10Make mod_proxy_html depend on mod_xml2encStefan Fritsch2-1/+2
2016-08-10Fix conffiles from wheezy upgradeStefan Fritsch6-1/+174
Some conffile may have got the wrong content during upgrade from wheezy to early jessie versions. In order to fix this without dpkg prompting the user, we need to replace those conffiles during preinst. Unfortunately, in preinst the package is not yet unpacked so we cannot access any of its files. Therefore, the correct conffile content is embedded in a base64 encoded tarball in the preinst script.
2016-08-07Fix error handling in is_problematic_index_html() in postinstStefan Fritsch1-2/+2
The 'return 1' could never trigger because cut always returns 0.
2016-07-21release 2.4.23-2Stefan Fritsch1-2/+2
2016-07-21Add mitigation for HTTP_PROXY envvar issueStefan Fritsch3-0/+26
2016-07-05release 2.4.23-1Stefan Fritsch1-2/+2
2016-07-05note CVE-2016-4979 in changelogStefan Fritsch1-1/+5
2016-07-05Tweaks for 2.4.23Stefan Fritsch5-17/+6
- changelog - add new *.load files - drop obsolete ap_get_useragent_host_modperl_crash.patch - explicitly enable mod_proxy_http2 and mod_proxy_fdpass
2016-07-05Merge remote-tracking branch 'origin/upstream'Stefan Fritsch973-12254/+21970
2016-07-05Imported Upstream version 2.4.23upstreamStefan Fritsch973-12254/+21970
2016-07-05Revert "Fix conffiles from wheezy upgrade"Stefan Fritsch6-169/+1
Revert fix for now. Will upload 2.4.23 first and then include the fix in a later upload when it got more testing. This reverts commit be57de2935c807f7fef290d96ce699fc160f0036.
2016-06-14Use 'Require method' instead of in userdir.confStefan Fritsch2-6/+2
Limit/LimitExcept is broken by design.
2016-06-04Fix spelling typoJean-Michel Vourgère1-1/+1
2016-05-29Re-introduce mod_imagemap and mod_cern_metaStefan Fritsch4-1/+4
2016-05-29dh_apache2: add missing options to the help summaryStefan Fritsch1-0/+1
2016-05-29set SHELL=/bin/bash during configure for reproducible buildsStefan Fritsch2-1/+3
2016-05-29Fix conffiles from wheezy upgradeStefan Fritsch6-1/+174
Some conffile may have got the wrong content during upgrade from wheezy to early jessie versions. In order to fix this without dpkg prompting the user, we need to replace those conffiles during preinst. Unfortunately, in preinst the package is not yet unpacked so we cannot access any of its files. Therefore, the correct conffile content is embedded in a base64 encoded tarball in the preinst script.
2016-05-28release 2.4.20-2Stefan Fritsch1-2/+2
2016-05-28fix postrm check for index.htmlStefan Fritsch2-1/+6
And check the check during build.
2016-05-28add ref to upstream commitStefan Fritsch1-0/+1