66 files changed, 215514 insertions, 35093 deletions

diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile
index ff8e99cff..918bcd22b 100644
--- a/package/aircrack-ng/Makefile
+++ b/package/aircrack-ng/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		aircrack-ng
-PKG_VERSION:=		1.0
+PKG_VERSION:=		1.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		dafbfaf944ca9d523fde4bae86f0c067
+PKG_MD5SUM:=		f7a24ed8fad122c4187d06bfd6f998b4
 PKG_DESCR:=		set of tools for auditing wireless networks
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpthread libopenssl libpcap
diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile
index 307853fab..2c0afd8bf 100644
--- a/package/apr-util/Makefile
+++ b/package/apr-util/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=              apr-util
-PKG_VERSION:=           0.9.15
+PKG_VERSION:=           1.3.9
 PKG_RELEASE:=           1
-PKG_MD5SUM:=            dc772ae295f49ddb8ee8e69a9716c53b
+PKG_MD5SUM:=            cc2ec0ba4f01d88375f1170f762518fa
 PKG_DESCR:=		Apache Portable Runtime utility library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libexpat apr
@@ -21,11 +21,11 @@ $(eval $(call PKG_template,APR_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${
 CONFIGURE_ARGS+=	--without-berkeley-db
 CONFIGURE_ARGS+=	--with-apr=${STAGING_DIR}/usr
 CONFIGURE_ARGS+=	--with-expat=${STAGING_DIR}/usr
-XAKE_FLAGS+=		apr_builddir=${STAGING_DIR}/usr/share/build \
-			apr_builders=${STAGING_DIR}/usr/share/build
+XAKE_FLAGS+=		apr_builddir=${STAGING_DIR}/usr/share/build-1 \
+			apr_builders=${STAGING_DIR}/usr/share/build-1
 
 post-install:
 	${INSTALL_DIR} ${IDIR_APR_UTIL}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libaprutil-0.so* ${IDIR_APR_UTIL}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libaprutil-1.so* ${IDIR_APR_UTIL}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/apr-util/patches/patch-uri_Makefile_in b/package/apr-util/patches/patch-uri_Makefile_in
deleted file mode 100644
index 670623ad0..000000000
--- a/package/apr-util/patches/patch-uri_Makefile_in
+++ /dev/null
@@ -1,19 +0,0 @@
-$Id$
---- apr-util-0.9.13.orig/uri/Makefile.in	2004-11-25 00:45:40.000000000 +0100
-+++ apr-util-0.9.13/uri/Makefile.in	2007-02-07 12:55:37.000000000 +0100
-@@ -3,7 +3,7 @@ VPATH = @srcdir@
- INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@ -I.
- 
- TARGETS = uri_delims.h apr_uri.lo
--CLEAN_TARGETS = gen_uri_delims uri_delims.h
-+CLEAN_TARGETS = gen_uri_delims
- 
- # bring in rules.mk for standard functionality
- @INCLUDE_RULES@
-@@ -13,6 +13,3 @@ gen_uri_delims: $(gen_uri_delims_OBJECTS
- 	$(LINK) $(EXTRA_LDFLAGS) $(gen_uri_delims_OBJECTS) $(EXTRA_LIBS)
- 
- apr_uri.lo: uri_delims.h apr_uri.c
--
--uri_delims.h: gen_uri_delims
--	./gen_uri_delims > uri_delims.h
diff --git a/package/apr-util/patches/uri_delim.patch b/package/apr-util/patches/uri_delim.patch
deleted file mode 100644
index 04ca4e1d8..000000000
--- a/package/apr-util/patches/uri_delim.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur apr-util-0.9.13/uri/uri_delims.h build_mipsel/w-apr-util-0.9.13-1/apr-util-0.9.13/uri/uri_delims.h
---- apr-util-0.9.13/uri/uri_delims.h    1970-01-01 01:00:00.000000000 +0100
-+++ build_mipsel/w-apr-util-0.9.13-1/apr-util-0.9.13/uri/uri_delims.h   2007-02-07 13:06:56.000000000 +0100
-@@ -0,0 +1,16 @@
-+/* this file is automatically generated by gen_uri_delims, do not edit */
-+static const unsigned char uri_delims[256] = {
-+    T_NUL,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,T_HASH,0,0,0,0,
-+    0,0,0,0,0,0,0,T_SLASH,0,0,0,0,0,0,0,0,0,0,T_COLON,0,
-+    0,0,0,T_QUESTION,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-+};
-
diff --git a/package/apr/Makefile b/package/apr/Makefile
index 486a96842..4f65c5eef 100644
--- a/package/apr/Makefile
+++ b/package/apr/Makefile
@@ -4,22 +4,15 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		apr
-PKG_VERSION:=		0.9.17
+PKG_VERSION:=		1.4.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ca1e22d98081a03a33c2a0b8684eb192
+PKG_MD5SUM:=		fc80cb54f158c2674f9eeb47a1f672cd
 PKG_DESCR:=		Apache Portable Runtime library
 PKG_SECTION:=		libs
-ifeq ($(ADK_PACKAGE_APR_THREADING),y)
 PKG_DEPENDS:=		libpthread
-PKG_BUILDDEP+=		libpthread
-endif
 PKG_URL:=		http://apr.apache.org
 PKG_SITES:=		http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/
 
-PKG_FLAVOURS=		THREADING
-PKGFD_FULL=		Enable threading support
-
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -31,23 +24,19 @@ CONFIGURE_ENV+=		ac_cv_sizeof_ssize_t=4
 CONFIGURE_ENV+=		ac_cv_file__dev_zero=yes
 CONFIGURE_ENV+=		apr_cv_process_shared_works=no
 CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
+CONFIGURE_ENV+=		apr_cv_tcp_nodelay_with_cork=no
 CONFIGURE_ARGS+=	--with-devrandom=/dev/urandom
-
-ifeq (${ADK_PACKAGE_APR_THREADING},y)
 CONFIGURE_ARGS+=	--enable-threads
-else
-CONFIGURE_ARGS+=	--disable-threads
-endif
 
 post-install:
 	${INSTALL_DIR} ${IDIR_APR}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libapr-0.so* ${IDIR_APR}/usr/lib/
-	${INSTALL_DIR} ${STAGING_DIR}/usr/share/build
-	${CP} ${WRKINST}/usr/share/build/* ${STAGING_DIR}/usr/share/build/
+	${CP} ${WRKINST}/usr/lib/libapr-1.so* ${IDIR_APR}/usr/lib/
+	${INSTALL_DIR} ${STAGING_DIR}/usr/share/build-1
+	${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_DIR}/usr/share/build-1/
 	# we need to patch paths to get apr-util compiling
 	$(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," \
-		${WRKINST}/usr/bin/apr-config
+		${WRKINST}/usr/bin/apr-1-config
 	$(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," \
-		${WRKINST}/usr/bin/apr-config
+		${WRKINST}/usr/bin/apr-1-config
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/apr/patches/patch-include_apr_want_h b/package/apr/patches/patch-include_apr_want_h
new file mode 100644
index 000000000..5f1a11c5e
--- /dev/null
+++ b/package/apr/patches/patch-include_apr_want_h
@@ -0,0 +1,16 @@
+--- apr-1.4.2.orig/include/apr_want.h	2010-01-06 12:36:50.000000000 +0100
++++ apr-1.4.2/include/apr_want.h	2010-05-29 17:56:14.201613974 +0200
+@@ -89,11 +89,13 @@
+ 
+ #else
+ 
++/*
+ struct iovec
+ {
+     void *iov_base;
+     size_t iov_len;
+ };
++*/
+ 
+ #endif
+ 
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 425683f24..c35e686a5 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		1.6.2.5
+PKG_VERSION:=		1.6.2.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9d1f7bcf6833605ced4b2740d14bd576
+PKG_MD5SUM:=		861f57ba43bfe05dc645e0679a260e41
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		net
 PKG_MULTI:=		1
diff --git a/package/asterisk/patches/patch-Makefile b/package/asterisk/patches/patch-Makefile
deleted file mode 100644
index 1ba02c900..000000000
--- a/package/asterisk/patches/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- asterisk-1.6.2.1.orig/Makefile	2009-12-10 22:04:20.000000000 +0100
-+++ asterisk-1.6.2.1/Makefile	2010-02-05 21:05:41.313084404 +0100
-@@ -366,8 +366,8 @@ makeopts: configure
- 	@exit 1
- 
- menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
--	menuselect/menuselect --check-deps $@
--	menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
-+	./menuselect/menuselect --check-deps $@
-+	./menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
- 
- $(MOD_SUBDIRS_EMBED_LDSCRIPT):
- 	+@echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
diff --git a/package/asterisk/patches/patch-apps_app_followme_c b/package/asterisk/patches/patch-apps_app_followme_c
deleted file mode 100644
index 8ecfa9226..000000000
--- a/package/asterisk/patches/patch-apps_app_followme_c
+++ /dev/null
@@ -1,26 +0,0 @@
---- asterisk-1.6.2.1.orig/apps/app_followme.c	2009-09-15 18:06:24.000000000 +0200
-+++ asterisk-1.6.2.1/apps/app_followme.c	2010-02-14 10:33:51.540422962 +0100
-@@ -172,7 +172,9 @@ static int ynlongest = 0;
- 
- static const char *featuredigittostr;
- static int featuredigittimeout = 5000;		/*!< Feature Digit Timeout */
--static const char *defaultmoh = "default";    	/*!< Default Music-On-Hold Class */
-+static const char *defaultmoh;		    	/*!< Default Music-On-Hold Class */
-+
-+
- 
- static char takecall[20] = "1", nextindp[20] = "2";
- static char callfromprompt[PATH_MAX] = "followme/call-from";
-@@ -236,6 +238,7 @@ static struct call_followme *alloc_profi
- 
- static void init_profile(struct call_followme *f)
- {
-+	defaultmoh = "default";
- 	f->active = 1;
- 	ast_copy_string(f->moh, defaultmoh, sizeof(f->moh));
- }
-@@ -1195,3 +1198,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MO
- 		.unload = unload_module,
- 		.reload = reload,
- 	       );
-+
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 9f771defb..a7ddfb1d8 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		curl
-PKG_VERSION:=		7.19.7
+PKG_VERSION:=		7.20.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ecb2e37e45c9933e2a963cabe03670ab
+PKG_MD5SUM:=		d7df0507db48546661b155b612cac19c
 PKG_DESCR:=		a client-side URL transfer tool
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libcurl
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index b6c026739..11e93d2ce 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile
@@ -3,25 +3,25 @@
 
 include ${TOPDIR}/rules.mk
 
-PKG_NAME=		davfs2
-PKG_VERSION=		1.3.3
-PKG_RELEASE=		1
-PKG_MD5SUM=		57def26e4d6d63527e01612d10fd0515
+PKG_NAME:=		davfs2
+PKG_VERSION:=		1.4.6
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c9e8aeb15daeba4b6283b40bb640e908
 PKG_DESCR:=		WebDAV filesystem
 PKG_SECTION:=		admin
 PKG_BUILDDEP+=		libiconv neon
 ifneq (${ADK_PACKAGE_DAVFS2_FUSE}${ADK_PACKAGE_DAVFS2_BOTH},)
 PKG_BUILDDEP+=		fuse
 endif
-PKG_URL:=		http://savannah.nongnu.org/projects/davfs2
-PKG_SITES=		${MASTER_SITE_SOURCEFORGE:=dav/}
+PKG_URL:=		http://savannah.nongnu.org/projects/davfs2		
+PKG_SITES:=		http://www.very-clever.com/download/nongnu/davfs2/
 
 ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y)
-PKG_DEPENDS:=			fuse-utils kmod-fuse-fs libiconv neon
+PKG_DEPENDS:=		fuse-utils kmod-fuse-fs libiconv neon
 else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y)
-PKG_DEPENDS:=			kmod-coda-fs libiconv neon
+PKG_DEPENDS:=		kmod-coda-fs libiconv neon
 else
-PKG_DEPENDS:=			kmod-coda-fs fuse-utils kmod-fuse-fs libiconv neon
+PKG_DEPENDS:=		kmod-coda-fs fuse-utils kmod-fuse-fs libiconv neon
 endif
 
 include ${TOPDIR}/mk/package.mk
diff --git a/package/davfs2/patches/patch-src_cache_c b/package/davfs2/patches/patch-src_cache_c
deleted file mode 100644
index ac8b0b4f1..000000000
--- a/package/davfs2/patches/patch-src_cache_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- davfs2-1.3.3.orig/src/cache.c	2008-06-24 21:32:50.000000000 +0200
-+++ davfs2-1.3.3/src/cache.c	2008-12-08 00:06:51.000000000 +0100
-@@ -23,7 +23,6 @@
- 
- #include "config.h"
- 
--#include <argz.h>
- #include <dirent.h>
- #include <errno.h>
- #include <error.h>
diff --git a/package/davfs2/patches/patch-src_dav_coda2_c b/package/davfs2/patches/patch-src_dav_coda2_c
deleted file mode 100644
index 1ef269348..000000000
--- a/package/davfs2/patches/patch-src_dav_coda2_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- davfs2-1.3.3.orig/src/dav_coda2.c	2008-02-02 23:23:45.000000000 +0100
-+++ davfs2-1.3.3/src/dav_coda2.c	2008-12-08 00:07:35.000000000 +0100
-@@ -23,7 +23,6 @@
- 
- #include "config.h"
- 
--#include <argz.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <limits.h>
diff --git a/package/davfs2/patches/patch-src_dav_coda3_c b/package/davfs2/patches/patch-src_dav_coda3_c
deleted file mode 100644
index 9a4bee68b..000000000
--- a/package/davfs2/patches/patch-src_dav_coda3_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- davfs2-1.3.3.orig/src/dav_coda3.c	2008-02-02 23:24:10.000000000 +0100
-+++ davfs2-1.3.3/src/dav_coda3.c	2008-12-08 00:08:00.000000000 +0100
-@@ -23,7 +23,6 @@
- 
- #include "config.h"
- 
--#include <argz.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <limits.h>
diff --git a/package/davfs2/patches/patch-src_dav_fuse5_c b/package/davfs2/patches/patch-src_dav_fuse5_c
deleted file mode 100644
index 21c92b9a5..000000000
--- a/package/davfs2/patches/patch-src_dav_fuse5_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- davfs2-1.3.3.orig/src/dav_fuse5.c	2008-04-05 20:36:06.000000000 +0200
-+++ davfs2-1.3.3/src/dav_fuse5.c	2008-12-08 00:08:26.000000000 +0100
-@@ -23,7 +23,6 @@
- 
- #include "config.h"
- 
--#include <argz.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <stddef.h>
diff --git a/package/davfs2/patches/patch-src_dav_fuse7_c b/package/davfs2/patches/patch-src_dav_fuse7_c
deleted file mode 100644
index 846f4a98a..000000000
--- a/package/davfs2/patches/patch-src_dav_fuse7_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- davfs2-1.3.3.orig/src/dav_fuse7.c	2008-04-09 21:43:34.000000000 +0200
-+++ davfs2-1.3.3/src/dav_fuse7.c	2008-12-08 00:08:32.000000000 +0100
-@@ -23,7 +23,6 @@
- 
- #include "config.h"
- 
--#include <argz.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <stddef.h>
diff --git a/package/davfs2/patches/patch-src_kernel_interface_c b/package/davfs2/patches/patch-src_kernel_interface_c
deleted file mode 100644
index 15d5c909b..000000000
--- a/package/davfs2/patches/patch-src_kernel_interface_c
+++ /dev/null
@@ -1,31 +0,0 @@
-$Id$
---- davfs2-1.3.3.orig/src/kernel_interface.c	2008-04-05 20:43:04.000000000 +0200
-+++ davfs2-1.3.3/src/kernel_interface.c	2008-12-08 00:09:01.000000000 +0100
-@@ -23,7 +23,6 @@
- 
- #include "config.h"
- 
--#include <argz.h>
- #include <errno.h>
- #include <error.h>
- #include <fcntl.h>
-@@ -173,7 +172,8 @@ static int init_coda(int *dev, dav_run_m
-     }
- 
-     if (*dev <= 0) {
--        system("/sbin/modprobe coda &>/dev/null");
-+        system("/sbin/insmod coda");
-+	sleep(1);
-         minor = 0;
-         while (*dev <= 0 && minor < MAX_CODADEVS) {
-             char *path;
-@@ -240,7 +240,8 @@ static int init_fuse(int *dev, dav_run_m
- 
-     *dev = open(path, O_RDWR | O_NONBLOCK);
-     if (*dev <= 0) {
--        system("/sbin/modprobe fuse &>/dev/null");
-+        system("/sbin/insmod fuse");
-+	sleep(1);
-         *dev = open(path, O_RDWR | O_NONBLOCK);
-     }
-     if (*dev <= 0) {
diff --git a/package/davfs2/patches/patch-src_mount_davfs_c b/package/davfs2/patches/patch-src_mount_davfs_c
index ba0c030f2..516604ffc 100644
--- a/package/davfs2/patches/patch-src_mount_davfs_c
+++ b/package/davfs2/patches/patch-src_mount_davfs_c
@@ -1,40 +1,22 @@
-$Id$
---- davfs2-1.3.3.orig/src/mount_davfs.c	2008-06-30 20:29:42.000000000 +0200
-+++ davfs2-1.3.3/src/mount_davfs.c	2008-12-08 00:20:01.000000000 +0100
-@@ -23,12 +23,10 @@
- 
- #include "config.h"
- 
--#include <argz.h>
- #include <ctype.h>
- #include <errno.h>
- #include <error.h>
+--- davfs2-1.4.6.orig/src/mount_davfs.c	2010-01-21 19:50:15.000000000 +0100
++++ davfs2-1.4.6/src/mount_davfs.c	2010-05-29 21:10:23.041613426 +0200
+@@ -29,7 +29,6 @@
+ #ifdef HAVE_FCNTL_H
  #include <fcntl.h>
+ #endif
 -#include <fstab.h>
  #include <getopt.h>
  #include <grp.h>
- #include <limits.h>
-@@ -602,15 +600,18 @@ static char *check_double_mounts(dav_arg
-    free to choose them. They should be configured in davfs2.conf anyway. */
- static void check_fstab(const dav_args *args) {
- 
+ #ifdef HAVE_LIBINTL_H
+@@ -677,6 +676,7 @@ check_double_mounts(dav_args *args)
+ static void
+ check_fstab(const dav_args *args)
+ {
 +#if 0
      dav_args *n_args = new_args();
      n_args->mopts = DAV_USER_MOPTS;
  
-     setfsent();
-     struct fstab *ft = getfsfile(mpoint);
-     if (ft == NULL)
-+#endif
-         error(EXIT_FAILURE, 0, _("no entry for %s found in %s"), url,
--              _PATH_FSTAB);
-+              "/etc/fstab");
- 
-+#if 0
-     if (strcmp(url, ft->fs_spec) != 0) {
-         char *fstab_url = decode_octal(ft->fs_spec);
-         if (strcmp(url, fstab_url) != 0)
-@@ -642,6 +643,7 @@ static void check_fstab(const dav_args *
+@@ -733,6 +733,7 @@ check_fstab(const dav_args *args)
  
      endfsent();
      delete_args(n_args);
@@ -42,28 +24,28 @@ $Id$
  }
  
  
-@@ -661,7 +663,7 @@ static void check_mountpoint(dav_args *a
+@@ -754,7 +755,7 @@ check_mountpoint(dav_args *args)
      struct passwd *pw;
  
      if (*mpoint != '/') {
 -        char *mp = canonicalize_file_name(mpoint);
 +        char *mp = realpath(mpoint, NULL);
-         if (mp == NULL)
+         if (!mp)
              error(EXIT_FAILURE, 0,
                    _("can't evaluate path of mount point %s"), mpoint);
-@@ -1754,6 +1756,7 @@ static dav_args *new_args(void) {
-