From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- sys-fs/ntfs3g/Manifest | 11 +++ sys-fs/ntfs3g/files/99-ntfs3g.rules | 1 + .../files/ntfs3g-2014.2.15-no-split-usr.patch | 25 ++++++ .../files/ntfs3g-2016.2.22-CVE-2017-0358.patch | 40 +++++++++ .../ntfs3g/files/ntfs3g-2016.2.22-sysmacros.patch | 43 ++++++++++ sys-fs/ntfs3g/metadata.xml | 31 +++++++ sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild | 94 ++++++++++++++++++++++ sys-fs/ntfs3g/ntfs3g-2017.3.23.ebuild | 93 +++++++++++++++++++++ 8 files changed, 338 insertions(+) create mode 100644 sys-fs/ntfs3g/Manifest create mode 100644 sys-fs/ntfs3g/files/99-ntfs3g.rules create mode 100644 sys-fs/ntfs3g/files/ntfs3g-2014.2.15-no-split-usr.patch create mode 100644 sys-fs/ntfs3g/files/ntfs3g-2016.2.22-CVE-2017-0358.patch create mode 100644 sys-fs/ntfs3g/files/ntfs3g-2016.2.22-sysmacros.patch create mode 100644 sys-fs/ntfs3g/metadata.xml create mode 100644 sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild create mode 100644 sys-fs/ntfs3g/ntfs3g-2017.3.23.ebuild (limited to 'sys-fs/ntfs3g') diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest new file mode 100644 index 000000000000..9462c18db204 --- /dev/null +++ b/sys-fs/ntfs3g/Manifest @@ -0,0 +1,11 @@ +AUX 99-ntfs3g.rules 51 SHA256 912165f71bbcae4753cd10a74c78bfd98e49bd9adbf80b96c39fc6738b12d463 SHA512 9310dd1dceec9a6252d3e8b95a9a1002c84a6f077457892eefe1255c85557041defbd8dcf6acef86285b45abd8bbe85822dd59a9e4c307bba80dd2c17f971851 WHIRLPOOL 9a0439ceb3bb1f142ee1929c03dab22066fdb3dba85c216265f6f10f3e9e2416beb4f3a73c8965b621b8d7b34c467a81628b6656f59e4c51e9fd529007f7ca27 +AUX ntfs3g-2014.2.15-no-split-usr.patch 1322 SHA256 3fdd9b2947e1ded82258a86d55d481d641613d8ff916f6eeacc6c0e68042beb8 SHA512 232a1a7b84339c86758365564fce2058c3e652f833c6908245aa5f6f0e91d5c09cedcb978a1ebe62897c7288df4fe8671ba7085af403056742d897181e479e05 WHIRLPOOL 733bcf75833bcd57f90fc69e55e6b4698470d92c4494cc4a567ba8b4ea562437587d13a1278b766f77ff16097057e3a9a0abfbb131466957a5d14bac0f3f37c9 +AUX ntfs3g-2016.2.22-CVE-2017-0358.patch 1169 SHA256 8772d827d9551cb3e9b5c6b22b54e6992ad8084327bbce452c1a48a8b3199e44 SHA512 223f7b4fcd962d3c2499787f9a32c09f35705de98d3d1c96677cea18c67f77f5a086b7839892cb25b62c9145b2543c02d5abca89a82cda2345d5f993d6a60131 WHIRLPOOL 42c337534e8f83c32a78afabec807ab097f90d9cb58ce3520509298912153513763fb55e5f6e77c1fbafb21c1534b9bc9c58a2084f3157e00d8394df5b751d9f +AUX ntfs3g-2016.2.22-sysmacros.patch 911 SHA256 9d9ed593acd23f01b2a862a86691d953253976c962e8b8cd52884bef86a2d342 SHA512 34768ef1ebf42b125cdc4d86937042f21b7146c4c76c1ed37e66e59a4bfaa863b54f7dbcca14a9d842782113e6ac70b2a96e62022dc2c8f717ec43c9985bf79f WHIRLPOOL 3cd24fbf9a307901b131bb56556aefdd04e0324e0bd268ecafa8b60612079d5a2a63edfbb3b0cedaee7f7a43580c5b07a665465f701d7280bbcd579e94d538cb +DIST ntfs-3g_ntfsprogs-2016.2.22.tgz 1264364 SHA256 d7b72c05e4b3493e6095be789a760c9f5f2b141812d5b885f3190c98802f1ea0 SHA512 dbd36fadd2881db1d17fdbf5d2b4e50bbe11dc9dd0ad4917e7f8bc4032c2287346143756ce8754df0d46ce9209f2c0c41b626cad929d76a9bc881712c7101c15 WHIRLPOOL 64630580b70e85f67b31ea7380ff3b6862be0c8cdf6c6af17e9a5eb2fe3f0d5efa7404ad726638ed958fb218631f7006eb492e713c7957d3ce60c6fbb1dd2bb9 +DIST ntfs-3g_ntfsprogs-2017.3.23.tgz 1259054 SHA256 3e5a021d7b761261836dcb305370af299793eedbded731df3d6943802e1262d5 SHA512 3a607f0d7be35204c992d8931de0404fbc52032c13b4240d2c5e6f285c318a28eb2a385d7cf5ac4cd445876aee5baa5753bb636ada0d870d84a9d3fdbce794ef WHIRLPOOL b1bf327c993aff08b1761a36cff680bccab51d7fb46fc7bb57b0e03a848345307a6d73c3c48118363dbb8eca26abbafded42cb87f853a1ab9b3b38b7af0da715 +EBUILD ntfs3g-2016.2.22-r2.ebuild 2461 SHA256 0006f8a362f7a863b558fcf06c6bedc9ebed00311bb92b4f97a3bf0c76e9d884 SHA512 0e97a1235323d44ed6bb994e6160377f16641b15772a3ee84de12d671661a795db09b99d2c3f8dd82545d406a83b2f3465c898b4e7a84c7c5dadfbf56977ecb5 WHIRLPOOL 137fe641b9bbe7e3188bc8cefe30f56c1291d5cd59cc9a1541e4a09dbb5e72653ab02d6db6eb7f503583a2b26c4e3927efc8e9ae6ae85f64eaadbc57b631150c +EBUILD ntfs3g-2017.3.23.ebuild 2394 SHA256 84c40ffc9e353511d4f8fc216d342da9c745b8fd9a2f75dc640e5955e86402fb SHA512 2c7596436ec75b7e31d5fa20e17fc9725a2706040483f522d902fc324f92157a0ee91394cda8cda9200f64b8f611b30d0fcc6d3c6a91ff093ac1b786c21e3e9d WHIRLPOOL 8beabd8aacac2854c1f0dff442fd55f591f9f7992075de8c62b58e9fea7d7dac4e08e648457d085bf4062015525abf91ff920e2ff1fe61b17aea6bc0012e0b2e +MISC ChangeLog 6990 SHA256 73a76f52d064e7d57c6a983fea11b9bd376faeebfc27b331b5fde0e0e81d0cff SHA512 a409c45c209637d74e761b3661143dcdfebdb2584f417c84c64318e2290764e30082aecdbe65825f994ed8d6e8f84eef3ab43e401f995b87eae924e22a6e34fd WHIRLPOOL 31c5a6d88c89320f2ac827c994424ee6702e7e78404cf2c816cb9a97bb54f56c5e76e751a3d66e384fb4458ecfd083db020a588918b6abb8ae4dd2ce3f604280 +MISC ChangeLog-2015 27701 SHA256 a481cc5e084b27ab69d246441444c1042e51d50632d1dd0b879d25c0030fa794 SHA512 ab13797c750cfc453bda34f3173f2c759e89372ded9e6a5a7ee50b2afe6bd8fc73e8f05a251360eecddbb9678bf568d66da72553dda7a8b831e88c98333be329 WHIRLPOOL 9291a2ed0207cebc9420096d893135d3eec062b186c89912c2e2bd465e1bf64ca60a4f241ebf0cbdc923a73190db3d39e180b6b49a355b6a7225eba65beec4e3 +MISC metadata.xml 1188 SHA256 137f9b625baf6c162d272e71546dab97404dc6806486d386f464b57a6409ee27 SHA512 6d9aa23202090132c37fe6915aa300597f2c88474065749de36143b8a47090c5bdb2e6449dffbb3843c9b7d30254fdde849b1aa230641910189d00134bd88c85 WHIRLPOOL fcaba5a19b69912ead9212550b8979f7d9490383b1bc124b9c5cb15dae0bae5a2035c8e0e1973c2d69df033998b2be672cb29779e09e48c4787d059697221278 diff --git a/sys-fs/ntfs3g/files/99-ntfs3g.rules b/sys-fs/ntfs3g/files/99-ntfs3g.rules new file mode 100644 index 000000000000..52dca4064766 --- /dev/null +++ b/sys-fs/ntfs3g/files/99-ntfs3g.rules @@ -0,0 +1 @@ +ENV{ID_FS_TYPE}=="ntfs", ENV{ID_FS_TYPE}="ntfs-3g" diff --git a/sys-fs/ntfs3g/files/ntfs3g-2014.2.15-no-split-usr.patch b/sys-fs/ntfs3g/files/ntfs3g-2014.2.15-no-split-usr.patch new file mode 100644 index 000000000000..0228bfec330b --- /dev/null +++ b/sys-fs/ntfs3g/files/ntfs3g-2014.2.15-no-split-usr.patch @@ -0,0 +1,25 @@ +we handle split /usr logic ourselves. this ends up breaking when building +for an abi that doesn't exist in / (like cross-compiling) as the tests fail. + +--- a/libntfs-3g/Makefile.in ++++ b/libntfs-3g/Makefile.in +@@ -912,19 +912,6 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-local \ + uninstall-rootlibLTLIBRARIES + + +-# We may need to move .so files to root +-# And create ldscript or symbolic link from /usr +-install-exec-hook: install-rootlibLTLIBRARIES +-@INSTALL_LIBRARY_TRUE@ if [ ! "$(rootlibdir)" -ef "$(libdir)" ]; then \ +-@INSTALL_LIBRARY_TRUE@ $(MV) -f "$(DESTDIR)/$(libdir)"/libntfs-3g.so* "$(DESTDIR)/$(rootlibdir)"; \ +-@INSTALL_LIBRARY_TRUE@ fi +-@GENERATE_LDSCRIPT_TRUE@@INSTALL_LIBRARY_TRUE@ if [ ! "$(rootlibdir)" -ef "$(libdir)" ]; then \ +-@GENERATE_LDSCRIPT_TRUE@@INSTALL_LIBRARY_TRUE@ $(install_sh_PROGRAM) "libntfs-3g.script.so" "$(DESTDIR)/$(libdir)/libntfs-3g.so"; \ +-@GENERATE_LDSCRIPT_TRUE@@INSTALL_LIBRARY_TRUE@ fi +-@GENERATE_LDSCRIPT_FALSE@@INSTALL_LIBRARY_TRUE@ if [ ! "$(rootlibdir)" -ef "$(libdir)" ]; then \ +-@GENERATE_LDSCRIPT_FALSE@@INSTALL_LIBRARY_TRUE@ $(LN_S) "$(rootlibdir)/libntfs-3g.so" "$(DESTDIR)/$(libdir)/libntfs-3g.so"; \ +-@GENERATE_LDSCRIPT_FALSE@@INSTALL_LIBRARY_TRUE@ fi +- + uninstall-local: + @INSTALL_LIBRARY_TRUE@ $(RM) -f "$(DESTDIR)/$(rootlibdir)"/libntfs-3g.so* + diff --git a/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-CVE-2017-0358.patch b/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-CVE-2017-0358.patch new file mode 100644 index 000000000000..1ce7e9cdae32 --- /dev/null +++ b/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-CVE-2017-0358.patch @@ -0,0 +1,40 @@ +diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c +index 0bb38f97..c6d1dad3 100644 +--- a/src/lowntfs-3g.c ++++ b/src/lowntfs-3g.c +@@ -3827,13 +3827,14 @@ static fuse_fstype load_fuse_module(void) + struct stat st; + pid_t pid; + const char *cmd = "/sbin/modprobe"; ++ char *env = (char*)NULL; + struct timespec req = { 0, 100000000 }; /* 100 msec */ + fuse_fstype fstype; + + if (!stat(cmd, &st) && !geteuid()) { + pid = fork(); + if (!pid) { +- execl(cmd, cmd, "fuse", NULL); ++ execle(cmd, cmd, "fuse", NULL, &env); + _exit(1); + } else if (pid != -1) + waitpid(pid, NULL, 0); +diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c +index 268b0569..945fc0be 100644 +--- a/src/ntfs-3g.c ++++ b/src/ntfs-3g.c +@@ -3612,13 +3612,14 @@ static fuse_fstype load_fuse_module(void) + struct stat st; + pid_t pid; + const char *cmd = "/sbin/modprobe"; ++ char *env = (char*)NULL; + struct timespec req = { 0, 100000000 }; /* 100 msec */ + fuse_fstype fstype; + + if (!stat(cmd, &st) && !geteuid()) { + pid = fork(); + if (!pid) { +- execl(cmd, cmd, "fuse", NULL); ++ execle(cmd, cmd, "fuse", NULL, &env); + _exit(1); + } else if (pid != -1) + waitpid(pid, NULL, 0); diff --git a/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-sysmacros.patch b/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-sysmacros.patch new file mode 100644 index 000000000000..2fa1f2b34c88 --- /dev/null +++ b/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-sysmacros.patch @@ -0,0 +1,43 @@ +include the headers that define major/minor/makedev in more places + +https://bugs.gentoo.org/580136 + +--- a/libntfs-3g/ioctl.c ++++ b/libntfs-3g/ioctl.c +@@ -57,6 +57,12 @@ + #ifdef HAVE_SYS_TYPES_H + #include + #endif ++#ifdef HAVE_SYS_MKDEV_H ++#include ++#endif ++#ifdef HAVE_SYS_SYSMACROS_H ++#include ++#endif + + #ifdef HAVE_SYS_STAT_H + #include +--- a/src/lowntfs-3g.c ++++ b/src/lowntfs-3g.c +@@ -76,6 +76,9 @@ + #ifdef HAVE_SYS_MKDEV_H + #include + #endif ++#ifdef HAVE_SYS_SYSMACROS_H ++#include ++#endif + + #if defined(__APPLE__) || defined(__DARWIN__) + #include +--- a/src/ntfs-3g.c ++++ b/src/ntfs-3g.c +@@ -75,6 +75,9 @@ + #ifdef HAVE_SYS_MKDEV_H + #include + #endif ++#ifdef HAVE_SYS_SYSMACROS_H ++#include ++#endif + + #if defined(__APPLE__) || defined(__DARWIN__) + #include diff --git a/sys-fs/ntfs3g/metadata.xml b/sys-fs/ntfs3g/metadata.xml new file mode 100644 index 000000000000..20cef377f9b7 --- /dev/null +++ b/sys-fs/ntfs3g/metadata.xml @@ -0,0 +1,31 @@ + + + + + chutzpah@gentoo.org + + + base-system@gentoo.org + Gentoo Base System + + +The ntfs-3g driver is an open source, GPL licensed, third generation Linux +NTFS driver for 32-bit, little-endian architectures which was implemented +by the Linux-NTFS project. It provides full read-write access to NTFS, +excluding access to encrypted files, writing compressed files, changing +file ownership, access right. + + + + Use external FUSE library instead of internal one. Must be disabled + for unprivileged mounting to work. + + Build and install the ntfsdecrypt application. + Include internal version of ntfsprogs. + + + http://tuxera.com/forum/ + cpe:/a:ntfs-3g:ntfs-3g + ntfs-3g + + diff --git a/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild b/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild new file mode 100644 index 000000000000..09ebc7f920b6 --- /dev/null +++ b/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils linux-info udev toolchain-funcs libtool + +MY_PN=${PN/3g/-3g} +MY_P=${MY_PN}_ntfsprogs-${PV} + +DESCRIPTION="Open source read-write NTFS driver that runs under FUSE" +HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/" +SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz" + +LICENSE="GPL-2" +# The subslot matches the SONAME major #. +SLOT="0/87" +KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux" +IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr" + +RDEPEND="!=dev-libs/libgcrypt-1.2.2:0 + >=net-libs/gnutls-1.4.4 + ) + external-fuse? ( + >=sys-fs/fuse-2.8.0 +