summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsmael Luceno2021-10-10 19:41:42 +0200
committerIsmael Luceno2021-10-11 01:23:23 +0200
commitf4ea7b9a0857d40846260f7315cc497e8f70c293 (patch)
tree24e43ff4ecce0b84b5bbb23a493a6b968279cd5b
parent40b3b587b8d2e75e2fe11556d99715743acee578 (diff)
wine (devel) 6.19
-rwxr-xr-xx11-libs/wine/DETAILS2
-rw-r--r--x11-libs/wine/HISTORY7
-rw-r--r--x11-libs/wine/patches/0001-dnsapi-Work-around-missing-ns_name_skip.patch (renamed from x11-libs/wine/patches/dnsapi.diff)30
-rw-r--r--x11-libs/wine/patches/0002-server-Fix-missing-include-for-uid_t.patch33
4 files changed, 64 insertions, 8 deletions
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 81e51258b8..62342f954d 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -1,7 +1,7 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=wine
case "$WINE_BRANCH" in
-(devel) VERSION=6.18 ;;
+(devel) VERSION=6.19 ;;
(stable) VERSION=6.0.1 ;;
esac; case "$WINE_BRANCH" in
(scm)
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 1620423a3b..2aa3112feb 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,10 @@
+2021-10-10 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated (devel) to 6.19
+ * dnsapi.diff, 0001-dnsapi-Work-around-missing-ns_name_skip.patchi:
+ renamed patch, added description and updated status
+ * 0002-server-Fix-missing-include-for-uid_t.patch:
+ added patch to build 6.19 against musl
+
2021-09-29 Ismael Luceno <ismael@sourcemage.org>
* DETAILS: updated (devel) to 6.18
diff --git a/x11-libs/wine/patches/dnsapi.diff b/x11-libs/wine/patches/0001-dnsapi-Work-around-missing-ns_name_skip.patch
index 9f748fd922..a7a2c93b40 100644
--- a/x11-libs/wine/patches/dnsapi.diff
+++ b/x11-libs/wine/patches/0001-dnsapi-Work-around-missing-ns_name_skip.patch
@@ -1,10 +1,23 @@
-Upstream-Status: Backport
+From 930a2109f1d11f1c0571b869faea94d228440f7b Mon Sep 17 00:00:00 2001
+From: Hans Leidekker <hans@meelstraat.net>
+Date: Sun, 10 Oct 2021 23:51:49 +0200
+Subject: [PATCH 1/2] dnsapi: Work around missing ns_name_skip
+
+On some non-glibc systems (specifically musl) ns_name_skip may be missing.
+
+Fixes: 0d26dd2afbc3 ("dnsapi: Get rid of imported domain name parsing code.")
+[ismael@iodev.co.uk: Edited commit message]
+Upstream-Status: Submitted [https://bugs.winehq.org/show_bug.cgi?id=50985]
+Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
+---
+ dlls/dnsapi/libresolv.c | 35 +++++++++++++++++++++++++++++++----
+ 1 file changed, 31 insertions(+), 4 deletions(-)
diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
-index ac52147af01..633169e6d66 100644
+index 197ca84aeae9..032efb88a884 100644
--- a/dlls/dnsapi/libresolv.c
+++ b/dlls/dnsapi/libresolv.c
-@@ -344,6 +344,33 @@ static unsigned int get_record_size( const ns_rr *rr )
+@@ -548,6 +548,33 @@ static unsigned int get_record_size( const ns_rr *rr )
return size;
}
@@ -38,7 +51,7 @@ index ac52147af01..633169e6d66 100644
static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD *dlen )
{
DNS_STATUS ret = ERROR_SUCCESS;
-@@ -390,7 +417,7 @@ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD
+@@ -594,7 +621,7 @@ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD
r->Data.MINFO.pNameMailbox = dname_from_msg( msg, pos );
if (!r->Data.MINFO.pNameMailbox) return ERROR_NOT_ENOUGH_MEMORY;
@@ -47,7 +60,7 @@ index ac52147af01..633169e6d66 100644
return DNS_ERROR_BAD_PACKET;
r->Data.MINFO.pNameErrorsMailbox = dname_from_msg( msg, pos );
-@@ -451,7 +478,7 @@ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD
+@@ -655,7 +682,7 @@ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD
r->Data.SIG.pNameSigner = dname_from_msg( msg, pos );
if (!r->Data.SIG.pNameSigner) return ERROR_NOT_ENOUGH_MEMORY;
@@ -56,7 +69,7 @@ index ac52147af01..633169e6d66 100644
return DNS_ERROR_BAD_PACKET;
/* FIXME: byte order? */
-@@ -476,7 +503,7 @@ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD
+@@ -680,7 +707,7 @@ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD
r->Data.SOA.pNamePrimaryServer = dname_from_msg( msg, pos );
if (!r->Data.SOA.pNamePrimaryServer) return ERROR_NOT_ENOUGH_MEMORY;
@@ -65,7 +78,7 @@ index ac52147af01..633169e6d66 100644
return DNS_ERROR_BAD_PACKET;
r->Data.SOA.pNameAdministrator = dname_from_msg( msg, pos );
-@@ -486,7 +513,7 @@ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD
+@@ -690,7 +717,7 @@ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD
return ERROR_NOT_ENOUGH_MEMORY;
}
@@ -74,3 +87,6 @@ index ac52147af01..633169e6d66 100644
return DNS_ERROR_BAD_PACKET;
r->Data.SOA.dwSerialNo = ntohl( *(const DWORD *)pos ); pos += sizeof(DWORD);
+--
+2.33.0
+
diff --git a/x11-libs/wine/patches/0002-server-Fix-missing-include-for-uid_t.patch b/x11-libs/wine/patches/0002-server-Fix-missing-include-for-uid_t.patch
new file mode 100644
index 0000000000..f4958180b5
--- /dev/null
+++ b/x11-libs/wine/patches/0002-server-Fix-missing-include-for-uid_t.patch
@@ -0,0 +1,33 @@
+From b9fcfd6e79f3e5169e1ad82d24c6ca2f56ab4e48 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael@iodev.co.uk>
+Date: Sun, 10 Oct 2021 22:56:59 +0200
+Subject: [PATCH 2/2] server: Fix missing include for uid_t
+
+Explicitly include <sys/types.h> to make uid_t available to users of
+server/security.h.
+
+This is a problem on musl, and possibly other non-glibc systems.
+
+Fixes: c954e5b9e6a6 ("server: Avoid using wine/port.h.")
+Upstream-Status: Submitted [https://bugs.winehq.org/show_bug.cgi?id=51860]
+Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
+---
+ server/security.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/server/security.h b/server/security.h
+index 5388bc9c4195..39e7218ec5fa 100644
+--- a/server/security.h
++++ b/server/security.h
+@@ -21,6 +21,8 @@
+ #ifndef __WINE_SERVER_SECURITY_H
+ #define __WINE_SERVER_SECURITY_H
+
++#include <sys/types.h> /* for uid_t */
++
+ extern const LUID SeIncreaseQuotaPrivilege;
+ extern const LUID SeSecurityPrivilege;
+ extern const LUID SeTakeOwnershipPrivilege;
+--
+2.33.0
+