~bryce/ubuntu/+source/nginx:merge-v1.20.2-2-kinetic

Branch merges

Propose for merging

Merged into ubuntu/+source/nginx:debian/sid at revision 8a1186d4264418433834636c7e1d32c5ab6df69b

Thomas Ward (community): Approve on 2022-07-14

git-ubuntu bot: Approve on 2022-07-14

Robie Basak: Approve on 2022-07-14

Canonical Server Reporter: Pending requested 2022-06-24

Canonical Server Reporter: Pending requested 2022-06-24

Canonical Server Reporter: Pending requested 2022-06-24

Athos Ribeiro: Pending requested 2022-06-09

Canonical Server: Pending requested 2022-06-09

Diff: 186608 lines (+1685/-72) (has conflicts)

12 files modified

debian/apport/source_nginx.py (+19/-0)
debian/changelog (+1524/-0)
debian/control (+24/-29)
debian/copyright (+0/-5)
debian/modules/control (+0/-8)
debian/nginx-common.install (+1/-0)
debian/patches/nginx-fix-pidfile.patch (+89/-0)
debian/patches/series (+6/-0)
debian/patches/ubuntu-branding.patch (+20/-0)
debian/rules (+2/-4)
debian/tests/control (+0/-8)
dev/null (+0/-18)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

8a1186d... by Bryce Harrington on 2022-07-15

changelog

4ff8bdc... by Bryce Harrington on 2022-07-15

  * d/http-lua: Remove another lua patch

bd3d4f7... by Bryce Harrington on 2022-07-12

update-maintainer

a71c3f5... by Bryce Harrington on 2022-07-12

reconstruct-changelog

9a29666... by Bryce Harrington on 2022-07-12

merge-changelogs

5b7788a... by Bryce Harrington on 2022-07-12

    - ALPACA TLS issue
      + debian/patches/CVE-2021-3618.patch: specify the number of
        errors after which the connection is closed in
        src/mail/ngx_mail.h, src/mail/ngx_mail_core_module.c and
        src/mail/ngx_mail_handler.c.
      [Included in Debian release 1.20.2-2]

8ae4371... by Bryce Harrington on 2022-07-12

    - DNS Resolver issues
      + debian/patches/CVE-2021-23017-1.patch: fixed off-by-one write in
        src/core/ngx_resolver.c.
      + debian/patches/CVE-2021-23017-2.patch: fixed off-by-one read in
        src/core/ngx_resolver.c.
      + debian/patches/CVE-2021-23017.patch: removed, replaced with upstream
        commits.
      [Included in upstream release 1.20.1]

da4102a... by Bryce Harrington on 2022-07-12

  * Dropped:
    - DNS Resolver Off-by-One Heap Write
      + debian/patches/CVE-2021-23017.patch: fix logic in
        src/core/ngx_resolver.c.
      [Not needed: Replaced by upstream patches in separate commit]

1530ac3... by Bryce Harrington on 2022-07-12

  * d/p/ubuntu-branding.patch: Refresh

017db4b... by Bryce Harrington on 2022-07-12

    - d/control: (GeoIP2 related changes)
      + Update dependencies for http-geoip2 package to include libmaxminddb0.
      + Update nginx-core to include http-geoip2 module due to approved bin-MIR
        (LP #1867198)
      + Move geoip2 module build flags to the common flags so all
        package flavors have it.
      + Update dependencies for nginx-light, etc. to include
        libnginx-mod-http-geoip2 as it's in the 'common build flags'
        for all flavors of the builds.
      + Update package description for nginx-core to indicate geoip2
        is included, and to list third party HTTP modules. GeoIP2
        is not included for Stream by default, so we have to adjust
        this because the Stream part isn't MIR'd.