Merge branch 'master' of git+ssh://openadk.org/git/openadk

9 files changed, 48 insertions, 173 deletions

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) {
- 
- static void log_dbg_config(char *argv[], dav_args *args) {
- 
+@@ -1824,6 +1825,7 @@ new_args(void)
+ static void
+ log_dbg_cmdline(char *argv[])
+ {
 +    /*
      size_t len;
-     char * cmdline;
+     char *cmdline;
      if (argz_create(argv, &cmdline, &len) == 0) {
-@@ -1761,6 +1764,7 @@ static void log_dbg_config(char *argv[],
+@@ -1831,6 +1833,7 @@ log_dbg_cmdline(char *argv[])
          syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), cmdline);
          free(cmdline);
      }
 +    */
-     
-     syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG),
-            "Configuration:");
+ }
+ 
+ 
diff --git a/package/davfs2/patches/patch-src_umount_davfs_c b/package/davfs2/patches/patch-src_umount_davfs_c
index 387476f39..9dd1978d4 100644
--- a/package/davfs2/patches/patch-src_umount_davfs_c
+++ b/package/davfs2/patches/patch-src_umount_davfs_c
@@ -1,12 +1,11 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- davfs2-1.3.3.orig/src/umount_davfs.c	2008-01-11 22:40:18.000000000 +0100
-+++ davfs2-1.3.3/src/umount_davfs.c	2008-12-08 00:38:43.000000000 +0100
-@@ -114,7 +114,7 @@ int main(int argc, char *argv[]) {
+--- 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 == NULL)
+     if (!mpoint)
          mpoint = argv[optind];
-     if (mpoint == NULL || *mpoint != '/')
+     if (!mpoint || *mpoint != '/')
diff --git a/package/davfs2/patches/patch-src_webdav_c b/package/davfs2/patches/patch-src_webdav_c
index 35ad27492..20b125f1a 100644
--- a/package/davfs2/patches/patch-src_webdav_c
+++ b/package/davfs2/patches/patch-src_webdav_c
@@ -1,55 +1,35 @@
-$Id$
-
-	cf. http://sourceforge.net/tracker/index.php?func=detail&aid=1594808&group_id=26275&atid=386747
-
---- davfs2-1.3.3.orig/src/webdav.c	2008-06-28 19:20:07.000000000 +0200
-+++ davfs2-1.3.3/src/webdav.c	2008-12-08 00:37:23.000000000 +0100
-@@ -23,7 +23,6 @@
+--- 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 @@
+ #include <sys/stat.h>
+ #endif
  
- #include "config.h"
- 
--#include <argz.h>
- #include <errno.h>
- #include <error.h>
- #include <fcntl.h>
-@@ -34,6 +33,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <syslog.h>
 +#include <regex.h>
- #include <time.h>
- #include <unistd.h>
- 
-@@ -406,6 +406,11 @@ void dav_init_webdav(const char *scheme,
-     suri = (ne_uri *) ne_calloc(sizeof(ne_uri));
-     ne_fill_server_uri(session, suri);
- 
-+    /* begin of GMX hack */
-+    ne_server_capabilities caps;
-+    ne_options(session, "/", &caps);
-+    /* end of GMX hack */
 +
-     if (use_locks) {
-         locks = ne_lockstore_create();
-         if (lock_owner == NULL) {
-@@ -1859,13 +1864,18 @@ static int ssl_verify(void *userdata, in
-                      "or there might be a man-in-the-middle-attack.\n"));
-             printf(_("Accept certificate for this session? [y,N] "));
-             char *s = NULL;
-+            regex_t *re;
-             size_t n = 0;
-             ssize_t len = 0;
+ #include <ne_alloc.h>
+ #include <ne_auth.h>
+ #include <ne_basic.h>
+@@ -1918,6 +1920,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);
+@@ -1964,8 +1967,13 @@ ssl_verify(void *userdata, int failures,
              len = getline(&s, &n, stdin);
              if (len < 0)
                  abort();
--            if (rpmatch(s) < 1)
--                ret = -1;
+-            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);
-         }
      } 
+