Merge remote branch 'upstream/master'

29 files changed, 466 insertions, 67 deletions

diff --git a/main/acf-tinydns/APKBUILD b/main/acf-tinydns/APKBUILD
index 82b9ceb2..75f4766b 100644
--- a/main/acf-tinydns/APKBUILD
+++ b/main/acf-tinydns/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acf-tinydns
-pkgver=0.5.3
+pkgver=0.5.4
 pkgrel=0
 pkgdesc="A web-based system administration interface for tinydns"
 url="http://git.alpinelinux.org/cgit/acf-tinydns"
@@ -12,4 +12,4 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="0fec252d8cef53ffe226b3adf2acb9c3  acf-tinydns-0.5.3.tar.bz2"
+md5sums="6074fa480d044958878985c25e41b6a5  acf-tinydns-0.5.4.tar.bz2"
diff --git a/main/aumix/APKBUILD b/main/aumix/APKBUILD
index 679b87bd..1e455850 100644
--- a/main/aumix/APKBUILD
+++ b/main/aumix/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=aumix
 pkgver=2.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A color text mode sound mixer"
 url="http://www.jpj.net/~trevor/aumix.html"
 license="GPL"
@@ -14,13 +14,18 @@ source="http://jpj.net/~trevor/aumix/aumix-$pkgver.tar.bz2
 	aumix.initd
 	"
 
