Merge remote branch 'ncopa/master'

Conflicts:
	testing/iscsi-scst/APKBUILD

22 files changed, 101 insertions, 59 deletions

diff --git a/main/alpine-base/APKBUILD b/main/alpine-base/APKBUILD
index 10c6935e6..5cb458ae3 100644
--- a/main/alpine-base/APKBUILD
+++ b/main/alpine-base/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-base
-pkgver=2.1.0_git20101216
+pkgver=2.1.0_git20101221
 pkgrel=0
 pkgdesc="Meta package for minimal alpine base"
 url="http://alpinelinux.org"
diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index 3d56058ac..d500d4a9c 100644
--- a/main/busybox-initscripts/APKBUILD
+++ b/main/busybox-initscripts/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox-initscripts
 pkgver=2.0
-pkgrel=13
+pkgrel=14
 pkgdesc="Init scripts for busybox daemons"
 url="http://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts"
 arch="x86 x86_64"
@@ -40,16 +40,16 @@ EOF
 	chmod +x "$pkgdir"/etc/acpi/PWRF/00000080
 }
 
-md5sums="baa44c026a4c9468b01ec2771d76db19  acpid.initd
+md5sums="eba3eab9ace889088e01c6c9e80ae3db  acpid.initd
 6db6c6d6a5e0169e54a0e0527d83dfff  cron.initd
 dad20779adfb4b85b57b45c7c903a636  dnsd.initd
-4f8f9a7028a429c50740c09fcb2a1871  httpd.initd
-32315991b16a03a42a8cdd64f064ccc2  inetd.initd
-a5f2bb75d70d238bd534ccc57b643e90  klogd.initd
+56d24c7bd4e5d442c7436b0819017ff3  httpd.initd
+7504e0700dfa85f354d31af7a58663f9  inetd.initd
+b0146b19b828051985377de1e4431a32  klogd.initd
 12379687c0cfb5446e0cfc20bd6992bb  mdev-mount.initd
 ef3e93fe17964dd600364b1340654b5b  mdev.initd
 c01dc869cbdd68e86e64a35ccc1e885e  rdate.initd
-b5b23dd06cea120bd8d850b54bca0b59  syslog.initd
+4ef91ad26f5b6e64b5bc545e35f18af1  syslog.initd
 254186e513ff9fb9ede6a2e92257b247  watchdog.initd
 8ddb8d040c9c7a32c63039a2c80ff496  cron.confd
 60bc14cc3163d76f41bcc93dc0f9984b  klogd.confd
diff --git a/main/busybox-initscripts/acpid.initd b/main/busybox-initscripts/acpid.initd
index 548d4ba40..5fbae1e5a 100644
--- a/main/busybox-initscripts/acpid.initd
+++ b/main/busybox-initscripts/acpid.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 
 depend() {
-	need dev
+	need dev localmount
 	after hwdrivers modules
 }
 
diff --git a/main/busybox-initscripts/httpd.initd b/main/busybox-initscripts/httpd.initd
index 0737cfe19..be23a6b3a 100644
--- a/main/busybox-initscripts/httpd.initd
+++ b/main/busybox-initscripts/httpd.initd
@@ -3,7 +3,7 @@
 DAEMON=/usr/sbin/httpd
 
 depend() {
-	need net
+	need net localmount
 	after firewall
 }
 
diff --git a/main/busybox-initscripts/inetd.initd b/main/busybox-initscripts/inetd.initd
index 744c393aa..fa1f015b8 100644
--- a/main/busybox-initscripts/inetd.initd
+++ b/main/busybox-initscripts/inetd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 
 depend() {
-	need net
+	need net localmount
 	after firewall
 }
 
