davfs2: update to latest stable version

8 files changed, 4 insertions, 171 deletions

diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index 9be3a3a26..79cb2f960 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		davfs2
-PKG_VERSION:=		1.4.7
+PKG_VERSION:=		1.5.2
 PKG_RELEASE:=		1
-PKG_HASH:=		50c0ee2a12e8d09fc6a852d32bdfebb1f784939433a85f05254bc7ef28cff044
+PKG_HASH:=		be34a19ab57a6ea77ecb82083e9e4c1882e12b2de64257de567ad5ee7a17b358
 PKG_DESCR:=		webdav filesystem
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		fuse-utils neon
@@ -22,7 +22,9 @@ include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DAVFS2,davfs2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+AUTOTOOLS_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	--with-neon
+CONFIGURE_ENV+=		ac_cv_func_malloc_0_nonnull=yes
 
 davfs2-install:
 	${INSTALL_DIR} ${IDIR_DAVFS2}/etc/davfs2
diff --git a/package/davfs2/patches/patch-src_cache_c b/package/davfs2/patches/patch-src_cache_c
deleted file mode 100644
index f6e5cdce5..000000000
--- a/package/davfs2/patches/patch-src_cache_c
+++ /dev/null
@@ -1,18 +0,0 @@
---- davfs2-1.4.7.orig/src/cache.c	2012-07-19 13:26:00.000000000 +0200
-+++ davfs2-1.4.7/src/cache.c	2014-01-01 20:01:21.000000000 +0100
-@@ -24,7 +24,6 @@
- #include <dirent.h>
- #endif
- #include <errno.h>
--#include <error.h>
- #ifdef HAVE_FCNTL_H
- #include <fcntl.h>
- #endif
-@@ -55,7 +54,6 @@
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
--#include <sys/xattr.h>
- 
- #include <ne_alloc.h>
- #include <ne_string.h>
diff --git a/package/davfs2/patches/patch-src_coda_h b/package/davfs2/patches/patch-src_coda_h
deleted file mode 100644
index 9960514d9..000000000
--- a/package/davfs2/patches/patch-src_coda_h
+++ /dev/null
@@ -1,15 +0,0 @@
---- davfs2-1.4.7.orig/src/coda.h	2009-04-14 21:54:57.000000000 +0200
-+++ davfs2-1.4.7/src/coda.h	2014-01-01 20:12:52.000000000 +0100
-@@ -57,6 +57,12 @@ typedef int		     int32_t;
- typedef unsigned int	   u_int32_t;
- #endif
- 
-+typedef unsigned long u_long;
-+typedef unsigned int u_int;
-+typedef unsigned short u_short;
-+typedef unsigned long long u_quad_t;
-+#include <sys/types.h>
-+
- 
- /*
-  * Cfs constants
diff --git a/package/davfs2/patches/patch-src_dav_fuse_c b/package/davfs2/patches/patch-src_dav_fuse_c
deleted file mode 100644
index 1a67e1563..000000000
--- a/package/davfs2/patches/patch-src_dav_fuse_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- davfs2-1.4.7.orig/src/dav_fuse.c	2012-07-19 13:18:51.000000000 +0200
-+++ davfs2-1.4.7/src/dav_fuse.c	2014-01-01 20:02:55.000000000 +0100
-@@ -48,6 +48,8 @@
- #include <sys/stat.h>
- #endif
- 
-+#include <sys/select.h>
-+
- #include "defaults.h"
- #include "mount_davfs.h"
- #include "cache.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 5a884cfa3..000000000
--- a/package/davfs2/patches/patch-src_kernel_interface_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- davfs2-1.4.7.orig/src/kernel_interface.c	2012-07-19 12:58:48.000000000 +0200
-+++ davfs2-1.4.7/src/kernel_interface.c	2014-01-01 20:01:11.000000000 +0100
-@@ -20,7 +20,6 @@
- 
- #include "config.h"
- 
--#include <error.h>
- #ifdef HAVE_FCNTL_H
- #include <fcntl.h>
- #endif
diff --git a/package/davfs2/patches/patch-src_mount_davfs_c b/package/davfs2/patches/patch-src_mount_davfs_c
deleted file mode 100644
index a86657673..000000000
--- a/package/davfs2/patches/patch-src_mount_davfs_c
+++ /dev/null
@@ -1,61 +0,0 @@
---- davfs2-1.4.7.orig/src/mount_davfs.c	2012-07-19 13:35:11.000000000 +0200
-+++ davfs2-1.4.7/src/mount_davfs.c	2014-01-01 20:14:21.000000000 +0100
-@@ -20,16 +20,15 @@
- 
- #include "config.h"
- 
-+#include <paths.h>
- #ifdef HAVE_ARGZ_H
- #include <argz.h>
- #endif
- #include <ctype.h>
- #include <errno.h>
--#include <error.h>
- #ifdef HAVE_FCNTL_H
- #include <fcntl.h>
- #endif
--#include <fstab.h>
- #include <getopt.h>
- #include <grp.h>
- #ifdef HAVE_LIBINTL_H
-@@ -674,6 +673,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();
-@@ -737,6 +737,7 @@ check_fstab(const dav_args *args)
- 
-     endfsent();
-     delete_args(n_args);
-+#endif
- }
- 
- 
-@@ -758,7 +759,7 @@ check_mountpoint(dav_args *args)
-     struct passwd *pw;
- 
-     if (*mpoint != '/') {
--        char *mp = canonicalize_file_name(mpoint);
-+        char *mp = realpath(mpoint, NULL);
-         if (!mp)
-             error(EXIT_FAILURE, 0,
-                   _("can't evaluate path of mount point %s"), mpoint);
-@@ -1793,6 +1794,7 @@ new_args(void)
- static void
- log_dbg_cmdline(char *argv[])
- {
-+    /*
-     size_t len;
-     char *cmdline;
-     if (argz_create(argv, &cmdline, &len) == 0) {
-@@ -1800,6 +1802,7 @@ log_dbg_cmdline(char *argv[])
-         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "%s", cmdline);
-         free(cmdline);
-     }
-+    */
- }
- 
- 
diff --git a/package/davfs2/patches/patch-src_umount_davfs_c b/package/davfs2/patches/patch-src_umount_davfs_c
deleted file mode 100644
index 9dd1978d4..000000000
--- a/package/davfs2/patches/patch-src_umount_davfs_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- davfs2-1.4.6.orig/src/umount_davfs.c	2009-06-04 20:30:32.000000000 +0200
-+++ davfs2-1.4.6/src/umount_davfs.c	2010-05-30 09:53:14.681613660 +0200
-@@ -120,7 +120,7 @@ main(int argc, char *argv[])
-     if (optind < (argc - 1))
-         error(EXIT_FAILURE, 0, _("too many arguments"));
- 
--    char *mpoint = canonicalize_file_name(argv[optind]);
-+    char *mpoint = realpath(argv[optind], NULL);
-     if (!mpoint)
-         mpoint = argv[optind];
-     if (!mpoint || *mpoint != '/')
diff --git a/package/davfs2/patches/patch-src_webdav_c b/package/davfs2/patches/patch-src_webdav_c
deleted file mode 100644
index a2a71fe05..000000000
--- a/package/davfs2/patches/patch-src_webdav_c
+++ /dev/null
@@ -1,43 +0,0 @@
---- davfs2-1.4.7.orig/src/webdav.c	2012-07-19 13:27:51.000000000 +0200
-+++ davfs2-1.4.7/src/webdav.c	2014-01-01 20:14:54.000000000 +0100
-@@ -21,7 +21,6 @@
- #include "config.h"
- 
- #include <errno.h>
--#include <error.h>
- #ifdef HAVE_FCNTL_H
- #include <fcntl.h>
- #endif
-@@ -52,6 +51,8 @@
- #include <sys/stat.h>
- #endif
- 
-+#include <regex.h>
-+
- #include <ne_alloc.h>
- #include <ne_auth.h>
- #include <ne_basic.h>
-@@ -1921,6 +1922,7 @@ quota_result(void *userdata, const ne_ur
- static int
- ssl_verify(void *userdata, int failures, const ne_ssl_certificate *cert)
- {
-+    regex_t *re;
-     char *issuer = ne_ssl_readable_dname(ne_ssl_cert_issuer(cert));
-     char *subject = ne_ssl_readable_dname(ne_ssl_cert_subject(cert));
-     char *digest = ne_calloc(NE_SSL_DIGESTLEN);
-@@ -1967,8 +1969,13 @@ ssl_verify(void *userdata, int failures,
-             len = getline(&s, &n, stdin);
-             if (len < 0)
-                 abort();
--            if (rpmatch(s) > 0)
--                ret = 0;
-+	    if (regcomp(&re, "^[yY]", REG_EXTENDED) != 0) {
-+		if (regexec(&re, s, (size_t)0, NULL, 0) < 1) {
-+		        regfree(&re);
-+			ret = -1;
-+		}
-+		ret = 0;
-+	    }
-             free(s);
-     } 
-