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

22 files changed, 209 insertions, 90 deletions

diff --git a/main/apr/APKBUILD b/main/apr/APKBUILD
index 15f412e44d..097cd35e00 100644
--- a/main/apr/APKBUILD
+++ b/main/apr/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apr
-pkgver=1.3.8
+pkgver=1.3.9
 pkgrel=0
 pkgdesc="The Apache Portable Runtime"
 url="http://apr.apache.org/"
@@ -32,4 +32,4 @@ dev() {
 	return 0
 }
 
-md5sums="3c7e3a39ae3d3573f49cb74e2dbf87a2  apr-1.3.8.tar.bz2"
+md5sums="7138ac64d4458eeeaa9b9aefa4e6e51b  apr-1.3.9.tar.bz2"
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 87291ec771..0fe38ff91e 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dovecot
-pkgver=1.2.5
+pkgver=1.2.6
 pkgrel=0
 pkgdesc="IMAP and POP3 server"
 url="http://www.dovecot.org/"
@@ -29,5 +29,5 @@ build() {
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
 
-md5sums="8b057903d6a527dac964b51c5638c625  dovecot-1.2.5.tar.gz
+md5sums="807666f1a112e7379c4dbb57c9ce4899  dovecot-1.2.6.tar.gz
 c58b474dca20e6e60fa4f1f5b9c726e1  dovecot.initd"
diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD
index 49f092220b..5b5b53cc02 100644
--- a/main/fakeroot/APKBUILD
+++ b/main/fakeroot/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fakeroot
-pkgver=1.13
+pkgver=1.13.1
 pkgrel=0
 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
 license='GPL'
@@ -18,5 +18,5 @@ build() {
   make DESTDIR="$pkgdir" install
 }
 
-md5sums="e0cbeceb066cc678c9fe1d6d35d24ceb  fakeroot_1.13.tar.gz
+md5sums="f96aa2b0050892d118e74af43d8ed748  fakeroot_1.13.1.tar.gz
 ea7b7e3065090d72804cdf4719dd5832  busybox-compat.patch"
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index ce08a46aa2..dbf5a3c2e8 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=git
-pkgver=1.6.4.4
+pkgver=1.6.5
 pkgrel=0
 pkgdesc="GIT - the stupid content tracker"
 url="http://git.or.cz/"
@@ -39,5 +39,5 @@ perl() {
 }
 
 
-md5sums="b150352782998ca1f84185e6af53ec26  git-1.6.4.4.tar.bz2
+md5sums="da86c1736c55edb9f446828581137b51  git-1.6.5.tar.bz2
 04e1bdf76a0bac568f8488daad07dce7  bb-tar.patch"
diff --git a/main/gzip/APKBUILD b/main/gzip/APKBUILD
index eb06884d6d..6d7a0874f0 100644
--- a/main/gzip/APKBUILD
+++ b/main/gzip/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Leonardo Arena <rnalrd@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gzip
-pkgver=1.3.12
-pkgrel=2
+pkgver=1.3.13
+pkgrel=0
 pkgdesc="A popular data compression program"
 subpackages="$pkgname-doc"
 url="http://www.gnu.org/software/gzip/"
@@ -10,8 +10,7 @@ license="GPL2"
 depends=
 makedepends=
 install="$pkgname.post-deinstall"
-source="http://ftp.gnu.org/gnu/gzip/gzip-1.3.12.tar.gz
-	$install"
+source="http://ftp.gnu.org/gnu/gzip/gzip-$pkgver.tar.gz"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -30,5 +29,4 @@ build() {
 	ln -s /bin/gzip "$pkgdir"/usr/bin/gzip
 	ln -s /bin/gunzip "$pkgdir"/usr/bin/gunzip
 }
-md5sums="b5bac2d21840ae077e0217bc5e4845b1  gzip-1.3.12.tar.gz
-b84506d253e04db3c5af9016fead45a3  gzip.post-deinstall"
+md5sums="c54a31b93e865f6a4410b2dc64662706  gzip-1.3.13.tar.gz"
diff --git a/main/libcap/APKBUILD b/main/libcap/APKBUILD
index 731729c03a..666de86ce7 100644
--- a/main/libcap/APKBUILD
+++ b/main/libcap/APKBUILD
@@ -1,23 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libcap
-pkgver=2.16
-pkgrel=1
+pkgver=2.17
+pkgrel=0
 pkgdesc="POSIX 1003.1e capabilities"
 license="GPL"
 url="http://www.friedhoff.org/posixfilecaps.html"
 depends=
 makedepends="perl"
 source="http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$pkgname-$pkgver.tar.gz
-	include-order.patch
 	"
 subpackages="$pkgname-doc $pkgname-dev"
 
 build ()
 {
 	cd "$srcdir/$pkgname-$pkgver"
-	patch -p1 < ../include-order.patch || return 1
-
 	make lib=/lib prefix=/usr LIBATTR=no DESTDIR="$pkgdir" install
 }
-md5sums="9e075fda242c4070ba76407064c13302  libcap-2.16.tar.gz
-db5c78e0ab579bb6723fff5ebb2fd530  include-order.patch"
+md5sums="fa8c3841ce491b379de316a195e65da2  libcap-2.17.tar.gz"
diff --git a/main/libcap/include-order.patch b/main/libcap/include-order.patch
deleted file mode 100644
index 88c5fcc6c8..0000000000
--- a/main/libcap/include-order.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur a/progs/capsh.c b/progs/capsh.c
---- a/progs/capsh.c	2009-07-24 07:14:03.000000000 +0000
-+++ b/progs/capsh.c	2009-07-24 07:14:19.000000000 +0000
-@@ -12,11 +12,11 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-+#include <sys/wait.h>
- #include <sys/prctl.h>
- #include <sys/capability.h>
- #include <unistd.h>
- #include <errno.h>
--#include <sys/wait.h>
- 
- /* prctl based API for altering character of current process */
- #define PR_GET_KEEPCAPS    7
diff --git a/main/man-pages/APKBUILD b/main/man-pages/APKBUILD
index 77cafba2bb..c6f277c44a 100644
--- a/main/man-pages/APKBUILD
+++ b/main/man-pages/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=man-pages
-pkgver=3.22
+pkgver=3.23
 _posixver=2003-a
 pkgrel=0
 pkgdesc="Linux man pages"
@@ -24,5 +24,5 @@ build ()
 	done
 	make prefix="$pkgdir"/usr install || return 1
 }