diff --git a/main/busybox-initscripts/klogd.initd b/main/busybox-initscripts/klogd.initd
index e1e4324dd..d783bccdc 100644
--- a/main/busybox-initscripts/klogd.initd
+++ b/main/busybox-initscripts/klogd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 
 depend() {
-	need clock hostname
+	need clock hostname localmount
 	before net
 	provide logger
 	keyword novserver
diff --git a/main/busybox-initscripts/syslog.initd b/main/busybox-initscripts/syslog.initd
index 390cd6def..86050f1af 100644
--- a/main/busybox-initscripts/syslog.initd
+++ b/main/busybox-initscripts/syslog.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 
 depend() {
-	need clock hostname klogd
+	need clock hostname klogd localmount
 	provide logger
 }
 
diff --git a/main/cairo/APKBUILD b/main/cairo/APKBUILD
index 0c340f54c..b58d3fb1e 100644
--- a/main/cairo/APKBUILD
+++ b/main/cairo/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cairo
 pkgver=1.10.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Cairo vector graphics library"
 url="http://cairographics.org/"
 arch="x86 x86_64"
@@ -10,9 +10,9 @@ subpackages="$pkgname-dev $pkgname-doc"
 depends=
 makedepends="pkgconfig libpng-dev libxrender-dev fontconfig pixman-dev
 	xcb-util-dev fontconfig-dev freetype-dev expat-dev zlib-dev
-	libiconv-dev"
+	libiconv-dev mesa-dev"
 depends_dev="fontconfig-dev freetype-dev libpng-dev libxrender-dev pixman-dev
-	xcb-util-dev"
+	xcb-util-dev mesa-dev"
 source="http://cairographics.org/releases/$pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -23,6 +23,7 @@ build() {
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-xcb \
+		--enable-gl \
 		--disable-static || return 1
 	make || return 1
 }
diff --git a/main/coreutils/APKBUILD b/main/coreutils/APKBUILD
index 9e7870c38..83e5bf770 100644
--- a/main/coreutils/APKBUILD
+++ b/main/coreutils/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=coreutils
-pkgver=8.7
+pkgver=8.8
 pkgrel=0
 pkgdesc="The basic file, shell and text manipulation utilities"
 url="http://www.gnu.org/software/coreutils/"
@@ -31,4 +31,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="3c1ae9531159447083ae8f25ae554b81  coreutils-8.7.tar.gz"
+md5sums="bad596d9654e299eedea0eaf93f178fa  coreutils-8.8.tar.gz"
diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD
index 90a442f37..7066a8a57 100644
--- a/main/curl/APKBUILD
+++ b/main/curl/APKBUILD
@@ -1,13 +1,14 @@
-# Maintainer: Carlo Landmeter <clandmeter at gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=curl
 pkgver=7.21.3
-pkgrel=0
+pkgrel=1
 pkgdesc="An URL retrival utility and library"
 url="http://curl.haxx.se"
 arch="x86 x86_64"
 license="MIT"
 depends=
-makedepends="zlib-dev openssl-dev"
+depends_dev="zlib-dev openssl-dev"
+makedepends="$depends_dev"
 source="http://curl.haxx.se/download/curl-$pkgver.tar.bz2"
 subpackages="$pkgname-doc $pkgname-dev"
 
