pyrox.dev
davfs2: 1.4.7 -> 1.5.2; fixes the build
-49
pkgs/tools/filesystems/davfs2/davfs2-install.patch
-49
pkgs/tools/filesystems/davfs2/davfs2-install.patch
···
1
-
diff -rc davfs2-1.4.1/src/Makefile.in davfs2-1.4.1-new/src/Makefile.in
2
-
*** davfs2-1.4.1/src/Makefile.in 2009-06-13 18:31:22.000000000 +0200
3
-
--- davfs2-1.4.1-new/src/Makefile.in 2009-09-22 09:12:09.523154536 +0200
4
-
***************
5
-
*** 489,500 ****
6
-
7
-
8
-
install-exec-hook:
9
-
! chmod u+s $(DESTDIR)$(sbindir)/mount.davfs; \
10
-
! if test "$(sbindir)" != "$(ssbindir)"; then \
11
-
! $(mkinstalldirs) $(DESTDIR)$(ssbindir); \
12
-
! $(LN_S) -f $(DESTDIR)$(sbindir)/mount.davfs $(DESTDIR)$(ssbindir)/mount.davfs; \
13
-
! $(LN_S) -f $(DESTDIR)$(sbindir)/umount.davfs $(DESTDIR)$(ssbindir)/umount.davfs; \
14
-
! fi
15
-
16
-
uninstall-hook:
17
-
if test "$(sbindir)" != "$(ssbindir)"; then \
18
-
--- 489,495 ----
19
-
20
-
21
-
install-exec-hook:
22
-
! chmod u+s $(DESTDIR)$(sbindir)/mount.davfs;
23
-
24
-
uninstall-hook:
25
-
if test "$(sbindir)" != "$(ssbindir)"; then \
26
-
diff -rc davfs2-1.4.1/src/mount_davfs.c davfs2-1.4.1-new/src/mount_davfs.c
27
-
*** davfs2-1.4.1/src/mount_davfs.c 2009-06-12 11:54:58.000000000 +0200
28
-
--- davfs2-1.4.1-new/src/mount_davfs.c 2009-09-22 09:45:21.462726033 +0200
29
-
***************
30
-
*** 2327,2335 ****
31
-
}
32
-
if (st.st_uid != geteuid())
33
-
error(EXIT_FAILURE, 0, _("file %s has wrong owner"), filename);
34
-
! if ((st.st_mode &
35
-
(S_IXUSR | S_IRWXG | S_IRWXO | S_ISUID | S_ISGID | S_ISVTX)) != 0)
36
-
! error(EXIT_FAILURE, 0, _("file %s has wrong permissions"), filename);
37
-
38
-
FILE *file = fopen(filename, "r");
39
-
if (!file) {
40
-
--- 2327,2335 ----
41
-
}
42
-
if (st.st_uid != geteuid())
43
-
error(EXIT_FAILURE, 0, _("file %s has wrong owner"), filename);
44
-
! /* if ((st.st_mode &
45
-
(S_IXUSR | S_IRWXG | S_IRWXO | S_ISUID | S_ISGID | S_ISVTX)) != 0)
46
-
! error(EXIT_FAILURE, 0, _("file %s has wrong permissions"), filename); */
47
-
48
-
FILE *file = fopen(filename, "r");
49
-
if (!file) {
···
+5
-3
pkgs/tools/filesystems/davfs2/default.nix
+5
-3
pkgs/tools/filesystems/davfs2/default.nix
···
1
{ stdenv, fetchurl, neon, zlib }:
2
3
stdenv.mkDerivation rec {
4
-
name = "davfs2-1.4.7";
5
6
src = fetchurl {
7
url = "mirror://savannah/davfs2/${name}.tar.gz";
8
-
sha256 = "0i7hrwlfzisb4l2mza1kjj9q9xxixggjplsjm339zl7828mfxh2h";
9
};
10
11
buildInputs = [ neon zlib ];
12
13
-
patches = [ ./davfs2-install.patch ./isdir.patch ./fix-sysconfdir.patch ];
14
15
configureFlags = "--sysconfdir=/etc";
16
17
meta = {
18
homepage = "http://savannah.nongnu.org/projects/davfs2";
···
1
{ stdenv, fetchurl, neon, zlib }:
2
3
stdenv.mkDerivation rec {
4
+
name = "davfs2-1.5.2";
5
6
src = fetchurl {
7
url = "mirror://savannah/davfs2/${name}.tar.gz";
8
+
sha256 = "0n5k2xxfxmbsavg5fhp65lmy30hq9jg3w242rdzafvksnnda2d5y";
9
};
10
11
buildInputs = [ neon zlib ];
12
13
+
patches = [ ./isdir.patch ./fix-sysconfdir.patch ];
14
15
configureFlags = "--sysconfdir=/etc";
16
+
17
+
makeFlags = ["sbindir=$(out)/sbin" "ssbindir=$(out)/sbin"];
18
19
meta = {
20
homepage = "http://savannah.nongnu.org/projects/davfs2";
+1
-3
pkgs/top-level/all-packages.nix
+1
-3
pkgs/top-level/all-packages.nix