Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-115009: Update Windows installer to use SQLite 3.45.3. #117445

Merged
merged 1 commit into from Apr 16, 2024

Conversation

felixxm
Copy link
Contributor

@felixxm felixxm commented Apr 2, 2024

@felixxm
Copy link
Contributor Author

felixxm commented Apr 2, 2024

That's something new. Should I manually update SBOM 🤔 ?

@erlend-aasland erlend-aasland changed the title gh-115009: Update Windows installer to use SQLite 3.45.2. gh-115009: Update Windows installer to use SQLite 3.45.2 Apr 2, 2024
@erlend-aasland erlend-aasland added needs backport to 3.11 only security fixes needs backport to 3.12 bug and security fixes labels Apr 2, 2024
@felixxm
Copy link
Contributor Author

felixxm commented Apr 2, 2024

Should I create a 3rd PR for Android?

"sqlite-3.45.1-0", "xz-5.4.6-0"]:

@erlend-aasland
Copy link
Contributor

That's something new. Should I manually update SBOM 🤔 ?

Yes, that's new to me too. Looks like this patch is needed:

diff --git a/Misc/externals.spdx.json b/Misc/externals.spdx.json
index 6df6401835..df7ca6f759 100644
--- a/Misc/externals.spdx.json
+++ b/Misc/externals.spdx.json
@@ -94,7 +94,7 @@
           "checksumValue": "6f0364a27375435a34137b138ca4fedef8d23eec6493ca1dfff33bfc0c34fda4"
         }
       ],
-      "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/sqlite-3.45.1.0.tar.gz",
+      "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/sqlite-3.45.2.0.tar.gz",
       "externalRefs": [
         {
           "referenceCategory": "SECURITY",
@@ -105,7 +105,7 @@
       "licenseConcluded": "NOASSERTION",
       "name": "sqlite",
       "primaryPackagePurpose": "SOURCE",
-      "versionInfo": "3.45.1.0"
+      "versionInfo": "3.45.2.0"
     },
     {
       "SPDXID": "SPDXRef-PACKAGE-tcl-core",

@erlend-aasland
Copy link
Contributor

Should I create a 3rd PR for Android?

Sure, but we don't distribute binaries for Android (yet, or possibly ever), so it is not imperative. cc. @mhsmith

@felixxm
Copy link
Contributor Author

felixxm commented Apr 2, 2024

Yes, that's new to me too. Looks like this patch is needed:

Updated 🤞

Copy link
Contributor

@sethmlarson sethmlarson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for updating the SBOM! 🙏 If you did so manually, know that in the future you can update the version in get_externals.bat and run make regen-sbom and the script will take care of the rest.

@mhsmith
Copy link
Member

mhsmith commented Apr 4, 2024

Should I create a 3rd PR for Android?

Sure, but we don't distribute binaries for Android (yet, or possibly ever), so it is not imperative. cc. @mhsmith

The library dependencies for Android come from https://github.com/beeware/cpython-android-source-deps. I've just added a release of SQLite 3.45.2, so you can pick that up in CPython if you like.

If anyone wants to update Android dependency versions in the future, please create an issue in that repository. There's also cpython-apple-source-deps for iOS, although that doesn't include SQLite because it's supplied by iOS itself.

@sethmlarson
Copy link
Contributor

@mhsmith TIL about the separate repositories for Apple/Android builds, is the long-term plan to fold those into python/cpython-source-deps? Is the source code for each project unmodified from upstream?

@erlend-aasland
Copy link
Contributor

python/cpython-source-deps is unmodified. I can't speak for the iOS/Android repos. I would prefer it if we could use single repo, if possible.

@mhsmith
Copy link
Member

mhsmith commented Apr 10, 2024

Is the source code for each project unmodified from upstream?

There are some patch files in both the iOS and Android repositories.

I would prefer it if we could use single repo, if possible.

I agree; let's revisit this when we start talking about making official binary releases for Android and iOS, which I'd like to do during the Python 3.14 cycle.

@felixxm
Copy link
Contributor Author

felixxm commented Apr 15, 2024

I created python/cpython-source-deps#35 to add the 3.45.3 source.

@felixxm felixxm changed the title gh-115009: Update Windows installer to use SQLite 3.45.2 gh-115009: Update Windows installer to use SQLite 3.45.3. Apr 16, 2024
@felixxm
Copy link
Contributor Author

felixxm commented Apr 16, 2024

Updated to SQLite 3.45.3.

@zooba
Copy link
Member

zooba commented Apr 16, 2024

FYI, we prefer to not merge PRs into the source-deps repository, as it means we need one of our committers to verify that you've provided exactly the same code (with no added backdoors, look up xz if you think this sounds unreasonable).

Doing that check is more work than just pushing it ourselves, so it's generally best to just notify us when there is a new version so that whichever of our maintainers looks after it most can bring in the new version.

@felixxm
Copy link
Contributor Author

felixxm commented Apr 16, 2024

FYI, we prefer to not merge PRs into the source-deps repository, as it means we need one of our committers to verify that you've provided exactly the same code (with no added backdoors, look up xz if you think this sounds unreasonable).

Doing that check is more work than just pushing it ourselves, so it's generally best to just notify us when there is a new version so that whichever of our maintainers looks after it most can bring in the new version.

Noted 👍 I only had good intentions 💝

Copy link
Contributor

@erlend-aasland erlend-aasland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@zooba
Copy link
Member

zooba commented Apr 16, 2024

I only had good intentions

Didn't doubt them, but it's a policy that's easier to handle when we don't have exceptions. PRs on that repo should automatically close now (after ~hour).

@zooba zooba merged commit de0dc68 into python:main Apr 16, 2024
35 checks passed
@miss-islington-app

This comment was marked as outdated.

@miss-islington-app

This comment was marked as outdated.

@zooba
Copy link
Member

zooba commented Apr 16, 2024

@felixxm or @erlend-aasland can one of you do the backport? I can try to get to it later this week, but no guarantees I'll remember.

@felixxm
Copy link
Contributor Author

felixxm commented Apr 17, 2024

@felixxm or @erlend-aasland can one of you do the backport? I can try to get to it later this week, but no guarantees I'll remember.

Will prepare it later today.

diegorusso pushed a commit to diegorusso/cpython that referenced this pull request Apr 17, 2024
@felixxm felixxm deleted the gh-115009-windows branch April 17, 2024 19:01
@bedevere-app
Copy link

bedevere-app bot commented Apr 17, 2024

GH-118008 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.12 bug and security fixes label Apr 17, 2024
felixxm added a commit to felixxm/cpython that referenced this pull request Apr 17, 2024
zooba pushed a commit that referenced this pull request Apr 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants