1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 17:10:48 +00:00
nixpkgs/pkgs/tools/filesystems/davfs2/davfs2-install.patch
Eelco Dolstra 87fcfb0df2 * davfs2 updated to 1.4.5.
* neon updated to 0.28.6.

svn path=/nixpkgs/trunk/; revision=18841
2009-12-08 13:08:27 +00:00

50 lines
1.8 KiB
Diff

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) {