Skip to content

staging-next 2022-04-10#168140

Merged
vcunat merged 48 commits intomasterfrom
staging-next
Apr 12, 2022
Merged

staging-next 2022-04-10#168140
vcunat merged 48 commits intomasterfrom
staging-next

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Apr 10, 2022

trofi and others added 30 commits March 23, 2022 08:46
Without the change build fails as:

    audit_wrap.c:5010:15: error: invalid use of flexible array member
     5010 |     arg1->buf = (char [])(char *)memcpy(malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
          |               ^
Signed-off-by: Anders Kaseorg <[email protected]>
Co-authored-by: Guillaume Girol <[email protected]>
powerdns: fix 32-bit builds against glibc
Apply patch that already has been applied upstream:
- madler/zlib#607
- madler/zlib@05796d3

(cherry picked from commit f091c0e)
...fix path to tests, update homepage away from their tract

(cherry picked from commit a8b0e20 from PR #165414)
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Apr 10, 2022
@vcunat
Copy link
Member Author

vcunat commented Apr 10, 2022

I somehow chose the changes by hand, selecting all corresponding PRs with "security" label and then passing through all the merges in master..staging and picking some more. You can suggest changes to that as well, though we surely don't want to slow this iteration down too much.

The powerdns commit got left in staging-next by accident; it was intended for the previous iteration but got merged too late. It could come directly to master now, but... now I didn't have sufficient motivation to act on it.

@K900
Copy link
Contributor

K900 commented Apr 10, 2022

#166335 should probably go in

@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Apr 10, 2022
github-actions bot and others added 3 commits April 10, 2022 18:01
This partially reverts commit 7f8c513 from PR #168154,
and it's also the same as commit 32f4270.
The tests worked after curl fix (commit 0fad2b3 from PR #167993).
@vcunat
Copy link
Member Author

vcunat commented Apr 10, 2022

TL;DR: so that pycurl problem should be resolved now, both on master and also in a better way here on staging-next.

@fabianhjr
Copy link
Member

fabianhjr commented Apr 10, 2022

made this iteration a bit special, focused on security fixes and important bugfixes.

You can suggest changes to that as well, though we surely don't want to slow this iteration down too much.

Hi @vcunat, just to clarify. The idea is to merge this before the scheduled breaking changes freeze of staging/staging-next on April 17 and then open a new staging-next cycle with the pending staging commits from this cycle?

@vcunat
Copy link
Member Author

vcunat commented Apr 10, 2022

April 17 is the first time restrictions apply for changes merging to staging(-next) branch. Commits that are there now certainly will reach 22.05. (Well of course, it can happen that some of them will be found out to cause too much trouble and reverted, as usual.)

The release schedule itself even plans for two week-long staging(-next) iterations, though historically we typically struggled to make them that fast, so that part might happen a bit differently than planned.

@vcunat vcunat merged commit e111881 into master Apr 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.