-
Committer:
Bazaar Package Importer
-
Author(s):
Chuck Short
-
Date:
2010-05-05 01:28:04 UTC
-
mfrom:
(14.3.15 sid)
-
Revision ID:
james.westby@ubuntu.com-20100505012804-vbouq0xs3tu2vvij
Tags: 2.2.15-5ubuntu1
* Merge from debian unstable. Remaining changes:
- debian/{control, rules}: Enable PIE hardening.
- debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
- debian/control: Add bzr tag and point it to our tree.
- debian/apache2-2.common.apache2.init: Add graceful restart (LP: #456381)
+ Dropped:
- debian/patches/206-fix-potential-memory-leaks.dpatch: No longer needed.
- debian/patches/206-report-max-client-mpm-worker.dpatch: No longer needed.
- debian/config-dir/apache2.conf: Merged back from debian.
- mod-reqtimeout functionality: Merge back from debian.
- debian/patches/204_CVE-2010-0408.dpatch: No longer needed.
- debian/patches/205_CVE-2010-0434.dpatch: No longer needed.
- debian/patches/203_fix-ab-segfault.dpatch: No longer needed.