Skip to content

gh-90005: Don't link with libbsd if not needed - #105236

Merged
erlend-aasland merged 3 commits into
python:mainfrom
erlend-aasland:fix-fcntl-config
Jun 6, 2023
Merged

gh-90005: Don't link with libbsd if not needed#105236
erlend-aasland merged 3 commits into
python:mainfrom
erlend-aasland:fix-fcntl-config

Conversation

@erlend-aasland

@erlend-aaslanderlend-aasland commented Jun 2, 2023

Copy link
Copy Markdown
Contributor

@erlend-aasland

Copy link
Copy Markdown
ContributorAuthor

@jefferyto, does this work for you? (re #29696 (comment))

@jefferyto

Copy link
Copy Markdown
Contributor

Checking config.log after a test build with this change, I no longer see a check for libbsd after the flock function check is successful (and no -lbsd), so I would say this works 👍

@erlend-aasland
erlend-aasland marked this pull request as ready for review June 6, 2023 08:59
@erlend-aaslanderlend-aasland added needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Jun 6, 2023
@erlend-aasland
erlend-aasland enabled auto-merge (squash) June 6, 2023 09:10
@erlend-aasland
erlend-aasland merged commit e01c4de into python:mainJun 6, 2023
@miss-islington

Copy link
Copy Markdown
Contributor

Thanks @erlend-aasland for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖

@miss-islington

Copy link
Copy Markdown
Contributor

Sorry @erlend-aasland, I had trouble checking out the 3.12 backport branch.
Please retry by removing and re-adding the "needs backport to 3.12" label.
Alternatively, you can backport using cherry_picker on the command line.
cherry_picker e01c4de35dd40b132e57f4ba801991619bd2726b 3.12

@miss-islington

Copy link
Copy Markdown
Contributor

Sorry, @erlend-aasland, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker e01c4de35dd40b132e57f4ba801991619bd2726b 3.11

@erlend-aasland
erlend-aasland deleted the fix-fcntl-config branch June 6, 2023 10:04
erlend-aasland added a commit to erlend-aasland/cpython that referenced this pull request Jun 6, 2023
…05236)
The regression was introduced with commit 5b946ca.
Restore pre pythongh-29696 behaviour.
@erlend-aasland

Copy link
Copy Markdown
ContributorAuthor

Thanks for the report, @jefferyto!

@bedevere-bot

Copy link
Copy Markdown

GH-105359 is a backport of this pull request to the 3.11 branch.

@bedevere-botbedevere-bot removed the needs backport to 3.11 only security fixes label Jun 6, 2023
@bedevere-bot

Copy link
Copy Markdown

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

@bedevere-botbedevere-bot removed the needs backport to 3.12 only security fixes label Jun 6, 2023
erlend-aasland added a commit to erlend-aasland/cpython that referenced this pull request Jun 6, 2023
…05236)
The regression was introduced with commit 5b946ca.
Restore pre pythongh-29696 behaviour.
erlend-aasland added a commit that referenced this pull request Jun 6, 2023
)
The regression was introduced with commit 5b946ca.
Restore pre gh-29696 behaviour.
erlend-aasland added a commit that referenced this pull request Jun 6, 2023
)
The regression was introduced with commit 5b946ca.
Restore pre gh-29696 behaviour.
jefferyto added a commit to jefferyto/openwrt-packages that referenced this pull request Sep 5, 2023
Includes fix for CVE-2023-40217 (Bypass TLS handshake on closed
sockets).
This also:
* Remove 027-install-python3-symlink-after-stdlib.patch
This was merged upstream in
python/cpython#104693.
* Remove fix for unnecessary linking with libbsd
(60bf01c)
This was fixed upstream in
python/cpython#105236.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
jefferyto added a commit to jefferyto/openwrt-packages that referenced this pull request Sep 5, 2023
Includes fix for CVE-2023-40217 (Bypass TLS handshake on closed
sockets).
This also:
* Remove 027-install-python3-symlink-after-stdlib.patch
This was merged upstream in
python/cpython#104693.
* Remove fix for unnecessary linking with libbsd
(60bf01c)
This was fixed upstream in
python/cpython#105236.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
1715173329 pushed a commit to openwrt/packages that referenced this pull request Sep 8, 2023
Includes fix for CVE-2023-40217 (Bypass TLS handshake on closed
sockets).
This also:
* Remove 027-install-python3-symlink-after-stdlib.patch
This was merged upstream in
python/cpython#104693.
* Remove fix for unnecessary linking with libbsd
(60bf01c)
This was fixed upstream in
python/cpython#105236.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
jefferyto added a commit to jefferyto/openwrt-packages that referenced this pull request Sep 12, 2023
Includes fix for CVE-2023-40217 (Bypass TLS handshake on closed
sockets).
This also:
* Remove 027-install-python3-symlink-after-stdlib.patch
This was merged upstream in
python/cpython#104693.
* Remove fix for unnecessary linking with libbsd
(60bf01c)
This was fixed upstream in
python/cpython#105236.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
(cherry picked from commit e42c845)
BKPepe pushed a commit to openwrt/packages that referenced this pull request Sep 14, 2023
Includes fix for CVE-2023-40217 (Bypass TLS handshake on closed
sockets).
This also:
* Remove 027-install-python3-symlink-after-stdlib.patch
This was merged upstream in
python/cpython#104693.
* Remove fix for unnecessary linking with libbsd
(60bf01c)
This was fixed upstream in
python/cpython#105236.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
(cherry picked from commit e42c845)
lu-zero pushed a commit to domo-iot/packages that referenced this pull request Oct 23, 2023
Includes fix for CVE-2023-40217 (Bypass TLS handshake on closed
sockets).
This also:
* Remove 027-install-python3-symlink-after-stdlib.patch
This was merged upstream in
python/cpython#104693.
* Remove fix for unnecessary linking with libbsd
(60bf01c)
This was fixed upstream in
python/cpython#105236.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Sign up for freeto 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.

4 participants

@erlend-aasland@jefferyto@miss-islington@bedevere-bot