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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 3 commits into from
Jun 6, 2023
Merged

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

merged 3 commits into from
Jun 6, 2023

Conversation

erlend-aasland
Copy link
Contributor

@erlend-aasland erlend-aasland commented Jun 2, 2023 •
edited by bedevere-bot
Loading

@bedevere-bot bedevere-bot mentioned this pull request Jun 2, 2023
Closed
@erlend-aasland erlend-aasland mentioned this pull request Jun 2, 2023
Merged
@erlend-aasland
Copy link
Contributor Author

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

@jefferyto
Copy link
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-aasland erlend-aasland requested a review from corona10 as a code owner June 6, 2023 08:59
@erlend-aasland erlend-aasland added needs backport to 3.11 only security fixes needs backport to 3.12 bug and 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:main Jun 6, 2023
@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
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
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
@erlend-aasland
[3.12] pythongh-90005: Don't link with libbsd if not needed (python#1…
bdd2b89 
…05236)

The regression was introduced with commit 5b946ca.
Restore pre pythongh-29696 behaviour.
@erlend-aasland erlend-aasland mentioned this pull request Jun 6, 2023
Closed
@erlend-aasland
Copy link
Contributor Author

Thanks for the report, @jefferyto!

@bedevere-bot
Copy link

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

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

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

@bedevere-bot bedevere-bot removed the needs backport to 3.12 bug and security fixes label Jun 6, 2023
erlend-aasland added a commit to erlend-aasland/cpython that referenced this pull request Jun 6, 2023
@erlend-aasland
[3.11] pythongh-90005: Don't link with libbsd if not needed (python#1…
a8c9f08 
…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
@erlend-aasland
[3.12] gh-90005: Don't link with libbsd if not needed (#105236) (#105360
6f3a4fd 
)

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
@erlend-aasland
[3.11] gh-90005: Don't link with libbsd if not needed (#105236) (#105359
b8d3bb7 
)

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
@jefferyto
python3: Update to 3.11.5, refresh patches
e7b8a61 
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 jefferyto mentioned this pull request Sep 5, 2023
Merged
jefferyto added a commit to jefferyto/openwrt-packages that referenced this pull request Sep 5, 2023
@jefferyto
python3: Update to 3.11.5, refresh patches
8b34dfc 
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
@jefferyto @1715173329
python3: Update to 3.11.5, refresh patches
e42c845 
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
@jefferyto
python3: Update to 3.11.5, refresh patches
102b3a7 
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)
@jefferyto jefferyto mentioned this pull request Sep 12, 2023
Merged
BKPepe pushed a commit to openwrt/packages that referenced this pull request Sep 14, 2023
@jefferyto @BKPepe
python3: Update to 3.11.5, refresh patches
e05cf55 
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
@jefferyto @lu-zero
python3: Update to 3.11.5, refresh patches
aea6177 
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 free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@corona10 corona10 Awaiting requested review from corona10 corona10 is a code owner

Assignees

@erlend-aasland erlend-aasland

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@erlend-aasland @jefferyto @miss-islington @bedevere-bot