GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — gh-99108: Add missing md5/sha1 defines to Modules/Setup by asottile · Pull Request #102308 · python/cpython

Conversation

asottile commented Feb 28, 2023 •

edited by bedevere-bot

Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link

Copy Markdown

Contributor

Issue: Replace built-in hashlib with verified implementations from HACL* #99108

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions


          fix defines in Modules/Setup for md5 / sha1

2ad00be

bedevere-bot added the awaiting review label

Feb 28, 2023

asottile commented Feb 28, 2023

Copy link

Copy Markdown

Contributor Author

cc @msprotz @erlend-aasland

looks like these were missed too (copied them from Modules/Setup.stdlib.in)

this fixes the deadsnakes builds -- still not sure why this file doesn't get tested in cpython itself or how it differs from Setup.stdlib.in 🤷

msprotz reacted with thumbs up emoji

All reactions

👍 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

erlend-aasland commented Feb 28, 2023

Copy link

Copy Markdown

Contributor

As GPS noted on the related PR, this file is really not used anymore. We should tear it out.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

asottile commented Feb 28, 2023

Copy link

Copy Markdown

Contributor Author

As GPS noted on the related PR, this file is really not used anymore. We should tear it out.

debian still uses it -- is there a guide on what to replace it with?

$ wget -q http://deb.debian.org/debian/pool/main/p/python3.11/python3.11_3.11.2-4.debian.tar.xz
$ tar --to-stdout -xf * debian/rules | grep -nC3 Modules/Setup
537-define __post_configure
538-	egrep \
539-	  "^#($$(awk -v ORS='|' '$$2 ~ /^extension$$/ {print $$1}' debian/PVER-minimal.README.Debian.in)XX)" \
540:	  Modules/Setup \
541-	    | sed -e 's/^#//' -e 's/-Wl,-Bdynamic//;s/-Wl,-Bstatic//' \
542:	    >> $(1)/Modules/Setup.local
543-
544-	: # unconditionally run makesetup
545-	cd $(1) && \
546-	  ../Modules/makesetup -c ../Modules/config.c.in -s Modules \
547:	    Modules/Setup.local Modules/Setup.bootstrap Modules/Setup.stdlib ../Modules/Setup
548-	mv $(1)/config.c $(1)/Modules/
549-
550-	: # and fix the timestamps

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

erlend-aasland commented Feb 28, 2023

Copy link

Copy Markdown

Contributor

Is there even a guide on how to use Modules/Setup? ;) The link you provided is for 3.11; main is 3.12.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

erlend-aasland changed the title ~~fix defines in Modules/Setup for md5 / sha1~~ gh-99108: Add missing md5/sha1 defines to Modules/Setup

Feb 28, 2023

bedevere-bot mentioned this pull request

Feb 28, 2023

Replace built-in hashlib with verified implementations from HACL* #99108

Closed

erlend-aasland approved these changes

Feb 28, 2023

View reviewed changes

bedevere-bot added awaiting merge and removed awaiting review labels

Feb 28, 2023

asottile commented Feb 28, 2023

Copy link

Copy Markdown

Contributor Author

Is there even a guide on how to use Modules/Setup? ;) The link you provided is for 3.11; main is 3.12.

sorry here's the link for 3.12: https://salsa.debian.org/cpython-team/python3/-/blob/db3395e789613c8d01502da8a1be68a976337022/debian/rules#L544

I'm not sure, but it's been using this file for years as far as I know

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

erlend-aasland added the skip news label

Feb 28, 2023

erlend-aasland commented Feb 28, 2023

Copy link

Copy Markdown

Contributor

It seem that Modules/Setup is still tied to the build system, including fairly recent changes by Christian. IIRC, he has a long term goal of getting rid of it, but as long as the file is here (and being used in the wild), we should of course keep it up to date.

Thanks for noticing, and thanks for the patch!

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

erlend-aasland merged commit 360ef84 into python:main

Feb 28, 2023

bedevere-bot removed the awaiting merge label

Feb 28, 2023

erlend-aasland commented Feb 28, 2023

Copy link

Copy Markdown

Contributor

I'm not sure, but it's been using this file for years as far as I know

Correct, Modules/Setup has been in use for many years.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

asottile deleted the md5-sha1-defines branch

February 28, 2023 21:38

carljm added a commit to carljm/cpython that referenced this pull request

Feb 28, 2023


          Merge branch 'main' into inlinecomp2

73dc0ed

* main: (67 commits)
  pythongh-99108: Add missing md5/sha1 defines to Modules/Setup (python#102308)
  pythongh-100227: Move _str_replace_inf to PyInterpreterState (pythongh-102333)
  pythongh-100227: Move the dtoa State to PyInterpreterState (pythongh-102331)
  pythonGH-102305: Expand some macros in generated_cases.c.h (python#102309)
  Migrate to new PSF mailgun account (python#102284)
  pythongh-102192: Replace PyErr_Fetch/Restore etc by more efficient alternatives (in Python/) (python#102193)
  pythonGH-90744: Fix erroneous doc links in the sys module (python#101319)
  pythongh-87092: Make jump target label equal to the offset of the target in the instructions sequence (python#102093)
  pythongh-101101: Unstable C API tier (PEP 689) (pythonGH-101102)
  IDLE: Simplify DynOptionsMenu __init__code (python#101371)
  pythongh-101561: Add typing.override decorator (python#101564)
  pythongh-101825: Clarify that as_integer_ratio() output is always normalized (python#101843)
  pythongh-101773: Optimize creation of Fractions in private methods (python#101780)
  pythongh-102251: Updates to test_imp Toward Fixing Some Refleaks (pythongh-102254)
  pythongh-102296 Document that inspect.Parameter kinds support ordering (pythonGH-102297)
  pythongh-102250: Fix double-decref in COMPARE_AND_BRANCH error case (pythonGH-102287)
  pythongh-101100: Fix sphinx warnings in `types` module (python#102274)
  pythongh-91038: Change default argument value to `False` instead of `0` (python#31621)
  pythongh-101765: unicodeobject: use Py_XDECREF correctly (python#102283)
  [doc] Improve grammar/fix missing word (pythonGH-102060)
  ...

Reviewers

erlend-aasland

erlend-aasland approved these changes

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

3 participants

Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.

GeezerVison

Conversation

asottile commented Feb 28, 2023 • edited by bedevere-bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

asottile commented Feb 28, 2023

Uh oh!

erlend-aasland commented Feb 28, 2023

Uh oh!

asottile commented Feb 28, 2023

Uh oh!

erlend-aasland commented Feb 28, 2023

Uh oh!

asottile commented Feb 28, 2023

Uh oh!

erlend-aasland commented Feb 28, 2023

Uh oh!

erlend-aasland commented Feb 28, 2023

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

asottile commented Feb 28, 2023 •

edited by bedevere-bot

Loading

Uh oh!

There was an error while loading. Please reload this page.