diff --git a/main/dbus/APKBUILD b/main/dbus/APKBUILD
index 1779f4d3c..78bc247ab 100644
--- a/main/dbus/APKBUILD
+++ b/main/dbus/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dbus
-pkgver=1.4.0
+pkgver=1.4.1
 pkgrel=0
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
@@ -36,8 +36,8 @@ build() {
 
 package() {
 	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
+	make -j1 DESTDIR="$pkgdir" install
 	install -Dm755 "$srcdir"/dbus.initd "$pkgdir"/etc/init.d/dbus
 }
-md5sums="f59618b18d2fb2bd1fce9e1c5a2a3282  dbus-1.4.0.tar.gz
+md5sums="99cb057700c0455fb68f8d57902f77ac  dbus-1.4.1.tar.gz
 58356b4db650a89312a670c02804c540  dbus.initd"
diff --git a/main/dhcpcd-dbus/APKBUILD b/main/dhcpcd-dbus/APKBUILD
index a74fffea2..0439e8772 100644
--- a/main/dhcpcd-dbus/APKBUILD
+++ b/main/dhcpcd-dbus/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dhcpcd-dbus
-pkgver=0.4.2
+pkgver=0.5.2
 pkgrel=1
 pkgdesc="DBUS binding to dhcpcd"
 url="http://roy.marples.name/projects/dhcpcd-dbus"
@@ -14,13 +14,16 @@ source="http://roy.marples.name/downloads/dhcpcd/dhcpcd-dbus-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	make PREFIX=/usr SYSCONFDIR=/etc/dbus-1/system.d
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--libexecdir=/usr/lib/$pkgname \
+		|| return 1
+	make
 }
 
 package() {
 	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" PREFIX=/usr SYSCONFDIR=/etc/dbus-1/system.d \
-		install
+	make DESTDIR="$pkgdir" install
 }
 
-md5sums="c42ee474f21fd813abf5d04f56110a79  dhcpcd-dbus-0.4.2.tar.bz2"
+md5sums="29ab75851bc907d698add2087b0d28d3  dhcpcd-dbus-0.5.2.tar.bz2"
diff --git a/main/dhcpcd-ui/APKBUILD b/main/dhcpcd-ui/APKBUILD
index 588b58d32..e2e91c77e 100644
--- a/main/dhcpcd-ui/APKBUILD
+++ b/main/dhcpcd-ui/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dhcpcd-ui
 pkgver=0.5.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A GTK+ monitor and configuration GUI for dhcpcd"
 url="http://roy.marples.name/projects/dhcpcd-ui"
 arch="x86 x86_64"
 license="BSD-2"
-depends="dhcpcd-dbus"
+depends="dhcpcd-dbus hicolor-icon-theme"
 makedepends="glib-dev gtk+-dev dbus-dev libnotify-dev pkgconfig"
 install=
 subpackages="$pkgname-doc"
@@ -15,13 +15,12 @@ source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2"
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	./configure --prefix=/usr
-	make PREFIX=/usr
+	make
 }
 
 package() {
 	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" PREFIX=/usr SYSCONFDIR=/etc/dbus-1/system.d \
-		install
+	make DESTDIR="$pkgdir" AUTOSTARTDIR=/etc/xdg/autostart install
 }
 
 md5sums="a42b15650de093bcd3dd60fb94a483f7  dhcpcd-ui-0.5.1.tar.bz2"
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index 4103cfffc..a52357eba 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gcc
-pkgver=4.5.1
+pkgver=4.5.2
 _piepatchver=0.4.5
 _specs_ver=0.2.0
 _specs_gcc_ver=4.4.3
 
 _uclibc_abiver=0.9.32
 
-pkgrel=9
+pkgrel=2
 pkgdesc="The GNU Compiler Collection"
 url="http://gcc.gnu.org"
-arch="x86 x86_64"
+arch="all"
 license="GPL LGPL"
 depends="binutils libgcc libgomp libobjc"
 makedepends="bison flex gmp-dev mpfr-dev texinfo libmpc-dev gawk zlib-dev zip"
@@ -27,7 +27,7 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-g++-$pkgver.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-java-$pkgver.tar.bz2
-	http://distfiles.gentoo.org/distfiles/gcc-$pkgver-piepatches-v${_piepatchver}.tar.bz2
+	http://distfiles.gentoo.org/distfiles/gcc-4.5.1-piepatches-v${_piepatchver}.tar.bz2
 	http://distfiles.gentoo.org/distfiles/gcc-$_specs_gcc_ver-specs-$_specs_ver.tar.bz2
 	ftp://sourceware.org/pub/java/ecj-latest.jar
 	
