diff options
Diffstat (limited to 'sys-fs')
42 files changed, 988 insertions, 540 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex ac91c8237da4..4b19c4c15fa2 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/bindfs/Manifest b/sys-fs/bindfs/Manifest index f6e366b71168..56544a2a4ada 100644 --- a/sys-fs/bindfs/Manifest +++ b/sys-fs/bindfs/Manifest @@ -1,7 +1,5 @@ DIST bindfs-1.13.10.tar.gz 404078 BLAKE2B e4b5e4c6fea8463eaf3b612b7e3b67c0f64f8ebf430825c056c090d2f089c47a4fc8038c50744b43732f01529c082433a0920fc2257463810a6e2f5e69b89496 SHA512 0fcd07e412ce2a355310cc2eda4e005d045ac2c1744353eca118c921f647d4fc16d98269fd1e9d8bdc225602a915b2893746da77ae28c9cd07fa4eab0e03f4c7 -DIST bindfs-1.13.8.tar.gz 403296 BLAKE2B 38d5b298af6bd399c9b315fad8a0897ae785f8d4f963aad7d08024cf22eedc90c55e94d54fd7033a3343bb1ed3ab14b76b96ca6ce35b8799be4329ecee12ce44 SHA512 b0755ad5b91cd047942094d824c6a12a684b1c8bc990f4a28170a09283c0b11ab4d8c86ca65160802610e72f1c649d7249ed87e3e29410b210271c45b6846c11 -DIST bindfs-1.13.9.tar.gz 403698 BLAKE2B 71667e8f50320ac64c11fd1ddf2b5f59e9e2cdce0913ffdbf3d23b32368255ddd2650f6d5efeccdb9a03dc0f93710540d88a28a4ecb5f2e89dd83f59e86214de SHA512 7584577b289816a1ee514c4967893dcca69683b68b357d370c3a7accd39f96034f34d29751b66ef98ba35bb869498af4df813b0bdea805a42a38b47340f3d654 +DIST bindfs-1.13.11.tar.gz 404296 BLAKE2B d3b4ddf9d26f39223b7b663fc2b362b359c423b6c202026502d78524a8b54da9878e4953785aca0fbafa5ca76242f2c590ab941f997b33ba38c9a5239e58ccec SHA512 53b27e42ab7c117e28275dbeb23e43dceba86838ad54b2b8ae3c6e7b3631d0356597559d0746f2cd8363226ffb62bff2461d7a227ff82578f1d47c4b19bdd3f2 EBUILD bindfs-1.13.10.ebuild 478 BLAKE2B e918f5d8b816f4db54fe9218273e13a9f3856199329ae40cad25b48788b649a973d36783b60b61a45f27df329c4cf0c0a45b6e05c492c609faa24b471b5ae9d0 SHA512 a589ef3276f74a2cfd5cb1aff409d3d5f608fdafc70846b9ee1590e6f8c8cd3f53d1710f5cc1fabdbcb7ef575afb7917373a19d73391a8fbe466af33673e911f -EBUILD bindfs-1.13.8.ebuild 481 BLAKE2B 27a222315c1808348bb97ca4c363390308d7169952657894847b233593303bb6172f59b054a4967822ce36d75795d06b607d84d30d7697f6d9d02f2cafb037d6 SHA512 40782f3a98fb73bb97eb93700e9cb0442180d2f093040d9fcc0e0b579bf7066d472612b07cc70ee8ba680ae08cc0c49dad2da56935b292957a1502c3b5c05dc3 -EBUILD bindfs-1.13.9.ebuild 481 BLAKE2B 27a222315c1808348bb97ca4c363390308d7169952657894847b233593303bb6172f59b054a4967822ce36d75795d06b607d84d30d7697f6d9d02f2cafb037d6 SHA512 40782f3a98fb73bb97eb93700e9cb0442180d2f093040d9fcc0e0b579bf7066d472612b07cc70ee8ba680ae08cc0c49dad2da56935b292957a1502c3b5c05dc3 +EBUILD bindfs-1.13.11.ebuild 478 BLAKE2B 824442dde04d0da3220bf3d43af63bdf7e6ff7ee24c43258e57ed7a90cbf199b38e159f135029eee24a4b2814ad08ef1a884cb9e5e55b8b6b8f440456024e842 SHA512 e20c7fd5378c2bf121e2627589baa1a95ada8f1111f340b860d4eaa9684ed049fc3d4b66389d5370bc8f97f17d4f279acf8e8bf7a07ed574011af20cafaed00d MISC metadata.xml 432 BLAKE2B 8d4cfae65a05e718922b04a0e70d5dc9b22bea0339d6640015341b45b6a8c6d7c7d48a98290fcb2d0b039aab14a9feae1e6c527a7f483b421069174525d4e619 SHA512 1d22b2bad552a622edcebc9b52823a812f483588257c379077e1cc323bfffea67ed2802a3f62c9264cadf355ae3f96ab4705d005286c598f25447efe813fb06c diff --git a/sys-fs/bindfs/bindfs-1.13.8.ebuild b/sys-fs/bindfs/bindfs-1.13.11.ebuild index 14f35b43597f..1ac71904499e 100644 --- a/sys-fs/bindfs/bindfs-1.13.8.ebuild +++ b/sys-fs/bindfs/bindfs-1.13.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/sys-fs/bindfs/bindfs-1.13.9.ebuild b/sys-fs/bindfs/bindfs-1.13.9.ebuild deleted file mode 100644 index 14f35b43597f..000000000000 --- a/sys-fs/bindfs/bindfs-1.13.9.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="FUSE filesystem for bind mounting with altered permissions" -HOMEPAGE="https://bindfs.org/" -SRC_URI="https://bindfs.org/downloads/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -RDEPEND=">=sys-fs/fuse-2.9:0" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -RESTRICT="test" - -src_configure() { - econf $(use_enable debug debug-output) -} diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 4b648390bd55..684c921dfecd 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -24,4 +24,4 @@ EBUILD btrfs-progs-4.20.ebuild 2855 BLAKE2B 091b43bbf8beae8e05e97b26f8f200aeaed6 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4 EBUILD btrfs-progs-9999.ebuild 2855 BLAKE2B 94e2d31c4d5f8ef45c076cd736f246d35c46b7a768dfee3e17bd7ac2a92a391b4817f188c6e84dc44a4bf94b107d452bd7376cd4dbf47dedcfda1215ae57c357 SHA512 040c58607f706224ee439f46bdb82123b3abf83ea75f8bce6c47ba7f8c3ad971b717c1c4895caafdc49fdadd6ef646470177eb377a17fd8009d666b7afd627eb -MISC metadata.xml 934 BLAKE2B eb3a4c7fba09e537bcb97c3bdcc70b1cf7adf6c66a60abc7ab977f3d35ab0189ece1eb3994490a0418c3ad513a2896ee8bd19edbcef6f57ff3ab1d2af060289e SHA512 83c68333a33df7b836f3fe90c2dfe09789b8c3ecab7c1573534c37d745d565127ec291a91df400cf83d88ec7c284f1bf1a2f37130ec33b7f5e149f10edd80cee +MISC metadata.xml 821 BLAKE2B fcfbd09f0105b66c47f81af783cdd96d7fe1c5c3002ac9e4e8c270ff4348c3da8d44c03ec0dae10a6f32a300bbb1823e0039616a1c47db375bb0b938cc4b3f7f SHA512 8dda7730e4ed34352b74d73098267855e5ab61b6179b84b5e66e0bb2f6e3fb79fe693176482a27c0869b29a0b033de067e0b3a2ae3d49996ff2335e617d4915d diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml index 7da838752d13..8fca7add1357 100644 --- a/sys-fs/btrfs-progs/metadata.xml +++ b/sys-fs/btrfs-progs/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>floppym@gentoo.org</email> - <name>Mike Gilbert</name> - </maintainer> - <maintainer type="person"> <email>slyfox@gentoo.org</email> <name>Sergei Trofimovich</name> </maintainer> diff --git a/sys-fs/exfat-utils/Manifest b/sys-fs/exfat-utils/Manifest index 444b74a5ae0e..0ee871225e6a 100644 --- a/sys-fs/exfat-utils/Manifest +++ b/sys-fs/exfat-utils/Manifest @@ -1,5 +1,5 @@ DIST exfat-utils-1.2.8.tar.gz 181121 BLAKE2B 679b7662d14d9caa26b6d0aff1007130f6d7ad7a3eb36238847f9cb735011fe69fb367e013126419b780ad1fa61c6ad1fdb163e8c5727c4dcff50db85959b7b2 SHA512 98acebf74fe5f5181098cdd880303d6c78d5aa88aa7a87d5371c887e4614536b19a24d48526b235de034fad26b68ddaf4f286b68b5963e95cc1cf7cee1c7b58c DIST exfat-utils-1.3.0.tar.gz 188943 BLAKE2B 07af437fc21ae2f7d99db778069135c7391554f964a05eb6df715bcb5135003ecdc1257c541a61e0c140bfcffbc0802dd4118413f8d11a175be3f8adf5f5b83f SHA512 e1c5b708f22e878d7521e3299866bba127145757e3620696ff11b18c8c7d4830522974e8ee4771234b70aa9718295d3433779cf34ca990e28ccc06cbf9325f7e EBUILD exfat-utils-1.2.8.ebuild 638 BLAKE2B 5de4958b72b4d8522ab9eed8e45f56fc74511ae09c3de7b75ab605b83a055cfbe40a3bda8b67676758e69dcd43335f10f81953f18166ebe89b6369fcb701e210 SHA512 322012c9bf1ad9281cb7d3319703bc9a3a3db6f79548a1edfb49e8ffd4cc0b176e71eefdde6e83a386e51ffd6ba337baa00fb053d6cf8bbc2fa53b97bdcb7975 -EBUILD exfat-utils-1.3.0.ebuild 617 BLAKE2B 853b0c2959979a066e2d667824d055d12ae65918b31ad6d994ccb3d2de7f3493895496bbc6cbf8f285738386e889c1f271b2f526f1a247d4f9d8991fdf24175c SHA512 18ae81890262fecc7c524b9ebb99dce9534ad5b02d491bb4424a1659462cb21d90fde0f311f5603bc9ad95e24c8038ee2664c0b11c12b1194d179f7c55dd47fd +EBUILD exfat-utils-1.3.0.ebuild 615 BLAKE2B d1cc6399d21b700dd7d5b2b4912d90315f29c8bf024ddee87a8c5d8018b8cccab147db1f4db4262daf36c0dbd77bfb7b8f53f6d8e7835526dfb732e05ad74360 SHA512 6ed24066c6710f94ec7e6da9965b7fa4d9838fb2f32b17a0e0edbfa26419693aa701ba268de4feac48124fea6bc94d4cea12fa5cdbba26f2a09751ca56190835 MISC metadata.xml 451 BLAKE2B 89f419f995928b9d29c5aed14e20792fde2bc90cae84ad31b2df25eedfca4bbe23fef0845989616b5e6f0a44bc50941879bd5928e4f0dfbdb8a2ed4db97b95a0 SHA512 e9b06c7885b8f6d5d114042e9fa8946583b2a481ef74d4269e0d462ff995fb7da3d4ef171d401c48f517c93ca8b954f7f72f1fc0a9ac294b232e7d8a5da228c9 diff --git a/sys-fs/exfat-utils/exfat-utils-1.3.0.ebuild b/sys-fs/exfat-utils/exfat-utils-1.3.0.ebuild index b1883a7d7ed8..5d6f23fb66da 100644 --- a/sys-fs/exfat-utils/exfat-utils-1.3.0.ebuild +++ b/sys-fs/exfat-utils/exfat-utils-1.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz" # COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux" src_install() { default diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest index 982c7e8c8f08..2df13360f30c 100644 --- a/sys-fs/f2fs-tools/Manifest +++ b/sys-fs/f2fs-tools/Manifest @@ -5,5 +5,5 @@ DIST f2fs-tools-1.11.0.tar.gz 278795 BLAKE2B 8faefb1554283291ad2dc2b66800b88bbdc DIST f2fs-tools-1.12.0.tar.gz 286528 BLAKE2B ca2e17fa6c48905fc1905fdec865143a003260bd60f659cd9f6c427b371c39f4c869f7265dc198888adf7ef7d4d8ba7ed2a3733c52aab18277f5371cb2cb3be3 SHA512 3f1a914540f57f94bbdc33ad66ee0b02b26fe380b05f9209f226cb3df8e84e29aa4e8e91d77f52bf737915b2785d4b9723becf5a95d75e8821b2e107e991cbad EBUILD f2fs-tools-1.10.0.ebuild 829 BLAKE2B 33cb5076ad952162afc2b53506aa09370b28fd6c7942d7d800fc2f48506cb4fcf2db44f9e68ae58f70d95178a53c73b27cfe70aed1c5dc954d3e31e512aab70b SHA512 3319a0480393572701b4728268437cbc6490e84ee8f215425d663d2c314c42588b594869b6bf6ba87eb3a44947ef5d10ae9e0605942f1ed4f46d797769140a9f EBUILD f2fs-tools-1.11.0-r1.ebuild 824 BLAKE2B 888b9092f9f8b402ce3d549cc6c896877dd1b7b0c6fdea785092d3160929175bb26aee5e05def9c07a3edf3c39ce0b6670a08f7d2a50cd7dc87e71d7f73ea5c6 SHA512 0771171e56491746fb9703ac2c0d454d7bb35bf62fc4b7f031c2d7ed7c2fa207227950cd35741bd1967531f2dbb08d64bc00535441c67cb11decb875b5784912 -EBUILD f2fs-tools-1.12.0-r1.ebuild 867 BLAKE2B af13be138ba8b337ed71f4a6846d246a721abd2249d4483c04b704906221f93a6ee7fb19fa57e8eca51d99fcbe191139ee6826443e27815391afe1ccb4770165 SHA512 0d354c1e000a05a995327ee897ebe331b52347db4403eea340700584757aef63a61fbd713b6a84c71e0b4c236f61ac4ba8c8320e5eef8948a545109765f01aa1 +EBUILD f2fs-tools-1.12.0-r1.ebuild 862 BLAKE2B 02c0087976e8c385776decfae140346c857a6c7e071057eb3680cff615e66787f9416cba4e3a611166451971589fadf4fef9abfc43cc4d95535714d45abe351d SHA512 51aabee7f1d91b09426511be0c33967181109be7ea7d4ace44072879bfa8d31baf0c328452ccdffa9d4e0675750e27a2e6f7417bc7dc67e713125e07acc7b7e9 MISC metadata.xml 438 BLAKE2B a3bb4e3293bcde65dc3b01fdf363738fc65f63f50756a390f5c0211ed7d252c305e386a913cfc9b016c198238ae0017c82d52d2ff20f79957de19d8db9f30b0a SHA512 d662e42e0da62d264cad5df63fd8f407798f8d396f74b17a2d5cdb20793753b450bb232b4320f9491126b71752a44a69ed11a22b0433786f9825e3941ab24578 diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild index 52fc597dc549..3717d20a3636 100644 --- a/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild +++ b/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz LICENSE="GPL-2" SLOT="0/6" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86" IUSE="selinux" RDEPEND=" diff --git a/sys-fs/fuse-exfat/Manifest b/sys-fs/fuse-exfat/Manifest index 85b648638a16..665d955c7d52 100644 --- a/sys-fs/fuse-exfat/Manifest +++ b/sys-fs/fuse-exfat/Manifest @@ -1,5 +1,5 @@ DIST fuse-exfat-1.2.8.tar.gz 159588 BLAKE2B 929fb87ee75aa70ba68814763c085c76fa1e263451bc3cd388b67dc6e793383c8eede1ea754a55c7ce7f14b38b7ec40f503acd28b0709d1ef58b10cb977a1d58 SHA512 ce81f15121b9f21bdaaacb09bdeeccdc8d556585967b85f1ab57534a8da07ea45434541fc571069b5795bae0f2ba5f090bbe7a0d5881dd35de06b706abe6d395 DIST fuse-exfat-1.3.0.tar.gz 161278 BLAKE2B 864eed57d5ae70eac03464899ac7c63f5d55254b61b69064592bb7ae04f6c164b8113c568946103c407867c1b53511bf2b88bd6b25cf75aa3a1a9a2a7d4f12ae SHA512 90d2b89322590199012b035b88ae01559f1824172793d9e7845603940e2807e788c687e4958f1ef76678bd214bb03671b91fd2537901b6d6acf2e8c525a3f1f3 EBUILD fuse-exfat-1.2.8.ebuild 660 BLAKE2B 0312977cba4bc43838eefe3c0e2134f7de980dc2e37334c7ccb82cb10a2af2aa71d4c6de209ea7041cb9e8257f26f2e697ab41451fa716899ef45dc45ced26cd SHA512 e05ba0abcb4734cfd01d8910b724440a6e5ea415c726254bcaaa835caccadf3d5dfa9884e5dc4a4eaaf639ee121a7486ab60472920945b5d34fa5f08ddbe3079 -EBUILD fuse-exfat-1.3.0.ebuild 648 BLAKE2B 5daf5f418f314590df4e287cc5e40256f266c408be3bf16a7f0be70320169c95c8bdda9be7e77d909a9898f73b0a97e7aaa4a50bd3003ecefb4eef47512c195a SHA512 9f6b57a1a2a3fbe2f2c5172ce0f4fb04f612194610907c16fdec09d9cf4963f59b75c0476731f87e39d9e93e2d617f3c3b313f2c4070df94ad42713f1de46561 +EBUILD fuse-exfat-1.3.0.ebuild 646 BLAKE2B 1042189fc672d51bd2b8892081c410eacd432b23701b4900d7c58e99413df719433ed5118efc1afa7e1d41297bd92764911555e96cd7bb3faed4aec1702d28e8 SHA512 6ae237f2b84c48e710356431f780d96b1beca1b84bcf6b64693a2985b84f02f59fba6bda797df9b7b19a57b0f1787eece106873bdf3a48c21d185361c56ceb2c MISC metadata.xml 451 BLAKE2B 89f419f995928b9d29c5aed14e20792fde2bc90cae84ad31b2df25eedfca4bbe23fef0845989616b5e6f0a44bc50941879bd5928e4f0dfbdb8a2ed4db97b95a0 SHA512 e9b06c7885b8f6d5d114042e9fa8946583b2a481ef74d4269e0d462ff995fb7da3d4ef171d401c48f517c93ca8b954f7f72f1fc0a9ac294b232e7d8a5da228c9 diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild index 12b07aadcf40..8af0429633c2 100644 --- a/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild +++ b/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz" # COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux" RDEPEND="sys-fs/fuse:0" DEPEND="${RDEPEND}" diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest index dab86e067cee..d670a1aca3bb 100644 --- a/sys-fs/fuse/Manifest +++ b/sys-fs/fuse/Manifest @@ -5,8 +5,10 @@ DIST fuse-2.9.7.tar.gz 661138 BLAKE2B 8e56cfa8634e919bfc4f9fa589074763bd8c272d51 DIST fuse-2.9.8.tar.gz 4610904 BLAKE2B 803eebea510834676379df8c9514050efcf47d83c06ba1f5b5756d27f5c32d3a0cc199d826b0c041118c5d2260ff023f58432a0d7b623807c0a4af4da7c34eff SHA512 0a9b14d96c6f98f5c903baf00114bfff72f9aeb97224702bbed370516b2b582401d5b436fcef979918ffd85d69ba4a82c8f722c0b35ebd50f7aa5f4ddfdcf8ad DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2 DIST fuse-3.4.1.tar.xz 1016436 BLAKE2B 50a35039d7302741239736f2e62f4603c147d49947580fb92f7ac6b46aa8dbcd1cbb16ba35719e198dc3b693b11c215ee8123d02a0c96154d6c905541eb35936 SHA512 45e56346b6d4c90055168254cd8508339d5b428ec58f1d9e287439e3d48fce344498826f099de89051e6529e45a45e0990a0e07fc8a9acbae1f76f4d6c72dd0d +DIST fuse-3.4.2.tar.xz 1019864 BLAKE2B babb8454438b5c4a924e83112ee5c319c0fa37c544485265d9d91ff58ee22549aeabcfb53f8c30ee3fd984030ee2042099ab9bc6269875cc08c5048acb28740e SHA512 7519955d31566ac69454f5d44e95ccbe98d7719422ea8112cce6cc2138aef71a57f9fa1bc2a37212a0837938ec44e630f3adce0a4da153a030a5a46a06446de2 EBUILD fuse-2.9.7.ebuild 2206 BLAKE2B eb1f3ee67657e03d572bea6895655ab43f39cf41e6eef422baf6643184080a224f72e773afe496784d0e60d12ce63d9e678b3f1c43a867042f93fea2fc350cfa SHA512 5b44ada149cf1cc4028307ee6e11657e7e1de98f9893a5061aada592037ca54b16644354f970d222687b3f07d3673c1352c02e8ddf5fe60d031244a617d13d23 EBUILD fuse-2.9.8.ebuild 1942 BLAKE2B 160c38daa8321d980347079e0ab8677526c639e0d6f20b8fffaa481b7072146f1aced7f61cfc5ae05b483d7178beed551e6df44d5e319c9274a3c1c5cb530e58 SHA512 35efa56282f0a9a4aca7e284af1da587d6a5545439c50258ecc31c47159fa777c70400f28b4fd9c8392a39d1b43ba8c3c1935e0860d7689dc7ad40f5134e7da8 EBUILD fuse-2.9.9.ebuild 1883 BLAKE2B 7cbd50df85e6eaea2e89b3e36bf819bba20cc1589dc2607bff8e2fe97155a7f1f6ae34b9589c3965e29dffd311682a259cbbd06bd9cce215121837b2c29022c0 SHA512 876c5d8760383847d59db3ceed3dcb074fe48e87ef4192cbb8bd586eac9e5e2becfd7a0a49a76cb213426e961ac2e353d9421865fb5801507e59a584a89da5e0 EBUILD fuse-3.4.1.ebuild 1659 BLAKE2B fb830f40d7c535864111a02277aef8d51da505be9d497e09bf1d7e60c44831d13421261f24e4be82785aa275f78e3b7ba20f21d27fbe9edaed2fc33c5512c2b2 SHA512 d92104cda402f7497d2417012298558fcd532fdac41cdf8897c70a061c093a26aab04ac774f652c25e6d10e00ebd913bd8140502c8517c1a9df7d5b424407609 +EBUILD fuse-3.4.2.ebuild 1651 BLAKE2B a2f92916463994570422db3ac73c26363ee6551c9385e51f73d666c3a8fa5eaf762cc3bc4f0edcd37f74eebbf8511c2f19f9a1d66738fe9f581cfc5abb5e7f84 SHA512 94415c24288b1c08d44c220f8fd5fdf28631201941ef9c046a5e21784fda025ede2659c33b2846d1537dec1b9d0f389acb9cf1a4fe81af0ed494b5abe15b36ea MISC metadata.xml 391 BLAKE2B 69aa72b5ba983496e0b682bcde7d61b33d982031e1c5ca1f4b0181384daeff3a47482fc23e68ae9097321dfa5a0203abc60de4fae5aa99c7e32542e9b8e59f0a SHA512 181d574140e8459c76d7392cf63eec85e1b40142b31b9ac1a19bf657c8482b581c1ea23fdae6a523bbad4943e3245409dfc14eea38243b78ef541e3cad49a180 diff --git a/sys-fs/fuse/fuse-3.4.2.ebuild b/sys-fs/fuse/fuse-3.4.2.ebuild new file mode 100644 index 000000000000..80ef87425176 --- /dev/null +++ b/sys-fs/fuse/fuse-3.4.2.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{5,6,7} ) + +inherit meson multilib-minimal flag-o-matic udev python-any-r1 + +DESCRIPTION="An interface for filesystems implemented in userspace" +HOMEPAGE="https://github.com/libfuse/libfuse" +SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="test" + +DEPEND="virtual/pkgconfig + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]') + )" +RDEPEND=">=sys-fs/fuse-common-3.3.0-r1" + +DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt ) + +python_check_deps() { + has_version "dev-python/pytest[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + # lto not supported yet -- https://github.com/libfuse/libfuse/issues/198 + filter-flags -flto* + + # passthough_ll is broken on systems with 32-bit pointers + cat /dev/null > example/meson.build || die +} + +multilib_src_configure() { + meson_src_configure +} + +multilib_src_compile() { + eninja +} + +multilib_src_test() { + ${EPYTHON} -m pytest test || die +} + +multilib_src_install() { + DESTDIR="${D}" eninja install +} + +multilib_src_install_all() { + einstalldocs + + # installed via fuse-common + rm -r "${ED}"/{etc,$(get_udevdir)} || die + + # handled by the device manager + rm -r "${ED}"/dev || die + + # manually install man pages to respect compression + rm -r "${ED}"/usr/share/man || die + doman doc/{fusermount3.1,mount.fuse3.8} +} diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest index 8d2c1bcf620b..10ee50036a88 100644 --- a/sys-fs/loop-aes/Manifest +++ b/sys-fs/loop-aes/Manifest @@ -1,5 +1,3 @@ -DIST loop-AES-v3.7m.tar.bz2 329763 BLAKE2B eed2590ed7b23dbb5ffb07143f8c89a693cfa8741337e7620b2c0e9a7426bf48a11a219f24996636000c07f3bbedabd75a3cf31d95ebb463b108919f9aea314a SHA512 22cdf301e12d185789fe00a5e5b750e33ae4280dc45c98e71193504b7b46899bb973a083ba526657a62c5e3ab641b3d2f03ebf28e424d50caedad2c7a5f87be5 DIST loop-AES-v3.7n.tar.bz2 373901 BLAKE2B 5cac9bd55f35a6cf0c056a6a2e75a48f49c1d23b7ebe1821e10dab522508e64ed23e5993dbcc19dbdeaab6c315ee4e71c8ecc17d9da41a5ad0794abc92563d7e SHA512 d190561f92a47292285e44c728bf1fcf9b7dd9c54f970ebc11a2988686f409515687a22028187756baaa4622903564e2646971a63eba13557c6ce78dc1f0bb96 -EBUILD loop-aes-3.7m.ebuild 2035 BLAKE2B 0049c77cbf0acf349c1d5e380b7ac1072ab148acf6174e0ba14f070b55d722b6a8fcc7e7a47e1e37699dd254d124485ef5cfc04ff82ee14053441f62b90d8236 SHA512 964217043c2ed947f591836b51eb8e98a0cc0efa0d1e5673a737c31ea6190625f5b58ea44c27bdf7811e371d92fd1fa05d5b8577c83bb6b3fa167a30bb095ca4 EBUILD loop-aes-3.7n.ebuild 2032 BLAKE2B 2218843eb73db2ed63c8e0f19be6a9f16c4084982067d6b153ca9d42688e5c3e1aa5118fe3a5720b5b5d175b20550d1250dcbf872acfff19d0a63b6d0dfccab0 SHA512 abd4f49db32d9808ccf1d4363e967bbd48cfd0db2390afd6ddb591b2540d44bb66233fad18cc7a0756cc91448a5abc20eaee24641b66bbded73fefb184859309 MISC metadata.xml 633 BLAKE2B 364ea3f67381f2878af750cdf6da32980f96bad6f277d4cdc4c943e72a554e50e9c91fdce007a8ac63e3f9c715481740688b242947a8c19a25996b9f5621d726 SHA512 75e4ed0408d32a91012b03de7ac1f4ac4aac8a20ccc73ad612a9fe79e9046d79eee189e40692c13822e219b8ee35800b04fe36c88168be24248222c6ddd6193c diff --git a/sys-fs/loop-aes/loop-aes-3.7m.ebuild b/sys-fs/loop-aes/loop-aes-3.7m.ebuild deleted file mode 100644 index 426c9f5d7fd7..000000000000 --- a/sys-fs/loop-aes/loop-aes-3.7m.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-mod - -MY_P="${PN/aes/AES}-v${PV}" - -DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher" -HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86" -IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock" - -REPEND="app-crypt/loop-aes-losetup" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - linux-mod_pkg_setup - - CONFIG_CHECK="!BLK_DEV_LOOP" - MODULE_NAMES="loop(block::tmp-d-kbuild)" - BUILD_TARGETS="all" - - BUILD_PARAMS=" \ - V=1 \ - LINUX_SOURCE=\"${KERNEL_DIR}\" \ - KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \ - USE_KBUILD=y MODINST=n RUNDM=n" - use cpu_flags_x86_aes && BUILD_PARAMS="${BUILD_PARAMS} INTELAES=y" - use keyscrub && BUILD_PARAMS="${BUILD_PARAMS} KEYSCRUB=y" - use cpu_flags_x86_padlock && BUILD_PARAMS="${BUILD_PARAMS} PADLOCK=y" - - if use extra-ciphers; then - MODULE_NAMES="${MODULE_NAMES} - loop_blowfish(block::tmp-d-kbuild) - loop_serpent(block::tmp-d-kbuild) - loop_twofish(block::tmp-d-kbuild)" - BUILD_PARAMS="${BUILD_PARAMS} EXTRA_CIPHERS=y" - fi -} - -src_install() { - linux-mod_src_install - - dodoc README - dobin loop-aes-keygen - doman loop-aes-keygen.1 -} - -pkg_postinst() { - linux-mod_pkg_postinst - - einfo - einfo "For more instructions take a look at examples in README at:" - einfo "'${EPREFIX}/usr/share/doc/${PF}'" - einfo - einfo "If you have a newer Intel processor (i5, i7), and you use AES" - einfo "you may want to consider using the aes-ni use flag. It will" - einfo "use your processors native AES instructions giving quite a speed" - einfo "increase." - einfo - - ewarn - ewarn "Please consider using loop-aes-losetup package instead of" - ewarn "util-linux[loop-aes], it will enable all loop-aes services" - ewarn "without patching util-linux package" - ewarn - ewarn "In future only loop-aes-losetup will be available in portage" - ewarn -} diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index e33390ab267b..d534ba5b27f6 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -36,5 +36,5 @@ DIST LVM2.2.02.145.tgz 1986370 BLAKE2B 0c9e5efae17f26ff86152cecbf0b11a74e85007b2 DIST LVM2.2.02.183.tgz 2380574 BLAKE2B b1fe71b6cdb8ee20dd53d0ad3399c553487baafa12657ec81a794c84ad161988afdb8693ac247877a2645d693a0740c74c8b991047ed2ba4adc9ec75f1c261a9 SHA512 3947523c6b0862ada40677ed171ed0cf95e070119e377296fc5ccb153e9c4212d34c0b16a887dbd68ccf265525345dabfed2aa59fb3604555429a7e2ecfff4d7 EBUILD lvm2-2.02.116.ebuild 8431 BLAKE2B 5b17d1ff4ee12c1e8ed040711eb2501a42ff72c371901ca4b9e4ec24a7eab71c8b71bcf52b27e5aeb2548d4aa6cfcab4278d92f5259e22c98190038b019948f6 SHA512 5e8655e7d70566a2b06ef50baa62339b1f26d20385b8a9fc261188bc0012af8d4ed4ab451305e4df5289a44bafe3e2a1252f6264439d6539ab1ae54cda1373f7 EBUILD lvm2-2.02.145-r2.ebuild 8627 BLAKE2B 63c09b396d802d131aaaa94442a26c4be8b75fc12f1bf097f07a0e52aeba28e4f3b406706ca0ef62a77d0557fc88d3f9d60963dc816026910ff6e90f2bd6439f SHA512 c4553842441409458c5bb339f5e22fa05f9b4bd34c865b907ed6b2396ff8c6fddbb78be1f480f7e189662e87141d7385a933e8f33850a7c6dcae7d611a7f37e9 -EBUILD lvm2-2.02.183.ebuild 8769 BLAKE2B 8ff55443aee773e87a78842021820822e8ba2283b61b510dee16423b1e3eb6f48a7ca0badd7776a266c14a8e3a458da889bd548685cc9adcc72a31bbbc25ddd1 SHA512 8fb5b8587580b59869b784434662d771e78378158233633c650e0a445f7c808fa06ab37f744182a25c1fd293f6e9fcf24653a160f59f56b6696249c22d8f2ea0 +EBUILD lvm2-2.02.183.ebuild 8767 BLAKE2B 215e7c5e61420b610281fab0ca0fb37bcc54dd2a15876e3256132c002ce3fc0de27906e395029b2e403ffc4919625a0c54efee5020e48a2f1c7c64483a04e6af SHA512 e6b9dc0fe0b67ac02431bcd379f376908b24be175b7dccbbe4e70ff1708dc8c541cc5dffd0ea968813bdec876037951425a838264227e1ea4d8ccc94e674ab2b MISC metadata.xml 1146 BLAKE2B 7a4bbf38d2e752523c2909c240a2c90ada04aee8efe96c62c5989887f4997e00a4ed7312dd9803d8ddcae02e8bbc3ba8f0fa9e5da0f484bc9768e0ed99ab8be3 SHA512 24240ba35d93d9f9171f2b164d949846a5ea2126eceed4b4454dd0b4efb9b1132f9f6717d2c7364f20820b792bbaf26dc274f7c10767993b35a565a76e042f4f diff --git a/sys-fs/lvm2/lvm2-2.02.183.ebuild b/sys-fs/lvm2/lvm2-2.02.183.ebuild index 19b3acffaf85..6da7f66176f9 100644 --- a/sys-fs/lvm2/lvm2-2.02.183.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.183.ebuild @@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only" REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) systemd? ( udev )" diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest index c3df2501f6ab..42bb21d17d43 100644 --- a/sys-fs/lxcfs/Manifest +++ b/sys-fs/lxcfs/Manifest @@ -1,7 +1,5 @@ AUX lxcfs-fusermount-path.patch 489 BLAKE2B 3b9aa2d1202dd6b306be6b7820315214fe3b1cb07255a5723c92edf553536f3afb18849551a52a999941d7aeae90e2956e66d18d93d00fce20527a84e8d8e79e SHA512 560f06e7a996c4a2805b5a2c37d652631ad96e1f963f18fc73b72ee535ec333f7ad56a1a92806922dd673ffa512bab2b2c70c4b403b67dc2be02f2293b1221f6 AUX lxcfs.initd 536 BLAKE2B cc8906ec07679c2aafcfc92e038e0442622ade31a9e7b3745426cfce8e42db3f1c277d84802368f53f656fffdadca747a742b8874e5edb2724dfc74d6e97a628 SHA512 196e59cfc4b8fc06975ed24a38b710916b88a18477a0e6c7f63ff3ee8d9fb395d728bbcbf59c9dc97452262f6e2d74f3b2e6ef205bead907d989cd22bacb74ff -DIST lxcfs-3.0.2.tar.gz 49809 BLAKE2B dc73149b92ac040c56de5f4c11aafdf6e744ffd2b17e22ee9c784663ff102dedd74453581a77027037955238e081c596377c28b6066012fa32ee575e6a4c57fa SHA512 2065bbd68fd2974fe28c861b1e77c62a501da85e1bfc19eeafa49fd88c66e8e75ae007781c8bd05caf43fb3b80ad12c81c0f0f03d27ab1131e0cfe6d48443218 DIST lxcfs-3.0.3.tar.gz 49824 BLAKE2B 02e3a0a6f4fd515924c5f038f00d664ef347c9b685e6561334b460e0ce0ce5580aca67f33df56b44b9cdafa4953f4f92843662f3516e1c923f9242388b17dbc6 SHA512 d994e1dd85f499eba2847d33870281a4bcaf4466e2c8f7acb065f4f3d5688b93b775c486bc6db571e64d09a3567710b0c816e12555ffb3e3e50f81bc7f5f6be6 -EBUILD lxcfs-3.0.2.ebuild 1735 BLAKE2B 51a331b3697b9e74a99de4bfaf1ba57aade89740d353fd0c2587bcb68d3a3a6089f161bc4c41a0f0f175364df9e4f0c829e9237d50460b85b7f3bd8342baf6f9 SHA512 e5bd8924ad6da0650f960ff18ef21f8607eee17e35198a3079a4758cceec5d971089b7118ee25a97a5374a7c9a7a26a4ef34ec3762ab161920d3bda7d5a53e83 -EBUILD lxcfs-3.0.3.ebuild 1736 BLAKE2B c0a4b0fde3609ec039a1c3afc69d71f7afc7c05324f1226305952622f524e558cbb9e56dd61dfcb0aaa72ccf78a4de9491cc887ae8f9c80cc166679c67133ce0 SHA512 09007915f2d9d1343b0318337cbc6146ee750e301fc4c70c127283fd8f389fa64e90ddc09068225d53ea30193a5f9b74d3bdedc4cddaf8df9bddf3eac27c6179 +EBUILD lxcfs-3.0.3.ebuild 1735 BLAKE2B 51a331b3697b9e74a99de4bfaf1ba57aade89740d353fd0c2587bcb68d3a3a6089f161bc4c41a0f0f175364df9e4f0c829e9237d50460b85b7f3bd8342baf6f9 SHA512 e5bd8924ad6da0650f960ff18ef21f8607eee17e35198a3079a4758cceec5d971089b7118ee25a97a5374a7c9a7a26a4ef34ec3762ab161920d3bda7d5a53e83 MISC metadata.xml 808 BLAKE2B b8b8be1a8fd8a1a9614dbfeddd97cd322bcf0ed4d11a97bc6680bde28faa0bdaabbf8b5a92242e0da09845f6a08280dd0d6681e3932a7319117c186f167bf6fd SHA512 dfb81661c2feb5abb3397c93eabf26c12af51099f6676d8fec346c83ca3edea788745e4a59ea05035b16b1baf21edd16d9537f66fbd10d0c8da8a7933b35c528 diff --git a/sys-fs/lxcfs/lxcfs-3.0.2.ebuild b/sys-fs/lxcfs/lxcfs-3.0.2.ebuild deleted file mode 100644 index f9c354a881a3..000000000000 --- a/sys-fs/lxcfs/lxcfs-3.0.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd vcs-snapshot -DESCRIPTION="FUSE filesystem for LXC" -HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/" -LICENSE="Apache-2.0" -SLOT="0" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/lxc/lxcfs.git" - EGIT_BRANCH="master" - inherit git-r3 - SRC_URI="" - KEYWORDS="" -else - SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz" - KEYWORDS="amd64" -fi - -# Omit all dbus. Upstream appears to require it because systemd, but -# lxcfs makes no direct use of dbus. -RDEPEND=" - dev-libs/glib:2 - sys-fs/fuse:0 -" -DEPEND=" - sys-apps/help2man - ${RDEPEND} -" -PATCHES="${FILESDIR}/${PN}-fusermount-path.patch" - -src_prepare() { - default - ./bootstrap.sh || die "Failed to bootstrap configure files" -} - -src_configure() { - # Without the localstatedir the filesystem isn't mounted correctly - econf --localstatedir=/var -} - -# Test suite fails for me -# src_test() { -# emake tests -# tests/main.sh || die "Tests failed" -# } - -src_install() { - default - keepdir /var/lib/lxcfs - newinitd "${FILESDIR}"/${PN}.initd lxcfs - systemd_dounit config/init/systemd/lxcfs.service -} - -pkg_preinst() { - # In an upgrade situation merging /var/lib/lxcfs (an empty dir) - # fails because that is a live mountpoint when the service is - # running. It's unnecessary anyway so skip the action. - [[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var -} - -pkg_postinst() { - einfo - einfo "Starting with version 3.0.0 the cgfs PAM module has moved, and" - einfo "will eventually be available in app-emulation/lxc. See:" - einfo "https://brauner.github.io/2018/02/28/lxc-includes-cgroup-pam-module.html" - einfo "for more information." - einfo -} diff --git a/sys-fs/lxcfs/lxcfs-3.0.3.ebuild b/sys-fs/lxcfs/lxcfs-3.0.3.ebuild index 4d89fb38cc5f..f9c354a881a3 100644 --- a/sys-fs/lxcfs/lxcfs-3.0.3.ebuild +++ b/sys-fs/lxcfs/lxcfs-3.0.3.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then KEYWORDS="" else SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="amd64" fi # Omit all dbus. Upstream appears to require it because systemd, but diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest index 4f5e657a26b3..1c21d207202f 100644 --- a/sys-fs/ntfs3g/Manifest +++ b/sys-fs/ntfs3g/Manifest @@ -2,8 +2,12 @@ AUX 99-ntfs3g.rules 51 BLAKE2B 11dd7b3deb9276b38be508ec3de5bdb79ceb5e272e24d5dab AUX ntfs3g-2014.2.15-no-split-usr.patch 1322 BLAKE2B efc71e28913d649484c1cf0d51dc34d8515cfba484a6a36a7cf158b142346255d403457ce0418148bbaa9e3e6e2cd494a509aa0c205ae944609844f4b9a04bc1 SHA512 232a1a7b84339c86758365564fce2058c3e652f833c6908245aa5f6f0e91d5c09cedcb978a1ebe62897c7288df4fe8671ba7085af403056742d897181e479e05 AUX ntfs3g-2016.2.22-CVE-2017-0358.patch 1169 BLAKE2B 47ee2ae7724f77d6c50e4eb816a4558fc296990c2f65e56d40f71db642e75e2bb35aeb2d6880e3faf21f61d9c51619de003903dba93cb742170bf4df56d6e744 SHA512 223f7b4fcd962d3c2499787f9a32c09f35705de98d3d1c96677cea18c67f77f5a086b7839892cb25b62c9145b2543c02d5abca89a82cda2345d5f993d6a60131 AUX ntfs3g-2016.2.22-sysmacros.patch 911 BLAKE2B a53765dc5cd4ae8320584167fbf202b50827e07f4599ab8572d434cc61110bb190854b24e567b210843002b74245e5a7f271ea4548cc52a0d3d893eb622702b2 SHA512 34768ef1ebf42b125cdc4d86937042f21b7146c4c76c1ed37e66e59a4bfaa863b54f7dbcca14a9d842782113e6ac70b2a96e62022dc2c8f717ec43c9985bf79f +AUX ntfs3g-2017.3.23-big-sectors.patch 11378 BLAKE2B 47e47a6c1370af864aa7e700e56c8db1c190ae80bd3ed1ceeeb6952a143c2c7d640580d3586a088c7307893f3509884401cf2b7c4395ce8e536246ae3ae923e5 SHA512 e23b1e3eeeb3397e42c1a09afe8b261d5193df3fd521434b64aad80fe0c6fbbf78199b92659cbd76b6c802d77e708a81e86f1d2d97b464a5c854ef821ac722a1 +AUX ntfs3g-2017.3.23-check-mftmirr.patch 554 BLAKE2B 9c7ab2b705df38089dc0413b8132ea08ccfec34001470dfc8fb926ccdaddece6f7047cef29a9073a59f7a63da8f86e01dde9f8c9e482ae932a1dd860b940bffd SHA512 b6b4eb4c6c71b944a8a30b5da69fed97eec3b3e404c180f2c3434c402d3cf5b68aa7a4deaf74b74c11230c02ffd0ce41c96fa49f9874a0105e3219821431647f +AUX ntfs3g-2017.3.23-full-clusters.patch 2206 BLAKE2B 5e11e3a1f3e51cf46c09c2e83033429d3ca900b4531dee419afe742efa2285793a57f968a042725d06cd139980010f99e2e7e240d892838fb7ea67682fa834dc SHA512 dbcc69018fea460882d644b3c1b794eaf1580ca6e9edbdd9a9590bbb6333dae0fedb50878c010908e3e7c7a08e0d443e95f0f7144aad78f2f89c51e92d777523 DIST ntfs-3g_ntfsprogs-2016.2.22.tgz 1264364 BLAKE2B 6028048d676372c062cda1cf9ee43f2c1f035d080dde1201746d994e705756ab219de8359b1f8708e83e11c0036cdc33339e54299aa433f383e698e425ff2fed SHA512 dbd36fadd2881db1d17fdbf5d2b4e50bbe11dc9dd0ad4917e7f8bc4032c2287346143756ce8754df0d46ce9209f2c0c41b626cad929d76a9bc881712c7101c15 DIST ntfs-3g_ntfsprogs-2017.3.23.tgz 1259054 BLAKE2B 4f12a6061ef0c116f26225eb3fb5cb84e469b63710115fbfb54fa3802ea94192afa973a553742818ff6849b72919069ec92aca2d4d6f58d8cabca1b0fefa3abe SHA512 3a607f0d7be35204c992d8931de0404fbc52032c13b4240d2c5e6f285c318a28eb2a385d7cf5ac4cd445876aee5baa5753bb636ada0d870d84a9d3fdbce794ef EBUILD ntfs3g-2016.2.22-r2.ebuild 2450 BLAKE2B 8178b192162c011703272b7876b6b0b56a13698f2c673862789998b09f316c4cb06370a63a9cff9ab367562220284dfc38e614e80e27085a3e26615f4913cb14 SHA512 7a06505e8ca1d54b78bbe6da8975a69fcea297c36a74092bcd3259eacf3fd4cbaedceec5184c0b0e560f13141d6ca62692dc4a7a4e454090c844454a74adca0a EBUILD ntfs3g-2017.3.23-r1.ebuild 2360 BLAKE2B 4929f0847741acef18f7078d0f62246aada50f35312398e068ceb2438751aa34245dc0af5ddd1d06a85da8e8f084fd35c7beaf1380efd24fe6ce3f9b94d0a85d SHA512 3760806c53d47b38cd1b5416d76c1bdeb2854b1b831139ca86ef1de64de0933c8804e78a333f55751812c4a8bb1cc8c8757f002b3aa36181fba5ee43db7a5041 +EBUILD ntfs3g-2017.3.23-r2.ebuild 2794 BLAKE2B 00c1b7e33e335b1ce3a325f14b80650be7adca757b9574f17689cca3460dcdd7d5223987048830076c23de3c318ae0eb0a78c23837568214f1677814de9ee52a SHA512 528946f6a0fbec94fe8aa07e6a8add8c53aff6820c9b2d002c0a5dcba091509ddf1370bbcc388b5f393786da5d5861f59ae63b0a9e9b48562b9b831e01752581 MISC metadata.xml 1188 BLAKE2B cd693b8b1281d056a5e75baeb04019684a67033607e16479c58830fbf9a19b88ba6e263c5e0637b5501cd5fe2fd000f92e8212354576242fa31c513158b38774 SHA512 6d9aa23202090132c37fe6915aa300597f2c88474065749de36143b8a47090c5bdb2e6449dffbb3843c9b7d30254fdde849b1aa230641910189d00134bd88c85 diff --git a/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-big-sectors.patch b/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-big-sectors.patch new file mode 100644 index 000000000000..1cb8bb6c46c0 --- /dev/null +++ b/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-big-sectors.patch @@ -0,0 +1,379 @@ +--- a/libntfs-3g/bootsect.c.ref 2017-03-23 10:42:44.000000000 +0100 ++++ b/libntfs-3g/bootsect.c 2018-05-07 09:11:13.004710800 +0200 +@@ -38,6 +38,7 @@ + #include <errno.h> + #endif + ++#include "param.h" + #include "compat.h" + #include "bootsect.h" + #include "debug.h" +@@ -61,6 +62,7 @@ + { + u32 i; + BOOL ret = FALSE; ++ u16 sectors_per_cluster; + + ntfs_log_debug("Beginning bootsector check.\n"); + +@@ -83,15 +85,27 @@ + case 1: case 2: case 4: case 8: case 16: case 32: case 64: case 128: + break; + default: +- ntfs_log_error("Unexpected sectors per cluster value (%d).\n", +- b->bpb.sectors_per_cluster); +- goto not_ntfs; ++ if ((b->bpb.sectors_per_cluster < 240) ++ || (b->bpb.sectors_per_cluster > 249)) { ++ if (b->bpb.sectors_per_cluster > 128) ++ ntfs_log_error("Unexpected sectors" ++ " per cluster value (code 0x%x)\n", ++ b->bpb.sectors_per_cluster); ++ else ++ ntfs_log_error("Unexpected sectors" ++ " per cluster value (%d).\n", ++ b->bpb.sectors_per_cluster); ++ goto not_ntfs; ++ } + } + + ntfs_log_debug("Checking cluster size.\n"); +- i = (u32)le16_to_cpu(b->bpb.bytes_per_sector) * +- b->bpb.sectors_per_cluster; +- if (i > 65536) { ++ if (b->bpb.sectors_per_cluster > 128) ++ sectors_per_cluster = 1 << (256 - b->bpb.sectors_per_cluster); ++ else ++ sectors_per_cluster = b->bpb.sectors_per_cluster; ++ i = (u32)le16_to_cpu(b->bpb.bytes_per_sector) * sectors_per_cluster; ++ if (i > NTFS_MAX_CLUSTER_SIZE) { + ntfs_log_error("Unexpected cluster size (%d).\n", i); + goto not_ntfs; + } +@@ -171,7 +185,7 @@ + int ntfs_boot_sector_parse(ntfs_volume *vol, const NTFS_BOOT_SECTOR *bs) + { + s64 sectors; +- u8 sectors_per_cluster; ++ u16 sectors_per_cluster; + s8 c; + + /* We return -1 with errno = EINVAL on error. */ +@@ -186,7 +200,10 @@ + * below or equal the number_of_clusters) really belong in the + * ntfs_boot_sector_is_ntfs but in this way we can just do this once. + */ +- sectors_per_cluster = bs->bpb.sectors_per_cluster; ++ if (bs->bpb.sectors_per_cluster > 128) ++ sectors_per_cluster = 1 << (256 - bs->bpb.sectors_per_cluster); ++ else ++ sectors_per_cluster = bs->bpb.sectors_per_cluster; + ntfs_log_debug("SectorsPerCluster = 0x%x\n", sectors_per_cluster); + if (sectors_per_cluster & (sectors_per_cluster - 1)) { + ntfs_log_error("sectors_per_cluster (%d) is not a power of 2." +--- a/ntfsprogs/mkntfs.8.in.ref 2017-03-23 10:42:44.000000000 +0100 ++++ b/ntfsprogs/mkntfs.8.in 2018-05-07 09:11:13.014132400 +0200 +@@ -132,7 +132,7 @@ + .TP + \fB\-c\fR, \fB\-\-cluster\-size\fR BYTES + Specify the size of clusters in bytes. Valid cluster size values are powers of +-two, with at least 256, and at most 65536 bytes per cluster. If omitted, ++two, with at least 256, and at most 2097152 bytes (2MB) per cluster. If omitted, + .B mkntfs + uses 4096 bytes as the default cluster size. + .sp +--- a/ntfsprogs/mkntfs.c.ref 2017-03-23 10:42:44.000000000 +0100 ++++ b/ntfsprogs/mkntfs.c 2018-05-07 09:11:13.035522300 +0200 +@@ -6,7 +6,7 @@ + * Copyright (c) 2002-2006 Szabolcs Szakacsits + * Copyright (c) 2005 Erik Sornes + * Copyright (c) 2007 Yura Pakhuchiy +- * Copyright (c) 2010-2014 Jean-Pierre Andre ++ * Copyright (c) 2010-2018 Jean-Pierre Andre + * + * This utility will create an NTFS 1.2 or 3.1 volume on a user + * specified (block) device. +@@ -119,6 +119,7 @@ + # endif + #endif + ++#include "param.h" + #include "security.h" + #include "types.h" + #include "attrib.h" +@@ -287,7 +288,7 @@ + ntfs_log_info("Copyright (c) 2002-2006 Szabolcs Szakacsits\n"); + ntfs_log_info("Copyright (c) 2005 Erik Sornes\n"); + ntfs_log_info("Copyright (c) 2007 Yura Pakhuchiy\n"); +- ntfs_log_info("Copyright (c) 2010-2014 Jean-Pierre Andre\n"); ++ ntfs_log_info("Copyright (c) 2010-2018 Jean-Pierre Andre\n"); + ntfs_log_info("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home); + } + +@@ -3719,11 +3720,11 @@ + /* + * For huge volumes, grow the cluster size until the number of + * clusters fits into 32 bits or the cluster size exceeds the +- * maximum limit of 64kiB. ++ * maximum limit of NTFS_MAX_CLUSTER_SIZE. + */ + while (volume_size >> (ffs(vol->cluster_size) - 1 + 32)) { + vol->cluster_size <<= 1; +- if (vol->cluster_size > 65535) { ++ if (vol->cluster_size >= NTFS_MAX_CLUSTER_SIZE) { + ntfs_log_error("Device is too large to hold an " + "NTFS volume (maximum size is " + "256TiB).\n"); +@@ -3744,15 +3745,18 @@ + "to, or larger than, the sector size.\n"); + return FALSE; + } +- if (vol->cluster_size > 128 * (u32)opts.sector_size) { ++ /* Before Windows 10 Creators, the limit was 128 */ ++ if (vol->cluster_size > 4096 * (u32)opts.sector_size) { + ntfs_log_error("The cluster size is invalid. It cannot be " +- "more that 128 times the size of the sector " ++ "more that 4096 times the size of the sector " + "size.\n"); + return FALSE; + } +- if (vol->cluster_size > 65536) { ++ if (vol->cluster_size > NTFS_MAX_CLUSTER_SIZE) { + ntfs_log_error("The cluster size is invalid. The maximum " +- "cluster size is 65536 bytes (64kiB).\n"); ++ "cluster size is %lu bytes (%lukiB).\n", ++ (unsigned long)NTFS_MAX_CLUSTER_SIZE, ++ (unsigned long)(NTFS_MAX_CLUSTER_SIZE >> 10)); + return FALSE; + } + vol->cluster_size_bits = ffs(vol->cluster_size) - 1; +@@ -4387,6 +4391,7 @@ + u8 *sd; + FILE_ATTR_FLAGS extend_flags; + VOLUME_FLAGS volume_flags = const_cpu_to_le16(0); ++ int sectors_per_cluster; + int nr_sysfiles; + int buf_sds_first_size; + char *buf_sds; +@@ -4639,8 +4644,11 @@ + * already inserted, so no need to worry about these things. + */ + bs->bpb.bytes_per_sector = cpu_to_le16(opts.sector_size); +- bs->bpb.sectors_per_cluster = (u8)(g_vol->cluster_size / +- opts.sector_size); ++ sectors_per_cluster = g_vol->cluster_size / opts.sector_size; ++ if (sectors_per_cluster > 128) ++ bs->bpb.sectors_per_cluster = 257 - ffs(sectors_per_cluster); ++ else ++ bs->bpb.sectors_per_cluster = sectors_per_cluster; + bs->bpb.media_type = 0xf8; /* hard disk */ + bs->bpb.sectors_per_track = cpu_to_le16(opts.sectors_per_track); + ntfs_log_debug("sectors per track = %ld (0x%lx)\n", +--- a/ntfsprogs/ntfsclone.c.ref 2017-03-23 10:42:44.000000000 +0100 ++++ b/ntfsprogs/ntfsclone.c 2018-05-07 09:11:38.245007100 +0200 +@@ -3,7 +3,7 @@ + * + * Copyright (c) 2003-2006 Szabolcs Szakacsits + * Copyright (c) 2004-2006 Anton Altaparmakov +- * Copyright (c) 2010-2016 Jean-Pierre Andre ++ * Copyright (c) 2010-2018 Jean-Pierre Andre + * Special image format support copyright (c) 2004 Per Olofsson + * + * Clone NTFS data and/or metadata to a sparse file, image, device or stdout. +@@ -71,6 +71,7 @@ + */ + #define NTFS_DO_NOT_CHECK_ENDIANS + ++#include "param.h" + #include "debug.h" + #include "types.h" + #include "support.h" +@@ -270,7 +271,6 @@ + + #define LAST_METADATA_INODE 11 + +-#define NTFS_MAX_CLUSTER_SIZE 65536 + #define NTFS_SECTOR_SIZE 512 + + #define rounded_up_division(a, b) (((a) + (b - 1)) / (b)) +@@ -393,7 +393,7 @@ + "Efficiently clone, image, restore or rescue an NTFS Volume.\n\n" + "Copyright (c) 2003-2006 Szabolcs Szakacsits\n" + "Copyright (c) 2004-2006 Anton Altaparmakov\n" +- "Copyright (c) 2010-2016 Jean-Pierre Andre\n\n"); ++ "Copyright (c) 2010-2018 Jean-Pierre Andre\n\n"); + fprintf(stderr, "%s\n%s%s", ntfs_gpl, ntfs_bugs, ntfs_home); + exit(0); + } +@@ -756,7 +756,7 @@ + + static void copy_cluster(int rescue, u64 rescue_lcn, u64 lcn) + { +- char buff[NTFS_MAX_CLUSTER_SIZE]; /* overflow checked at mount time */ ++ char *buff; + /* vol is NULL if opt.restore_image is set */ + s32 csize = le32_to_cpu(image_hdr.cluster_size); + BOOL backup_bootsector; +@@ -783,6 +783,10 @@ + } + } + ++ buff = (char*)ntfs_malloc(csize); ++ if (!buff) ++ err_exit("Not enough memory"); ++ + // need reading when not about to write ? + if (read_all(fd, buff, csize) == -1) { + +@@ -858,6 +862,7 @@ + perr_printf("Write failed"); + #endif + } ++ free(buff); + } + + static s64 lseek_out(int fd, s64 pos, int mode) +@@ -995,7 +1000,11 @@ + struct progress_bar *progress, u64 *p_counter) + { + s64 i; +- char buff[NTFS_MAX_CLUSTER_SIZE]; ++ char *buff; ++ ++ buff = (char*)ntfs_malloc(csize); ++ if (!buff) ++ err_exit("Not enough memory"); + + memset(buff, 0, csize); + +@@ -1004,6 +1013,7 @@ + perr_exit("write_all"); + progress_update(progress, ++(*p_counter)); + } ++ free(buff); + } + + static void restore_image(void) +@@ -1492,7 +1502,7 @@ + + static void copy_wipe_mft(ntfs_walk_clusters_ctx *image, runlist *rl) + { +- char buff[NTFS_MAX_CLUSTER_SIZE]; /* overflow checked at mount time */ ++ char *buff; + void *fd; + s64 mft_no; + u32 mft_record_size; +@@ -1522,6 +1532,10 @@ + clusters_per_set = mft_record_size/csize; + records_per_set = 1; + } ++ buff = (char*)ntfs_malloc(mft_record_size); ++ if (!buff) ++ err_exit("Not enough memory"); ++ + mft_no = 0; + ri = rj = 0; + wi = wj = 0; +@@ -1554,6 +1568,7 @@ + } + } + image->current_lcn = current_lcn; ++ free(buff); + } + + /* +@@ -1566,7 +1581,7 @@ + + static void copy_wipe_i30(ntfs_walk_clusters_ctx *image, runlist *rl) + { +- char buff[NTFS_MAX_CLUSTER_SIZE]; /* overflow checked at mount time */ ++ char *buff; + void *fd; + u32 indx_record_size; + u32 csize; +@@ -1595,6 +1610,10 @@ + clusters_per_set = indx_record_size/csize; + records_per_set = 1; + } ++ buff = (char*)ntfs_malloc(indx_record_size); ++ if (!buff) ++ err_exit("Not enough memory"); ++ + ri = rj = 0; + wi = wj = 0; + if (rl[ri].length) +@@ -1627,6 +1646,7 @@ + } + } + image->current_lcn = current_lcn; ++ free(buff); + } + + static void dump_clusters(ntfs_walk_clusters_ctx *image, runlist *rl) +--- a/ntfsprogs/ntfsresize.c.ref 2017-03-23 10:42:44.000000000 +0100 ++++ b/ntfsprogs/ntfsresize.c 2018-05-07 09:11:13.076883400 +0200 +@@ -59,6 +59,7 @@ + #include <fcntl.h> + #endif + ++#include "param.h" + #include "debug.h" + #include "types.h" + #include "support.h" +@@ -243,8 +244,6 @@ + #define DIRTY_INODE (1) + #define DIRTY_ATTRIB (2) + +-#define NTFS_MAX_CLUSTER_SIZE (65536) +- + static s64 rounded_up_division(s64 numer, s64 denom) + { + return (numer + (denom - 1)) / denom; +@@ -404,7 +403,7 @@ + printf("Copyright (c) 2002-2005 Anton Altaparmakov\n"); + printf("Copyright (c) 2002-2003 Richard Russon\n"); + printf("Copyright (c) 2007 Yura Pakhuchiy\n"); +- printf("Copyright (c) 2011-2016 Jean-Pierre Andre\n"); ++ printf("Copyright (c) 2011-2018 Jean-Pierre Andre\n"); + printf("\n%s\n%s%s", ntfs_gpl, ntfs_bugs, ntfs_home); + } + +@@ -1849,9 +1848,13 @@ + static void copy_clusters(ntfs_resize_t *resize, s64 dest, s64 src, s64 len) + { + s64 i; +- char buff[NTFS_MAX_CLUSTER_SIZE]; /* overflow checked at mount time */ ++ char *buff; + ntfs_volume *vol = resize->vol; + ++ buff = (char*)ntfs_malloc(vol->cluster_size); ++ if (!buff) ++ perr_exit("ntfs_malloc"); ++ + for (i = 0; i < len; i++) { + + lseek_to_cluster(vol, src + i); +@@ -1875,6 +1878,7 @@ + resize->relocations++; + progress_update(&resize->progress, resize->relocations); + } ++ free(buff); + } + + static void relocate_clusters(ntfs_resize_t *r, runlist *dest_rl, s64 src_lcn) +--- a/include/ntfs-3g/param.h.ref 2017-03-23 10:42:44.000000000 +0100 ++++ b/include/ntfs-3g/param.h 2018-05-07 09:11:13.088302600 +0200 +@@ -40,6 +40,13 @@ + }; + + /* ++ * Parameters for formatting ++ */ ++ ++ /* Up to Windows 10, the cluster size was limited to 64K */ ++#define NTFS_MAX_CLUSTER_SIZE 2097152 /* Windows 10 Creators allows 2MB */ ++ ++/* + * Parameters for compression + */ + diff --git a/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-check-mftmirr.patch b/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-check-mftmirr.patch new file mode 100644 index 000000000000..f56eadc882f9 --- /dev/null +++ b/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-check-mftmirr.patch @@ -0,0 +1,12 @@ +--- a/libntfs-3g/volume.c.ref 2017-03-23 10:42:44.000000000 +0100 ++++ b/libntfs-3g/volume.c 2017-12-20 08:11:51.842424300 +0100 +@@ -959,7 +959,8 @@ + vol->mftmirr_size = l; + } + ntfs_log_debug("Comparing $MFTMirr to $MFT...\n"); +- for (i = 0; i < vol->mftmirr_size; ++i) { ++ /* Windows 10 does not update the full $MFTMirr any more */ ++ for (i = 0; (i < vol->mftmirr_size) && (i < FILE_first_user); ++i) { + MFT_RECORD *mrec, *mrec2; + const char *ESTR[12] = { "$MFT", "$MFTMirr", "$LogFile", + "$Volume", "$AttrDef", "root directory", "$Bitmap", diff --git a/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-full-clusters.patch b/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-full-clusters.patch new file mode 100644 index 000000000000..7d2496d372d5 --- /dev/null +++ b/sys-fs/ntfs3g/files/ntfs3g-2017.3.23-full-clusters.patch @@ -0,0 +1,81 @@ +--- a/ntfsprogs/ntfsclone.c 2018-05-16 18:46:47.114964000 +0200 ++++ b/ntfsprogs/ntfsclone.c 2018-07-16 14:03:20.273809100 +0200 +@@ -776,6 +776,10 @@ + + /* possible partial cluster holding the backup boot sector */ + backup_bootsector = (lcn + 1)*csize >= full_device_size; ++ buff = (char*)ntfs_malloc(csize); ++ if (!buff) ++ err_exit("Not enough memory"); ++ + if (backup_bootsector) { + csize = full_device_size - lcn*csize; + if (csize < 0) { +@@ -783,10 +787,6 @@ + } + } + +- buff = (char*)ntfs_malloc(csize); +- if (!buff) +- err_exit("Not enough memory"); +- + // need reading when not about to write ? + if (read_all(fd, buff, csize) == -1) { + +@@ -1507,6 +1507,7 @@ + s64 mft_no; + u32 mft_record_size; + u32 csize; ++ u32 buff_size; + u32 bytes_per_sector; + u32 records_per_set; + u32 clusters_per_set; +@@ -1524,15 +1525,18 @@ + /* + * Depending on the sizes, there may be several records + * per cluster, or several clusters per record. ++ * Anyway, full clusters are needed for rescuing bad ones. + */ + if (csize >= mft_record_size) { + records_per_set = csize/mft_record_size; + clusters_per_set = 1; ++ buff_size = csize; + } else { + clusters_per_set = mft_record_size/csize; + records_per_set = 1; ++ buff_size = mft_record_size; + } +- buff = (char*)ntfs_malloc(mft_record_size); ++ buff = (char*)ntfs_malloc(buff_size); + if (!buff) + err_exit("Not enough memory"); + +@@ -1585,6 +1589,7 @@ + void *fd; + u32 indx_record_size; + u32 csize; ++ u32 buff_size; + u32 bytes_per_sector; + u32 records_per_set; + u32 clusters_per_set; +@@ -1601,16 +1606,19 @@ + /* + * Depending on the sizes, there may be several records + * per cluster, or several clusters per record. ++ * Anyway, full clusters are needed for rescuing bad ones. + */ + indx_record_size = image->ni->vol->indx_record_size; + if (csize >= indx_record_size) { + records_per_set = csize/indx_record_size; + clusters_per_set = 1; ++ buff_size = csize; + } else { + clusters_per_set = indx_record_size/csize; + records_per_set = 1; ++ buff_size = indx_record_size; + } +- buff = (char*)ntfs_malloc(indx_record_size); ++ buff = (char*)ntfs_malloc(buff_size); + if (!buff) + err_exit("Not enough memory"); + diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild new file mode 100644 index 000000000000..fb67e549b9c8 --- /dev/null +++ b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit 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/88" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr" + +RDEPEND="!<sys-apps/util-linux-2.20.1-r2 + !sys-fs/ntfsprogs + ntfsdecrypt? ( + >=dev-libs/libgcrypt-1.2.2:0 + >=net-libs/gnutls-1.4.4 + ) + external-fuse? ( + >=sys-fs/fuse-2.8.0:0 + ) +" +DEPEND="${RDEPEND} + sys-apps/attr + virtual/pkgconfig +" + +S="${WORKDIR}/${MY_P}" + +DOCS="AUTHORS ChangeLog CREDITS README" + +PATCHES=( + "${FILESDIR}"/${PN}-2014.2.15-no-split-usr.patch + "${FILESDIR}"/${PN}-2016.2.22-sysmacros.patch #580136 + # Fedora fixes + "${FILESDIR}"/${PN}-2017.3.23-check-mftmirr.patch + "${FILESDIR}"/${PN}-2017.3.23-big-sectors.patch + "${FILESDIR}"/${PN}-2017.3.23-full-clusters.patch +) + +pkg_setup() { + if use external-fuse && use kernel_linux; then + if kernel_is lt 2 6 9; then + die "Your kernel is too old." + fi + CONFIG_CHECK="~FUSE_FS" + FUSE_FS_WARNING="You need to have FUSE module built to use ntfs-3g" + linux-info_pkg_setup + fi +} + +src_prepare() { + default + # Keep the symlinks in the same place we put the main binaries. + # Having them in / when all the progs are in /usr is pointless. + sed -i \ + -e 's:/sbin:$(sbindir):g' \ + {ntfsprogs,src}/Makefile.in || die #578336 + # Note: patches apply to Makefile.in, so don't run autotools here. + elibtoolize +} + +src_configure() { + # disable hd library until we have the right library in the tree and + # don't links to hwinfo one causing issues like bug #602360 + tc-ld-disable-gold + econf \ + --prefix="${EPREFIX}"/usr \ + --exec-prefix="${EPREFIX}"/usr \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + $(use_enable debug) \ + --enable-ldscript \ + --disable-ldconfig \ + $(use_enable acl posix-acls) \ + $(use_enable xattr xattr-mappings) \ + $(use_enable ntfsdecrypt crypto) \ + $(use_enable ntfsprogs) \ + $(use_enable ntfsprogs quarantined) \ + --without-uuid \ + --without-hd \ + --enable-extras \ + $(use_enable static-libs static) \ + --with-fuse=$(usex external-fuse external internal) +} + +src_install() { + default + + use suid && fperms u+s /usr/bin/${MY_PN} + # Not needed with the link of mount.ntfs being created, causes + # issues like bug #635080 +# udev_dorules "${FILESDIR}"/99-ntfs3g.rules + dosym mount.ntfs-3g /usr/sbin/mount.ntfs #374197 + + find "${D}" -name '*.la' -type f -delete || die +} diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest index 48c16a7fa6a8..5efd370a863c 100644 --- a/sys-fs/quota/Manifest +++ b/sys-fs/quota/Manifest @@ -19,7 +19,9 @@ AUX quota.rc7 688 BLAKE2B 18a3317da5360532d6e6d9051f674a7a8e0495fa08aae8511fc7b7 AUX rpc.rquotad.initd 448 BLAKE2B 59dc12ee73ddd0473f8122c780ef94c46dc8cfa0e15bd7a839b2d0360ea08d18d239b17b538b0ff9cd8110b8c29676aa93d06f25cf4acbc7f169ac545ab5248e SHA512 c6ab8d6e0e15032bbbee523c2550e7f23d48fb45035d37181e988f2f96cd1ece316681f1b529b51fd1aeb390c5f27a6911f5de52132e90b4cbcfb4c2dfc95954 DIST quota-4.03.tar.gz 564352 BLAKE2B b474be79576fd2db7ad5f7c4e93d665fca19004727f4ff12e960da3251091b026c1458adecc0ed3a803da3bfcef6c857f612c44c7800ecc53c9ae53450d10338 SHA512 9603940048dcc0c4db6d6e14173769c815641ebc78a0cc457a0622dbfc597319bae1eaad4ef3281c52757995d47424b96dc66426ce540a8b538b996eea2dc5f8 DIST quota-4.04.tar.gz 577303 BLAKE2B 8ee1e8f99b70f626ec051e4e9afe53c788b625a29f26afbe075039cf88dde9f6641c39e0ccfdbfcc6981fabe35e8fd15e7203989e9bbbdd1f1772949566531f6 SHA512 adc33863d2a966b4c46983fa3926e6b6ba75e260ed21bdff646584237840e6beb0dcfbfd2f655969aa5675c3c398ac2e483afb933f03f983756ebb3352d0eaad +DIST quota-4.05.tar.gz 577313 BLAKE2B ab0adc04a2bee46f5b4f528c3a1b7f1dfbfc93cc153aebef91cf563e0b03344479b4d465f7d91cfee60c533052f27ce54f24a937c0c1ec312a5fff763cb82bd1 SHA512 a13ca93fb6fad032cb032874dda2f5d792e619b41e89b481e6aaa4f06ac5774e2728b09dd625addfbe22efccb1d85892b093736084c72f75675a60df168b92f2 EBUILD quota-4.03.ebuild 1961 BLAKE2B 306162b56dabbb3796c8e5f62c5f1bf675905a1c723a0d9ba34bc7c72b02880f8ab7aa87b9be271b86b19f9396b95514f5f627bec97641599fd9f7e01a35ba85 SHA512 be1868451e07ecdc03dd204357d61a84851801d5426eee81a9c5590f998e54ebf5cb1f7ffee73260d43f82efdbfe439942f633397c70ae4ca83b6b082ef174a8 EBUILD quota-4.04-r1.ebuild 1597 BLAKE2B 1bf5b4269b3fb2a7dfef5407dd2d0be2ad7f1cf730b0b59f6bdc6eddf5a5d9c595013cd4b98c90711da2aa4fb8f04319922d1a37eb4cc7b283728b3ff027f116 SHA512 72dab78bee71c09181e85855d38f79318b952b48aaca910edaf27b018c827b7ab106631662e67616c13ed8de8427d9730f515305d3479e6fbb07712463702784 -EBUILD quota-4.04-r2.ebuild 1654 BLAKE2B d58cc6c0090826d59dbbce6a55c26096bc4d625380b4fac34c67559dd2f3541e09082e2d7836c35707e750d8c4ee6643975458080dbe5c6179acb6d4488ac278 SHA512 817525a07312a932d471a948515068addbc44489459584ca7b5d12ef73301a6f76c06677d388e77ac0d1ad51871bf79ba22afc006055183736053c235aa16027 +EBUILD quota-4.04-r2.ebuild 1642 BLAKE2B d721a074b1849ca52de06efc4170b26ddd8cf8117e8fff06c00a9f6a5d1a4bd6a9f378b9a34f5d51b5927616d59864b84c9ffb6c5f0fd292e82af276a15626e6 SHA512 a4276b27a96a85bcf33032f30b30cc4ef9c521936c57a2968db1416184f66644e1b625c00c5274b399586368b870ed26453ab6be480a89906923c8ebaba89178 +EBUILD quota-4.05.ebuild 1548 BLAKE2B 4d62b492ee718f0b2ce05c84706f5ea634f23676f7d24f05451b5f98e363fc74146aba045524be0c85ef7c9de82b4326cc1914c87fdbfc36712ce04547634bea SHA512 9ed6d2fd53401b74d27614d0060957554d7909b1cc2e1ed2f4f91cfbed8d9dacb78612290be33ac59dac1ce4f0882c13e20580d25f593d6fd8676f716db5d9d4 MISC metadata.xml 482 BLAKE2B 4b2afb537080bc15a4cd9756de6fcbb8df9a19a5a6ea3a7a4e024756be844415d46c07c3321c9dc6bfde8956ec4fb5f3ef87d0dcd090a3f4ed606e724d25fbf4 SHA512 50b2143425f8ab315784fab4d9e569d2f80893c91ba64b4c209947eb79688ed9e8e23955b9f04406d699de6f28e9c10dad78889853d05f84191af65911d7a38e diff --git a/sys-fs/quota/quota-4.04-r2.ebuild b/sys-fs/quota/quota-4.04-r2.ebuild index a6080157d8e6..3ee741ee0951 100644 --- a/sys-fs/quota/quota-4.04-r2.ebuild +++ b/sys-fs/quota/quota-4.04-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,10 +11,11 @@ SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86" IUSE="ldap netlink nls rpc tcpd" RDEPEND=" + sys-fs/e2fsprogs ldap? ( >=net-nds/openldap-2.3.35 ) netlink? ( sys-apps/dbus @@ -45,7 +46,7 @@ src_prepare() { src_configure() { local myeconfargs=( - --docdir="${EPREFIX%/}/usr/share/doc/${PF}" + --enable-ext2direct $(use_enable nls) $(use_enable ldap ldapmail) $(use_enable netlink) diff --git a/sys-fs/quota/quota-4.05.ebuild b/sys-fs/quota/quota-4.05.ebuild new file mode 100644 index 000000000000..06512aaf271a --- /dev/null +++ b/sys-fs/quota/quota-4.05.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +DESCRIPTION="Linux quota tools" +HOMEPAGE="https://sourceforge.net/projects/linuxquota/" +SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="ldap netlink nls rpc tcpd" + +RDEPEND=" + sys-fs/e2fsprogs + ldap? ( >=net-nds/openldap-2.3.35 ) + netlink? ( + sys-apps/dbus + dev-libs/libnl:3 + ) + rpc? ( + net-nds/rpcbind + elibc_glibc? ( sys-libs/glibc[-rpc(-)] ) + net-libs/libtirpc + net-libs/rpcsvc-proto + ) + tcpd? ( sys-apps/tcp-wrappers ) +" +DEPEND=" + ${RDEPEND} + nls? ( sys-devel/gettext ) +" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --enable-ext2direct + $(use_enable nls) + $(use_enable ldap ldapmail) + $(use_enable netlink) + $(use_enable rpc) + $(use_enable rpc rpcsetquota) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + dodoc doc/* README.* Changelog + + insinto /etc + insopts -m0644 + doins warnquota.conf quotatab + + newinitd "${FILESDIR}"/quota.rc7 quota + newconfd "${FILESDIR}"/quota.confd quota + + if use rpc ; then + newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad + fi + + if use ldap ; then + insinto /etc/openldap/schema + insopts -m0644 + doins "${FILESDIR}"/ldap-scripts/quota.schema + + exeinto /usr/share/quota/ldap-scripts + doexe "${FILESDIR}"/ldap-scripts/*.pl + doexe "${FILESDIR}"/ldap-scripts/edquota_editor + fi +} diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest index 29b7dd68e75e..6c0fe1ad5c84 100644 --- a/sys-fs/squashfs-tools/Manifest +++ b/sys-fs/squashfs-tools/Manifest @@ -1,5 +1,3 @@ -AUX squashfs-tools-3.2-makedev.patch 422 BLAKE2B 4bb1b8bf226435864511c4d18ffd7c2e5be464a0c37d259782341180e3bab97d847e97c0efe831a3ff5cefd38cb71b0c5b0ffd20e5b00fb0635878f1f9bcf7c0 SHA512 1f999da86292966d3fc107a00da2449f86615bc65dcb80cdf01e04f3956747d26d81e1593f9bc0edc0e6fef8052bd1383c7d9a2b4bedb48c186e63ab887abf43 -AUX squashfs-tools-3.4-makedev.patch 423 BLAKE2B 854613016eb5591ff2b14a2de54aaa3cce8e1eccc506c0f906fd83024e9b1cfb68cc900d3b12a5f3812e658bb0efaa949dda8308ee9c2074a4813516c95c454e SHA512 0a3ebac2bf2794733b2dd7cb1689646ec02ed34656708b3fe5f1ebe3f8524290cacabf3221c7bc3538731aafdff531ac74f95cf7d5aad3ab8c9285069688d950 AUX squashfs-tools-4.3-2gb.patch 961 BLAKE2B b178c5e225be9f1b74c8c28bce5f516d1195e9b6bb8f029c34efc6bee62deca5c0173afeadd930f09a8a2304f57223c0d78d24bee6a9d98d07825e748929b0cb SHA512 c45cad7822964ad4c74ea36fdd833fbfaf9e8e047726fa7a9517392bfa0b04a4de348bf3a511b071ac36d045c40cab0d8efeff054ebcd90b94f8508516b7dd71 AUX squashfs-tools-4.3-aligned-data.patch 375 BLAKE2B e4964cd55bfa3f6026f6090c9e5fe97ddce2ad6efaf99920aa329a42f8cd54217bb918cc1e6678359ff0dd6d7d58361f5fe63cd2aa3254602878cae2e1673c5e SHA512 566e2ada5e86afc799cb0c52396179bedfbcc49349bc6eb43c048b96215b1638c3765f7c75c6fa35593d5a95a1111df7c29a143ee4a55eaf33a6663e9bfe1b25 AUX squashfs-tools-4.3-extmatch.patch 3487 BLAKE2B df11e9bc8b991e50a94b4c8f8ffa3ddf25db0e2f911db3d4d2fbcbfec793f3d946eac8f4343a113ff6239454b280615e67f93f995c06af6cfe415f3ea330b124 SHA512 e034320ace6b992968d3f6776aeb0b94237619585e7fac195e917622b941bbfbddc62b625409f79fe7a1853ab58f76d6679c28320646b6883eb58183a3adfdea @@ -11,16 +9,10 @@ AUX squashfs-tools-4.3-xattrs.patch 1076 BLAKE2B deca0eb05d6ac4302b82193b333dec5 DIST squashfs-tools_4.3-11.debian.tar.xz 27108 BLAKE2B 948a69f79fbec6af2467a56457410253676d693e1d67efef034f85523c17e6db6d85f1f9e9b2f8ae391ac5783d37b7d2cdb3434acee96c19880bbf6a5b771e40 SHA512 ef22436a6da925f8ac0c61ae4450b4cc9a87930b456035dd2588c3edf0d7530cd1a9d1e7bde90c9462e39687a9a8d0caedea5f181cd2414e4caa8af1d3965b0a DIST squashfs-tools_4.3-3.debian.tar.xz 15252 BLAKE2B 5273eb8007192190786513f49be68eded38a7acae80d0c84067e8d239d53304a79be454cc4970af0d1c1eff6e58b75403201497dfd18d175f9d5aae5e0102834 SHA512 ab1a707e04e92697549f7e7c667c5da835d39d5e2cb791e47bf549b232e7173e6981c33a87cd373c4a7a4815e4af1b7294fe13e54422a5ccdcff90904bfc51ae DIST squashfs-tools_4.3-7.debian.tar.xz 19612 BLAKE2B 7894b6fa27e7e46aec82b680a1ce521c895436ccb1cafcfd3d95e09f56546e08539a7c152854ee14e9516e217339617d25e68c0cc1a4c41b3bdd689caeefa94a SHA512 88df37e0c13483c5591f925156628b3ae27279f56d2453f7f1f82558da1bc3338e23e9481d704b785a40846c6dedc6b0a0e1dd2ea70fe26ea2f1e855fd6d6fdf -DIST squashfs3.2-r2.tar.gz 314764 BLAKE2B 55d2f38572263c4b1ec704ed7a07794400e904e260e316e399511851d35ab0f7e1834eba605e8739d1b8f6b5a56512570d36196d21743d05842e958b3d80e368 SHA512 983f1fa966c15fb4929eaaf2d88401aac72f6d04e8c5523bd46397bc28928ff13b638e0e96bc09650627449c37f6a654ffa727445f1e9ca13cdc9de4fc43012f -DIST squashfs3.4.tar.gz 352660 BLAKE2B f48b1f0399d3fde75b8f625fa4130d04772ed9e6d8dc179e7105a7770a5bd211a7aa5c7d5d621efedc54707b37a622351efa65291c03cd84d049ec4a1094773a SHA512 5e126ea468271f54c62d473a04a355169514f2668b4dc0de4138a8ef2a6e633d373454e7b85c1c684b875d9dfc8afb17c05548dd5062d05f847ffef8e624d9fe DIST squashfs4.3.tar.gz 182550 BLAKE2B f56ff33a505f7d60cced11224526bfce003bc06184ad7e8cb9cd08b14854164da8d2ecc64694d44085c46bcfa3aaa85939c97820415345053f7956af04066fdb SHA512 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79 -EBUILD squashfs-tools-3.2_p2-r1.ebuild 1021 BLAKE2B 7e3485fdb797f12e782736b21ee4b675ab9436eaf65a60391004d2eb69a3e24d26a3dfa35c6a0b902b203e01d2d5ce036c34c9d95677b20392578f7431c9c187 SHA512 d4b88eabdf7792ffb35369821b8ed5c1083228794bcbdabd34026662307e0dcf35f743d2a26693404ac150ab8e1500bb6ec02353ee061aa167d526dfadfc1ff4 -EBUILD squashfs-tools-3.2_p2.ebuild 953 BLAKE2B a4d1a831009bf68138e760847c6e964737db11c64e18e135b5ee5aa0335d8981d72bd2f39740769a847391e1efca36a7f012f07a2ce20deef71daef58bfd0b21 SHA512 989198cdeb688add1cd826743ab55b7ff33f0de87bf8338e4d6d14882dc79452ebf54fc393a41365e10efa22da1e0e0643f2ea50f4c4fabc8ab969517845f129 -EBUILD squashfs-tools-3.4-r1.ebuild 1005 BLAKE2B cb55eca250959a6e9fd91eab43f989711047bf524f90ee19f8decc364237ef735bd0dadb233dad17c8b0ffd97464a8a6156b5fae019779ed0c42630b09d8e1b8 SHA512 7db000e02f9d9a9a32fd33fb90299852be6a075c9c1954c9a34bca2ead534014177f9de959341ceab5d7948bc80898af3517043bd245294a7fda799b65092875 -EBUILD squashfs-tools-3.4.ebuild 937 BLAKE2B 77ce02b82aae8aae9a5e64b7c4e28e416d70bf92f1ce2d4b017eb3a3a9bd257e7355176c149668a85f757ddb66f017543b55f366782b2ad7c1bd8f01a0921689 SHA512 ea53dbc7607757087c89d6ce7e1396b0ffaa462534bfaadc13e4400172d242c5089c85d722f4b52e26c35cfeb328c9d2495f9d826e2fdcd24135934de55f924b EBUILD squashfs-tools-4.3-r2.ebuild 2129 BLAKE2B c5c6b8fb86ae83ddc1c4c22c528665123ab08b9d2fc212faea1f460d8be277ff26f7d9f58c4fd912d1b3a4d2a36d8a65028d922e9e50fbc2198859207ee44103 SHA512 f6623c42b03d85ec1d60b5c591d9467ce22ba202c3b8d73c303550825f5b9c0cd9bd62feafae4c615bea9301a1d8cb20aee9194bc8d26d20372ca974a5715fec EBUILD squashfs-tools-4.3_p11-r1.ebuild 2261 BLAKE2B 621d709448cb692443f1719d2337b6f1e275d70c381aa07291aba2cd9e9c06b04ec1fb30770567983cf8d14034586e56373c09a7e239e41e1e74a03dc6859101 SHA512 d1f85f6eb6fc21d2da1ef708d8a823de71f6e014196cbd9f97ffc93a2c9dc87b87244b7a841529bb1939c244c914d45239619ca1162ac4124c267b2fe8aaebf8 EBUILD squashfs-tools-4.3_p11.ebuild 2169 BLAKE2B efc0e6110c461d7a36415f782e07d2b5f6681b2ac5271c185c62a573bb5c1df36d18bf967fccdb959851c5de3518fd433022b8aa59f3cd6ce5c59fb43812b58f SHA512 78315a8b0617dcaff29805f05b0245b32e86665a3c3e554e7545219800776bccdf03e3a5b05794c64e6938ad22187cd2e81f96222f6103ad69d222d3b9c3f77b -EBUILD squashfs-tools-4.3_p7.ebuild 2094 BLAKE2B 284c6aff0004705ea2fb2bfd09f621a4eb842c717a27e3115cdb805060591dd4984e04d762b97b429438f1ab775e94d385c80b35fcb09fe15ce978e70a2e6917 SHA512 1609df86a2048663b4dc65d3bed09fe939c2f4f2b6bd6583f7ded002016d3c67f3410ac964f950333f67437a266b1c13ba9e2643c1bd7040edca00b7b572e7dc +EBUILD squashfs-tools-4.3_p7.ebuild 2086 BLAKE2B 2d2368923220cfa9b65faa54572ac0a42045b428b024361021fd20b38d8fee32bb26c7b8778a8f9f4fc6675610da7241ab931b5f56736e5c53c307bfac052bcc SHA512 14ac135fe1191e7a34ba9fbed2ddd6c1c96ea72e46faf5f05e28ceee408f5dad806415893e976cbac3424227eccf2e3603524bf4c35f9753390ab6f18624f71b EBUILD squashfs-tools-9999.ebuild 1657 BLAKE2B ad5692c2f5cc0ab9a33b47cfcba96361a26fd07ea36d2f8ca23826deedc563978ae74aeb52884806db45b531f3b9b9c6691b2462ae7546e27be8188683c0b484 SHA512 2a90c73888a9f7295ba19a884eabf52d97b562741f015df5bf6a712ea7bbc18c39af6c03c57735a60462e3cca83d4ed1c8a5951eb87789d9d1c06bf708dc5257 MISC metadata.xml 619 BLAKE2B d54bfccd3de76d4c236ad8514d966713f72b61b6306d9c443ef72565ebb90c08e424b94d99276c499e403aeb28ce15e93a7fd4df00140a2200e99ab9cfa12fe5 SHA512 8da433deb63f3665c0423570472415dcb6b901686ba2cebe6e0f2a72a61a3226ebb6845755eb82dbc80478ec0a521793473c82f42938ad779877de11238195a9 diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-3.2-makedev.patch b/sys-fs/squashfs-tools/files/squashfs-tools-3.2-makedev.patch deleted file mode 100644 index c55d905dae18..000000000000 --- a/sys-fs/squashfs-tools/files/squashfs-tools-3.2-makedev.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/unsquashfs.c -+++ b/unsquashfs.c -@@ -34,6 +34,7 @@ - #include <zlib.h> - #include <sys/mman.h> - #include <utime.h> -+#include <sys/sysmacros.h> /* makedev */ - - #ifndef linux - #define __BYTE_ORDER BYTE_ORDER ---- a/mksquashfs.c -+++ b/mksquashfs.c -@@ -44,6 +44,7 @@ - #include <sys/mman.h> - #include <pthread.h> - #include <math.h> -+#include <sys/sysmacros.h> /* makedev */ - - #ifndef linux - #define __BYTE_ORDER BYTE_ORDER diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-3.4-makedev.patch b/sys-fs/squashfs-tools/files/squashfs-tools-3.4-makedev.patch deleted file mode 100644 index da9d6bed456f..000000000000 --- a/sys-fs/squashfs-tools/files/squashfs-tools-3.4-makedev.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/mksquashfs.c -+++ b/mksquashfs.c -@@ -47,6 +47,7 @@ - #include <math.h> - #include <regex.h> - #include <fnmatch.h> -+#include <sys/sysmacros.h> /* makedev */ - - #ifndef linux - #define __BYTE_ORDER BYTE_ORDER ---- a/unsquashfs.c -+++ b/unsquashfs.c -@@ -47,6 +47,7 @@ - #include <math.h> - #include <sys/ioctl.h> - #include <sys/time.h> -+#include <sys/sysmacros.h> /* makedev */ - - #ifndef linux - #define __BYTE_ORDER BYTE_ORDER diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild deleted file mode 100644 index 969a1b0ad8d3..000000000000 --- a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -MY_PV=${PV/_p/-r} -DESCRIPTION="Tool for creating compressed filesystem type squashfs" -HOMEPAGE="http://squashfs.sourceforge.net/" -SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="3.0" # squashfs filesystem version -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND}" -S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools -PATCHES=( - "${FILESDIR}"/${PN}-3.2-makedev.patch -) - -src_prepare() { - default - sed -i \ - -e 's:-O2:$(CFLAGS):' \ - -e '/-lz/s:$: $(LDFLAGS):' \ - Makefile || die - - echo "struct dir_info; `grep '^int dir_scan2' mksquashfs.c`;" >> global.h -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - newbin mksquashfs mksquashfs-${SLOT} - newbin unsquashfs unsquashfs-${SLOT} - cd .. - dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README-3.2 -} diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild deleted file mode 100644 index 33c9be8386ec..000000000000 --- a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit toolchain-funcs - -MY_PV=${PV/_p/-r} -DESCRIPTION="Tool for creating compressed filesystem type squashfs" -HOMEPAGE="http://squashfs.sourceforge.net/" -SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="3.0" # squashfs filesystem version -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools - -src_prepare() { - sed -i \ - -e 's:-O2:$(CFLAGS):' \ - -e '/-lz/s:$: $(LDFLAGS):' \ - Makefile || die - - echo "struct dir_info; `grep '^int dir_scan2' mksquashfs.c`;" >> global.h -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - newbin mksquashfs mksquashfs-${SLOT} - newbin unsquashfs unsquashfs-${SLOT} - cd .. - dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README-3.2 -} diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild deleted file mode 100644 index 4b252ea04382..000000000000 --- a/sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -MY_PV=${PV/_p/-r} -DESCRIPTION="Tool for creating compressed filesystem type squashfs" -HOMEPAGE="http://squashfs.sourceforge.net/" -SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="3.1" # squashfs filesystem version -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-3.4-makedev.patch -) -S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools - -src_prepare() { - default - sed -i \ - -e 's:-O2:$(CFLAGS):' \ - -e '/-lz/s:$: $(LDFLAGS):' \ - Makefile || die - - sed -i -e 's:get_nprocs():sysconf(_SC_NPROCESSORS_ONLN):' *.c -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - newbin mksquashfs mksquashfs-${SLOT} - newbin unsquashfs unsquashfs-${SLOT} - cd .. - dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README -} diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild deleted file mode 100644 index ef2cd80bfd22..000000000000 --- a/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit toolchain-funcs - -MY_PV=${PV/_p/-r} -DESCRIPTION="Tool for creating compressed filesystem type squashfs" -HOMEPAGE="http://squashfs.sourceforge.net/" -SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="3.1" # squashfs filesystem version -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools - -src_prepare() { - sed -i \ - -e 's:-O2:$(CFLAGS):' \ - -e '/-lz/s:$: $(LDFLAGS):' \ - Makefile || die - - sed -i -e 's:get_nprocs():sysconf(_SC_NPROCESSORS_ONLN):' *.c -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - newbin mksquashfs mksquashfs-${SLOT} - newbin unsquashfs unsquashfs-${SLOT} - cd .. - dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README -} diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild index 8565685e580a..be500fe6c33a 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86" IUSE="debug lz4 lzma lzo static xattr +xz" LIB_DEPEND=" diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index 1f6dd732a2c3..b18c3a554495 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -15,5 +15,5 @@ EBUILD zfs-kmod-0.7.8.ebuild 4072 BLAKE2B d148372b05ac609549329f337792e8087841b5 EBUILD zfs-kmod-0.7.9-r1.ebuild 4279 BLAKE2B 793f8e6257e52f67b2a6aeae8da3e6f86e3ac76798e3afcbc253b3b56d203548e883740031f4a973730c50da8c4309ae4804e5b9b95ec91af5489e82faa9765c SHA512 e5a6c17c6fb4f6ab37cbcc5fc4fbdace31585a41292ced5eda922a19178c8e3d85c0b7a1e52eaea94490416111922e5b85a5f7abd7c5aa3f4b815eebae17e7ca EBUILD zfs-kmod-0.7.9.ebuild 4072 BLAKE2B 301b09e71e36e279d2fb8532884bbf7599ae7c1bdc81188b008420039a227ea2efa251b00ebf8b434d5d0e6c3fe41fe0b4dfb27fe599ceb414045a64848f8914 SHA512 d22123433d5cf24e385737076743a515ab2280b5a4e851ab657f78225aed2315c05edf13e15156be172218fcce2d049a1d2f5a353bca39e2061fb61504b0675f EBUILD zfs-kmod-0.7.9999.ebuild 4131 BLAKE2B 10f0553102967537d42f5b2da8ede7c8894ca9134a1421efadd1db538b3381d588fe6729dc37c84ab025212ca01a74c2e60768fe8f7808acbd21f0179b2a9abb SHA512 ad59815b9e2ce844e6caa5232d1e4f17c70b930b8295a28e44f37b8293c602fb8b98f939bb1ea22cef68c8e724de6a581b09073d41fd7a14aa181a0cadb6250c -EBUILD zfs-kmod-9999.ebuild 2737 BLAKE2B 45cc57c6c4f5270e56fe6631843e8ef241bef3848bd8fad4eb941eb028fb00bee9e84e2e7226a898d49574272a0e41b54109ee11b071fb77224e3cfc16655242 SHA512 fd5a3ce13a3f854ac44e1662f5a6c9c6aa0dd209d4369fa42ebb7c19ac2def29071cd6a1ccef2e870c5151aee8faba20aa514065b40c4bcfc7a41e48f5372bc3 +EBUILD zfs-kmod-9999.ebuild 4189 BLAKE2B 716f0a07888b59592e5bc0ad063f5865b1ddbee07617dedb1744a6c5b13f98e3658b01d00260ee60f6ac921f3c64b3038cc2581df45019964e7028487503bc58 SHA512 ea0972a782e3e25fd12156f1b13d07eb89155ac3dbf8bc3026557ba04c11f224f12f603e90672abd6899a6153ce96612359d4907a779abada3b4f53ca8519cab MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index 19b0a9a5a511..268f01711031 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -1,53 +1,52 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -if [ ${PV} == "9999" ]; then - AUTOTOOLS_AUTORECONF="1" +inherit flag-o-matic linux-info linux-mod toolchain-funcs + +DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" +HOMEPAGE="https://zfsonlinux.org/" + +if [[ ${PV} == "9999" ]]; then + inherit autotools git-r3 EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" - inherit git-r3 else SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" + KEYWORDS="~amd64" + ZFS_KERNEL_COMPAT="${ZFS_KERNEL_COMPAT_OVERRIDE:-5.0}" S="${WORKDIR}/zfs-${PV}" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" fi -inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="https://zfsonlinux.org/" - -LICENSE="CDDL GPL-2+" +LICENSE="CDDL debug? ( GPL-2+ )" SLOT="0" IUSE="custom-cflags debug +rootfs" -RESTRICT="debug? ( strip ) test" -DEPEND=" - dev-lang/perl - virtual/awk -" +DEPEND="" RDEPEND="${DEPEND} !sys-fs/zfs-fuse !sys-kernel/spl " -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" +BDEPEND=" + dev-lang/perl + virtual/awk +" + +RESTRICT="debug? ( strip ) test" -DOCS=( AUTHORS COPYRIGHT NOTICE META README.md ) +DOCS=( AUTHORS COPYRIGHT META README.md ) pkg_setup() { linux-info_pkg_setup + CONFIG_CHECK=" !DEBUG_LOCK_ALLOC - !GRKERNSEC_RANDSTRUCT - !PAX_KERNEXEC_PLUGIN_METHOD_OR - !TRIM_UNUSED_KSYMS EFI_PARTITION - KALLSYMS MODULES + !PAX_KERNEXEC_PLUGIN_METHOD_OR + !TRIM_UNUSED_KSYMS ZLIB_DEFLATE ZLIB_INFLATE " @@ -64,31 +63,42 @@ pkg_setup() { DEVTMPFS " - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" + kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP" + + kernel_is -ge 2 6 32 || die "Linux 2.6.32 or newer required" - [ ${PV} != "9999" ] && \ - { kernel_is le 4 17 || die "Linux 4.17 is the latest supported version."; } + if [[ ${PV} != "9999" ]]; then + local KV_MAJOR_MAX="${ZFS_KERNEL_COMPAT%%.*}" + local KV_MINOR_MAX="${ZFS_KERNEL_COMPAT##*.}" + kernel_is -le "${KV_MAJOR_MAX}" "${KV_MINOR_MAX}" || die \ + "Linux ${KV_MAJOR_MAX}.${KV_MINOR_MAX} is the latest supported version" + fi check_extra_config } src_prepare() { - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" + default - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + if [[ ${PV} == "9999" ]]; then + eautoreconf + else + # Set module revision number + sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" + fi - autotools-utils_src_prepare + # Remove GPLv2-licensed ZPIOS unless we are debugging + use debug || sed -e 's/^subdir-m += zpios$//' -i module/Makefile.in } src_configure() { + set_arch_to_kernel + use custom-cflags || strip-flags + filter-ldflags -Wl,* - set_arch_to_kernel - local myeconfargs=(${myeconfargs} + local myconf=( --bindir="${EPREFIX}/bin" --sbindir="${EPREFIX}/sbin" --with-config=kernel @@ -97,23 +107,60 @@ src_configure() { $(use_enable debug) ) - autotools-utils_src_configure + econf "${myconf[@]}" +} + +src_compile() { + set_arch_to_kernel + + default } src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" + set_arch_to_kernel + + emake \ + DEPMOD="/bin/true" \ + DESTDIR="${D}" \ + INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" \ + install + + einstalldocs } pkg_postinst() { linux-mod_pkg_postinst # Remove old modules - if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] - then - ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" + if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then + ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs" + ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" + rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" + rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon" fi + + if use x86 || use arm; then + ewarn "32-bit kernels will likely require increasing vmalloc to" + ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." + fi + + ewarn "This version of ZFSOnLinux includes support for new feature flags" + ewarn "that are incompatible with previous versions. GRUB2 support for" + ewarn "/boot with the new feature flags is not yet available." + ewarn "Do *NOT* upgrade root pools to use the new feature flags." + ewarn "Any new pools will be created with the new feature flags by default" + ewarn "and will not be compatible with older versions of ZFSOnLinux. To" + ewarn "create a newpool that is backward compatible wih GRUB2, use " + ewarn + ewarn "zpool create -d -o feature@async_destroy=enabled " + ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" + ewarn " -o feature@spacemap_histogram=enabled" + ewarn " -o feature@enabled_txg=enabled " + ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" + ewarn " ..." + ewarn + ewarn "GRUB2 support will be updated as soon as either the GRUB2" + ewarn "developers do a tag or the Gentoo developers find time to backport" + ewarn "support from GRUB2 HEAD." } diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index 2577994db832..d43babd66714 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -1,4 +1,5 @@ AUX bash-completion-r1 11310 BLAKE2B f6c105fef1737d4be0e76967fdec62aa52fa7665bfc1e9aa4c944dd6442d64d7d31b8af54f92f5db25542f968ecf83da46db8c2a8f978577526bf9f90d8bccf3 SHA512 03be521e2c646196766d5fd049f241cb97f290abf0409881ea6ba709934984deda402c8513009e62a5787e0648023b55c040e5f99baef27709e81c3bc9c8f56e +AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319 AUX zfs-init.sh.in 582 BLAKE2B 27e5c1aff398c42178b3d7c005e91a1f8f3afa303a22e49c93a2cd7134016a8d07d68483126d60e46ed4ff5cbaeb87f050e9c9fb5bff5352d5dc32b4d94db7b4 SHA512 bed7eae5f902f13489241782d3d560b53a5a3258de492763b7b25783ca9417975afb9000f68f58be5c2057e1db50a569374ed0ff572140aa65e401e20e646461 AUX zfs.service.in 335 BLAKE2B a18ad1d70975df98cfb7b5196ad17b7197d5eb59cac2ccb3b9243f111c6c882c3480eb6396e347eac91670e3a67d7f122953d6fa82ec61a6467163b788b31858 SHA512 7a167b389723e5f55fea6956e5546e46c89ebf3e2d1c25f6b56c357e6d3ffc765226549d78cdeb79b4dc90c798ec6326a13996215b40eb49179376e32c3c3287 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451 @@ -16,5 +17,5 @@ EBUILD zfs-0.7.8.ebuild 6075 BLAKE2B a64e55ee89c210962c3b40fa08b233a57a473f317f1 EBUILD zfs-0.7.9-r1.ebuild 6270 BLAKE2B 65a3f5776ab6b8f35e273120d76241be3e65ef7cfa4541263f1175fe1865a2ed08048cb5fde7289323394e52831409bce63aa9dce7140d44f14a3cfa6a1ba7c2 SHA512 76ef51ba6bf80ec63b26613eb528049aa1bfbb741ca58458d6c8635fbbab4c8a0e2a85b523b98912037402a33a3e75764850997457204d3146453a274cebe0ef EBUILD zfs-0.7.9.ebuild 6073 BLAKE2B 380d85c5fc958d461781bdf8326c723a52800406cbbeaec4414453397d4a4f4fea9100d8a8096608b7025eac4e424072fe62b4bb1cd9dae36268e42ad1c04106 SHA512 b2dca9e72c53447030e6605a2a0a8469e9676da88e038f66afe784f70668c719bc9e5ad02092a40dc20c1345a2c74126256a42dcf0f979401fe84858cffc8b44 EBUILD zfs-0.7.9999.ebuild 5977 BLAKE2B ac507d39effe8be9bdca30a0c158b109e00d471958643770c567a7000efb996417398f6e9bc8a9e4d597cc1af3a91486b46d9ba2af292cca57b684f05db6dcde SHA512 62bf3008f373b44652a91c191f72d167946d26202da51ffef0d15fa57a1705f2d0c9b11afbe7c409d657a1a08efc8f69dc95efaeec0b63f28eaa3f2b7ce47e89 -EBUILD zfs-9999.ebuild 6218 BLAKE2B b291a7514613b2ad54aa3c415f10adc0e7d92b6cc63a09ccbd660e282e625d2159ddaed9cef320ec48022abf846ab3d952277f7341578309f51cd4c237f449e5 SHA512 8e39289a2ac8a76a2f0cd50f0daa1c9a9835f7e68be1838750c41e4eb72d2226b6ca43447a23f8fcb3b12f6d5e990d8adae2d4d3f45575d41a31735e43cfb9c4 +EBUILD zfs-9999.ebuild 6359 BLAKE2B 5d1ddfa83a289f4772076d525578799d21493fdfe1980c34b6eb9e686241375dab5aa7311f6e57df4b7a99177c0a59dab1211791e6dd201a277f060a7903e17b SHA512 369e8f25ee675972d34bbe873db7719c7d83dfbf967e6094d78f0a831d180064c0603ca4fb43618524ff2402a1087a7992f675dc97cb5b656a8a1e446b67501a MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295 diff --git a/sys-fs/zfs/files/bash-completion-sudo.patch b/sys-fs/zfs/files/bash-completion-sudo.patch new file mode 100644 index 000000000000..8ae9d25d2761 --- /dev/null +++ b/sys-fs/zfs/files/bash-completion-sudo.patch @@ -0,0 +1,35 @@ +From 3829d0b867f6aa4bde8798147dee74a86435d12c Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Fri, 22 Mar 2019 22:04:40 -0700 +Subject: [PATCH] contrib/bash_completion.d/zfs: remove sudo reference + +--- + contrib/bash_completion.d/zfs | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/contrib/bash_completion.d/zfs b/contrib/bash_completion.d/zfs +index 914db43c..b1aded36 100644 +--- a/contrib/bash_completion.d/zfs ++++ b/contrib/bash_completion.d/zfs +@@ -21,13 +21,13 @@ + # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + # OTHER DEALINGS IN THE SOFTWARE. + +-if [[ -w /dev/zfs ]]; then ++#if [[ -w /dev/zfs ]]; then + __ZFS_CMD="zfs" + __ZPOOL_CMD="zpool" +-else +- __ZFS_CMD="sudo zfs" +- __ZPOOL_CMD="sudo zpool" +-fi ++#else ++# __ZFS_CMD="sudo zfs" ++# __ZPOOL_CMD="sudo zpool" ++#fi + + __zfs_get_commands() + { +-- +2.21.0 + diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 0d0c1cf5b262..bde2d9e06bc3 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -1,43 +1,61 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +EAPI=7 -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" -fi +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev +inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev DESCRIPTION="Userland utilities for ZFS Linux kernel module" HOMEPAGE="https://zfsonlinux.org/" +if [[ ${PV} == "9999" ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" +else + SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" + KEYWORDS="~amd64" +fi + LICENSE="BSD-2 CDDL MIT" SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" +IUSE="custom-cflags debug kernel-builtin python +rootfs test-suite static-libs" COMMON_DEPEND=" + ${PYTHON_DEPS} net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk + python? ( + virtual/python-cffi[${PYTHON_USEDEP}] + ) " -DEPEND="${COMMON_DEPEND} + +BDEPEND="${COMMON_DEPEND} virtual/pkgconfig + python? ( + dev-python/setuptools[${PYTHON_USEDEP}] + ) " RDEPEND="${COMMON_DEPEND} !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) + !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) + sys-fs/udev-init-scripts + rootfs? ( + app-arch/cpio + app-misc/pax-utils + !<sys-boot/grub-2.00-r2:2 + !<sys-kernel/genkernel-3.5.1.1 + !<sys-kernel/genkernel-next-67 + !<sys-kernel/bliss-initramfs-7.1.0 + !<sys-kernel/dracut-044-r1 + ) test-suite? ( sys-apps/util-linux sys-devel/bc @@ -46,24 +64,22 @@ RDEPEND="${COMMON_DEPEND} sys-fs/mdadm sys-process/procps virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - ) + ) " -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="test" + +PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" ) pkg_setup() { if use kernel_linux && use test-suite; then linux-info_pkg_setup + if ! linux_config_exists; then ewarn "Cannot check the linux kernel configuration." else - # recheck that we don't have usblp to collide with libusb if use test-suite; then if linux_chkconfig_present BLK_DEV_LOOP; then eerror "The ZFS test suite requires loop device support enabled." @@ -72,34 +88,38 @@ pkg_setup() { eerror "in /usr/src/linux/.config or" eerror " Device Drivers --->" eerror " Block devices --->" - eerror " [ ] Loopback device support" + eerror " [X] Loopback device support" fi fi fi fi - } src_prepare() { + default + + [[ ${PV} == "9999" ]] && eautoreconf + # Update paths sed -e "s|/sbin/lsmod|/bin/lsmod|" \ -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in + -i scripts/common.sh.in || die - if use kernel-builtin - then - einfo "kernel-builtin enabled, removing module loading from" - einfo "systemd units." - sed -i -e '/modprobe\ zfs/d' etc/systemd/system/*.service.in || die + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_prepare + popd >/dev/null || die fi - autotools-utils_src_prepare } src_configure() { use custom-cflags || strip-flags - local myeconfargs=( + + local myconf=( --bindir="${EPREFIX}/bin" + --enable-systemd + --enable-sysvinit --sbindir="${EPREFIX}/sbin" --with-config=user --with-dracutdir="${EPREFIX}/usr/lib/dracut" @@ -109,47 +129,53 @@ src_configure() { --with-systemdunitdir="$(systemd_get_systemunitdir)" --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" $(use_enable debug) + $(use_enable python pyzfs) ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die - if use kernel-builtin - then - sed -i -e '/modprobe\ zfs/d' "${T}/zfs.service" || die + + econf "${myconf[@]}" +} + +src_compile() { + default + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die fi } src_install() { - autotools-utils_src_install + default + gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - newbashcomp "${FILESDIR}/bash-completion-r1" zfs + use test-suite || rm -rf "${ED}/usr/share/zfs" + + dobashcomp contrib/bash_completion.d/zfs bashcomp_alias zfs zpool - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" + # strip executable bit from conf.d file + fperms 0644 /etc/conf.d/zfs + + if use python; then + pushd contrib/pyzfs >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die + fi + + # enforce best available python implementation + python_setup + python_fix_shebang "${ED}/bin" } pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then + if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then einfo "Adding ${P} to the module database to ensure that the" einfo "kernel modules and userland utilities stay in sync." update_moduledb fi - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then + if [[ -e "${EROOT}/etc/runlevels/boot/zfs" ]]; then einfo 'The zfs boot script has been split into the zfs-import,' einfo 'zfs-mount and zfs-share scripts.' einfo @@ -159,24 +185,23 @@ pkg_postinst() { einfo 'The zfs-import and zfs-mount scripts have been added to the boot' einfo 'runlevel while the zfs-share script is in the default runlevel.' - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" + rm "${EROOT}/etc/runlevels/boot/zfs" + ln -snf "${EROOT}/etc/init.d/zfs-import" \ + "${EROOT}/etc/runlevels/boot/zfs-import" + ln -snf "${EROOT}/etc/init.d/zfs-mount" \ + "${EROOT}/etc/runlevels/boot/zfs-mount" + ln -snf "${EROOT}/etc/init.d/zfs-share" \ + "${EROOT}/etc/runlevels/default/zfs-share" else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ + [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ + [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ + [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ einfo "You should add zfs-share to the default runlevel." fi - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then + if [[ -e "${EROOT}/etc/runlevels/default/zed" ]]; then einfo 'The downstream OpenRC zed script has replaced by the upstream' einfo 'OpenRC zfs-zed script.' einfo @@ -184,18 +209,17 @@ pkg_postinst() { einfo 'convenience, it has been automatically removed and the zfs-zed' einfo 'script that replaced it has been configured to start.' - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" + rm "${EROOT}/etc/runlevels/boot/zed" + ln -snf "${EROOT}/etc/init.d/zfs-zed" \ + "${EROOT}/etc/runlevels/default/zfs-zed" else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ + [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ einfo "You should add zfs-zed to the default runlevel." fi - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then + if [[ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ]]; then einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" + rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" fi systemd_reenable zfs-zed.service @@ -205,13 +229,10 @@ pkg_postinst() { systemd_reenable zfs-share.service systemd_reenable zfs-import.target systemd_reenable zfs.target - systemd_reenable zfs.service - } pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then + if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then remove_moduledb fi } |