ntfs-3g moved to main

2015-08-24 09:43:46 +03:00
parent 97bc66ef9c
commit 9e2b3314d6
5 changed files with 251 additions and 0 deletions
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+    <device>
+        <match key="volume.fstype" string="ntfs">
+            <append key="volume.fstype.alternative" type="copy_property">volume.fstype</append>
+            <merge key="volume.mount.ntfs.valid_options" type="copy_property">volume.mount.valid_options</merge>
+            <merge key="volume.unmount.ntfs.valid_options" type="copy_property">volume.unmount.valid_options</merge>
+            <merge key="volume.fstype" type="string">ntfs-3g</merge>
+            <merge key="volume.mount.valid_options" type="strlist">ro</merge>
+            <append key="volume.mount.valid_options" type="strlist">atime</append>
+            <append key="volume.mount.valid_options" type="strlist">noatime</append>
+            <append key="volume.mount.valid_options" type="strlist">relatime</append>
+            <append key="volume.mount.valid_options" type="strlist">fake_rw</append>
+            <append key="volume.mount.valid_options" type="strlist">no_def_opts</append>
+            <append key="volume.mount.valid_options" type="strlist">default_permissions</append>
+            <append key="volume.mount.valid_options" type="strlist">umask=</append>
+            <append key="volume.mount.valid_options" type="strlist">fmask=</append>
+            <append key="volume.mount.valid_options" type="strlist">dmask=</append>
+            <append key="volume.mount.valid_options" type="strlist">uid=</append>
+            <append key="volume.mount.valid_options" type="strlist">gid=</append>
+            <append key="volume.mount.valid_options" type="strlist">show_sys_files</append>
+            <append key="volume.mount.valid_options" type="strlist">silent</append>
+            <append key="volume.mount.valid_options" type="strlist">force</append>
+            <append key="volume.mount.valid_options" type="strlist">remove_hiberfile</append>
+            <append key="volume.mount.valid_options" type="strlist">locale=</append>
+            <append key="volume.mount.valid_options" type="strlist">streams_interface=</append>
+            <append key="volume.mount.valid_options" type="strlist">debug</append>
+            <append key="volume.mount.valid_options" type="strlist">no_detach</append>
+            <append key="volume.mount.valid_options" type="strlist">sync</append>
+            <append key="volume.mount.valid_options" type="strlist">dirsync</append>
+            <append key="volume.mount.valid_options" type="strlist">nodiratime</append>
+            <append key="volume.mount.valid_options" type="strlist">noexec</append>
+            <append key="volume.mount.valid_options" type="strlist">quiet</append>
+            <append key="volume.mount.valid_options" type="strlist">remount</append>
+            <append key="volume.mount.valid_options" type="strlist">exec</append>
+            <append key="volume.mount.valid_options" type="strlist">recover</append>
+            <append key="volume.mount.valid_options" type="strlist">norecover</append>
+            <merge key="volume.unmount.valid_options" type="strlist">lazy</merge>
+            <merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
+        </match>
+    </device>
+</deviceinfo>
@@ -0,0 +1,47 @@
+diff -Naur ntfs-3g_ntfsprogs-2015.3.14.orig/ntfsprogs/Makefile.in ntfs-3g_ntfsprogs-2015.3.14/ntfsprogs/Makefile.in
+--- ntfs-3g_ntfsprogs-2015.3.14.orig/ntfsprogs/Makefile.in	2015-03-14 16:10:28.000000000 +0200
+++ ntfs-3g_ntfsprogs-2015.3.14/ntfsprogs/Makefile.in	2015-05-06 10:22:31.563526903 +0300
+@@ -1348,15 +1348,15 @@
+ # mkfs.ntfs[.8] hard link
+ 
+ @ENABLE_NTFSPROGS_TRUE@install-exec-hook:
+-@ENABLE_NTFSPROGS_TRUE@	$(INSTALL) -d $(DESTDIR)/sbin
+-@ENABLE_NTFSPROGS_TRUE@	$(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/sbin/mkfs.ntfs
+@ENABLE_NTFSPROGS_TRUE@	$(INSTALL) -d $(DESTDIR)/usr/bin
+@ENABLE_NTFSPROGS_TRUE@	$(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/usr/bin/mkfs.ntfs
+ 
+ @ENABLE_NTFSPROGS_TRUE@install-data-hook:
+ @ENABLE_NTFSPROGS_TRUE@	$(INSTALL) -d $(DESTDIR)$(man8dir)
+ @ENABLE_NTFSPROGS_TRUE@	$(LN_S) -f mkntfs.8 $(DESTDIR)$(man8dir)/mkfs.ntfs.8
+ 
+ @ENABLE_NTFSPROGS_TRUE@uninstall-local:
+-@ENABLE_NTFSPROGS_TRUE@	$(RM) -f $(DESTDIR)/sbin/mkfs.ntfs
+@ENABLE_NTFSPROGS_TRUE@	$(RM) -f $(DESTDIR)/usr/bin/mkfs.ntfs
+ @ENABLE_NTFSPROGS_TRUE@	$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ntfs.8
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+diff -Naur ntfs-3g_ntfsprogs-2015.3.14.orig/src/Makefile.in ntfs-3g_ntfsprogs-2015.3.14/src/Makefile.in
+--- ntfs-3g_ntfsprogs-2015.3.14.orig/src/Makefile.in	2015-03-14 16:10:28.000000000 +0200
+++ ntfs-3g_ntfsprogs-2015.3.14/src/Makefile.in	2015-05-06 10:22:31.566526903 +0300
+@@ -1040,9 +1040,9 @@
+ @ENABLE_NTFS_3G_TRUE@@RUN_LDCONFIG_TRUE@	$(LDCONFIG)
+ 
+ @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@install-exec-local:	install-rootbinPROGRAMS
+-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(MKDIR_P) "$(DESTDIR)/sbin"
+-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g"
+-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
+@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(MKDIR_P) "$(DESTDIR)/usr/bin"
+@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/usr/bin/mount.ntfs-3g"
+@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/usr/bin/mount.lowntfs-3g"
+ 
+ @ENABLE_NTFS_3G_TRUE@install-data-local:	install-man8
+ @ENABLE_NTFS_3G_TRUE@	$(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"
+@@ -1050,7 +1050,7 @@
+ 
+ @ENABLE_NTFS_3G_TRUE@uninstall-local:
+ @ENABLE_NTFS_3G_TRUE@	$(RM) -f "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"
+-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(RM) -f "$(DESTDIR)/sbin/mount.ntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
+@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(RM) -f "$(DESTDIR)/usr/bin/mount.ntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.