@@ -138,6 +138,7 @@ build() {
 		--build=${CBUILD} \
 		--host=${CHOST} \
 		--target=${CTARGET} \
+		--with-pkgversion='Alpine' \
 		--disable-altivec \
 		--disable-checking \
 		--disable-fixed-point \
@@ -287,10 +288,10 @@ libgcj() {
 	mv "$pkgdir"/usr/share/java "$subpkgdir"/usr/share/
 }
 	
-md5sums="dc8959e31b01a65ce10d269614815054  gcc-core-4.5.1.tar.bz2
-b294953ff0bb2f20c7acb2bf005d832a  gcc-g++-4.5.1.tar.bz2
-3c11b7037896e967eddf8178af2ddd98  gcc-objc-4.5.1.tar.bz2
-0f8692921c918ae6491857e5b00acc53  gcc-java-4.5.1.tar.bz2
+md5sums="aa9e36bec080452372bfba793428ee82  gcc-core-4.5.2.tar.bz2
+9821f1c61e43755866861485ff364e90  gcc-g++-4.5.2.tar.bz2
+3561c6585e9062105cc3591a8c39d7dc  gcc-objc-4.5.2.tar.bz2
+fe2b647bace18dc7867a4192def46e2c  gcc-java-4.5.2.tar.bz2
 1f86fe5dc7d506b7fc04fcd8b7d2693c  gcc-4.5.1-piepatches-v0.4.5.tar.bz2
 441c76504e1d97170117c294e65c7a72  gcc-4.4.3-specs-0.2.0.tar.bz2
 d7cd6a27c8801e66cbaa964a039ecfdb  ecj-latest.jar
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 4021b6a4b..6cdffae65 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -4,7 +4,7 @@ _flavor=grsec
 pkgname=linux-${_flavor}
 pkgver=2.6.35.9
 _kernver=2.6.35
-pkgrel=5
+pkgrel=6
 pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 depends="mkinitfs linux-firmware"
@@ -159,4 +159,4 @@ ea7a7eb2775b71ae5ef24d029a4905bd  xfrm-fix-gre-key-endianess.patch
 7cae2d1e1947fa57d7aaaf31c649471c  0004-staging-hv-fix-netvsc-sleeping-while-atomic.patch
 8c224ba0cdf0aa572c7eb50379435be4  setlocalversion.patch
 a9494f66196bc6308da0f129221d31b8  kernelconfig.x86
-b38f1f99f8f3b75c52d4a1ab2b0d13fd  kernelconfig.x86_64"
+0270cb828e6b23b4aa844c46c8b2d300  kernelconfig.x86_64"
diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64
index 627e7c812..d730addc7 100644
--- a/main/linux-grsec/kernelconfig.x86_64
+++ b/main/linux-grsec/kernelconfig.x86_64
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.35.8
-# Wed Nov 24 14:52:40 2010
+# Linux kernel version: 2.6.35.9
+# Tue Dec 21 08:49:30 2010
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -118,6 +118,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_EMBEDDED=y
+CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
 # CONFIG_KALLSYMS is not set
 CONFIG_HOTPLUG=y
@@ -184,6 +185,7 @@ CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 CONFIG_BLK_DEV_BSG=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLOCK_COMPAT=y
 
 #
 # IO Schedulers
@@ -510,12 +512,17 @@ CONFIG_HOTPLUG_PCI_SHPC=m
 # Executable file formats / Emulations
 #
 CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 # CONFIG_HAVE_AOUT is not set
 CONFIG_BINFMT_MISC=m
-# CONFIG_IA32_EMULATION is not set
-# CONFIG_COMPAT_FOR_U64_ALIGNMENT is not set
+CONFIG_IA32_EMULATION=y
+# CONFIG_IA32_AOUT is not set
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
 CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
 
 #
 # Networking options
@@ -4207,6 +4214,7 @@ CONFIG_QUOTA_TREE=m
 CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
 CONFIG_QUOTACTL=y
+CONFIG_QUOTACTL_COMPAT=y
 CONFIG_AUTOFS_FS=m
 CONFIG_AUTOFS4_FS=m
 CONFIG_FUSE_FS=m
diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD
index 12b0d04c2..a15fc5216 100644
--- a/main/lvm2/APKBUILD
+++ b/main/lvm2/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lvm2
-pkgver=2.02.78
+pkgver=2.02.79
 pkgrel=0
 pkgdesc="Logical Volume Manager 2 utilities"
 url="http://sourceware.org/lvm2/"
@@ -51,6 +51,6 @@ dm() {
 	mv "$pkgdir"/sbin/dm* "$subpkgdir"/sbin/
 }
 
-md5sums="f87b1470a4cdea49cb1f92060c144db5  LVM2.2.02.78.tgz
+md5sums="e6929251a90b0b626c024942a242f337  LVM2.2.02.79.tgz
 6f65f902cf19f144a42b8d6aceadf395  lvm.initd
 ec36d5fe4561220304e406c5c797e71f  lvm.confd"
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index 949c859af..66ff4c3da 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa
 pkgver=7.8.2
-pkgrel=4
+pkgrel=6
 pkgdesc="Mesa DRI OpenGL library"
 url="http://www.mesa3d.org"
 arch="x86 x86_64"
@@ -28,7 +28,7 @@ source="ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2
 	mesa-7.8-git.patch"
 
 depends_dev="libdrm-dev dri2proto libx11-dev libxext-dev libxxf86vm-dev
-	libxdamage-dev libxfixes-dev libxcb-dev"
+	libxdamage-dev libxfixes-dev libxcb-dev glproto"
 
 _dri_driverdir=/usr/lib/xorg/modules/dri
 
@@ -62,6 +62,9 @@ build() {
 		--with-driver=dri \
 		--with-state-trackers=dri,glx,egl \
 		--enable-xcb \
+		--enable-egl \
+		--enable-gles2 \
+		--disable-gallium-egl \
 		--disable-glut \
 		--disable-glw || return 1
 
diff --git a/main/perl-net-smtp-ssl/APKBUILD b/main/perl-net-smtp-ssl/APKBUILD
index a898d5255..c3837d522 100644
--- a/main/perl-net-smtp-ssl/APKBUILD
+++ b/main/perl-net-smtp-ssl/APKBUILD
@@ -3,10 +3,10 @@
 pkgname=perl-net-smtp-ssl
 _realname=Net-SMTP-SSL
 pkgver=1.01
-pkgrel=0
+pkgrel=1
 pkgdesc="SSL support for Net::SMTP"
 url="http://search.cpan.org/dist/Net-SMTP-SSL/"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL"
 depends="perl perl-io-socket-ssl"
 makedepends="perl-dev"
@@ -19,6 +19,10 @@ build() {
 
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
 	make || return 1
+}
+
+package() {
+	cd "$srcdir/$_realname-$pkgver"
 	make DESTDIR="$pkgdir" install
         # creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
diff --git a/main/perl-net-ssleay/APKBUILD b/main/perl-net-ssleay/APKBUILD
index c9585bf10..c93b9ce48 100644
--- a/main/perl-net-ssleay/APKBUILD
+++ b/main/perl-net-ssleay/APKBUILD
@@ -3,10 +3,10 @@
 pkgname=perl-net-ssleay
 _realname=Net-SSLeay
 pkgver=1.36
-pkgrel=2
+pkgrel=3
 pkgdesc="Perl extension for using OpenSSL"
 url="http://search.cpan.org/dist/Net-SSLeay/"
-arch="x86 x86_64"
+arch="all"
 license="GPL"
 depends="perl"
 makedepends="perl-dev openssl-dev zlib-dev"
diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD
index 289520043..8a8dd40e0 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 000000000..6b8fe5548
--- /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;
+     }