1: 00dac52b = 1: bbac7661 - debian/{control, apache2.install, apache2-utils.ufw.profile, apache2.dirs}: Add ufw profiles. 2: 890bfeaa = 2: 1f6fa5f0 - debian/apache2.py, debian/apache2-bin.install: Add apport hook. 3: 54f028d1 ! 3: f7c44b9e - debian/patches/086_svn_cross_compiles: Backport several cross fixes from upstream @@ -131,9 +131,9 @@ --- a/debian/patches/series +++ b/debian/patches/series @@ + # This patch is applied manually #suexec-custom.patch - - remove_mod_lbmethod_load_order_dependency.diff + setenvifexpr.diff + +# Patches added by Ubuntu +086_svn_cross_compiles 4: 676a9a6e ! 4: 92420b0b - d/index.html, d/icons/ubuntu-logo.png, d/apache2.postrm: replace Debian with Ubuntu on default page. + d/source/include-binaries: add Ubuntu icon file @@ -119,10 +119,10 @@ --- a/debian/source/include-binaries +++ b/debian/source/include-binaries @@ - debian/icons/odf6otp-20x22.png - debian/icons/odf6oth-20x22.png + debian/icons/odf6ots-20x22.png + debian/icons/odf6ott-20x22.png debian/icons/openlogo-75.png +debian/icons/ubuntu-logo.png - debian/upstream/signing-key.pgp debian/perl-framework/t/htdocs/apache/acceptpathinfo/index.shtml debian/perl-framework/t/htdocs/apache/acceptpathinfo/info.php + debian/perl-framework/t/htdocs/apache/acceptpathinfo/off/index.shtml 5: 6ae6dc28 = 5: 7faffea9 - d/t/control, d/t/check-http2: add basic test for http2 support 6: a57862f3 = 6: 3c4eef85 - d/control, d/rules, d/config-dir/mods-available/md.load: don't build libapache2-mod-md, as that makes apache2-bin pull in libcurl4 which cannot be coinstalled with libcurl3. That situation breaks the installation of libapache2-mod-shib2. See https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/1770242/comments/1 for details. 7: 08b68c8f < -: -------- * SECURITY UPDATE: denial of service in HTTP/2 via large SETTINGS frames - debian/patches/CVE-2018-11763.patch: rework connection IO event handling in modules/http2/h2_session.c, modules/http2/h2_session.h, modules/http2/h2_version.h. - CVE-2018-11763 -: -------- > 7: b0015c49 * Dropped: - SECURITY UPDATE: denial of service in HTTP/2 via large SETTINGS frames + debian/patches/CVE-2018-11763.patch: rework connection IO event handling in modules/http2/h2_session.c, modules/http2/h2_session.h, modules/http2/h2_version.h. - CVE-2018-11763 [Fixed in 2.4.35] -: -------- > 8: 64a15d34 merge-changelogs -: -------- > 9: 2b0bae73 reconstruct-changelog -: -------- > 10: bad3cd6e update-maintainer
« Back to merge proposal
1: 00dac52b = 1: bbac7661 - debian/{control, apache2.install, apache2- utils.ufw. profile, apache2.dirs}: Add ufw profiles. apache2- bin.install: Add apport hook. patches/ 086_svn_ cross_compiles: Backport several cross fixes from upstream patches/ series patches/ series suexec- custom. patch mod_lbmethod_ load_order_ dependency. diff svn_cross_ compiles ubuntu- logo.png, d/apache2.postrm: replace Debian with Ubuntu on default page. + d/source/ include- binaries: add Ubuntu icon file source/ include- binaries source/ include- binaries icons/odf6otp- 20x22.png icons/odf6oth- 20x22.png icons/odf6ots- 20x22.png icons/odf6ott- 20x22.png icons/openlogo- 75.png icons/ubuntu- logo.png upstream/ signing- key.pgp perl-framework/ t/htdocs/ apache/ acceptpathinfo/ index.shtml perl-framework/ t/htdocs/ apache/ acceptpathinfo/ info.php perl-framework/ t/htdocs/ apache/ acceptpathinfo/ off/index. shtml dir/mods- available/ md.load: don't build libapache2-mod-md, as that makes apache2-bin pull in libcurl4 which cannot be coinstalled with libcurl3. That situation breaks the installation of libapache2- mod-shib2. See https:/ /bugs.launchpad .net/ubuntu/ +source/ apache2/ +bug/1770242/ comments/ 1 for details. patches/ CVE-2018- 11763.patch: rework connection IO event handling in modules/ http2/h2_ session. c, modules/ http2/h2_ session. h, modules/ http2/h2_ version. h. - CVE-2018-11763 patches/ CVE-2018- 11763.patch: rework connection IO event handling in modules/ http2/h2_ session. c, modules/ http2/h2_ session. h, modules/ http2/h2_ version. h. - CVE-2018-11763 [Fixed in 2.4.35] changelog
2: 890bfeaa = 2: 1f6fa5f0 - debian/apache2.py, debian/
3: 54f028d1 ! 3: f7c44b9e - debian/
@@ -131,9 +131,9 @@
--- a/debian/
+++ b/debian/
@@
+ # This patch is applied manually
#
-
- remove_
+ setenvifexpr.diff
+
+# Patches added by Ubuntu
+086_
4: 676a9a6e ! 4: 92420b0b - d/index.html, d/icons/
@@ -119,10 +119,10 @@
--- a/debian/
+++ b/debian/
@@
- debian/
- debian/
+ debian/
+ debian/
debian/
+debian/
- debian/
debian/
debian/
+ debian/
5: 6ae6dc28 = 5: 7faffea9 - d/t/control, d/t/check-http2: add basic test for http2 support
6: a57862f3 = 6: 3c4eef85 - d/control, d/rules, d/config-
7: 08b68c8f < -: -------- * SECURITY UPDATE: denial of service in HTTP/2 via large SETTINGS frames - debian/
-: -------- > 7: b0015c49 * Dropped: - SECURITY UPDATE: denial of service in HTTP/2 via large SETTINGS frames + debian/
-: -------- > 8: 64a15d34 merge-changelogs
-: -------- > 9: 2b0bae73 reconstruct-
-: -------- > 10: bad3cd6e update-maintainer