Merge branch 'master' of git://git.alpinelinux.org/aports

28 files changed, 358 insertions, 92 deletions

diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index 83e145aa0..980912814 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=5
+pkgrel=6
 pkgdesc="Init scripts for busybox daemons"
 url="http://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts"
 license="GPL-2"
@@ -55,7 +55,7 @@ b5b23dd06cea120bd8d850b54bca0b59  syslog.initd
 22adbf155ffc4595206ded6daad07812  rdate.confd
 77fb31a75511247bf4e3430565a276bc  syslog.confd
 0bb55dde32f5e119111fa4938daaef3d  watchdog.confd
-022b670c549e402573797cc72fa12032  mdev.conf
+835d931c46e5fcc753e4694aa3591853  mdev.conf
 ad1556961294e4aa2abca6be52138b7c  dvbdev
 5c8725b4cbdeda23b00f08124a0d20bf  ide_links
 1acfd58dfd1cf324c90ca3a3be519510  usbdev
diff --git a/main/busybox-initscripts/mdev.conf b/main/busybox-initscripts/mdev.conf
index 6ee65a20e..13affc2bf 100644
--- a/main/busybox-initscripts/mdev.conf
+++ b/main/busybox-initscripts/mdev.conf
@@ -26,7 +26,7 @@ ptmx	root:tty 0666
 
 # ram.*
 ram([0-9]*)	root:disk 0660 >rd/%1
-loop([0-9]+)	root:disk 0660 >loop/
+loop([0-9]+)	root:disk 0660 >loop/%1
 sd[a-z].*	root:disk 0660 */lib/mdev/usbdisk_link
 hd[a-z][0-9]*	root:disk 0660 */lib/mdev/ide_links
 md[0-9]		root:disk 0660
diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD
index 3b96c8229..87536931a 100644
--- a/main/dahdi-linux-grsec/APKBUILD
+++ b/main/dahdi-linux-grsec/APKBUILD
@@ -14,7 +14,7 @@ _realname=dahdi-linux
 
 pkgname=${_realname}-${_flavor}
 pkgver=2.2.0
-pkgrel=14
+pkgrel=15
 pkgdesc="Digium Asterisk Hardware Device Interface drivers"
 url="http://www.asterisk.org"
 license="GPL"
diff --git a/main/iscsitarget-grsec/APKBUILD b/main/iscsitarget-grsec/APKBUILD
index 7772f5412..3a5b1de20 100644
--- a/main/iscsitarget-grsec/APKBUILD
+++ b/main/iscsitarget-grsec/APKBUILD
@@ -15,7 +15,7 @@ if [ -f ../iscsitarget/APKBUILD ]; then
 fi
 pkgname=${_realname}-${_flavor}
 pkgver=${pkgver:-0.4.17}
-pkgrel=12
+pkgrel=13
 pkgdesc="$_flavor kernel modules for iscsitarget"
 url="http://iscsitarget.sourceforge.net/"
 license="GPL-2"
diff --git a/main/kqemu-grsec/APKBUILD b/main/kqemu-grsec/APKBUILD
index 477d15128..cac8523a3 100644
--- a/main/kqemu-grsec/APKBUILD
+++ b/main/kqemu-grsec/APKBUILD
@@ -12,7 +12,7 @@ _abi_release=$pkgver-${_flavor}
 pkgname=${_realname}-${_flavor}
 pkgver=1.4.0_pre1
 _realver=1.4.0pre1
-pkgrel=5
+pkgrel=6
 pkgdesc="$_flavor kernel modules for kemu"
 url="http://www.nongnu.org/qemu/"
 license="GPL"
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 0cde93349..87ae01011 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -4,7 +4,7 @@ _flavor=grsec
 pkgname=linux-${_flavor}
 pkgver=2.6.30.6
 _kernver=2.6.30
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 depends="mkinitfs"
@@ -13,7 +13,7 @@ _config=${config:-kernelconfig}
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
 	ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
-	grsecurity-2.1.14-2.6.30.6-200909091844.patch
+	grsecurity-2.1.14-2.6.30.6-200909121646.patch
 	net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch
 	$_config
 	"
