3011: Backport of #2958 r=mergify[bot] a=nextgens
## What type of PR?
bug-fix
## What does this PR do?
Backport of #2958
### Related issue(s)
- closes#2934
- closes#2919
## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.
- [ ] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.
Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
Co-authored-by: Dimitri Huisman <diman@huisman.xyz>
Co-authored-by: Florent Daigniere <nextgens@users.noreply.github.com>
From now on the issues section is only used for bug reports that follow the issue template.
All other topics (including feature requests) are discussed on the github discussions section of the project.
2991: Remove IMAP ID capability from nginx r=mergify[bot] a=gaudenz
The ID capability is not supported by nginx. Advertizing it leads to problems with client which send an ID command before authenticating. Before authentication commands are not forwarded to dovecot, but directly processed by nginx.
## What type of PR?
bugfix PR
## What does this PR do?
### Related issue(s)
Closes#2938
## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.
- [X] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.
Co-authored-by: Gaudenz Steinlin <gaudenz@durcheinandertal.ch>
The ID capability is not supported by nginx. Advertizing it leads to
problems with client which send an ID command before authenticating.
Before authentication commands are not forwarded to dovecot, but
directly processed by nginx.
One notable client which hit this issue is offlineimap.
Closes#2938
2986: Roundcube 1.6.4 (backport #2985) r=nextgens a=mergify[bot]
This is an automatic backport of pull request #2985 done by [Mergify](https://mergify.com).
Cherry-pick of 2a570d0f6f has failed:
```
On branch mergify/bp/2.0/pr-2985
Your branch is up to date with 'origin/2.0'.
You are currently cherry-picking commit 2a570d0f.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: core/admin/start.py
new file: towncrier/newsfragments/2985.misc
modified: webmails/Dockerfile
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: docs/faq.rst
```
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
---
<details>
<summary>Mergify commands and options</summary>
<br />
More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
You can also trigger Mergify actions by commenting on this pull request:
- ``@Mergifyio` refresh` will re-evaluate the rules
- ``@Mergifyio` rebase` will rebase this PR on its base branch
- ``@Mergifyio` update` will merge the base branch into this PR
- ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch
Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.com
</details>
Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
Co-authored-by: Florent Daigniere <nextgens@users.noreply.github.com>
2978: Forbidden_file_extension.map could not be overridden. (backport #2975) r=mergify[bot] a=mergify[bot]
This is an automatic backport of pull request #2975 done by [Mergify](https://mergify.com).
---
<details>
<summary>Mergify commands and options</summary>
<br />
More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
You can also trigger Mergify actions by commenting on this pull request:
- ``@Mergifyio` refresh` will re-evaluate the rules
- ``@Mergifyio` rebase` will rebase this PR on its base branch
- ``@Mergifyio` update` will merge the base branch into this PR
- ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch
Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.com
</details>
Co-authored-by: Dimitri Huisman <diman@huisman.xyz>
2967: Hardened malloc was not disabled for oletools when an CPU with missing flags is used (backport #2961) r=mergify[bot] a=mergify[bot]
This is an automatic backport of pull request #2961 done by [Mergify](https://mergify.com).
---
<details>
<summary>Mergify commands and options</summary>
<br />
More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
You can also trigger Mergify actions by commenting on this pull request:
- ``@Mergifyio` refresh` will re-evaluate the rules
- ``@Mergifyio` rebase` will rebase this PR on its base branch
- ``@Mergifyio` update` will merge the base branch into this PR
- ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch
Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.com
</details>
Co-authored-by: Dimitri Huisman <diman@huisman.xyz>
Co-authored-by: Dimitri Huisman <52963853+Diman0@users.noreply.github.com>
Co-authored-by: Florent Daigniere <nextgens@users.noreply.github.com>
Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
2960: Manual backport of -- Update admin password for demo server #2953 r=mergify[bot] a=Diman0
## What type of PR?
documentation
## What does this PR do?
backport of #2953 which updates the demo documentation with the new password.
### Related issue(s)
n/a
## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.
- [x] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.
Co-authored-by: Dimitri Huisman <diman@huisman.xyz>
2957: Remove the version pinning on hardened malloc (backport #2956) r=mergify[bot] a=mergify[bot]
This is an automatic backport of pull request #2956 done by [Mergify](https://mergify.com).
---
<details>
<summary>Mergify commands and options</summary>
<br />
More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
You can also trigger Mergify actions by commenting on this pull request:
- ``@Mergifyio` refresh` will re-evaluate the rules
- ``@Mergifyio` rebase` will rebase this PR on its base branch
- ``@Mergifyio` update` will merge the base branch into this PR
- ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch
Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.com
</details>
Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
2947: Upgrade webmails (backport #2945) r=mergify[bot] a=mergify[bot]
This is an automatic backport of pull request #2945 done by [Mergify](https://mergify.com).
---
<details>
<summary>Mergify commands and options</summary>
<br />
More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
You can also trigger Mergify actions by commenting on this pull request:
- ``@Mergifyio` refresh` will re-evaluate the rules
- ``@Mergifyio` rebase` will rebase this PR on its base branch
- ``@Mergifyio` update` will merge the base branch into this PR
- ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch
Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.com
</details>
Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
2930: Maybe fix fetchmail when used with pop3 (backport #2929) r=mergify[bot] a=mergify[bot]
This is an automatic backport of pull request #2929 done by [Mergify](https://mergify.com).
---
<details>
<summary>Mergify commands and options</summary>
<br />
More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
You can also trigger Mergify actions by commenting on this pull request:
- ``@Mergifyio` refresh` will re-evaluate the rules
- ``@Mergifyio` rebase` will rebase this PR on its base branch
- ``@Mergifyio` update` will merge the base branch into this PR
- ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch
Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.com
</details>
Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
2927: Remove the usage of capabilities, use port 8080 for admin (backport #2924) r=mergify[bot] a=mergify[bot]
This is an automatic backport of pull request #2924 done by [Mergify](https://mergify.com).
Cherry-pick of 562cd8c135 has failed:
```
On branch mergify/bp/2.0/pr-2924
Your branch is up to date with 'origin/2.0'.
You are currently cherry-picking commit 562cd8c1.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: core/admin/Dockerfile
modified: core/base/Dockerfile
modified: core/dovecot/start.py
modified: core/nginx/conf/nginx.conf
modified: core/postfix/start.py
modified: core/rspamd/conf/arc.conf
modified: core/rspamd/conf/dkim_signing.conf
modified: core/rspamd/conf/multimap.conf
modified: core/rspamd/conf/whitelist.conf
modified: core/rspamd/start.py
modified: docs/faq.rst
modified: optional/fetchmail/fetchmail.py
new file: towncrier/newsfragments/2906.bugfix
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
both modified: core/admin/start.py
deleted by us: core/nginx/dovecot/login.lua
```
Cherry-pick of b2a5a80e12 has failed:
```
On branch mergify/bp/2.0/pr-2924
Your branch is ahead of 'origin/2.0' by 1 commit.
(use "git push" to publish your local commits)
You are currently cherry-picking commit b2a5a80e.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: core/dovecot/conf/dovecot.conf
modified: towncrier/newsfragments/2906.bugfix
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by us: core/nginx/dovecot/proxy.conf
```
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
---
<details>
<summary>Mergify commands and options</summary>
<br />
More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
You can also trigger Mergify actions by commenting on this pull request:
- ``@Mergifyio` refresh` will re-evaluate the rules
- ``@Mergifyio` rebase` will rebase this PR on its base branch
- ``@Mergifyio` update` will merge the base branch into this PR
- ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch
Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.com
</details>
Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
In the real world users can't get them to work...
(cherry picked from commit 562cd8c135)
# Conflicts:
# core/admin/start.py
# core/nginx/dovecot/login.lua