-build() { 
+prepare() { 
 	cd "$srcdir"/aumix-$pkgver
 	for i in ../*.patch; do
 		msg "Applying $i..."
 		patch -p1 < $i || return 1
 	done
 
+	sed -i -e '/USE_NLS=yes/d' configure || return 1
+}
+
+build() {
+	cd "$srcdir"/aumix-$pkgver
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--without-gtk1 \
@@ -28,7 +33,11 @@ build() {
 		--disable-nls
 
 	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
+}
+
+package() {
+	cd "$srcdir"/aumix-$pkgver
+	make -j1 DESTDIR="$pkgdir" install || return 1
 	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/aumix
 }
 md5sums="dc3fc7209752207c23e7c94ab886b340  aumix-2.8.tar.bz2
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index d6efe92b..421c936c 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
 pkgname=bash
-pkgver=4.1.002
+pkgver=4.1.005
 _patchlevel=${pkgver##*.}
 _myver=${pkgver%.*}
 _patchbase=${_myver%.*}${_myver#*.}
@@ -67,4 +67,7 @@ package() {
 md5sums="9800d8724815fd84994d9be65ab5e7b8  bash-4.1.tar.gz
 80fec5f3d60a63756a4999c877e31a8e  bash-noinfo.patch
 582dea5671b557f783e18629c2f77b68  bash41-001
-118d465095d4a4706eb1d34696a2666a  bash41-002"
+118d465095d4a4706eb1d34696a2666a  bash41-002
+120f7cf039a40d35fe375e59d6f17adc  bash41-003
+336ee037fc2cc1e2350b05097fbdc87c  bash41-004
+9471e666797f0b03eb2175ed752a9550  bash41-005"
diff --git a/main/cdrkit/APKBUILD b/main/cdrkit/APKBUILD
index 929f06fa..ce5f9830 100644
--- a/main/cdrkit/APKBUILD
+++ b/main/cdrkit/APKBUILD
@@ -6,7 +6,7 @@ pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio C
 url="http://cdrkit.org/"
 license="GPL2"
 depends="file bzip2"
-makedepends="cmake libcap-dev bzip2-dev zlib-dev"
+makedepends="cmake libcap-dev bzip2-dev zlib-dev !libiconv"
 source="http://$pkgname.org/releases/$pkgname-$pkgver.tar.gz"
 subpackages="$pkgname-doc"
 
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index 33f4e853..4ecd8dff 100644
--- a/main/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=dhcp
 pkgver=4.1.0_p1
 _realver=4.1.0p1
-pkgrel=8
+pkgrel=9
 pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)"
 url="https://www.isc.org/"
 license="GPL"
@@ -26,6 +26,8 @@ prepare() {
 
 build() {
 	cd "$srcdir/$pkgname-$_realver"
+	# fix ipv6
+	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc/dhcp \
 		--with-cli-pid-file=/var/run/dhcp/dhclient.pid \
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index 01d421d9..cfc7a77c 100644
--- a/main/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dhcpcd
-pkgver=5.2.1
+pkgver=5.2.2
 pkgrel=0
 pkgdesc="RFC2131 compliant DHCP client"
 url="http://roy.marples.name/projects/dhcpcd/"
@@ -25,4 +25,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="e3bf901c54553673c376b7bcc63b2ff3  dhcpcd-5.2.1.tar.bz2"
+md5sums="30a161c93bd4548a28d97041329bf335  dhcpcd-5.2.2.tar.bz2"
diff --git a/main/djbdns/APKBUILD b/main/djbdns/APKBUILD
index cfb71005..a9895c23 100644
--- a/main/djbdns/APKBUILD
+++ b/main/djbdns/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=djbdns
 pkgver=1.05
-pkgrel=32
+pkgrel=33
 pkgdesc="Excellent high-performance DNS services"
 url="http://cr.yp.to/djbdns.html"
 license="public-domain"
 depends=
-subpackages="tinydns dnscache"
+subpackages="djbdns-common tinydns dnscache"
 source="http://cr.yp.to/djbdns/$pkgname-$pkgver.tar.gz
 	headtail.patch
 	dnsroots.patch
@@ -20,6 +20,7 @@ source="http://cr.yp.to/djbdns/$pkgname-$pkgver.tar.gz
 	dnscache.pre-install
 	dnscache.initd
 	dnscache.confd
+	dnscache.monthly
 	"
 
 build() {
@@ -44,9 +45,19 @@ build() {
 	mkdir -p "$pkgdir"/usr/share/doc/djbdns
 }
 
+common() {
+	pkgdesc="Base utilities of djbdns"
+	replaces="djbdns"
+
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/dnsq "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/dnsip "$subpkgdir"/usr/bin
+}
+
 tinydns() {
 	pkgdesc="A small and secure DNS server"
 	install=tinydns.pre-install
+
 	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/etc/tinydns \
 		"$subpkgdir"/var/cache/tinydns
 	mv "$pkgdir"/usr/bin/tinydns* "$subpkgdir"/usr/bin
@@ -59,6 +70,8 @@ tinydns() {
 dnscache() {
 	pkgdesc="A recursive resolver"
 	install=dnscache.pre-install
+	depends=djbdns-common
+
 	mkdir -p "$subpkgdir"/usr/bin \
 		"$subpkgdir"/etc/dnscache/ip \
 		"$subpkgdir"/etc/dnscache/servers
@@ -71,8 +84,10 @@ dnscache() {
 		"$subpkgdir"/etc/init.d/dnscache
 	install -D -m644 "$srcdir"/dnscache.confd \
 		"$subpkgdir"/etc/conf.d/dnscache
+	install -D -m755 "$srcdir"/dnscache.monthly \
+		"$subpkgdir"/etc/periodic/monthly/dnscache-hints-refresh
 }
-	
+
 md5sums="3147c5cd56832aa3b41955c7a51cbeb2  djbdns-1.05.tar.gz
 0d2adaf9f1626043e8702b825cdccdd6  headtail.patch
 7565048ebc981238879122c7f88cc143  dnsroots.patch
@@ -81,8 +96,9 @@ adb6745606cae593eb5ea6870fc27bd4  djbdns-1.05-jumbo-josb.patch
 c7be73fe2fb4ae02d5096fa2c1f55a68  1.05-errno.patch
 1292500c04baba3995d9753fe40fdc94  1.05-response.patch
 7695bf50559c09798ec852b578ac8698  tinydns.pre-install
-3f4cd61c41f760c3007a8b09a4da091f  tinydns.initd
+fe48165a920cf843ceb9a4ee50bf74c0  tinydns.initd
 7dcf6674c07d46c736b3c25d9c92384a  tinydns.confd
 e09c3a6ba6917e16f4736ab5c070dbe9  dnscache.pre-install
-ec15af30819b9e146f86223753b367a0  dnscache.initd
-e2938593277d7a87806e70e145a90c3f  dnscache.confd"
+e5cada3b032da84c4a0e41ef8b3108cb  dnscache.initd
+2b3d02e88f70603c760bf368ab3ed636  dnscache.confd
+6253f44f042fc5aa31fd182780d9853c  dnscache.monthly"
diff --git a/main/djbdns/dnscache.confd b/main/djbdns/dnscache.confd
index f456bf8d..e5312812 100644
--- a/main/djbdns/dnscache.confd
+++ b/main/djbdns/dnscache.confd
@@ -20,4 +20,6 @@ IP=127.0.0.1
 # FORWARDONLY - servers/@ are parent caches, not root servers
 #FORWARDONLY=
 
+# UPDATEHINTS - refresh zone hints
+UPDATEHINTS=1
 
diff --git a/main/djbdns/dnscache.initd b/main/djbdns/dnscache.initd
index 3e88e3a4..37d9d9ba 100755
--- a/main/djbdns/dnscache.initd
+++ b/main/djbdns/dnscache.initd
@@ -17,8 +17,8 @@ depend() {
 # Main program
 
 start() {
-	UID=$( grep dnscache /etc/passwd | cut -f3 -d: )
-	GID=$( grep dnscache /etc/group | cut -f3 -d: )
+	UID=$(id -u dnscache)
+	GID=$(id -g dnscache)
 	
 	ebegin "Starting dnscache"
 	if [ -z "$UID" ] || [ -z "$GID" ]; then
diff --git a/main/djbdns/dnscache.monthly b/main/djbdns/dnscache.monthly
new file mode 100755
index 00000000..0bd5a853
--- /dev/null
+++ b/main/djbdns/dnscache.monthly
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+if [ -f ./etc/conf.d/dnscache ]; then
+	. /etc/conf.d/dnscache
+fi
+
+if [ -z "$UPDATEHINTS" ]; then
+	exit 0
+fi
+
+cd /etc/dnscache/servers
+NEEDRESTART=
+ZONES=`ls /etc/dnscache/servers`
+for ZONEFILE in $ZONES; do
+	# Convert symlinks to copies, so we can update it
+	ZONE="$ZONEFILE"
+	if [ -L $ZONEFILE ]; then
+		DST="`readlink "$ZONEFILE"`"
+		cp -f "$DST" "$ZONEFILE"
+	fi
+
+	if [ "$ZONE" == "@" ]; then
+		ZONE="."
+	fi
+
+	if [ "$ZONE" != "." -o "$FORWARDONLY" = "" ]; then
+		TMPF=`mktemp -t`
+	
+		# Refresh zone info
+		dnsqr ns $ZONE | awk '/^answer: ./ { print $5 }' | sort -u | xargs dnsip > $TMPF
+
+		grep "^$" $TMPF 1> /dev/null
+		if [ $? != 0 ]; then
+			cmp -s $ZONEFILE $TMPF
+			if [ "$?" != 0 ]; then
+				NEEDRESTART=yes
+				cat $TMPF > $ZONEFILE
+			fi
+		fi
+		rm $TMPF
+	fi
+done
+
+if [ "$NEEDRESTART" ] && /etc/init.d/dnscache --quiet status; then
+	/etc/init.d/dnscache restart
+fi
+
+exit 0
diff --git a/main/djbdns/tinydns.initd b/main/djbdns/tinydns.initd
index ab15ffe3..8dfc5393 100755
--- a/main/djbdns/tinydns.initd
+++ b/main/djbdns/tinydns.initd
@@ -29,8 +29,8 @@ fi
 # Main program
 reload() {
 	local rc opwd="$opwd"
-	UID=$( grep tinydns /etc/passwd | cut -f3 -d: )
-	GID=$( grep tinydns /etc/group | cut -f3 -d: )
+	UID=$(id -u tinydns)
+	GID=$(id -g tinydns)
 
 	# Create the $ROOT directory if necessary
 	if [ ! -d "$ROOT" ]; then
diff --git a/main/ez-ipupdate/APKBUILD b/main/ez-ipupdate/APKBUILD
index 33cb03ea..9da97305 100644
--- a/main/ez-ipupdate/APKBUILD
+++ b/main/ez-ipupdate/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com>
 pkgname=ez-ipupdate
 pkgver=3.0.10
-pkgrel=1
+pkgrel=0
 pkgdesc="utility for updating your host name for many of the dynamic DNS services (ez-ip.net, dyndns.org, etc)"
 url="http://ez-ipupdate.com/"
 license="GPL"
@@ -13,16 +13,27 @@ subpackages=""
 source="http://ez-ipupdate.com/dist/$pkgname-$pkgver.tar.gz
 	ez-ipupdate.confd
 	ez-ipupdate.initd
+	errno.patch
 	"
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	cd "$_builddir"
+	for A in ../*.patch ; do
+		patch -p1 < $A
+	done
+}
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
-
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
@@ -33,4 +44,5 @@ build() {
 
 md5sums="6505c9d18ef6b5ce13fe2a668eb5724b  ez-ipupdate-3.0.10.tar.gz
 e6e06780b1896f2250132cc16cd10710  ez-ipupdate.confd
-6b9ce71b7b6b739794f003b2ebbf66ed  ez-ipupdate.initd"
+6b9ce71b7b6b739794f003b2ebbf66ed  ez-ipupdate.initd
+1fede0dcb5d9ca108855df0a9d213413  errno.patch"
diff --git a/main/ez-ipupdate/errno.patch b/main/ez-ipupdate/errno.patch
new file mode 100644
index 00000000..fea52580
--- /dev/null
+++ b/main/ez-ipupdate/errno.patch
@@ -0,0 +1,56 @@
+# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# 
+# T2 SDE: package/.../ezipupdate/errno.patch
+# Copyright (C) 2004 - 2005 The T2 SDE Project
+# Copyright (C) 1998 - 2003 ROCK Linux Project
+# 
+# More information can be found in the files COPYING and README.
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- T2-COPYRIGHT-NOTE-END ---
+
+--- ./conf_file.c.orig	2000-10-23 04:36:18.000000000 +0200
++++ ./conf_file.c	2003-05-28 08:42:42.000000000 +0200
+@@ -1,4 +1,4 @@
+-/* ============================================================================
++	/* ============================================================================
+  * Copyright (C) 1999 Angus Mackay. All rights reserved; 
+  *
+  * This program is free software; you can redistribute it and/or modify
+@@ -37,13 +37,16 @@
+ 
+ #include <conf_file.h>
+ 
+-#if HAVE_STRERROR
++#if HAVE_ERRNO_H
++#  include <errno.h>
++#elif HAVE_STRERROR
+ extern int errno;
+ #  define error_string strerror(errno)
+-#elif HAVE_SYS_ERRLIST
+-extern const char *const sys_errlist[];
+-extern int errno;
+-#  define error_string (sys_errlist[errno])
++#endif
++
++#if HAVE_SYS_ERRLIST
++//extern char *const strerror[];
++#  define error_string (strerror[errno])
+ #else
+ #  define error_string "error message not found"
+ #endif
+@@ -85,7 +88,7 @@ int parse_conf_file(char *fname, struct 
+   {
+     if((in=fopen(fname, "r")) == NULL)
+     {
+-      fprintf(stderr, "could not open config file \"%s\": %s\n", fname, error_string);
++      fprintf(stderr, "could not open config file \"%s\"\n", fname);
+       return(-1);
+     }
+   }
diff --git a/main/feh/APKBUILD b/main/feh/APKBUILD
index 4895f403..aeefeb3d 100644
--- a/main/feh/APKBUILD
+++ b/main/feh/APKBUILD
@@ -1,20 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=feh
-pkgver=1.3.4
-pkgrel=2
+pkgver=1.4.2
+pkgrel=0
 pkgdesc="feh is a fast, lightweight image viewer which uses imlib2"
 url="http://www.linuxbrit.co.uk/feh/"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="libxt-dev libpng-dev giblib-dev imlib2-dev jpeg-dev"
-source="http://linuxbrit.co.uk/downloads/$pkgname-$pkgver.tar.gz"
+makedepends="libxt-dev libpng-dev giblib-dev imlib2-dev jpeg-dev 
+	libxinerama-dev wget"
+source="https://derf.homelinux.org/~derf/projects/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man || return 1
+	sed -i -e "s:/usr/local:/usr:g" config.mk
 	make || return 1
 }
 
@@ -23,4 +23,4 @@ package() {
 	make DESTDIR=$pkgdir docsdir=/usr/share/doc/feh install || return 1
 	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
-md5sums="3d35ba3d2f0693b019800787f1103891  feh-1.3.4.tar.gz"
+md5sums="19906a6e319e99e0d98856f64324fed8  feh-1.4.2.tar.bz2"
diff --git a/main/fetchmail/APKBUILD b/main/fetchmail/APKBUILD
index a15e71d0..779ab8b9 100644
--- a/main/fetchmail/APKBUILD
+++ b/main/fetchmail/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fetchmail
-pkgver=6.3.15
+pkgver=6.3.16
 pkgrel=0
 pkgdesc="A remote-mail retrieval and forwarding utility"
 url="http://fetchmail.berlios.de/"
@@ -41,5 +41,5 @@ fetchmailconf() {
 	mv usr/lib "$subpkgdir"/usr/
 }
 
-md5sums="53de0a1ff9dda5a6b99adf04ed0132cb  fetchmail-6.3.15.tar.bz2
+md5sums="1a40acb371376c7d54fe468c99dfc216  fetchmail-6.3.16.tar.bz2
 b27fe01a7c25534d62d175c8ba22fc48  fetchmail.initd"
diff --git a/main/gettext/APKBUILD b/main/gettext/APKBUILD
index b96a8a99..5bb26daa 100644
--- a/main/gettext/APKBUILD
+++ b/main/gettext/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail.com>
 pkgname=gettext
 pkgver=0.17
-pkgrel=2
+pkgrel=3
 pkgdesc="GNU locale utilities"
 url="http://www.gnu.org/software/gettext/gettext.html"
 license='GPL'
@@ -14,24 +14,30 @@ source="ftp://ftp.mirror.nl/pub/mirror/gnu/gettext/gettext-0.17.tar.gz
 	"
 subpackages="$pkgname-doc $pkgname-dev"
 
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
 	for i in ../*.patch; do
 		msg "Applying $i..."
 		patch -p1 < $i || return 1
 	done
+}
 
-	export CXX=${CXX_UC:-g++-uc}
-
+build() {
+	cd "$_builddir"
 	# http://bugs.gentoo.org/show_bug.cgi?id=81628
 	export CPPFLAGS="$CPPFLAGS -I/usr/include/libxml2"
 
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--disable-static
-	unset MAKEFLAGS
 	make || return 1
-	make DESTDIR="$pkgdir/" install
+}
+
+package() {
+	cd "$_builddir"
+	make -j1 DESTDIR="$pkgdir/" install
 }
 
 md5sums="58a2bc6d39c0ba57823034d55d65d606  gettext-0.17.tar.gz
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index f27bf247..ca396675 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=git
-pkgver=1.7.0.4
+pkgver=1.7.0.5
 pkgrel=0
 pkgdesc="GIT - the stupid content tracker"
 url="http://git.or.cz/"
@@ -42,5 +42,5 @@ perl() {
 }
 
 
-md5sums="1cc8b2aea57e5e999ccac18ae355f760  git-1.7.0.4.tar.bz2
+md5sums="77d50f41ef282752dc69d9a47765f5c7  git-1.7.0.5.tar.bz2
 e63a201556c4f089de790805c09a2e5b  bb-tar.patch"
diff --git a/main/libspf2/0001-provide-dn_skipname.patch b/main/libspf2/0001-provide-dn_skipname.patch
new file mode 100644
index 00000000..feb46efa
--- /dev/null
+++ b/main/libspf2/0001-provide-dn_skipname.patch
@@ -0,0 +1,120 @@
+From abfd38dbff2be2e63ee222a87b4f24de5573e7eb Mon Sep 17 00:00:00 2001
+From: Natanael Copa <natanael.copa@gmail.com>
+Date: Mon, 19 Apr 2010 14:53:35 +0000
+Subject: [PATCH] provide dn_skipname
+
+---
+ configure.ac                   |    3 +-
+ src/libreplace/__dn_skipname.c |   87 ++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 89 insertions(+), 1 deletions(-)
+ create mode 100644 src/libreplace/__dn_skipname.c
+
+diff --git a/configure.ac b/configure.ac
+index 310d73c..8a0dd2b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -272,7 +273,7 @@ AC_CHECK_FUNCS([strcasecmp strncasecmp strspn strtoul])
+ AC_CHECK_FUNCS([gethostbyname inet_ntoa select strrchr strstr strtol])
+ 
+ AC_REPLACE_FUNCS([getopt_long_only strncasecmp])
+-AC_REPLACE_FUNCS([__ns_initparse __ns_name_uncompress __ns_get16 __ns_msg_getflag])
++AC_REPLACE_FUNCS([__ns_initparse __ns_name_uncompress __ns_get16 __ns_msg_getflag __dn_skipname])
+ 
+ AC_CONFIG_FILES([Makefile
+                  Doxyfile
+diff --git a/src/libreplace/__dn_skipname.c b/src/libreplace/__dn_skipname.c
+new file mode 100644
+index 0000000..88d48b5
+--- /dev/null
++++ b/src/libreplace/__dn_skipname.c
+@@ -0,0 +1,87 @@
++/* 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.
++ */
++#include <sys/types.h>
++#include <resolv.h>
++
++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.7.0.4
+
diff --git a/main/libspf2/APKBUILD b/main/libspf2/APKBUILD
index 266147d8..da5ba384 100644
--- a/main/libspf2/APKBUILD
+++ b/main/libspf2/APKBUILD
@@ -1,29 +1,41 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libspf2
 pkgver=1.2.9
-pkgrel=0
+pkgrel=1
 pkgdesc="Sender Policy Framework library, a part of the SPF/SRS protocol pair."
 url="http://www.libspf2.org"
 license="LGPL-2.1 BSD-2"
 subpackages="$pkgname-dev"
-makedepends=
+makedepends="autoconf automake libtool bind-dev"
 depends=
 source="http://www.libspf2.org/spf/libspf2-$pkgver.tar.gz
-	libspf2-localpolicy-fix.patch"
+	libspf2-localpolicy-fix.patch
+	0001-provide-dn_skipname.patch
+	"
 
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	cd "$_builddir"
 	for i in ../*.patch; do
 		msg "Apply $i"
 		patch -p1 < $i || return 1
 	done
+	libtoolize --force && aclocal && automake && autoconf && autoheader
+}
+
+build() {
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		|| return 1
 	# uclibc claims to have res_ninit() but it doesnt.
 	sed -i -e 's:HAVE_DECL_RES_NINIT 1:HAVE_DECL_RES_NINIT 0:' config.h
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="3305df4d1b13ca964d80b23bb5e4e2b6  libspf2-1.2.9.tar.gz
-48d82a6af8c513d75a7402f2933b8b0a  libspf2-localpolicy-fix.patch"
+48d82a6af8c513d75a7402f2933b8b0a  libspf2-localpolicy-fix.patch
+201889cbd209aa7cae9ce11ed5ebaaa6  0001-provide-dn_skipname.patch"
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index b514a1a5..759d6716 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -55,7 +55,7 @@ prepare() {
 
 	mkdir -p "$srcdir"/build
 	cp "$srcdir"/$_config "$srcdir"/build/.config
-	make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="$CC" \
+	make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="${CC:-gcc}" \
 		silentoldconfig
 }
 
@@ -68,7 +68,7 @@ menuconfig() {
 
 build() {
 	cd "$srcdir"/build
-	make CC="$CC" || return 1
+	make CC="${CC:--gcc}" || return 1
 }
 
 package() {
@@ -99,7 +99,7 @@ dev() {
 	# external modules, and create the scripts
 	mkdir -p "$dir"
 	cp "$srcdir"/$_config "$dir"/.config
-	make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="$CC" \
+	make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="${CC:-gcc}" \
 		silentoldconfig prepare scripts
 
 	# remove the stuff that poits to real sources. we want 3rd party
diff --git a/main/make/APKBUILD b/main/make/APKBUILD
index 5d214140..5b0137cc 100644
--- a/main/make/APKBUILD
+++ b/main/make/APKBUILD
@@ -1,20 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=make
 pkgver=3.81
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU make utility to maintain groups of programs"
 url="http://www.gnu.org/software/make"
 license=GPL
-depends=uclibc
+depends=
 subpackages="$pkgname-doc"
 source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
 
+_builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd $startdir/src/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		--disable-nls
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/mlmmj/APKBUILD b/main/mlmmj/APKBUILD
index 96649fd6..6ac4d162 100644
--- a/main/mlmmj/APKBUILD
+++ b/main/mlmmj/APKBUILD
@@ -1,19 +1,24 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mlmmj
 pkgver=1.2.16
-pkgrel=0
+pkgrel=1
 pkgdesc="Mailing list managing made joyful"
 url="http://mlmmj.org/"
 license="MIT"
 subpackages="$pkgname-doc"
-depends="uclibc"
+depends=
+makedepends=
 source="http://mlmmj.mmj.dk/files/$pkgname-$pkgver.tar.bz2 "
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 
-	configure --prefix=/usr
+	./configure --prefix=/usr
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" install || return 1
 	install -d "$pkgdir"/usr/share/mlmmj/texts
 	cp -r listtexts/* "$pkgdir"/usr/share/mlmmj/texts/
diff --git a/main/procps/APKBUILD b/main/procps/APKBUILD
index 83204ad1..368148b2 100644
--- a/main/procps/APKBUILD
+++ b/main/procps/APKBUILD
@@ -18,7 +18,8 @@ build() {
 
 package() {
 	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" ldconfig=true install || return 1
+	make DESTDIR="$pkgdir" ldconfig=true install="/bin/install -D" \
+		install || return 1
 	install -d "$pkgdir"/usr/include/proc || return 1
 	install -m644 proc/*.h "$pkgdir"/usr/include/proc/ || return 1
 }
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index fa13a0ab..e0f6582f 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=squid
 pkgver=2.7.7
 _ver=2.7.STABLE7
-pkgrel=2
+pkgrel=3
 pkgdesc="A full-featured Web proxy cache server."
 url="http://www.squid-cache.org"
 install="squid.pre-install squid.pre-upgrade squid.post-install"
@@ -11,8 +11,9 @@ pkgusers="squid"
 pkggroups="squid"
 license="GPL-2"
 depends="$pkgname-errors-english logrotate"
-makedepends="openssl-dev perl-dev autoconf automake"
+makedepends="openssl-dev perl-dev autoconf automake heimdal-dev"
 subpackages="$pkgname-doc
+	squid_kerb_auth
 	$pkgname-errors-armenian:errors_armenian
 	$pkgname-errors-azerbaijani:errors_azerbaijani
 	$pkgname-errors-bulgarian:errors_bulgarian
@@ -52,6 +53,7 @@ source="http://www.squid-cache.org/Versions/v2/2.7/${pkgname}-${_ver}.tar.bz2
 	squid.initd
 	squid.confd
 	squid-2.7-gentoo.patch
+	squid-2-heimdal.patch
 	squid-2.7-ims-content-type.patch
 	$pkgname.logrotate
 	"
@@ -63,6 +65,7 @@ build() {
 
 	patch -p1 -i "$srcdir"/squid-2.7-gentoo.patch || return 1
 	patch -p1 -i "$srcdir"/squid-2.7-ims-content-type.patch || return 1
+	patch -p1 -i "$srcdir"/squid-2-heimdal.patch || return 1
 
 	touch NEWS AUTHORS
 	aclocal && autoconf && automake -a || return 1
@@ -77,6 +80,7 @@ build() {
 		--enable-basic-auth-helpers="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,squid_radius_auth" \
 		--enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \
 		--enable-ntlm-auth-helpers="SMB,fakeauth,no_check" \
+		--enable-negotiate-auth-helpers="squid_kerb_auth" \
 		--enable-delay-pools --enable-arp-acl --enable-ssl \
 		--enable-linux-netfilter --enable-ident-lookups \
 		--enable-useragent-log --enable-cache-digests --enable-referer-log \
@@ -100,6 +104,11 @@ build() {
 	chmod +x "$pkgdir"/usr/lib/squid/*
 }
 
+squid_kerb_auth() {
+	pkgdesc="Squid kerberos authetication helper"
+	install -d "$subpkgdir"/usr/lib/squid
+	mv "$pkgdir"/usr/lib/squid/squid_kerb_auth "$subpkgdir"/usr/lib/squid/
+}
 
 _mv_error() {
 	local d=usr/share/squid/errors
@@ -285,5 +294,6 @@ md5sums="c18b0371fca813d5e7c7e0baf87baa22  squid-2.7.STABLE7.tar.bz2
 57fed05adc40acab6a5480ec7a014154  squid.initd
 44b052db7910f386ef88ddcf69c9ba4e  squid.confd
 3827f71d940b47eb385a1a1d92a51d66  squid-2.7-gentoo.patch
+614b97126ad9eecf728095f2de63d33d  squid-2-heimdal.patch
 549377b5a6b673bf19ea6c34003d122c  squid-2.7-ims-content-type.patch
 58823e0b86bc2dc71d270208b7b284b4  squid.logrotate"
diff --git a/main/squid/squid-2-heimdal.patch b/main/squid/squid-2-heimdal.patch
new file mode 100644
index 00000000..67500ae6
--- /dev/null
+++ b/main/squid/squid-2-heimdal.patch
@@ -0,0 +1,18 @@
+diff -Nru squid-2.7.STABLE6.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-2.7.STABLE6/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
+--- squid-2.7.STABLE6.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2007-05-14 23:36:29.000000000 +0000
++++ squid-2.7.STABLE6/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2009-02-16 23:26:28.000000000 +0000
+@@ -18,10 +18,10 @@
+ #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
+ 
+ # HEIMDAL
+-#KERBINC = -DHEIMDAL -I/usr/include/heimdal
+-#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
++KERBINC = -DHEIMDAL -I/usr/include/heimdal
++KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
+ 
+ # MIT
+-KERBINC = 
+-KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
++#KERBINC = 
++#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
+ 
diff --git a/main/strace/APKBUILD b/main/strace/APKBUILD
index 40965ec9..d7a10cfd 100644
--- a/main/strace/APKBUILD
+++ b/main/strace/APKBUILD
@@ -1,20 +1,28 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=strace
 pkgver=4.5.19
-pkgrel=0
+pkgrel=1
 pkgdesc="A useful diagnositic, instructional, and debugging tool"
 url="http://sourceforge.net/projects/strace/"
 license="BSD"
-depends="uclibc"
+depends=
+makedepends=
 source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2"
 subpackages="$pkgname-doc"
 
 build () 
 { 
 	cd "$srcdir/$pkgname-$pkgver"
+	#changes in kernel headers in 2.6.32
+	sed -i -e 's/include <linux\/socket.h>/include <sys\/socket.h>/g' \
+		configure
 	./configure --prefix=/usr \
 		
 	make || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
 	make -j1 DESTDIR="$pkgdir" install
 }
 md5sums="2415e435d61e40315a298c80aced0cda  strace-4.5.19.tar.bz2"
diff --git a/main/unixodbc/APKBUILD b/main/unixodbc/APKBUILD
index cd72a165..e0ed27c9 100644
--- a/main/unixodbc/APKBUILD
+++ b/main/unixodbc/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=unixodbc
 pkgver=2.2.14
-pkgrel=0
+pkgrel=1
 pkgdesc="ODBC is an open specification to access Data Sources"
 url="http://www.unixodbc.org/"
 license="GPL2"
@@ -18,8 +18,13 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
+		--disable-nls \
 		--enable-gui=no
 	make || return 1
+}
+
+package() {
+	cd "$srcdir/unixODBC-$pkgver"
 	make -j1 DESTDIR="$pkgdir" install
 
 }
diff --git a/main/xchat/APKBUILD b/main/xchat/APKBUILD
index 96486e27..cb4bdbef 100644
--- a/main/xchat/APKBUILD
+++ b/main/xchat/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xchat
 pkgver=2.8.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK+ based IRC client"
 url="http://www.xchat.org/"
 license="GPL"
@@ -9,12 +9,14 @@ makedepends="pkgconfig gtk+-dev openssl-dev dbus-glib-dev perl-dev
 	libxext-dev"
 source="http://www.$pkgname.org/files/source/2.8/$pkgname-$pkgver.tar.bz2
 	http://www.$pkgname.org/files/source/2.8/patches/xc286-smallfixes.diff
+	depreciated-macros.patch
 	$pkgname-gtk2.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
 	patch -p1 < ../xc286-smallfixes.diff || return 1
+	patch -p1 -i "$srcdir"/depreciated-macros.patch || return 1
 	patch -p1 < ../xchat-gtk2.patch || return 1
 }
 
@@ -42,4 +44,5 @@ package() {
 
 md5sums="1f2670865d43a23a9abc596dde999aca  xchat-2.8.6.tar.bz2
 eb68b6261bf6740cb5f223627eb8f384  xc286-smallfixes.diff
+daee42354f95ca54a84248c3cb690fee  depreciated-macros.patch
 f3fe00982c0bec93152ed0b32438ef87  xchat-gtk2.patch"
diff --git a/main/xchat/depreciated-macros.patch b/main/xchat/depreciated-macros.patch
new file mode 100644
index 00000000..1b86be2f
--- /dev/null
+++ b/main/xchat/depreciated-macros.patch
@@ -0,0 +1,57 @@
+--- a/src/fe-gtk/fe-gtk.c	2008-02-24 08:39:44.000000000 +0000
++++ b/src/fe-gtk/fe-gtk.c.new	2010-04-01 18:10:31.840778707 +0000
+@@ -819,7 +819,8 @@
+ 	switch (info_type)
+ 	{
+ 	case 0:	/* window status */
+-		if (!GTK_WIDGET_VISIBLE (GTK_WINDOW (sess->gui->window)))
++		if (!gtk_widget_get_visible (GTK_WINDOW (sess->gui->window)))
++
+ 			return 2;	/* hidden (iconified or systray) */
+ #if GTK_CHECK_VERSION(2,4,0)
+ 		if (gtk_window_is_active (GTK_WINDOW (sess->gui->window)))
+--- a/src/fe-gtk/menu.c	2008-06-08 07:59:37.000000000 +0000
++++ b/src/fe-gtk/menu.c.new	2010-04-01 18:15:54.527573869 +0000
+@@ -1670,7 +1670,7 @@
+ menu_canacaccel (GtkWidget *widget, guint signal_id, gpointer user_data)
+ {
+ 	/* GTK2.2 behaviour */
+-	return GTK_WIDGET_IS_SENSITIVE (widget);
++	return gtk_widget_is_sensitive (widget);
+ }
+ 
+ #endif
+--- a/src/fe-gtk/maingui.c	2008-04-01 08:53:41.000000000 +0000
++++ b/src/fe-gtk/maingui.c.new	2010-04-01 18:21:56.400181435 +0000
+@@ -599,7 +599,7 @@
+ 	int num;
+ 	GtkWidget *f = NULL;
+ 
+-	if (current_sess && GTK_WIDGET_HAS_FOCUS (current_sess->gui->input_box))
++	if (current_sess && gtk_widget_has_focus (current_sess->gui->input_box))
+ 		f = current_sess->gui->input_box;
+ 
+ 	num = gtk_notebook_page_num (GTK_NOTEBOOK (mg_gui->note_book), box);
+@@ -809,8 +809,8 @@
+ static void
+ mg_hide_empty_pane (GtkPaned *pane)
+ {
+-	if ((pane->child1 == NULL || !GTK_WIDGET_VISIBLE (pane->child1)) &&
+-		 (pane->child2 == NULL || !GTK_WIDGET_VISIBLE (pane->child2)))
++	if ((pane->child1 == NULL || !gtk_widget_get_visible (pane->child1)) &&
++		 (pane->child2 == NULL || !gtk_widget_get_visible (pane->child2)))
+ 	{
+ 		gtk_widget_hide (GTK_WIDGET (pane));
+ 		return;
+@@ -2563,9 +2563,9 @@
+ {
+ 	int handle_size;
+ 
+-/*	if (pane->child1 == NULL || (!GTK_WIDGET_VISIBLE (pane->child1)))
++/*	if (pane->child1 == NULL || (!gtk_widget_get_visible (pane->child1)))
+ 		return;
+-	if (pane->child2 == NULL || (!GTK_WIDGET_VISIBLE (pane->child2)))
++	if (pane->child2 == NULL || (!gtk_widget_get_visible (pane->child2)))
+ 		return;*/
+ 
+ 	gtk_widget_style_get (GTK_WIDGET (pane), "handle-size", &handle_size, NULL);