-md5sums="409e7325188d8734a63c823fd58c7dce  man-pages-3.22.tar.gz
+md5sums="4d0263bded9ad02a123ce11114ef76ac  man-pages-3.23.tar.gz
 7c78aff03c0a6767ba483d34f19e4b09  man-pages-posix-2003-a.tar.bz2"
diff --git a/main/popt/APKBUILD b/main/popt/APKBUILD
index a46f218c2e..469b65bd8d 100644
--- a/main/popt/APKBUILD
+++ b/main/popt/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=popt
-pkgver=1.14
+pkgver=1.15
 pkgrel=0
 pkgdesc="A commandline option parser"
 url="http://rpm5.org"
@@ -16,4 +16,4 @@ build ()
 	make || return 1
 	make DESTDIR=$pkgdir install || return 1
 }
-md5sums="4f90a07316eb825604dd10ae4f9f3f04  popt-1.14.tar.gz"
+md5sums="c61ef795fa450eb692602a661ec8d7f1  popt-1.15.tar.gz"
diff --git a/main/python/APKBUILD b/main/python/APKBUILD
index d5d38b99ca..daefac1ae8 100644
--- a/main/python/APKBUILD
+++ b/main/python/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=python
-pkgver=2.6.2
-pkgrel=1
+pkgver=2.6.3
+pkgrel=0
 pkgdesc="A high-level scripting language"
 url="http://www.python.org"
 license="custom"
 subpackages="$pkgname-dev $pkgname-doc"
