wine 6.6 (devel)

4 files changed, 89 insertions, 6 deletions

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index f578f2830a..010e0b0689 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -1,6 +1,9 @@
 . "$GRIMOIRE/FUNCTIONS"
            SPELL=wine
 case "$WINE_BRANCH" in
+(devel)  VERSION=6.6 ;;
+(stable) VERSION=6.0 ;;
+esac; case "$WINE_BRANCH" in
   (scm)
          VERSION=$(get_scm_version)
           SOURCE=$SPELL-git.tar.bz2
@@ -9,12 +12,6 @@ case "$WINE_BRANCH" in
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
   FORCE_DOWNLOAD=1
   ;;
-  (devel)
-         VERSION=6.5
-  ;&
-  (stable)
-         VERSION=6.0
-  ;&
   (*)
           SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.sign
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 7b1792af17..da89ceb5f7 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,10 @@
+2021-04-12 Ismael Luceno <ismael@sourcemage.org>
+	* DETAILS: updated to 6.6 (devel)
+	* PRE_BUILD, patches/dnsapi.diff: Fix build against musl
+
+2021-04-07 Ismael Luceno <ismael@sourcemage.org>
+	* DETAILS: updated to 6.0 (stable) / 6.5 (devel)
+
 2018-06-02 Thomas Orgis <sobukus@sourcemage.org>
 	* DETAILS: stable version 3.0.1
 
diff --git a/x11-libs/wine/PRE_BUILD b/x11-libs/wine/PRE_BUILD
new file mode 100755
index 0000000000..c230ad14bf
--- /dev/null
+++ b/x11-libs/wine/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/x11-libs/wine/patches/dnsapi.diff b/x11-libs/wine/patches/dnsapi.diff
new file mode 100644
index 0000000000..9f748fd922
--- /dev/null
+++ b/x11-libs/wine/patches/dnsapi.diff
@@ -0,0 +1,76 @@
+Upstream-Status: Backport
+
+diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
+index ac52147af01..633169e6d66 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 )
+     return size;
+ }
+ 
++/* based on ns_name_skip from libresolv */
++static int skip_name( const unsigned char **ptr, const unsigned char *end )
++{
++    const unsigned char *cp = *ptr;
++    unsigned int len;
++
++    while (cp < end && (len = *cp++))
++    {
++        switch (len & NS_CMPRSFLGS)
++        {
++        case 0:
++            cp += len;
++            continue;
++        case NS_CMPRSFLGS:
++            cp++;
++            break;
++        default:
++            return -1;
++        }
++        break;
++    }
++
++    if (cp > end) return -1;
++    *ptr = cp;
++    return 0;
++}
++
+ 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
+         r->Data.MINFO.pNameMailbox = dname_from_msg( msg, pos );
+         if (!r->Data.MINFO.pNameMailbox) return ERROR_NOT_ENOUGH_MEMORY;
+ 
+-        if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0)
++        if (skip_name( &pos, ns_msg_end( msg ) ) < 0)
+             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
+         r->Data.SIG.pNameSigner = dname_from_msg( msg, pos );
+         if (!r->Data.SIG.pNameSigner) return ERROR_NOT_ENOUGH_MEMORY;
+ 
+-        if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0)
++        if (skip_name( &pos, ns_msg_end( msg ) ) < 0)
+             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
+         r->Data.SOA.pNamePrimaryServer = dname_from_msg( msg, pos );
+         if (!r->Data.SOA.pNamePrimaryServer) return ERROR_NOT_ENOUGH_MEMORY;
+ 
+-        if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0)
++        if (skip_name( &pos, ns_msg_end( msg ) ) < 0)
+             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
+             return ERROR_NOT_ENOUGH_MEMORY;
+         }
+ 
+-        if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0)
++        if (skip_name( &pos, ns_msg_end( msg ) ) < 0)
+             return DNS_ERROR_BAD_PACKET;
+ 
+         r->Data.SOA.dwSerialNo   = ntohl( *(const DWORD *)pos ); pos += sizeof(DWORD);