From: fvalasiad <fvalasiad@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: wine: update to 8.13.
Date: Tue, 25 Jul 2023 11:47:58 +0200 [thread overview]
Message-ID: <20230725094758.ISRdv4XjVztKkMHVhecS0jWu3MPty_jRfQ7pLznCvPE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45202@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1785 bytes --]
New comment by fvalasiad on void-packages repository
https://github.com/void-linux/void-packages/pull/45202#issuecomment-1649490737
Comment:
After some digging I found the commit that broke musl support
```
commit 41cc117b3f37ab4b9b4ac8a815cd2a496d38fb4b (HEAD)
Author: Billy Laws <blaws05@gmail.com>
Date: Sat Jun 3 21:57:42 2023 +0100
commit 41cc117b3f37ab4b9b4ac8a815cd2a496d38fb4b (HEAD)
Author: Billy Laws <blaws05@gmail.com>
Date: Sat Jun 3 21:57:42 2023 +0100
server: Avoid using SOL_IPX to detect whether IPX is supported.
diff --git a/server/sock.c b/server/sock.c
index 088e6d63079..34be6ea22ef 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -62,6 +62,7 @@
#ifdef HAVE_NETIPX_IPX_H
# include <netipx/ipx.h>
+# define HAS_IPX
#elif defined(HAVE_LINUX_IPX_H)
# ifdef HAVE_ASM_TYPES_H
# include <asm/types.h>
@@ -70,8 +71,6 @@
# include <linux/types.h>
# endif
# include <linux/ipx.h>
-#endif
-#if defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS)
# define HAS_IPX
#endif
```
the problem with it is at the following code:
```
#ifdef HAS_IPX
int ipx_type = protocol - WS_NSPROTO_IPX;
#ifdef SOL_IPX
setsockopt( sockfd, SOL_IPX, IPX_TYPE, &ipx_type, sizeof(ipx_type) );
#else
struct ipx val;
/* Should we retrieve val using a getsockopt call and then
* set the modified one? */
val.ipx_pt = ipx_type;
setsockopt( sockfd, 0, SO_DEFAULT_HEADERS, &val, sizeof(val) );
#endif
#endif
```
previously `HAS_IPX` wasn't defined at all, now it is defined while `SOL_IPX` isn't and so we branch to #else without checking for the existence of `SO_DEFAULT_HEADERS` as the macro originally did.
I will consider reverting the commit to upstream wine.
next prev parent reply other threads:[~2023-07-25 9:47 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-23 11:53 [PR PATCH] " fvalasiad
2023-07-23 18:13 ` mhmdanas
2023-07-24 13:15 ` classabbyamp
2023-07-24 16:32 ` Hoshpak
2023-07-24 16:57 ` fvalasiad
2023-07-25 9:47 ` fvalasiad [this message]
2023-07-25 10:17 ` fvalasiad
2023-07-25 16:47 ` fvalasiad
2023-07-26 9:50 ` Hoshpak
2023-07-26 12:37 ` [PR PATCH] [Updated] " fvalasiad
2023-07-26 14:31 ` fvalasiad
2023-07-26 16:45 ` [PR PATCH] [Merged]: " Hoshpak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230725094758.ISRdv4XjVztKkMHVhecS0jWu3MPty_jRfQ7pLznCvPE@z \
--to=fvalasiad@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).