main/wine: network fix

2 files changed, 26 insertions, 4 deletions

diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD
index 2895200434..8a8dd40e08 100644
--- a/main/wine/APKBUILD
+++ b/main/wine/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wine
 pkgver=1.3.9
-pkgrel=0
+pkgrel=1
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
 arch="x86"
@@ -12,12 +12,18 @@ makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev
         libpng-dev jpeg-dev freetype-dev"
 # lcms
 source="http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$pkgver.tar.bz2
-        dn_skipname.patch"
+        dn_skipname.patch
+        iphlpapi-fix.patch
+        "
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
         cd "$_builddir"
-        patch -p1 -i "$srcdir"/dn_skipname.patch || return 1
+        for i in $source; do
+                case $i in
+                *.patch) patch -p1 -i "$srcdir"/$i || return 1;;
+                esac
+        done
 }
 
 build() {
@@ -34,4 +40,5 @@ package() {
         mkdir -p "$pkgdir"/etc/wine
 }
 md5sums="708862552219e1c97585b291ea7277c2  wine-1.3.9.tar.bz2
-6ebeaa64eddf97be3267db236ce84b71  dn_skipname.patch"
+6ebeaa64eddf97be3267db236ce84b71  dn_skipname.patch
+d3d0e26eb5b9937e5e1139597b6c3f5b  iphlpapi-fix.patch"
diff --git a/main/wine/iphlpapi-fix.patch b/main/wine/iphlpapi-fix.patch
new file mode 100644
index 0000000000..6b8fe5548a
--- /dev/null
+++ b/main/wine/iphlpapi-fix.patch
@@ -0,0 +1,15 @@
+diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
+index d734c39..321c0a3 100644
+--- a/dlls/iphlpapi/iphlpapi_main.c
++++ b/dlls/iphlpapi/iphlpapi_main.c
+@@ -1115,6 +1115,10 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved,
+         {
+             if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK && aa->OperStatus == IfOperStatusUp)
+                 aa->DnsSuffix = dnsSuffix;
++            else
++                /* MSVC runtime requires DnsSuffix to be valid pointer
++                 * make it an empty string */
++                aa->DnsSuffix = (WCHAR *)((BYTE*)dnsSuffix + dns_suffix_size - 2);
+         }
+         ret = ERROR_SUCCESS;
+     }