@@ -114,6 +114,6 @@ dev() {
 
 md5sums="7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 f89295707f68c2b349534b490c9d5f2d  patch-2.6.30.6.bz2
-15313bb5bc54aacb96508b5e19e94bc7  grsecurity-2.1.14-2.6.30.6-200909091844.patch
+1151bdabaa0ee99890d4d5fd85dd94b8  grsecurity-2.1.14-2.6.30.6-200909121646.patch
 ca05fd252783b82e01610e775cf56498  net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch
 35d29ea012d4b009ce2bd37b7540903e  kernelconfig"
diff --git a/main/linux-grsec/grsecurity-2.1.14-2.6.30.6-200909091844.patch b/main/linux-grsec/grsecurity-2.1.14-2.6.30.6-200909121646.patch
index 02ba27af0..62718132e 100644
--- a/main/linux-grsec/grsecurity-2.1.14-2.6.30.6-200909091844.patch
+++ b/main/linux-grsec/grsecurity-2.1.14-2.6.30.6-200909121646.patch
@@ -2937,7 +2937,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/Makefile linux-2.6.30.6/arch/sparc/Makefile
  
 diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_32.c linux-2.6.30.6/arch/sparc/mm/fault_32.c
 --- linux-2.6.30.6/arch/sparc/mm/fault_32.c	2009-07-24 17:47:51.000000000 -0400
-+++ linux-2.6.30.6/arch/sparc/mm/fault_32.c	2009-08-27 21:11:25.299108429 -0400
++++ linux-2.6.30.6/arch/sparc/mm/fault_32.c	2009-09-12 16:45:57.368158675 -0400
 @@ -21,6 +21,9 @@
  #include <linux/interrupt.h>
  #include <linux/module.h>
@@ -2948,7 +2948,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_32.c linux-2.6.30.6/arch/sparc/mm/
  
  #include <asm/system.h>
  #include <asm/page.h>
-@@ -167,6 +170,264 @@ static unsigned long compute_si_addr(str
+@@ -167,6 +170,265 @@ static unsigned long compute_si_addr(str
  	return safe_compute_effective_address(regs, insn);
  }
  
@@ -3158,6 +3158,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_32.c linux-2.6.30.6/arch/sparc/mm/
 +			{
 +				unsigned long addr;
 +
++				regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
 +				addr = (save & 0x003FFFFFU) << 10;
 +				regs->u_regs[UREG_G2] = addr;
 +				addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
@@ -3213,7 +3214,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_32.c linux-2.6.30.6/arch/sparc/mm/
  asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
  			       unsigned long address)
  {
-@@ -231,6 +492,24 @@ good_area:
+@@ -231,6 +493,24 @@ good_area:
  		if(!(vma->vm_flags & VM_WRITE))
  			goto bad_area;
  	} else {
@@ -3240,7 +3241,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_32.c linux-2.6.30.6/arch/sparc/mm/
  			goto bad_area;
 diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_64.c linux-2.6.30.6/arch/sparc/mm/fault_64.c
 --- linux-2.6.30.6/arch/sparc/mm/fault_64.c	2009-07-24 17:47:51.000000000 -0400
-+++ linux-2.6.30.6/arch/sparc/mm/fault_64.c	2009-08-27 21:11:25.310208001 -0400
++++ linux-2.6.30.6/arch/sparc/mm/fault_64.c	2009-09-10 17:13:47.968065725 -0400
 @@ -20,6 +20,9 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
@@ -3251,7 +3252,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_64.c linux-2.6.30.6/arch/sparc/mm/
  
  #include <asm/page.h>
  #include <asm/pgtable.h>
-@@ -249,6 +252,404 @@ static void noinline bogus_32bit_fault_a
+@@ -249,6 +252,405 @@ static void noinline bogus_32bit_fault_a
  	show_regs(regs);
  }
  
@@ -3594,6 +3595,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_64.c linux-2.6.30.6/arch/sparc/mm/
 +			{
 +				unsigned long addr;
 +
++				regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
 +				addr = (save & 0x003FFFFFU) << 10;
 +				regs->u_regs[UREG_G2] = addr;
 +				addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
@@ -3656,7 +3658,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_64.c linux-2.6.30.6/arch/sparc/mm/
  asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
  {
  	struct mm_struct *mm = current->mm;
-@@ -315,6 +716,29 @@ asmlinkage void __kprobes do_sparc64_fau
+@@ -315,6 +717,29 @@ asmlinkage void __kprobes do_sparc64_fau
  	if (!vma)
  		goto bad_area;
  
diff --git a/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD
index 9d8a59d55..bf33e1b04 100644
--- a/main/opennhrp/APKBUILD
+++ b/main/opennhrp/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=opennhrp
 pkgver=0.11.1
-pkgrel=0
+pkgrel=1
 pkgdesc="NBMA Next Hop Resolution Protocol daemon"
 url="http://sourceforge.net/projects/opennhrp"
 license="GPL-3"
@@ -10,6 +10,7 @@ makedepends="c-ares-dev"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
 	opennhrp-0.9.3-peer-up-bgp.patch
+	opennhrp-0.11.1-fix.patch
 	$pkgname.initd
 	$pkgname.confd
 	"
@@ -29,5 +30,6 @@ build() {
 }
 md5sums="9cc1e99de2b132591d685eb5f9d70630  opennhrp-0.11.1.tar.bz2
 f81539fc92800bb79668dda119a97d1d  opennhrp-0.9.3-peer-up-bgp.patch
+0e6defecbb3f54814bc3580bb41b0e3f  opennhrp-0.11.1-fix.patch
 85821b61c02427146b866b7582157cfd  opennhrp.initd
 8eee86233728dc0d156bbfee6d98f338  opennhrp.confd"
diff --git a/main/opennhrp/opennhrp-0.11.1-fix.patch b/main/opennhrp/opennhrp-0.11.1-fix.patch
new file mode 100644
index 000000000..0f838a2c3
--- /dev/null
+++ b/main/opennhrp/opennhrp-0.11.1-fix.patch
@@ -0,0 +1,58 @@
+commit c24f2cf55eee9a5aefe27bcb34822a5737f170cf
+Author: Timo Teras <timo.teras@iki.fi>
+Date:   Mon Sep 14 08:25:09 2009 +0300
+
+    peer: reset both events when script triggers
+    
+    otherwise we can get same callback twice.
+
+diff --git a/nhrp/nhrp_peer.c b/nhrp/nhrp_peer.c
+index b447784..e5721a5 100644
+--- a/nhrp/nhrp_peer.c
++++ b/nhrp/nhrp_peer.c
+@@ -308,14 +308,16 @@ struct nhrp_peer *nhrp_peer_from_event(union nhrp_peer_event e, int revents)
+ 
+ 	if (revents & EV_CHILD) {
+ 		peer = container_of(e.child, struct nhrp_peer, child);
+-		ev_timer_stop(&peer->timer);
+ 	} else if (revents & EV_TIMEOUT) {
+ 		peer = container_of(e.timer, struct nhrp_peer, timer);
+-		ev_child_stop(&peer->child);
+ 	} else {
+ 		NHRP_BUG_ON(revents != 0);
+ 		peer = container_of(e.child, struct nhrp_peer, child);
+ 	}
++
++	ev_child_stop(&peer->child);
++	ev_timer_stop(&peer->timer);
++
+ 	return peer;
+ }
+ 
+diff --git a/nhrp/nhrp_server.c b/nhrp/nhrp_server.c
+index d928886..ad6e292 100644
+--- a/nhrp/nhrp_server.c
++++ b/nhrp/nhrp_server.c
+@@ -195,13 +195,18 @@ static void nhrp_server_finish_reg(struct nhrp_pending_request *pr)
+ 
+ static void nhrp_server_finish_cie_reg_cb(union nhrp_peer_event e, int revents)
+ {
+-	struct nhrp_peer *peer = nhrp_peer_from_event(e, revents);
+-	struct nhrp_pending_request *pr = peer->request;
+-	struct nhrp_packet *packet = pr->packet;
+-	struct nhrp_cie *cie = pr->cie;
++	struct nhrp_peer *peer;
++	struct nhrp_pending_request *pr;
++	struct nhrp_packet *packet;
++	struct nhrp_cie *cie;
+ 	struct nhrp_peer_selector sel;
+ 	char tmp[64], reason[32];
+ 
++	peer = nhrp_peer_from_event(e, revents);
++	pr = peer->request;
++	packet = pr->packet;
++	cie = pr->cie;
++
+ 	peer->request = NULL;
+ 	nhrp_address_format(&peer->protocol_address, sizeof(tmp), tmp);
+ 	if (revents != 0 && nhrp_peer_event_ok(e, revents)) {
diff --git a/main/opennhrp/opennhrp-0.9.2-fix-false-assert.patch b/main/opennhrp/opennhrp-0.9.2-fix-false-assert.patch
deleted file mode 100644
index 67b44ab5d..000000000
--- a/main/opennhrp/opennhrp-0.9.2-fix-false-assert.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru opennhrp-0.9.2.orig/nhrp/nhrp_peer.c opennhrp-0.9.2/nhrp/nhrp_peer.c
---- opennhrp-0.9.2.orig/nhrp/nhrp_peer.c	2009-02-02 13:12:46 +0000
-+++ opennhrp-0.9.2/nhrp/nhrp_peer.c	2009-02-02 13:36:51 +0000
-@@ -1260,7 +1260,8 @@
- {
- 	char tmp[NHRP_PEER_FORMAT_LEN];
- 
--	NHRP_BUG_ON(peer->flags & NHRP_PEER_FLAG_REMOVED);
-+	if (peer->flags & NHRP_PEER_FLAG_REMOVED)
-+		return;
- 
- 	nhrp_debug("Removing %s %s",
- 		   nhrp_peer_type[peer->type],
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 05f709a18..6d9724953 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=php
 pkgver=5.3.0
 _suhosinver=${pkgver}-0.9.8-BETA-1
-pkgrel=1
+pkgrel=2
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 license="PHP-3"
@@ -12,7 +12,7 @@ install="$pkgname.post-upgrade"
 makedepends="pcre-dev libxml2-dev libiconv-dev openssl-dev zlib-dev bzip2-dev
 	curl-dev libpng-dev jpeg-dev freetype-dev libmcrypt-dev mysql-dev
 	sqlite-dev libtool libltdl postgresql-dev db-dev unixodbc-dev icu-dev
-	enchant-dev gd-dev gmp-dev gettext-dev imap-dev aspell-dev
+	gd-dev gmp-dev gettext-dev imap-dev aspell-dev
 	net-snmp-dev libxslt-dev cyrus-sasl-dev openldap-dev pkgconfig
 	libgcrypt-dev"
 subpackages="$pkgname-dev $pkgname-doc
@@ -21,7 +21,6 @@ subpackages="$pkgname-dev $pkgname-doc
 	$pkgname-calendar
 	$pkgname-curl
 	$pkgname-dba
-	$pkgname-enchant
 	$pkgname-exif
 	$pkgname-ftp
 	$pkgname-gd
@@ -103,7 +102,6 @@ build() {
 		--with-bz2=shared \
 		--with-curl=shared \
 		--with-db4=shared \
-		--with-enchant=shared,/usr \
 		--with-freetype-dir=shared,/usr \
 		--with-gd=shared,/usr \
 		--with-gettext=shared \
@@ -140,6 +138,7 @@ build() {
 		--without-db3 \
 		--without-qdbm \
 		"
+#		--with-enchant=shared,/usr \
 #		--with-tidy=shared \
         ./configure --build=${CHOST:-i486-alpine-linux-uclibc} \
 		--prefix=/usr \
@@ -171,6 +170,8 @@ _mv_mod() {
 	local d=usr/lib/php/20090626
 	mkdir -p "$subpkgdir/$d"
 	mv "$pkgdir/$d/${1}.so" "$subpkgdir/$d/" || return 1
+	install -d "$subpkgdir"/etc/php/conf.d
+	echo "extension=${1}.so" > "$subpkgdir"/etc/php/conf.d/${1}.ini
 	return 0
 }
 
@@ -179,7 +180,7 @@ bz2()		{ _mv_mod bz2; }
 calendar()	{ _mv_mod calendar; }
 curl()		{ _mv_mod curl; }
 dba()		{ _mv_mod dba; }
-enchant()	{ _mv_mod enchant; }
+#enchant()	{ _mv_mod enchant; }
 exif()		{ _mv_mod exif; }
 ftp()		{ _mv_mod ftp; }
 gd()		{ _mv_mod gd; }
diff --git a/main/transmission/APKBUILD b/main/transmission/APKBUILD
deleted file mode 100644
index 0942c1b2a..000000000
--- a/main/transmission/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer:Carlo Landmeter
-pkgname=transmission
-pkgver=1.61
-pkgel=0
-pkgdesc="Fast, easy, and fee BitToent client (CLI tools daemon and webinterface)"
-url="http://www.tansmissionbt.com"
-install="$pkgname.pre-install"
-license="MIT"
-depends="curl"
-makedepends="openssl-dev pkgconfig curl-dev g++"
-source="http://download.m0k.org/transmission/files/transmission-$pkgver.tar.bz2
-	transmission-daemon.initd
-	transmission-daemon.confd
-	$pkgname.pre-install"
-subpackages="$pkgname-doc"
-
-build() {
-        cd "$srcdir/$pkgname-$pkgver"
-
-        ./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--disable-gtk \
-		--disable-nls
-        make || return 1
-        make prefix="$pkgdir"/usr mandir="$pkgdir"/usr/share/man install
-        install -D -m755 "$srcdir"/transmission-daemon.initd "$pkgdir"/etc/init.d/transmission-daemon
-        install -D -m644 "$srcdir"/transmission-daemon.confd "$pkgdir"/etc/conf.d/transmission-daemon
-}
-md5sums="0b0428f4a6237a64dc8b7d378ace3f06  transmission-1.61.tar.bz2
-b3b921242bdc3b33a8ac05fc30653b6c  transmission-daemon.initd
-89478a70fcd93463e1dd8d751da994da  transmission-daemon.confd
-f1c8d94e1f7ff77c23a7e92d3860754d  transmission.pre-install"
diff --git a/main/uclibc/0001-Add-dn_skipname-from-OpenBSD.patch b/main/uclibc/0001-Add-dn_skipname-from-OpenBSD.patch
new file mode 100644
index 000000000..6dd7b17cb
--- /dev/null
+++ b/main/uclibc/0001-Add-dn_skipname-from-OpenBSD.patch
@@ -0,0 +1,115 @@
+From ab443685d9f923afcdfb9fbb071a293b53aa3c40 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <natanael.copa@gmail.com>
+Date: Sun, 13 Sep 2009 09:53:09 +0000
+Subject: [PATCH] Add dn_skipname() from OpenBSD
+
+dn_skipname() is needed by a few applications like yate, wine, kde and
+probably more.
+---
+ libresolv/resolv.c |   85 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 85 insertions(+), 0 deletions(-)
+
+diff --git a/libresolv/resolv.c b/libresolv/resolv.c
+index 38b10ff..c55046d 100644
+--- a/libresolv/resolv.c
++++ b/libresolv/resolv.c
+@@ -7,7 +7,9 @@
+  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+  */
+ 
++#include <sys/types.h>
+ #include <features.h>
++#include <resolv.h>
+ 
+ void __stub1(void);
+ void __stub1(void)
+@@ -16,3 +18,86 @@ void __stub1(void)
+ }
+ link_warning (__stub1, "the `libresolv' library is a stub.  Do you really need it?")
+ 
++/* taken from OpenBSD source */
++/*
++ * ++Copyright++ 1985, 1993
++ * -
++ * Copyright (c) 1985, 1993
++ *    The Regents of the University of California.  All rights reserved.
++ * 
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. Neither the name of the University nor the names of its contributors
++ *    may be used to endorse or promote products derived from this software
++ *    without specific prior written permission.
++ * 
++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ * -
++ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
++ * 
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies, and that
++ * the name of Digital Equipment Corporation not be used in advertising or
++ * publicity pertaining to distribution of the document or software without
++ * specific, written prior permission.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
++ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
++ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
++ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
++ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
++ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
++ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
++ * SOFTWARE.
++ * -
++ * --Copyright--
++ */
++
++/*
++ * Skip over a compressed domain name. Return the size or -1.
++ */
++int
++__dn_skipname(const u_char *comp_dn, const u_char *eom)
++{
++	const u_char *cp;
++	int n;
++
++	cp = comp_dn;
++	while (cp < eom && (n = *cp++)) {
++		/*
++		 * check for indirection
++		 */
++		switch (n & INDIR_MASK) {
++		case 0:			/* normal case, n == len */
++			cp += n;
++			continue;
++		case INDIR_MASK:	/* indirection */
++			cp++;
++			break;
++		default:		/* illegal type */
++			return (-1);
++		}
++		break;
++	}
++	if (cp > eom)
++		return (-1);
++	return (cp - comp_dn);
++}
++
+-- 
+1.6.4.2
+
diff --git a/main/uclibc/APKBUILD b/main/uclibc/APKBUILD
index b4692019e..ca217c064 100644
--- a/main/uclibc/APKBUILD
+++ b/main/uclibc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=uclibc
 pkgver=0.9.30.1
-pkgrel=17
+pkgrel=18
 pkgdesc="C library for developing embedded Linux systems"
 url=http://uclibc.org
 license="LGPL-2"
@@ -13,6 +13,7 @@ depends_dev="linux-headers"
 source="http://uclibc.org/downloads/$_mynamever.tar.bz2
 	$pkgname-0.9.30.1-resolv.patch
 	uclibc-0.9.30.1-pthread_getattr_np.patch
+	0001-Add-dn_skipname-from-OpenBSD.patch
 	0001-ldd-segfault-fix.patch
 	0001-linuxthreads-fixes-from-Will-Newton-will.newton-AT-g.patch
 	0001-include-sys-mount.h-define-MNT_DETATCH-and-MNT_EXPIR.patch
@@ -65,6 +66,7 @@ build() {
 md5sums="1a4b84e5536ad8170563ffa88c34679c  uClibc-0.9.30.1.tar.bz2
 ea91460617601b6e084ead66bc3948f5  uclibc-0.9.30.1-resolv.patch
 cf80c0d44a41e02f389be427ee615d61  uclibc-0.9.30.1-pthread_getattr_np.patch
+c9e3df01e854db4b1118266acd9bcfbd  0001-Add-dn_skipname-from-OpenBSD.patch
 4079b20c763727863bc53408e4988434  0001-ldd-segfault-fix.patch
 bcd1c4c9c87f092fb4631559e6ec13ba  0001-linuxthreads-fixes-from-Will-Newton-will.newton-AT-g.patch
 7ac347d2921e12c4acdfedc4eb4e5d9c  0001-include-sys-mount.h-define-MNT_DETATCH-and-MNT_EXPIR.patch
diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD
index bd04b7b76..be722f31f 100644
--- a/main/xtables-addons-grsec/APKBUILD
+++ b/main/xtables-addons-grsec/APKBUILD
@@ -16,7 +16,7 @@ fi
 
 pkgname=${_realname}-${_flavor}
 pkgver=${pkgver:-1.17}
-pkgrel=10
+pkgrel=11
 pkgdesc="Iptables extensions kernel modules"
 url="http://xtables-addons.sourceforge.net/"
 license="GPL"
diff --git a/testing/kamailio/APKBUILD b/testing/kamailio/APKBUILD
index f40d89fac..a5d6bfe48 100644
--- a/testing/kamailio/APKBUILD
+++ b/testing/kamailio/APKBUILD
@@ -1,9 +1,12 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kamailio
 pkgver=1.5.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source SIP Server"
 url="http://www.kamailio.org/"
+pkgusers="kamailio"
+pkggroups="kamailio"
 license="GPL"
 depends=
 makedepends="bison flex expat-dev postgresql-dev mysql-dev pcre-dev
@@ -25,9 +28,13 @@ build() {
 	cd scripts
 	sed -i -e 's:/var/run/kamailio.pid:/var/run/kamailio/kamailio.pid:g' \
 		kamctl.base kamctlrc || return 1
+	# we actually dont need bash
+	sed -i -e '1s:/bin/bash:/bin/sh:' kamctl kamdbctl \
+		|| return 1
 	cd ..
 
 	make prefix=/usr \
+		cfg-dir=/etc/kamailio \
 		MODS_MYSQL=yes \
 		MODS_PCRE=yes \
 		MODS_PRESENCE=yes \
@@ -36,6 +43,7 @@ build() {
 		include_modules=db_postgres \
 		all || return 1
 	make prefix=/usr \
+		cfg-dir=/etc/kamailio \
 		MODS_MYSQL=yes \
 		MODS_PCRE=yes \
 		MODS_PRESENCE=yes \
@@ -45,6 +53,7 @@ build() {
 		basedir="$pkgdir" install || return 1
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	install -d -o kamailio "$pkgdir"/var/run/kamailio
 }
 
 _mv_mod() {
@@ -87,6 +96,6 @@ presence() {
 }
 
 md5sums="6c6f4ed6fbcb4d008b8ac3de5b99ce99  kamailio-1.5.2-notls_src.tar.gz
-e6b93397ec2a1ec094d23d93d87771bd  kamailio.initd
+84f3c403b65a8fca9df4b71f51224e21  kamailio.initd
 c646af2dd31f5c4289a2f802c873d98f  kamailio.pre-install
 3fbaf633ff1620d0d526fc4047c7bed9  kamailio.post-install"
diff --git a/testing/kamailio/kamailio.initd b/testing/kamailio/kamailio.initd
index aaea95b3e..afe9cb082 100644
--- a/testing/kamailio/kamailio.initd
+++ b/testing/kamailio/kamailio.initd
@@ -11,8 +11,8 @@ start() {
 	ebegin "Starting Kamailio"
 	start-stop-daemon --start --quiet --pidfile $pidfile --exec $daemon \
 		-- \
-		-u ${KAMAILIO_USER:-opensips} \
-		-g ${KAMAILIO_GROUP:-opensips} \
+		-u ${KAMAILIO_USER:-kamailio} \
+		-g ${KAMAILIO_GROUP:-kamailio} \
 		-P $pidfile  
 	eend $?
 }
diff --git a/testing/linux-vserver/APKBUILD b/testing/linux-vserver/APKBUILD
index b934ac5d6..4901257fd 100644
--- a/testing/linux-vserver/APKBUILD
+++ b/testing/linux-vserver/APKBUILD
@@ -2,9 +2,9 @@
 
 _flavor=vserver
 pkgname=linux-${_flavor}
-pkgver=2.6.30.5
+pkgver=2.6.30.6
 _kernver=2.6.30
-pkgrel=2
+pkgrel=0
 pkgdesc="Linux kernel with vserver"
 url="http://linux-vserver.org/"
 depends="mkinitfs"
@@ -13,7 +13,7 @@ _config=${config:-kernelconfig}
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
 	ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
-	http://vserver.13thfloor.at/Experimental/patch-2.6.30.5-vs2.3.0.36.14-pre7.diff
+	http://vserver.13thfloor.at/Experimental/patch-2.6.30.6-vs2.3.0.36.14-pre8.diff
 	net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch
 	$_config
 	"
@@ -113,7 +113,7 @@ dev() {
 }
 
 md5sums="7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-47841c7ff5c81a7b349a79f2fa8e9138  patch-2.6.30.5.bz2
-19c807c338e25abf2850eb4b04f0b4f1  patch-2.6.30.5-vs2.3.0.36.14-pre7.diff
+f89295707f68c2b349534b490c9d5f2d  patch-2.6.30.6.bz2
+37e45dcf0eb69e8cc8665522dde28f1a  patch-2.6.30.6-vs2.3.0.36.14-pre8.diff
 ca05fd252783b82e01610e775cf56498  net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch
 d6c121ed9e568fe4179afc428ff824b6  kernelconfig"
diff --git a/testing/mpd/APKBUILD b/testing/mpd/APKBUILD
index 92e8c6db7..c52e1c2de 100644
--- a/testing/mpd/APKBUILD
+++ b/testing/mpd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <natanael.copa@gmail.com>
 pkgname=mpd
 pkgver=0.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
 url="http://musicpd.org"
 pkgusers="mpd"
@@ -32,7 +32,7 @@ build() {
 	install -d "$pkgdir"/etc
 	sed -e 's:\#pid_file.*:pid_file\t\t/var/run/mpd/mpd.pid:' \
 		-e 's:\#user.*:user\t\tmpd:' \
-		-e 's:\#log_file.*:log_file\t\t/var/log/mpd:' \
+		-e 's:\#log_file.*:log_file\t\t/var/log/mpd/mpd.log:' \
 		doc/mpdconf.example > "$pkgdir"/etc/mpd.conf
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
@@ -44,5 +44,5 @@ build() {
 		"$pkgdir"/var/lib/mpd/music
 }
 md5sums="869779fdf592ac45d067c7dec228cb51  mpd-0.15.2.tar.bz2
-942017fbdc8bbaf5109e972a0a51b2c1  mpd.initd
+338857abd41efd08b2d2b5399a07a87f  mpd.initd
 dbd301041953a5cf9c2b9de8f23eb6bb  mpd.confd"
diff --git a/testing/mpd/mpd.initd b/testing/mpd/mpd.initd
index 7601ed4f2..e84035760 100644
--- a/testing/mpd/mpd.initd
+++ b/testing/mpd/mpd.initd
@@ -3,7 +3,7 @@
 # init.d file for music player daemon
 
 NAME=mpd
-DAEMON=/usr/sbin/$NAME
+DAEMON=/usr/bin/$NAME
 CONF=/etc/mpd.conf
 
 depend() {
@@ -23,7 +23,7 @@ get_pidfile() {
 }
 
 start() {
-	checkconf || return 1
+	checkconfig || return 1
 	get_pidfile
 	ebegin "Starting ${NAME}"
 		start-stop-daemon --start --quiet \
diff --git a/testing/pjproject/APKBUILD b/testing/pjproject/APKBUILD
index 949693f46..363d7616e 100644
--- a/testing/pjproject/APKBUILD
+++ b/testing/pjproject/APKBUILD
@@ -1,28 +1,38 @@
-# Contributor: Michael Mason <ms13sp@gmail.com> 
+# Contributor: Michael Mason <ms13sp@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pjproject
-pkgver=1.0.1
+pkgver=1.4
 pkgrel=0
 pkgdesc="CLI Softphone"
 url="http://www.pjsip.org/pjsua.htm"
 license="GPL"
-depends="uclibc uclibc++ openssl pth"
-makedepends="uclibc++-dev openssl-dev autoconf binutils pth-dev"
+depends=
+makedepends="uclibc++-dev openssl-dev pth-dev"
 install=
-subpackages="$pkgname-dev"
-source="http://www.pjsip.org/release/1.0.1/$pkgname-$pkgver.tar.bz2"
+subpackages="$pkgname-dev pjsua"
+source="http://www.pjsip.org/release/$pkgver/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	export CXX=g++-uc
+	export CXX=${CXX_UC:-g++-uc}
 
-	./configure --prefix=/usr \
+	./configure --build=${CHOST:-i486-alpine-linux-uclibc} \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
 	make -j1 dep || return 1
 	make -j1 all || return 1
-	make -j1 DESTDIR="$pkgdir" install
+	make -j1 DESTDIR="$pkgdir" prefix=/usr install
 
 }
 
-md5sums="6462f2a636e5b14f50e92efc000924f0  pjproject-1.0.1.tar.bz2"
+pjsua() {
+	pkgdesc="pjsua is an open source command line SIP user agent (softphone)"
+	cd "$srcdir/$pkgname-$pkgver"/pjsip-apps/bin/
+	install -D -m755 pjsua-${CHOST:-i486-alpine-linux-uclibc} \
+		"$subpkgdir"/usr/bin/pjsua
+}
+		
+	
+md5sums="c5abd0d764d89788d817d449141e45a6  pjproject-1.4.tar.bz2"
diff --git a/main/enchant/APKBUILD b/x11/enchant/APKBUILD
index 8133127b4..8133127b4 100644
--- a/main/enchant/APKBUILD
+++ b/x11/enchant/APKBUILD
diff --git a/x11/transmission/APKBUILD b/x11/transmission/APKBUILD
new file mode 100644
index 000000000..e1a52ebca
--- /dev/null
+++ b/x11/transmission/APKBUILD
@@ -0,0 +1,47 @@
+# Maintainer:Carlo Landmeter
+pkgname=transmission
+pkgver=1.74
+pkgel=0
+pkgdesc="Lightweight GTK BitTorrent client"
+url="http://www.tansmissionbt.com"
+install="$pkgname.pre-install"
+license="MIT"
+depends=
+makedepends="openssl-dev pkgconfig curl-dev gtk+-dev intltool"
+source="http://download.m0k.org/transmission/files/transmission-$pkgver.tar.bz2
+	transmission-daemon.initd
+	transmission-daemon.confd
+	"
+subpackages="$pkgname-cli $pkgname-daemon $pkgname-doc"
+
+build() {
+        cd "$srcdir/$pkgname-$pkgver"
+
+        ./configure --prefix=/usr \
+		--mandir=/usr/share/man 
+        make || return 1
+        make DESTDIR="$pkgdir" install
+}
+
+daemon() {
+	pkgdesc="Lightweight BitTorrent client (daemon and webinterface)"
+	install -d "$subpkgdir"/usr/share "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/transmission-daemon "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/share/transmission "$subpkgdir"/usr/share/
+        install -D -m755 "$srcdir"/transmission-daemon.initd \
+		"$pkgdir"/etc/init.d/transmission-daemon
+        install -D -m644 "$srcdir"/transmission-daemon.confd \
+		"$pkgdir"/etc/conf.d/transmission-daemon
+}
+
+cli() {
+	pkgdesc="Lightweight BitTorrent client (cli  and remote)"
+	install -d "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/transmission-remote \
+		"$pkgdir"/usr/bin/transmissioncli \
+		"$subpkgdir"/usr/bin/
+}
+
+md5sums="6b1080800c62308179cfc7a691c82d63  transmission-1.74.tar.bz2
+b3b921242bdc3b33a8ac05fc30653b6c  transmission-daemon.initd
+89478a70fcd93463e1dd8d751da994da  transmission-daemon.confd"
diff --git a/main/transmission/transmission-daemon.confd b/x11/transmission/transmission-daemon.confd
index c1f338f07..c1f338f07 100644
--- a/main/transmission/transmission-daemon.confd
+++ b/x11/transmission/transmission-daemon.confd
diff --git a/main/transmission/transmission-daemon.initd b/x11/transmission/transmission-daemon.initd
index af9461cc6..af9461cc6 100644
--- a/main/transmission/transmission-daemon.initd
+++ b/x11/transmission/transmission-daemon.initd
diff --git a/main/transmission/transmission.pre-install b/x11/transmission/transmission.pre-install
index 44a14760f..44a14760f 100644
--- a/main/transmission/transmission.pre-install
+++ b/x11/transmission/transmission.pre-install
diff --git a/x11/wine/0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch b/x11/wine/0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch
new file mode 100644
index 000000000..05ac31416
--- /dev/null
+++ b/x11/wine/0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch
@@ -0,0 +1,39 @@
+From 0454ace14774654c3670a2a29613bed5039991c5 Mon Sep 17 00:00:00 2001
+From: Roderick Colenbrander <thunderbird2k@gmail.com>
+Date: Thu, 3 Sep 2009 13:51:44 +0200
+Subject: [PATCH] Always adjust the color_shifts pointer when SelectBitmap is called. This fixes a regression in Steam (bug 19916).
+
+---
+ dlls/winex11.drv/bitmap.c |   10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c
+index 4d635aa..fee2dbc 100644
+--- a/dlls/winex11.drv/bitmap.c
++++ b/dlls/winex11.drv/bitmap.c
+@@ -110,10 +110,6 @@ HBITMAP CDECL X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
+     if (physDev->depth != physBitmap->pixmap_depth)
+     {
+         physDev->depth = physBitmap->pixmap_depth;
+-        if(physDev->depth == 1)
+-            physDev->color_shifts = NULL;
+-        else
+-            physDev->color_shifts = &physBitmap->pixmap_color_shifts;
+         wine_tsx11_lock();
+         XFreeGC( gdi_display, physDev->gc );
+         physDev->gc = XCreateGC( gdi_display, physDev->drawable, 0, NULL );
+@@ -122,6 +118,12 @@ HBITMAP CDECL X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
+         XFlush( gdi_display );
+         wine_tsx11_unlock();
+     }
++
++    if(physDev->depth == 1)
++        physDev->color_shifts = NULL;
++    else
++        physDev->color_shifts = &physBitmap->pixmap_color_shifts;
++
+     return hbitmap;
+ }
+ 
+-- 
+1.6.0.4
diff --git a/x11/wine/APKBUILD b/x11/wine/APKBUILD
new file mode 100644
index 000000000..aae298c83
--- /dev/null
+++ b/x11/wine/APKBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=wine
+pkgver=1.1.29
+pkgrel=0
+pkgdesc="A compatibility layer for running Windows programs"
+url="http://www.winehq.com"
+license="LGPL"
+subpackages="$pkgname-dev $pkgname-doc"
+makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev
+	libxcursor-dev libxrandr-dev libxdamage-dev mesa-dev flex bison"
+# lcms
+source="http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$pkgver.tar.bz2
+	0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch"
+
+build () 
+{ 
+	cd "$srcdir"/$pkgname-$pkgver
+	patch -Np1 -i "$srcdir"/0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch
+	./configure --prefix=/usr --sysconfdir=/etc --with-x
+	make depend || return 1
+	make || return 1
+	make prefix="$pkgdir"/usr install || return 1
+	mkdir -p "$pkgdir"/etc/wine
+}
+md5sums="c3a9218840a80b29932cee49f2d45d9d  wine-1.1.29.tar.bz2
+63c4a6aee199039d35e6b57fa505e887  0001-Always-adjust-the-color_shifts-pointer-when-SelectBi.patch"