summaryrefslogtreecommitdiff
path: root/package/davfs2
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-01-06 09:53:25 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-01-06 09:53:25 +0100
commit2288ec26df8e47d9b699e46eecd05eb3570f03a0 (patch)
tree1d204b70e027fd737f6aae1b7308ae959f5bd0b9 /package/davfs2
parent45e7808c41c2e66266f738aa5eff70ce18cc04ac (diff)
parent667bc9e981847a1d117a2fc7110948075a268bdd (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/davfs2')
-rw-r--r--package/davfs2/Makefile10
-rw-r--r--package/davfs2/patches/patch-src_cache_c14
-rw-r--r--package/davfs2/patches/patch-src_coda_h15
-rw-r--r--package/davfs2/patches/patch-src_dav_fuse_c19
-rw-r--r--package/davfs2/patches/patch-src_kernel_interface_c10
-rw-r--r--package/davfs2/patches/patch-src_mount_davfs_c30
-rw-r--r--package/davfs2/patches/patch-src_webdav_c18
7 files changed, 85 insertions, 31 deletions
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index 1b4c0a3ff..cde8727d3 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile
@@ -4,15 +4,17 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= davfs2
-PKG_VERSION:= 1.4.6
-PKG_RELEASE:= 2
-PKG_MD5SUM:= c9e8aeb15daeba4b6283b40bb640e908
+PKG_VERSION:= 1.4.7
+PKG_RELEASE:= 1
+PKG_MD5SUM:= c75f9d7d260e7364362b89beba2b3186
PKG_DESCR:= WebDAV filesystem
PKG_SECTION:= net/fs
PKG_DEPENDS:= fuse-utils kmod-fuse-fs neon
PKG_BUILDDEP:= libiconv-tiny neon fuse
PKG_URL:= http://savannah.nongnu.org/projects/davfs2/
-PKG_SITES:= http://www.very-clever.com/download/nongnu/davfs2/
+PKG_SITES:= http://download.savannah.gnu.org/releases/davfs2/
+
+PKG_LIBC_DEPENDS:= uclibc eglibc glibc
include ${TOPDIR}/mk/package.mk
diff --git a/package/davfs2/patches/patch-src_cache_c b/package/davfs2/patches/patch-src_cache_c
index dd03ed67c..f6e5cdce5 100644
--- a/package/davfs2/patches/patch-src_cache_c
+++ b/package/davfs2/patches/patch-src_cache_c
@@ -1,6 +1,14 @@
---- davfs2-1.4.6.orig/src/cache.c 2009-11-15 11:15:17.000000000 +0100
-+++ davfs2-1.4.6/src/cache.c 2010-12-27 22:02:47.000000000 +0100
-@@ -55,7 +55,6 @@
+--- 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
diff --git a/package/davfs2/patches/patch-src_coda_h b/package/davfs2/patches/patch-src_coda_h
new file mode 100644
index 000000000..9960514d9
--- /dev/null
+++ b/package/davfs2/patches/patch-src_coda_h
@@ -0,0 +1,15 @@
+--- 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
index fca0e83f2..1a67e1563 100644
--- a/package/davfs2/patches/patch-src_dav_fuse_c
+++ b/package/davfs2/patches/patch-src_dav_fuse_c
@@ -1,10 +1,11 @@
---- davfs2-1.4.6.orig/src/dav_fuse.c 2010-02-16 20:29:49.000000000 +0100
-+++ davfs2-1.4.6/src/dav_fuse.c 2010-12-27 22:02:24.000000000 +0100
-@@ -33,6 +33,7 @@
- #ifdef HAVE_STDINT_H
- #include <stdint.h>
+--- 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 <stdlib.h>
- #include <string.h>
- #ifdef HAVE_SYSLOG_H
- #include <syslog.h>
+
++#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
new file mode 100644
index 000000000..5a884cfa3
--- /dev/null
+++ b/package/davfs2/patches/patch-src_kernel_interface_c
@@ -0,0 +1,10 @@
+--- 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
index 516604ffc..a86657673 100644
--- a/package/davfs2/patches/patch-src_mount_davfs_c
+++ b/package/davfs2/patches/patch-src_mount_davfs_c
@@ -1,6 +1,16 @@
---- 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 @@
+--- 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
@@ -8,15 +18,15 @@
#include <getopt.h>
#include <grp.h>
#ifdef HAVE_LIBINTL_H
-@@ -677,6 +676,7 @@ check_double_mounts(dav_args *args)
+@@ -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;
-
-@@ -733,6 +733,7 @@ check_fstab(const dav_args *args)
+ setfsent();
+@@ -737,6 +737,7 @@ check_fstab(const dav_args *args)
endfsent();
delete_args(n_args);
@@ -24,7 +34,7 @@
}
-@@ -754,7 +755,7 @@ check_mountpoint(dav_args *args)
+@@ -758,7 +759,7 @@ check_mountpoint(dav_args *args)
struct passwd *pw;
if (*mpoint != '/') {
@@ -33,7 +43,7 @@
if (!mp)
error(EXIT_FAILURE, 0,
_("can't evaluate path of mount point %s"), mpoint);
-@@ -1824,6 +1825,7 @@ new_args(void)
+@@ -1793,6 +1794,7 @@ new_args(void)
static void
log_dbg_cmdline(char *argv[])
{
@@ -41,8 +51,8 @@
size_t len;
char *cmdline;
if (argz_create(argv, &cmdline, &len) == 0) {
-@@ -1831,6 +1833,7 @@ log_dbg_cmdline(char *argv[])
- syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), cmdline);
+@@ -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_webdav_c b/package/davfs2/patches/patch-src_webdav_c
index 20b125f1a..a2a71fe05 100644
--- a/package/davfs2/patches/patch-src_webdav_c
+++ b/package/davfs2/patches/patch-src_webdav_c
@@ -1,6 +1,14 @@
---- davfs2-1.4.6.orig/src/webdav.c 2010-02-16 20:29:59.000000000 +0100
-+++ davfs2-1.4.6/src/webdav.c 2010-05-30 09:52:01.161613627 +0200
-@@ -52,6 +52,8 @@
+--- 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
@@ -9,7 +17,7 @@
#include <ne_alloc.h>
#include <ne_auth.h>
#include <ne_basic.h>
-@@ -1918,6 +1920,7 @@ quota_result(void *userdata, const ne_ur
+@@ -1921,6 +1922,7 @@ quota_result(void *userdata, const ne_ur
static int
ssl_verify(void *userdata, int failures, const ne_ssl_certificate *cert)
{
@@ -17,7 +25,7 @@
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);
-@@ -1964,8 +1967,13 @@ ssl_verify(void *userdata, int failures,
+@@ -1967,8 +1969,13 @@ ssl_verify(void *userdata, int failures,
len = getline(&s, &n, stdin);
if (len < 0)
abort();