This is the upstream commit that is part of the master branch, and the commit that should have actually been backported. Instead, we're carrying the following commit:
which is actually part of the initial PR, and doesn't belong to any upstream branch. Interestingly, I did catch this problem during the review (see the inline comments for diff 1bde929 at the MP), but I only asked Lena to update the "Origin" header, and failed to actually compare the patches line-by-line.
We are going to have to amend Jammy's SRU (Lena will probably need to refresh the patch), and will likely need to do another SRU to Kinetic.
I was interested in the conversation a look at bit more into this.
I noticed that upstream actually has implemented the necessary safeguard here:
https:/ /github. com/net- snmp/net- snmp/commit/ d420ff6cd3a3bd8 ae469fc2d6a0baf d523280794
This is the upstream commit that is part of the master branch, and the commit that should have actually been backported. Instead, we're carrying the following commit:
https:/ /github. com/net- snmp/net- snmp/commit/ 49a0bca5a138a97 5ba503e6e8e0c7f 1b72fe74be
which is actually part of the initial PR, and doesn't belong to any upstream branch. Interestingly, I did catch this problem during the review (see the inline comments for diff 1bde929 at the MP), but I only asked Lena to update the "Origin" header, and failed to actually compare the patches line-by-line.
We are going to have to amend Jammy's SRU (Lena will probably need to refresh the patch), and will likely need to do another SRU to Kinetic.