davfs2: Update to 1.5.5
Switched URL to @SAVANNAH for more mirrors. Added PKG_BUILD_PARALLEL for faster compilation. Added PKG_LICENSE info. Minor reorganization for consistency between packages. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
parent
fdc5c5be60
commit
b958f62462
|
@ -8,14 +8,19 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=davfs2
|
||||
PKG_VERSION:=1.5.4
|
||||
PKG_RELEASE:=3
|
||||
PKG_VERSION:=1.5.5
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/davfs2/
|
||||
PKG_HASH:=c9c4e0f0912a782386216b2147eb9c36c47f193b8fcf3d637719e0b9fe7c96e0
|
||||
PKG_SOURCE_URL:=@SAVANNAH/davfs2
|
||||
PKG_HASH:=587c6a25ad78109995a7ccb8e60aa1c491b149f2c99d47033f3d5e648430ad2f
|
||||
|
||||
PKG_MAINTAINER:=Federico Di Marco <fededim@gmail.com>
|
||||
PKG_LICENSE:=GPL-3
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
|
||||
PKG_FIXUP:=gettext-version autoreconf
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include $(INCLUDE_DIR)/nls.mk
|
||||
|
@ -26,8 +31,7 @@ define Package/davfs2
|
|||
SUBMENU:=Filesystem
|
||||
DEPENDS=+libneon +kmod-fuse +libfuse $(ICONV_DEPENDS) $(INTL_DEPENDS)
|
||||
TITLE:=Mount a WebDAV resource as a regular file system.
|
||||
URL:=http://savannah.nongnu.org/projects/davfs2/
|
||||
MAINTAINER:=Federico Di Marco <fededim@gmail.com>
|
||||
URL:=https://savannah.nongnu.org/projects/davfs2/
|
||||
endef
|
||||
|
||||
define Package/davfs2/description
|
||||
|
|
|
@ -1,17 +1,6 @@
|
|||
--- a/src/cache.c
|
||||
+++ b/src/cache.c
|
||||
@@ -58,7 +58,7 @@
|
||||
#ifdef HAVE_SYS_TYPES_H
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
-#include <sys/xattr.h>
|
||||
+#include <linux/xattr.h>
|
||||
|
||||
#include <ne_alloc.h>
|
||||
#include <ne_string.h>
|
||||
--- a/src/webdav.c
|
||||
+++ b/src/webdav.c
|
||||
@@ -2033,7 +2033,7 @@ ssl_verify(void *userdata, int failures,
|
||||
@@ -2037,7 +2037,7 @@ ssl_verify(void *userdata, int failures, const ne_ssl_certificate *cert)
|
||||
len = getline(&s, &n, stdin);
|
||||
if (len < 0)
|
||||
abort();
|
||||
|
|
|
@ -34,6 +34,73 @@
|
|||
#ifdef HAVE_FCNTL_H
|
||||
#include <fcntl.h>
|
||||
#endif
|
||||
--- /dev/null
|
||||
+++ b/src/compat.h
|
||||
@@ -0,0 +1,64 @@
|
||||
+#ifndef _COMPAT_H
|
||||
+#define _COMPAT_H
|
||||
+
|
||||
+#ifndef _PATH_MOUNTED
|
||||
+# define _PATH_MOUNTED "/proc/mounts"
|
||||
+#endif
|
||||
+
|
||||
+#ifndef _PATH_MNTTAB
|
||||
+# define _PATH_MNTTAB "/etc/fstab"
|
||||
+#endif
|
||||
+
|
||||
+#ifdef HAVE_ERROR_H
|
||||
+# include <error.h>
|
||||
+#else
|
||||
+# include <stdio.h>
|
||||
+# include <stdarg.h>
|
||||
+# include <stdlib.h>
|
||||
+# include <string.h>
|
||||
+static void error_at_line(int status, int errnum, const char *filename,
|
||||
+ unsigned int linenum, const char *format, ...)
|
||||
+{
|
||||
+ va_list ap;
|
||||
+
|
||||
+ fflush(stdout);
|
||||
+
|
||||
+ if (filename != NULL)
|
||||
+ fprintf(stderr, "%s:%u: ", filename, linenum);
|
||||
+
|
||||
+ va_start(ap, format);
|
||||
+ vfprintf(stderr, format, ap);
|
||||
+ va_end(ap);
|
||||
+
|
||||
+ if (errnum != 0)
|
||||
+ fprintf(stderr, ": %s", strerror(errnum));
|
||||
+
|
||||
+ fprintf(stderr, "\n");
|
||||
+
|
||||
+ if (status != 0)
|
||||
+ exit(status);
|
||||
+}
|
||||
+
|
||||
+#define error(status, errnum, format...) \
|
||||
+ error_at_line(status, errnum, NULL, 0, format)
|
||||
+
|
||||
+#endif /* HAVE_ERROR_H */
|
||||
+
|
||||
+#ifndef HAVE_CANONICALIZE_FILE_NAME
|
||||
+#include <limits.h>
|
||||
+#include <string.h>
|
||||
+#include <stdlib.h>
|
||||
+static char * canonicalize_file_name(const char *path)
|
||||
+{
|
||||
+ char buf[PATH_MAX] = { };
|
||||
+
|
||||
+ snprintf(buf, sizeof(buf) - 1, "%s", path);
|
||||
+
|
||||
+ if (!realpath(path, buf))
|
||||
+ return NULL;
|
||||
+
|
||||
+ return strdup(buf);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+#endif /* _COMPAT_H */
|
||||
--- a/src/dav_fuse.c
|
||||
+++ b/src/dav_fuse.c
|
||||
@@ -47,6 +47,9 @@
|
||||
|
@ -125,70 +192,3 @@
|
|||
}
|
||||
|
||||
session = ne_session_create(args->scheme, args->host, args->port);
|
||||
--- /dev/null
|
||||
+++ b/src/compat.h
|
||||
@@ -0,0 +1,64 @@
|
||||
+#ifndef _COMPAT_H
|
||||
+#define _COMPAT_H
|
||||
+
|
||||
+#ifndef _PATH_MOUNTED
|
||||
+# define _PATH_MOUNTED "/proc/mounts"
|
||||
+#endif
|
||||
+
|
||||
+#ifndef _PATH_MNTTAB
|
||||
+# define _PATH_MNTTAB "/etc/fstab"
|
||||
+#endif
|
||||
+
|
||||
+#ifdef HAVE_ERROR_H
|
||||
+# include <error.h>
|
||||
+#else
|
||||
+# include <stdio.h>
|
||||
+# include <stdarg.h>
|
||||
+# include <stdlib.h>
|
||||
+# include <string.h>
|
||||
+static void error_at_line(int status, int errnum, const char *filename,
|
||||
+ unsigned int linenum, const char *format, ...)
|
||||
+{
|
||||
+ va_list ap;
|
||||
+
|
||||
+ fflush(stdout);
|
||||
+
|
||||
+ if (filename != NULL)
|
||||
+ fprintf(stderr, "%s:%u: ", filename, linenum);
|
||||
+
|
||||
+ va_start(ap, format);
|
||||
+ vfprintf(stderr, format, ap);
|
||||
+ va_end(ap);
|
||||
+
|
||||
+ if (errnum != 0)
|
||||
+ fprintf(stderr, ": %s", strerror(errnum));
|
||||
+
|
||||
+ fprintf(stderr, "\n");
|
||||
+
|
||||
+ if (status != 0)
|
||||
+ exit(status);
|
||||
+}
|
||||
+
|
||||
+#define error(status, errnum, format...) \
|
||||
+ error_at_line(status, errnum, NULL, 0, format)
|
||||
+
|
||||
+#endif /* HAVE_ERROR_H */
|
||||
+
|
||||
+#ifndef HAVE_CANONICALIZE_FILE_NAME
|
||||
+#include <limits.h>
|
||||
+#include <string.h>
|
||||
+#include <stdlib.h>
|
||||
+static char * canonicalize_file_name(const char *path)
|
||||
+{
|
||||
+ char buf[PATH_MAX] = { };
|
||||
+
|
||||
+ snprintf(buf, sizeof(buf) - 1, "%s", path);
|
||||
+
|
||||
+ if (!realpath(path, buf))
|
||||
+ return NULL;
|
||||
+
|
||||
+ return strdup(buf);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+#endif /* _COMPAT_H */
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -32,8 +32,7 @@ mount_davfs_SOURCES = cache.c dav_coda.c
|
||||
@@ -32,8 +32,7 @@ mount_davfs_SOURCES = cache.c dav_coda.c \
|
||||
kernel_interface.h mount_davfs.h webdav.h
|
||||
umount_davfs_SOURCES = umount_davfs.c defaults.h
|
||||
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
diff --git a/src/webdav.c b/src/webdav.c
|
||||
index 1ff7c7f..74cd957 100644
|
||||
--- a/src/webdav.c
|
||||
+++ b/src/webdav.c
|
||||
@@ -25,7 +25,7 @@
|
||||
|
|
Loading…
Reference in New Issue