[dralley]

Ensure that we're not susceptible to a sequoia CVE

[patchback]

Backport to 2.20: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 0e88e74 on top of patchback/backports/2.20/0e88e74762e85766e7e878da2ec313d30ac81147/pr-2622

Backporting merged PR #2622 into 2.22

1. Ensure you have a local repo clone of your fork. Unless you cloned it
   from the upstream, this would be your origin remote.
2. Make sure you have an upstream repo added as a remote too. In these
   instructions you'll refer to it by the name upstream. If you don't
   have it, here's how you can add it:

   git remote add upstream https://github.com/pulp/pulp_container.git
   

3. Ensure you have the latest copy of upstream and prepare a branch
   that will hold the backported code:

   git fetch upstream
   git checkout -b patchback/backports/2.20/0e88e74762e85766e7e878da2ec313d30ac81147/pr-2622 upstream/2.20
   

4. Now, cherry-pick PR Update pysequoia version in requirements.txt #2622 contents into that branch:

   git cherry-pick -x 0e88e74762e85766e7e878da2ec313d30ac81147
   

   If it'll yell at you with something like fatal: Commit 0e88e74762e85766e7e878da2ec313d30ac81147 is a merge but no -m option was given., add -m 1 as follows instead:

   git cherry-pick -m1 -x 0e88e74762e85766e7e878da2ec313d30ac81147
   

5. At this point, you'll encounter some merge conflicts. You must
   resolve them in order to preserve the patch from PR Update pysequoia version in requirements.txt #2622 as close to the
   original as possible.
6. Once conflicts are resolved and git added, run:

   git cherry-pick --continue
   

7. Push this branch to your fork on GitHub:

   git push origin patchback/backports/2.20/0e88e74762e85766e7e878da2ec313d30ac81147/pr-2622
   

8. Create a PR, ensure that the CI is green. If it's not — update it so that
   the tests and any other checks pass. This is it!
   Now relax and wait for the maintainers to process your pull request
   when they have some cycles to do reviews. Don't worry — they'll tell you if
   any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

[patchback]

Backport to 2.19: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 0e88e74 on top of patchback/backports/2.19/0e88e74762e85766e7e878da2ec313d30ac81147/pr-2622

Backporting merged PR #2622 into 2.22

1. Ensure you have a local repo clone of your fork. Unless you cloned it
   from the upstream, this would be your origin remote.
2. Make sure you have an upstream repo added as a remote too. In these
   instructions you'll refer to it by the name upstream. If you don't
   have it, here's how you can add it:

   git remote add upstream https://github.com/pulp/pulp_container.git
   

3. Ensure you have the latest copy of upstream and prepare a branch
   that will hold the backported code:

   git fetch upstream
   git checkout -b patchback/backports/2.19/0e88e74762e85766e7e878da2ec313d30ac81147/pr-2622 upstream/2.19
   

4. Now, cherry-pick PR Update pysequoia version in requirements.txt #2622 contents into that branch:

   git cherry-pick -x 0e88e74762e85766e7e878da2ec313d30ac81147
   

   If it'll yell at you with something like fatal: Commit 0e88e74762e85766e7e878da2ec313d30ac81147 is a merge but no -m option was given., add -m 1 as follows instead:

   git cherry-pick -m1 -x 0e88e74762e85766e7e878da2ec313d30ac81147
   

5. At this point, you'll encounter some merge conflicts. You must
   resolve them in order to preserve the patch from PR Update pysequoia version in requirements.txt #2622 as close to the
   original as possible.
6. Once conflicts are resolved and git added, run:

   git cherry-pick --continue
   

7. Push this branch to your fork on GitHub:

   git push origin patchback/backports/2.19/0e88e74762e85766e7e878da2ec313d30ac81147/pr-2622
   

8. Create a PR, ensure that the CI is green. If it's not — update it so that
   the tests and any other checks pass. This is it!
   Now relax and wait for the maintainers to process your pull request
   when they have some cycles to do reviews. Don't worry — they'll tell you if
   any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.