gh-78469: Declare missing sethostname for Solaris 10 #109447

kulikjak · 2023-09-15T13:03:22Z

As discussed in the issue, sethostname is missing from Solaris 10 headers but is available on Solaris 11.

And because there isn't an OS version specific macro for Solaris, I had to "create" one.

Issue: Declare sethostname in socketmodule.c for SOLARIS #78469

vstinner · 2023-09-15T15:44:53Z

Modules/socketmodule.c

@@ -5652,8 +5652,9 @@ socket_sethostname(PyObject *self, PyObject *args)
    Py_buffer buf;
    int res, flag = 0;

-#ifdef _AIX
-/* issue #18259, not declared in any useful header file */
+#if defined(_AIX) || (defined(__sun) && defined(__SVR4) && SUNOS_VERSION == 510)


wow, that's very spefic. It was available before and after, but not at version 510? :-)

vstinner · 2023-09-15T15:47:27Z

configure.ac

+	# in most compilers, so we define one here.
+	SUNOS_VERSION=`echo $ac_sys_release | tr -d '.'`
+	AC_DEFINE_UNQUOTED([SUNOS_VERSION], [$SUNOS_VERSION],
+	                   [The version of SunOS/Solaris as reported by `uname -r' without the dot.])


How do you distinguish Solaris 5.10 and Solaris 51.0?

Maybe multiply the major version by 100 or 1000? or use a shift of 8 bits? The usage would be:

major = VERSION >> 8 minor = VERSION & 255

The disavantage is the need to write versions in hexadecimal :-(

@erlend-aasland: Should we prefix new pyconfig.h constants by Py_ ? see: capi-workgroup/problems#46

I think we should follow the PEP-7 recommendations: https://peps.python.org/pep-0007/#naming-conventions

How do you distinguish Solaris 5.10 and Solaris 51.0?

I see what you mean, but that's not happening. The leading 5 was dropped from the name 25 years ago and while e.g. uname and compilation targets still use it, nobody today calls it Solaris/SunOS 5.10; only Solaris 10. If we ever release Solaris 51, uname -r should report it as 5.51.

That said, I am not strongly against changing it if you still prefer your suggestion.

I think we should follow the PEP-7 recommendations: https://peps.python.org/pep-0007/#naming-conventions

Thanks, I missed that. It's fixed now.

vstinner · 2023-09-15T15:49:24Z

When was Solaris 10 release? Is it still supported? Does this change better to forks of Solaris?

kulikjak · 2023-10-05T15:04:22Z

When was Solaris 10 release? Is it still supported? Does this change better to forks of Solaris?

Sorry for such a long delay. As mentioned in the issue, Solaris 10, while in the "extended support stage" intended mostly for critical fixes, is still supported (ATM at least until January 2025). There are still people using it and possibly installing newer Python onto it.

As for the Solaris forks, this doesn't affect those because the first open version was Solaris 11.

configure.ac

Co-authored-by: Victor Stinner <[email protected]>

erlend-aasland · 2023-10-06T13:04:00Z

Is this a bug-fix? If so, we should backport it and add a NEWS entry.

vstinner · 2023-10-06T13:50:22Z

@kulikjak Update configure

Do you use "make regen-configure"? See: https://docs.python.org/dev/using/configure.html#generated-files

@kulikjak: Anyway, I push directly into your branch to fix the configure script (regenerate it).

Modules/socketmodule.c

vstinner

LGTM.

vstinner · 2023-10-06T13:53:29Z

@kulikjak: I also replaced Py_SUNOS_VERSION == 510 with Py_SUNOS_VERSION <= 510.

kulikjak · 2023-10-09T12:13:50Z

Do you use "make regen-configure"? See: https://docs.python.org/dev/using/configure.html#generated-files

Sigh, sorry. Normally, I do, but this time I thought that I could quickly edit it myself, ... and I was wrong. Thanks for fixing it.

Is this a bug-fix? If so, we should backport it and add a NEWS entry.

I guess it is (fixing a build on Solaris <= 10). I can add a NEWS entry, although now there is a skip-news tag, so I am not sure whether I should do so?

Other than that, the build failure doesn't seem to be related, so that's good.

miss-islington · 2023-10-09T21:18:09Z

Thanks @kulikjak for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

…109447) Add OS version specific macro for Solaris: Py_SUNOS_VERSION. (cherry picked from commit 3b1580a) Co-authored-by: Jakub Kulík <[email protected]>

bedevere-app · 2023-10-09T21:18:23Z

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

bedevere-app · 2023-10-09T21:18:29Z

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

…109447) Add OS version specific macro for Solaris: Py_SUNOS_VERSION. (cherry picked from commit 3b1580a) Co-authored-by: Jakub Kulík <[email protected]>

bedevere-bot · 2023-10-09T21:36:38Z

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot s390x SLES 3.x has failed when building commit 3b1580a.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/540/builds/6801) and take a look at the build logs.
Check if the failure is related to this commit (3b1580a) or if it is a false positive.
If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/540/builds/6801

Failed tests:

test_signal

Failed subtests:

test_stress_modifying_handlers - test.test_signal.StressTest.test_stress_modifying_handlers

Summary of the results of the build (if available):

==

Click to see traceback logs

Traceback (most recent call last):
  File "/home/dje/cpython-buildarea/3.x.edelsohn-sles-z/build/Lib/test/test_signal.py", line 1374, in test_stress_modifying_handlers
    self.assertGreater(num_received_signals, 0)
AssertionError: 0 not greater than 0

… (#110580) Add OS version specific macro for Solaris: Py_SUNOS_VERSION. (cherry picked from commit 3b1580a) Co-authored-by: Jakub Kulík <[email protected]>

… (#110581) Add OS version specific macro for Solaris: Py_SUNOS_VERSION. (cherry picked from commit 3b1580a) Co-authored-by: Jakub Kulík <[email protected]>

…9447) Add OS version specific macro for Solaris: Py_SUNOS_VERSION.

kulikjak added 2 commits September 15, 2023 11:54

Add OS version specific macro for Solaris

e71d8fb

declare sethostname in socketmodule.c for Solaris 10

5593f21

kulikjak requested review from erlend-aasland and corona10 as code owners September 15, 2023 13:03

bedevere-app bot added the awaiting review label Sep 15, 2023

bedevere-app bot mentioned this pull request Sep 15, 2023

Declare sethostname in socketmodule.c for SOLARIS #78469

Closed

vstinner reviewed Sep 15, 2023

View reviewed changes

rename SUNOS_VERSION to Py_SUNOS_VERSION (PEP 7 naming conventions)

bc5523e

vstinner reviewed Oct 5, 2023

View reviewed changes

configure.ac Outdated Show resolved Hide resolved

kulikjak and others added 2 commits October 6, 2023 14:15

Update configure.ac

3a96e29

Co-authored-by: Victor Stinner <[email protected]>

Update configure

691441c

erlend-aasland approved these changes Oct 6, 2023

View reviewed changes

bedevere-app bot added awaiting core review and removed awaiting review labels Oct 6, 2023

Run make regen-configure

f8f49e4

vstinner enabled auto-merge (squash) October 6, 2023 13:51

vstinner reviewed Oct 6, 2023

View reviewed changes

Modules/socketmodule.c Outdated Show resolved Hide resolved

vstinner approved these changes Oct 6, 2023

View reviewed changes

vstinner disabled auto-merge October 6, 2023 13:51

Update Modules/socketmodule.c

5970802

vstinner added the skip news label Oct 6, 2023

vstinner enabled auto-merge (squash) October 6, 2023 13:52

Merge branch 'main' into Solaris10-sethostname

9cb0a31

erlend-aasland added the needs backport to 3.11 only security fixes label Oct 9, 2023

erlend-aasland added the needs backport to 3.12 bug and security fixes label Oct 9, 2023

vstinner merged commit 3b1580a into python:main Oct 9, 2023
27 checks passed

bedevere-app bot removed the awaiting core review label Oct 9, 2023

bedevere-app bot removed the needs backport to 3.12 bug and security fixes label Oct 9, 2023

bedevere-app bot removed the needs backport to 3.11 only security fixes label Oct 9, 2023

Glyphack pushed a commit to Glyphack/cpython that referenced this pull request Sep 2, 2024

pythongh-78469: Declare missing sethostname for Solaris 10 (python#10…

dc2bf28

…9447) Add OS version specific macro for Solaris: Py_SUNOS_VERSION.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gh-78469: Declare missing sethostname for Solaris 10 #109447

gh-78469: Declare missing sethostname for Solaris 10 #109447

kulikjak commented Sep 15, 2023 •

edited by bedevere-app bot

Loading

vstinner Sep 15, 2023

vstinner Sep 15, 2023

vstinner Sep 15, 2023

erlend-aasland Sep 18, 2023

kulikjak Oct 5, 2023

vstinner commented Sep 15, 2023

kulikjak commented Oct 5, 2023

erlend-aasland commented Oct 6, 2023

vstinner commented Oct 6, 2023

vstinner left a comment

vstinner commented Oct 6, 2023

kulikjak commented Oct 9, 2023 •

edited

Loading

miss-islington commented Oct 9, 2023

bedevere-app bot commented Oct 9, 2023

bedevere-app bot commented Oct 9, 2023

bedevere-bot commented Oct 9, 2023

gh-78469: Declare missing sethostname for Solaris 10 #109447

gh-78469: Declare missing sethostname for Solaris 10 #109447

Conversation

kulikjak commented Sep 15, 2023 • edited by bedevere-app bot Loading

vstinner Sep 15, 2023

Choose a reason for hiding this comment

vstinner Sep 15, 2023

Choose a reason for hiding this comment

vstinner Sep 15, 2023

Choose a reason for hiding this comment

erlend-aasland Sep 18, 2023

Choose a reason for hiding this comment

kulikjak Oct 5, 2023

Choose a reason for hiding this comment

vstinner commented Sep 15, 2023

kulikjak commented Oct 5, 2023

erlend-aasland commented Oct 6, 2023

vstinner commented Oct 6, 2023

vstinner left a comment

Choose a reason for hiding this comment

vstinner commented Oct 6, 2023

kulikjak commented Oct 9, 2023 • edited Loading

miss-islington commented Oct 9, 2023

bedevere-app bot commented Oct 9, 2023

bedevere-app bot commented Oct 9, 2023

bedevere-bot commented Oct 9, 2023

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

kulikjak commented Sep 15, 2023 •

edited by bedevere-app bot

Loading

kulikjak commented Oct 9, 2023 •

edited

Loading