-depends="db expat openssl zlib ncurses uclibc"
+depends=
 makedepends="db-dev expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev !gettext"
 source="http://www.$pkgname.org/ftp/$pkgname/$pkgver/Python-$pkgver.tar.bz2
 	$pkgname-2.6-internal-expat.patch
@@ -29,5 +29,5 @@ build() {
 	make DESTDIR="$pkgdir" install
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
-md5sums="245db9f1e0f09ab7e0faaa0cf7301011  Python-2.6.2.tar.bz2
+md5sums="8755fc03075b1701ca3f13932e6ade9f  Python-2.6.3.tar.bz2
 9d64df5e0a6aed149a792c7bff16e3d9  python-2.6-internal-expat.patch"
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index 473b3d7192..439f24b390 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
-pkgver=3.3.7
-pkgrel=4
+pkgver=3.3.8
+pkgrel=0
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="http://www.samba.org"
 license="GPL3"
@@ -104,7 +104,7 @@ tdb() {
 		usr/bin/tdb*
 }
 
-md5sums="bc7228cc686986353df67ff42b1b2b1e  samba-3.3.7.tar.gz
+md5sums="f4563c7dfca803c6d56a4948f0af05a8  samba-3.3.8.tar.gz
 c8a7f6ac5df2f73dbf023e25ea39927b  samba.initd
 c150433426e18261e6e3eed3930e1a76  samba.confd
 b7cafabfb4fa5b3ab5f2e857d8d1c733  samba.logrotate"
diff --git a/main/swig/APKBUILD b/main/swig/APKBUILD
index 21587995c5..3a2d470e5b 100644
--- a/main/swig/APKBUILD
+++ b/main/swig/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=swig
-pkgver=1.3.39
+pkgver=1.3.40
 pkgrel=0
 pkgdesc="SWIG is a compiler that makes it easy to integrate C and C++ code with scripting languages"
 url="http://www.swig.org/"
@@ -17,4 +17,4 @@ build ()
 	make DESTDIR="$pkgdir" install
 	install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
-md5sums="ac201d1b87f8659584534f9540d7ad24  swig-1.3.39.tar.gz"
+md5sums="2df766c9e03e02811b1ab4bba1c7b9cc  swig-1.3.40.tar.gz"
diff --git a/main/sysstat/APKBUILD b/main/sysstat/APKBUILD
index 90a81b3c6b..1d3039d4aa 100644
--- a/main/sysstat/APKBUILD
+++ b/main/sysstat/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sysstat
-pkgver=9.0.4
+pkgver=9.0.5
 pkgrel=0
 pkgdesc="Performance monitoring tools for Linux"
 url="http://pagesperso-orange.fr/sebastien.godard/"
@@ -24,4 +24,4 @@ build() {
 
 }
 
-md5sums="961ff56564c1fbf9db9baa5aa4ad0ea5  sysstat-9.0.4.tar.gz"
+md5sums="767f4424f4e014c78ebeb3a6a3d4ea12  sysstat-9.0.5.tar.gz"
diff --git a/main/taglib/APKBUILD b/main/taglib/APKBUILD
index ff03066ef9..044649eafb 100644
--- a/main/taglib/APKBUILD
+++ b/main/taglib/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=taglib
-pkgver=1.5
+pkgver=1.6
 pkgrel=0
 pkgdesc="library for reading and editing the meta-data of several popular audio formats."
 url="http://ktown.kde.org/~wheeler/taglib.html"
@@ -17,4 +17,4 @@ build ()
 	make VERBOSE=1 || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="7b557dde7425c6deb7bbedd65b4f2717  taglib-1.5.tar.gz"
+md5sums="5ecad0816e586a954bd676a86237d054  taglib-1.6.tar.gz"
diff --git a/testing/freeradius/0001-Fix-detection-of-TLS-for-uClibc.patch b/testing/freeradius/0001-Fix-detection-of-TLS-for-uClibc.patch
new file mode 100644
index 0000000000..e76571a21c
--- /dev/null
+++ b/testing/freeradius/0001-Fix-detection-of-TLS-for-uClibc.patch
@@ -0,0 +1,33 @@
+From 51cb058c6a9472585622582d16e01c5540627c25 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 13 Oct 2009 12:53:38 +0000
+Subject: [PATCH] Fix detection of TLS for uClibc
+
+On uClibc the configure script will wrongly detect that TLS is
+available. This happends becuase the variable val in the test program
+is optimized away and missing during link time.
+
+This patch make sure that the variable val is not optimized away so
+configure correctly will detect that TLS is missing on uClibc.
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ acinclude.m4 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 6025474..100e5b0 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -382,7 +382,7 @@ m4_pushdef([AC_OUTPUT],
+ AC_DEFUN([FR_TLS],
+ [
+     AC_MSG_CHECKING(for TLS)
+-    AC_RUN_IFELSE([AC_LANG_SOURCE([[ static __thread int val; int main() { return 0; } ]])],[have_tls=yes],[have_tls=no],[have_tls=no ])
++    AC_RUN_IFELSE([AC_LANG_SOURCE([[ static __thread int val; int main(int argc, char *argv[]) { return val = argc; } ]])],[have_tls=yes],[have_tls=no],[have_tls=no ])
+     AC_MSG_RESULT($have_tls)
+     if test "$have_tls" = "yes"; then
+         AC_DEFINE([HAVE_THREAD_TLS],[1],[Define if the compiler supports __thread])
+-- 
+1.6.4.4
+
diff --git a/testing/freeradius/APKBUILD b/testing/freeradius/APKBUILD
new file mode 100644
index 0000000000..5163359104
--- /dev/null
+++ b/testing/freeradius/APKBUILD
@@ -0,0 +1,68 @@
+# Contributor: 
+# Maintainer: 
+pkgname=freeradius
+pkgver=2.1.7
+pkgrel=0
+pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
+url="http://freeradius.org/"
+license="GPL"
+depends=
+makedepends="openssl-dev pth-dev mysql-dev postgresql-dev gdbm-dev readline-dev
+	bash libtool autoconf automake
+	"
+pkggroups="radiusd"
+pkgusers="radiusd"
+install="freeradius.pre-install"
+subpackages="$pkgname-doc $pkgname-dev"
+source="ftp://ftp.freeradius.org/pub/freeradius/$pkgname-server-$pkgver.tar.gz
+	freeradius.confd
+	freeradius.initd
+	0001-Fix-detection-of-TLS-for-uClibc.patch
+	freeradius-2.1.6-nothreads.patch
+	freeradius-2.1.7-pkglibdir.patch
+	"
+
+build() {
+	cd "$srcdir/$pkgname-server-$pkgver"
+	for i in ../*.patch; do
+		msg "Applying $i"
+		patch -p1 -i $i || return 1
+	done
+
+	aclocal && ./autogen.sh || return 1
+
+	export CONFIG_SHELL=/bin/bash
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+                --localstatedir=/var \
+		--disable-static \
+		|| return 1
+
+#	# the configure script fails to detect that we dont have TLS
+#	sed -i -e '/^\#define HAVE_THREAD_TLS/d' src/include/autoconf.h \
+#		|| return 1
+
+	make -j1 || return 1
+	install -d -m0750 -o root -g radiusd "$pkgdir"/etc/raddb
+	install -d -m0750 -o root -g radiusd "$pkgdir"/var/run/radius
+	install -d -m0750 -o root -g radiusd "$pkgdir"/var/log/radius
+	install -d -m0750 -o root -g radiusd "$pkgdir"/var/log/radius/radacct
+
+	make -j1 R="$pkgdir" install
+	sed -i -e 's:^#user *= *nobody:user = radiusd:;s:^#group *= *nobody:group = radiusd:' \
+		"$pkgdir"/etc/raddb/radiusd.conf
+	chown -R root:radiusd "$pkgdir"/etc/raddb/*
+	rm -f "$pkgdir/usr/sbin/rc.radiusd"
+	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+
+}
+
+md5sums="b1f77c5e3116bcb0ac0aa9080a06ebf1  freeradius-server-2.1.7.tar.gz
+fc6693f3df5a0694610110287a28568a  freeradius.confd
+b22092fcdcb61d7f0b8e13a007c444c5  freeradius.initd
+2e39f10c814bc7e1172c4cb2d178b39b  0001-Fix-detection-of-TLS-for-uClibc.patch
+1e04786d3f626200999f53471c19ac47  freeradius-2.1.6-nothreads.patch
+4c8af50e174d392c0210cbf494cd15cd  freeradius-2.1.7-pkglibdir.patch"
diff --git a/testing/freeradius/freeradius-2.1.6-nothreads.patch b/testing/freeradius/freeradius-2.1.6-nothreads.patch
new file mode 100644
index 0000000000..41a41c8d6e
--- /dev/null
+++ b/testing/freeradius/freeradius-2.1.6-nothreads.patch
@@ -0,0 +1,13 @@
+diff -Nru freeradius-server-2.1.6.orig/src/main/event.c freeradius-server-2.1.6/src/main/event.c
+--- freeradius-server-2.1.6.orig/src/main/event.c	2009-05-18 13:13:55.000000000 +0200
++++ freeradius-server-2.1.6/src/main/event.c	2009-09-05 07:52:42.000000000 +0200
+@@ -1667,7 +1667,9 @@
+ 	 */
+ 	request->num_proxied_requests = 1;
+ 	request->num_proxied_responses = 0;
++#ifdef HAVE_PTHREAD_H
+ 	request->child_pid = NO_SUCH_CHILD_PID;
++#endif
+ 
+ 	update_event_timestamp(request->proxy, request->proxy_when.tv_sec);
+ 
diff --git a/testing/freeradius/freeradius-2.1.7-pkglibdir.patch b/testing/freeradius/freeradius-2.1.7-pkglibdir.patch
new file mode 100644
index 0000000000..d5767fbd02
--- /dev/null
+++ b/testing/freeradius/freeradius-2.1.7-pkglibdir.patch
@@ -0,0 +1,63 @@
+diff -ru freeradius-server-2.1.7.orig/Make.inc.in freeradius-server-2.1.7/Make.inc.in
+--- freeradius-server-2.1.7.orig/Make.inc.in	2009-10-09 08:38:58.000000000 +0000
++++ freeradius-server-2.1.7/Make.inc.in	2009-10-09 08:39:15.000000000 +0000
+@@ -10,6 +10,7 @@
+ sysconfdir	= @sysconfdir@
+ localstatedir	= @localstatedir@
+ libdir		= @libdir@
++pkglibdir	= @libdir@/freeradius
+ bindir		= @bindir@
+ sbindir		= @sbindir@
+ docdir		= @docdir@
+diff -ru freeradius-server-2.1.7.orig/raddb/radiusd.conf.in freeradius-server-2.1.7/raddb/radiusd.conf.in
+--- freeradius-server-2.1.7.orig/raddb/radiusd.conf.in	2009-10-09 08:38:58.000000000 +0000
++++ freeradius-server-2.1.7/raddb/radiusd.conf.in	2009-10-09 08:39:15.000000000 +0000
+@@ -103,7 +103,7 @@
+ #	make
+ #	make install
+ #
+-libdir = @libdir@
++libdir = @libdir@/freeradius
+ 
+ #  pidfile: Where to place the PID of the RADIUS server.
+ #
+diff -ru freeradius-server-2.1.7.orig/src/modules/Makefile freeradius-server-2.1.7/src/modules/Makefile
+--- freeradius-server-2.1.7.orig/src/modules/Makefile	2009-10-09 08:38:58.000000000 +0000
++++ freeradius-server-2.1.7/src/modules/Makefile	2009-10-09 08:39:15.000000000 +0000
+@@ -12,7 +12,7 @@
+ 	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
+ 
+ install:
+-	$(INSTALL) -d -m 755 $(R)$(libdir)
++	$(INSTALL) -d -m 755 $(R)$(pkglibdir)
+ 	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
+ 
+ clean:
+diff -ru freeradius-server-2.1.7.orig/src/modules/rules.mak freeradius-server-2.1.7/src/modules/rules.mak
+--- freeradius-server-2.1.7.orig/src/modules/rules.mak	2009-10-09 08:38:58.000000000 +0000
++++ freeradius-server-2.1.7/src/modules/rules.mak	2009-10-09 08:40:56.000000000 +0000
+@@ -123,7 +123,7 @@
+ $(TARGET).la: $(LT_OBJS)
+ 	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
+ 	-module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@     \
+-	-rpath $(libdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
++	-rpath $(pkglibdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
+ 
+ #######################################################################
+ #
+@@ -164,13 +164,13 @@
+ #  Do any module-specific installation.
+ #
+ #  If there isn't a TARGET defined, then don't do anything.
+-#  Otherwise, install the libraries into $(libdir)
++#  Otherwise, install the libraries into $(pkglibdir)
+ #
+ install:
+ 	@[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL)
+ 	if [ "x$(TARGET)" != "x" ]; then \
+ 	    $(LIBTOOL) --mode=install $(INSTALL) -c \
+-		$(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
++ 		$(TARGET).la $(R)$(pkglibdir)/$(TARGET).la || exit $$?; \
+ 	    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
+ 	    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
+ 	fi
diff --git a/unstable/freeradius/freeradius.confd b/testing/freeradius/freeradius.confd
index 9811289ba4..9811289ba4 100644
--- a/unstable/freeradius/freeradius.confd
+++ b/testing/freeradius/freeradius.confd
diff --git a/unstable/freeradius/freeradius.initd b/testing/freeradius/freeradius.initd
index 86909adef9..86909adef9 100644
--- a/unstable/freeradius/freeradius.initd
+++ b/testing/freeradius/freeradius.initd
diff --git a/unstable/freeradius/freeradius.pre-install b/testing/freeradius/freeradius.pre-install
index 875022745c..875022745c 100644
--- a/unstable/freeradius/freeradius.pre-install
+++ b/testing/freeradius/freeradius.pre-install
diff --git a/unstable/freeradius/APKBUILD b/unstable/freeradius/APKBUILD
deleted file mode 100644
index f6a527390f..0000000000
--- a/unstable/freeradius/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: 
-# Maintainer: 
-pkgname=freeradius
-pkgver=2.1.3
-pkgrel=1
-pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
-url="http://freeradius.org/"
-license="GPL"
-depends=
-makedepends="openssl-dev pth-dev mysql-dev postgresql-dev gdbm-dev"
-install="freeradius.pre-install"
-subpackages="$pkgname-doc $pkgname-dev"
-source="ftp://ftp.freeradius.org/pub/freeradius/$pkgname-server-$pkgver.tar.gz
-	freeradius.confd
-	freeradius.initd
-	"
-
-build() {
-	cd "$srcdir/$pkgname-server-$pkgver"
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--without-threads \
-		--disable-tls 
-	make -j1 || return 1
-	make -j1 DESTDIR="$pkgdir" install
-
-	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-}
-
-md5sums="017ebe7dd2e261caee448c64ccd4584d  freeradius-server-2.1.3.tar.gz
-fc6693f3df5a0694610110287a28568a  freeradius.confd
-b22092fcdcb61d7f0b8e13a007c444c5  freeradius.initd"