summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2009-12-08 13:08:27 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2009-12-08 13:08:27 +0000
commit87fcfb0df2b1971553434393f63cc4425d2f28bd (patch)
tree46419665569dd7f393972262c0ff91747bdb8462 /pkgs/os-specific
parent83ee756b0acfb8ae74d6bbf528811382535aa99e (diff)
downloadnixlib-87fcfb0df2b1971553434393f63cc4425d2f28bd.tar
nixlib-87fcfb0df2b1971553434393f63cc4425d2f28bd.tar.gz
nixlib-87fcfb0df2b1971553434393f63cc4425d2f28bd.tar.bz2
nixlib-87fcfb0df2b1971553434393f63cc4425d2f28bd.tar.lz
nixlib-87fcfb0df2b1971553434393f63cc4425d2f28bd.tar.xz
nixlib-87fcfb0df2b1971553434393f63cc4425d2f28bd.tar.zst
nixlib-87fcfb0df2b1971553434393f63cc4425d2f28bd.zip
* davfs2 updated to 1.4.5.
* neon updated to 0.28.6.

svn path=/nixpkgs/trunk/; revision=18841
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/davfs2/davfs2-install.patch49
-rw-r--r--pkgs/os-specific/linux/davfs2/default.nix20
2 files changed, 0 insertions, 69 deletions
diff --git a/pkgs/os-specific/linux/davfs2/davfs2-install.patch b/pkgs/os-specific/linux/davfs2/davfs2-install.patch
deleted file mode 100644
index 93e9b09a9145..000000000000
--- a/pkgs/os-specific/linux/davfs2/davfs2-install.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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/os-specific/linux/davfs2/default.nix b/pkgs/os-specific/linux/davfs2/default.nix
deleted file mode 100644
index b4acc96f208d..000000000000
--- a/pkgs/os-specific/linux/davfs2/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{stdenv, fetchurl, neon, zlib}:
-
-stdenv.mkDerivation rec {
-  name = "davfs2-1.4.1";
-
-  src = fetchurl {
-    url = "http://www.very-clever.com/download/nongnu/davfs2/${name}.tar.gz";
-    sha256 = "0fqq331rd3ylzfhdsbbj0b2znn3d0js0kxcv3w54dl9g2cs8fqhn";
-  };
-
-  buildInputs = [ neon zlib ]; 
-  patches = [ ./davfs2-install.patch ]; 
-
-  meta = {
-    description = "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;
-  };
-}