diff --git a/pkgs/tools/filesystems/davfs2/davfs2-install.patch b/pkgs/tools/filesystems/davfs2/davfs2-install.patch deleted file mode 100644 index 93e9b09a9145..000000000000 --- a/pkgs/tools/filesystems/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/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index d16af28010c2..20b71af6331d 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -1,19 +1,21 @@ { stdenv, fetchurl, neon, zlib }: stdenv.mkDerivation rec { - name = "davfs2-1.4.7"; + name = "davfs2-1.5.2"; src = fetchurl { url = "mirror://savannah/davfs2/${name}.tar.gz"; - sha256 = "0i7hrwlfzisb4l2mza1kjj9q9xxixggjplsjm339zl7828mfxh2h"; + sha256 = "0n5k2xxfxmbsavg5fhp65lmy30hq9jg3w242rdzafvksnnda2d5y"; }; buildInputs = [ neon zlib ]; - patches = [ ./davfs2-install.patch ./isdir.patch ./fix-sysconfdir.patch ]; + patches = [ ./isdir.patch ./fix-sysconfdir.patch ]; configureFlags = "--sysconfdir=/etc"; + makeFlags = ["sbindir=$(out)/sbin" "ssbindir=$(out)/sbin"]; + meta = { homepage = "http://savannah.nongnu.org/projects/davfs2"; description = "mount WebDAV shares like a typical filesystem"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b35c94d692f0..200084285fbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1185,9 +1185,7 @@ in darkstat = callPackage ../tools/networking/darkstat { }; - davfs2 = callPackage ../tools/filesystems/davfs2 { - neon = neon_0_29; - }; + davfs2 = callPackage ../tools/filesystems/davfs2 { }; dbench = callPackage ../development/tools/misc/dbench { };