From 8207b8d44693503e1c086aea0fc30c592a59b15d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 1 Jan 2014 20:19:13 +0100
Subject: another round of updates and musl fixes

---
 package/davfs2/patches/patch-src_mount_davfs_c | 30 +++++++++++++++++---------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'package/davfs2/patches/patch-src_mount_davfs_c')

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);
      }
 +    */
-- 
cgit v1.2.3