* davfs2 updated to 1.4.5.

* neon updated to 0.28.6.

svn path=/nixpkgs/trunk/; revision=18841

2 files changed, 70 insertions, 0 deletions

diff --git a/pkgs/tools/filesystems/davfs2/davfs2-install.patch b/pkgs/tools/filesystems/davfs2/davfs2-install.patch
new file mode 100644
index 000000000000..93e9b09a9145
--- /dev/null
+++ b/pkgs/tools/filesystems/davfs2/davfs2-install.patch
@@ -0,0 +1,49 @@
+diff -rc davfs2-1.4.1/src/Makefile.in davfs2-1.4.1-new/src/Makefile.in
+*** davfs2-1.4.1/src/Makefile.in	2009-06-13 18:31:22.000000000 +0200
+--- davfs2-1.4.1-new/src/Makefile.in	2009-09-22 09:12:09.523154536 +0200
+***************
+*** 489,500 ****
+  
+  
+  install-exec-hook:
+! 	chmod u+s $(DESTDIR)$(sbindir)/mount.davfs; \
+! 	if test "$(sbindir)" != "$(ssbindir)"; then \
+! 	  $(mkinstalldirs) $(DESTDIR)$(ssbindir); \
+! 	  $(LN_S) -f $(DESTDIR)$(sbindir)/mount.davfs $(DESTDIR)$(ssbindir)/mount.davfs; \
+! 	  $(LN_S) -f $(DESTDIR)$(sbindir)/umount.davfs $(DESTDIR)$(ssbindir)/umount.davfs; \
+! 	fi
+  
+  uninstall-hook:
+  	if test "$(sbindir)" != "$(ssbindir)"; then \
+--- 489,495 ----
+  
+  
+  install-exec-hook:
+! 	chmod u+s $(DESTDIR)$(sbindir)/mount.davfs; 
+  
+  uninstall-hook:
+  	if test "$(sbindir)" != "$(ssbindir)"; then \
+diff -rc davfs2-1.4.1/src/mount_davfs.c davfs2-1.4.1-new/src/mount_davfs.c
+*** davfs2-1.4.1/src/mount_davfs.c	2009-06-12 11:54:58.000000000 +0200
+--- davfs2-1.4.1-new/src/mount_davfs.c	2009-09-22 09:45:21.462726033 +0200
+***************
+*** 2327,2335 ****
+      }
+      if (st.st_uid != geteuid())
+          error(EXIT_FAILURE, 0, _("file %s has wrong owner"), filename);
+!     if ((st.st_mode &
+            (S_IXUSR | S_IRWXG | S_IRWXO | S_ISUID | S_ISGID | S_ISVTX)) != 0)
+!         error(EXIT_FAILURE, 0, _("file %s has wrong permissions"), filename);
+  
+      FILE *file = fopen(filename, "r");
+      if (!file) {
+--- 2327,2335 ----
+      }
+      if (st.st_uid != geteuid())
+          error(EXIT_FAILURE, 0, _("file %s has wrong owner"), filename);
+! /*    if ((st.st_mode &
+            (S_IXUSR | S_IRWXG | S_IRWXO | S_ISUID | S_ISGID | S_ISVTX)) != 0)
+!         error(EXIT_FAILURE, 0, _("file %s has wrong permissions"), filename); */
+  
+      FILE *file = fopen(filename, "r");
+      if (!file) {
diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix
new file mode 100644
index 000000000000..1d5f6d8ffcda
--- /dev/null
+++ b/pkgs/tools/filesystems/davfs2/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, neon, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "davfs2-1.4.5";
+
+  src = fetchurl {
+    url = "mirror://savannah/davfs2/${name}.tar.gz";
+    sha256 = "1pkl2braggp2qg4c68dwfv399l9jz7cvi7gkm4xbj6mgvl0cxw18";
+  };
+
+  buildInputs = [ neon zlib ];
+  
+  patches = [ ./davfs2-install.patch ]; 
+
+  meta = {
+    longDescription = "Web Distributed Authoring and Versioning (WebDAV), an extension to the HTTP-protocol, allows authoring of resources on a remote web server. davfs2 provides the ability to access such resources like a typical filesystem, allowing for use by standard applications with no built-in support for WebDAV.";
+
+    license = "GPLv3+";
+    homepage = http://savannah.nongnu.org/projects/davfs2;
+  };
+}