gh-63760: Don't declare gethostname() on Solaris #108817

vstinner · 2023-09-02T16:05:56Z

Since at least 2013, Oracle Solaris defines gethostname(). socketmodule.c no longer has to define gethostname() for Solaris.

Oracle Solaris and OpenSolaris have patches to remove the gethostname() definition in Python:

Issue: request to reopen Issue837046 - pyport.h redeclares gethostname() if SOLARIS is defined #63760

vstinner · 2023-09-02T16:07:30Z

@kulikjak: Would you mind to review my PR? (And test it if possible?)

I saw your PR #23208, but I tried to add more documentation about the change from the issue and your latest comments.

I plan to backport the change manually to Python 3.12 (the function was defined in pyport.h), and then to 3.11.

kulikjak · 2023-09-02T16:55:08Z

@vstinner, I tried running tests but sadly the build failed due to what seems like unrelated issue:

/builds/cpython-main/Modules/termios.c: In function 'termios_tcgetwinsize_impl':
/builds/cpython-main/Modules/termios.c:389:9: error: implicit declaration of function 'ioctl' [-Werror=implicit-function-declaration]
389 |     r = ioctl(fd, TIOCGWINSZ, &w);
    |         ^~~~~
/builds/cpython-main/Modules/_multiprocessing/multiprocessing.c: In function 'multiprocessing_exec':
/builds/cpython-main/Modules/_multiprocessing/multiprocessing.h:44:32: error: implicit declaration of function 'sysconf'; did you mean '_sysconf'? [-Werror=implicit-function-declaration]
44 |         # define SEM_VALUE_MAX sysconf(_SC_SEM_VALUE_MAX)
   |                                ^~~~~

but I don't see how this change can break anything as it's how we compile Python for many years now.

Just two minor nits for the NEWS fragment - it's at least since 2005 (when Solaris was opened) and it's not just Oracle Solaris but Solaris in general.

vstinner · 2023-09-02T17:14:59Z

/builds/cpython-main/Modules/_multiprocessing/multiprocessing.c: In function 'multiprocessing_exec':
/builds/cpython-main/Modules/_multiprocessing/multiprocessing.h:44:32: error: implicit declaration of function 'sysconf'; did you mean '_sysconf'? [-Werror=implicit-function-declaration]
44 |         # define SEM_VALUE_MAX sysconf(_SC_SEM_VALUE_MAX)
   |                                ^~~~~

I wrote PR #108823 to fix warning.

For Modules/termios.c, I don't know which include is missing on Solaris to get ioctl(). Is it also unistd.h? On Linux, man ioctl asks to #include <sys/ioctl.h>.

Since 2005, Solaris defines gethostname(). socketmodule.c no longer has to define gethostname() for Solaris. Oracle Solaris and OpenSolaris have patches to remove the gethostname() definition in Python: * https://github.com/oracle/solaris-userland/blob/master/components/python/python37/patches/15-gethostname.patch * https://github.com/OpenIndiana/oi-userland/blob/oi/hipster/components/python/python37/patches/15-gethostname.patch * https://github.com/omniosorg/omnios-build/blob/master/build/python27/patches/24-gethostname.patch Co-Authored-by: Jakub Kulík <[email protected]>

vstinner · 2023-09-02T17:16:33Z

Just two minor nits for the NEWS fragment - it's at least since 2005 (when Solaris was opened) and it's not just Oracle Solaris but Solaris in general.

Ok, I updated the PR. Would you mind to review it again?

kulikjak

Thanks!

kulikjak · 2023-09-02T17:54:51Z

For Modules/termios.c, I don't know which include is missing on Solaris to get ioctl(). Is it also unistd.h? On Linux, man ioctl asks to #include <sys/ioctl.h>.

Yes, I needed to add unistd.h there for build to pass. With #108823 there seems to be no issues anymore. Thanks!

bedevere-bot · 2023-09-02T17:59:03Z

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

Since 2005, Solaris defines gethostname(). socketmodule.c no longer has to define gethostname() for Solaris. Oracle Solaris and OpenSolaris have patches to remove the gethostname() definition in Python: * https://github.com/oracle/solaris-userland/blob/master/components/python/python37/patches/15-gethostname.patch * https://github.com/OpenIndiana/oi-userland/blob/oi/hipster/components/python/python37/patches/15-gethostname.patch * https://github.com/omniosorg/omnios-build/blob/master/build/python27/patches/24-gethostname.patch Co-authored-by: Jakub Kulík <[email protected]> (cherry picked from commit 0e6d582)

vstinner · 2023-09-02T18:01:07Z

Yes, I needed to add unistd.h there for build to pass. With #108823 there seems to be no issues anymore. Thanks!

Please create a PR for Modules/termios.c.

kulikjak · 2023-09-02T18:19:47Z

I created #108825 to fix it.

…08824) gh-63760: Don't declare gethostname() on Solaris (#108817) Since 2005, Solaris defines gethostname(). socketmodule.c no longer has to define gethostname() for Solaris. Oracle Solaris and OpenSolaris have patches to remove the gethostname() definition in Python: * https://github.com/oracle/solaris-userland/blob/master/components/python/python37/patches/15-gethostname.patch * https://github.com/OpenIndiana/oi-userland/blob/oi/hipster/components/python/python37/patches/15-gethostname.patch * https://github.com/omniosorg/omnios-build/blob/master/build/python27/patches/24-gethostname.patch Co-authored-by: Jakub Kulík <[email protected]> (cherry picked from commit 0e6d582)

…GH-108817) (pythonGH-108824) pythongh-63760: Don't declare gethostname() on Solaris (pythonGH-108817) Since 2005, Solaris defines gethostname(). socketmodule.c no longer has to define gethostname() for Solaris. Oracle Solaris and OpenSolaris have patches to remove the gethostname() definition in Python: * https://github.com/oracle/solaris-userland/blob/master/components/python/python37/patches/15-gethostname.patch * https://github.com/OpenIndiana/oi-userland/blob/oi/hipster/components/python/python37/patches/15-gethostname.patch * https://github.com/omniosorg/omnios-build/blob/master/build/python27/patches/24-gethostname.patch (cherry picked from commit 7269916) Co-authored-by: Victor Stinner <[email protected]> Co-authored-by: Jakub Kulík <[email protected]> (cherry picked from commit 0e6d582)

…8817) (GH-108824) (#108832) [3.12] gh-63760: Don't declare gethostname() on Solaris (GH-108817) (GH-108824) gh-63760: Don't declare gethostname() on Solaris (GH-108817) Since 2005, Solaris defines gethostname(). socketmodule.c no longer has to define gethostname() for Solaris. Oracle Solaris and OpenSolaris have patches to remove the gethostname() definition in Python: * https://github.com/oracle/solaris-userland/blob/master/components/python/python37/patches/15-gethostname.patch * https://github.com/OpenIndiana/oi-userland/blob/oi/hipster/components/python/python37/patches/15-gethostname.patch * https://github.com/omniosorg/omnios-build/blob/master/build/python27/patches/24-gethostname.patch (cherry picked from commit 7269916) Co-authored-by: Victor Stinner <[email protected]> Co-authored-by: Jakub Kulík <[email protected]> (cherry picked from commit 0e6d582) Co-authored-by: Victor Stinner <[email protected]>

vstinner added the needs backport to 3.12 only security fixes label Sep 2, 2023

bedevere-bot mentioned this pull request Sep 2, 2023

request to reopen Issue837046 - pyport.h redeclares gethostname() if SOLARIS is defined #63760

Closed

bedevere-bot added the awaiting core review label Sep 2, 2023

vstinner removed the needs backport to 3.12 only security fixes label Sep 2, 2023

vstinner mentioned this pull request Sep 2, 2023

bpo-19561: Remove unnecessary gethostname() prototype for Solaris #23208

Closed

vstinner force-pushed the socket_solaris_gethostname branch from b83c531 to 0c3aaad Compare September 2, 2023 17:16

kulikjak approved these changes Sep 2, 2023

View reviewed changes

vstinner enabled auto-merge (squash) September 2, 2023 17:24

vstinner merged commit 0e6d582 into python:main Sep 2, 2023

vstinner deleted the socket_solaris_gethostname branch September 2, 2023 17:55

bedevere-bot removed the awaiting core review label Sep 2, 2023

miss-islington mentioned this pull request Sep 2, 2023

[3.11] [3.12] gh-63760: Don't declare gethostname() on Solaris (GH-108817) (GH-108824) #108832

Merged

vstinner mentioned this pull request Sep 7, 2023

Declare sethostname in socketmodule.c for SOLARIS #78469

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

gh-63760: Don't declare gethostname() on Solaris #108817

gh-63760: Don't declare gethostname() on Solaris #108817

Uh oh!

vstinner commented Sep 2, 2023 •

edited by bedevere-bot

Loading

Uh oh!

vstinner commented Sep 2, 2023

Uh oh!

kulikjak commented Sep 2, 2023

Uh oh!

vstinner commented Sep 2, 2023

Uh oh!

vstinner commented Sep 2, 2023

Uh oh!

kulikjak left a comment

Uh oh!

kulikjak commented Sep 2, 2023

Uh oh!

bedevere-bot commented Sep 2, 2023

Uh oh!

vstinner commented Sep 2, 2023

Uh oh!

kulikjak commented Sep 2, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

gh-63760: Don't declare gethostname() on Solaris #108817

gh-63760: Don't declare gethostname() on Solaris #108817

Uh oh!

Conversation

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

Uh oh!

Uh oh!

vstinner commented Sep 2, 2023

Uh oh!

kulikjak commented Sep 2, 2023

Uh oh!

vstinner commented Sep 2, 2023

Uh oh!

vstinner commented Sep 2, 2023

Uh oh!

kulikjak left a comment

Choose a reason for hiding this comment

Uh oh!

kulikjak commented Sep 2, 2023

Uh oh!

bedevere-bot commented Sep 2, 2023

Uh oh!

vstinner commented Sep 2, 2023

Uh oh!

kulikjak commented Sep 2, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

vstinner commented Sep 2, 2023 •

edited by bedevere-bot

Loading