diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-29 03:22:09 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-29 03:22:09 +0100 |
commit | d4bd6695641f6d2ec7ff8681913d304e995902f5 (patch) | |
tree | 6ec8d4c38152bb4f2bb4b93277236ebd9fbbd21d /net-fs | |
parent | 22910f5d14da606bd7f06e19a2f61c5d1a8fc94b (diff) |
gentoo resync : 29.05.2018
Diffstat (limited to 'net-fs')
-rw-r--r-- | net-fs/Manifest.gz | bin | 4699 -> 4699 bytes | |||
-rw-r--r-- | net-fs/cifs-utils/Manifest | 2 | ||||
-rw-r--r-- | net-fs/cifs-utils/cifs-utils-6.7.ebuild | 2 | ||||
-rw-r--r-- | net-fs/nfs-utils/Manifest | 18 | ||||
-rw-r--r-- | net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch | 45 | ||||
-rw-r--r-- | net-fs/nfs-utils/metadata.xml | 1 | ||||
-rw-r--r-- | net-fs/nfs-utils/nfs-utils-2.1.1-r1.ebuild | 175 | ||||
-rw-r--r-- | net-fs/nfs-utils/nfs-utils-2.1.2_rc6.ebuild | 190 | ||||
-rw-r--r-- | net-fs/nfs-utils/nfs-utils-2.2.2_rc1-r1.ebuild | 190 | ||||
-rw-r--r-- | net-fs/nfs-utils/nfs-utils-2.2.2_rc1_p20171107-r1.ebuild | 185 | ||||
-rw-r--r-- | net-fs/nfs-utils/nfs-utils-2.3.1-r1.ebuild | 191 | ||||
-rw-r--r-- | net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild | 2 | ||||
-rw-r--r-- | net-fs/nfs-utils/nfs-utils-2.3.2.ebuild (renamed from net-fs/nfs-utils/nfs-utils-2.2.1-r1.ebuild) | 37 |
13 files changed, 73 insertions, 965 deletions
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz Binary files differindex 23158bcc5976..f416de9c73af 100644 --- a/net-fs/Manifest.gz +++ b/net-fs/Manifest.gz diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest index 3ce9fec7e1cc..041bcddaa9a9 100644 --- a/net-fs/cifs-utils/Manifest +++ b/net-fs/cifs-utils/Manifest @@ -4,6 +4,6 @@ DIST cifs-utils-6.4.tar.bz2 392809 BLAKE2B 90d59cbc49e6d3cf427a43fd9deedc8ea8150 DIST cifs-utils-6.7.tar.bz2 363647 BLAKE2B 692c4b7de92c2cc5cb88591fb5b5b01ca7d925b105d10f7149e350d1b1661bb6447e71e0ca86095a9e294637d80126e54295413a685786b62c8e70cf26f893d0 SHA512 ee050a0eb4a72fbc8d773e86fbe6839ea2bf11cda5ebd071c8ead66e31b46d50ea4e1d1b26478373be53227cd60b32a90b65b5cb989b5a8237cddfc65bad8e5e DIST cifs-utils-6.8.tar.bz2 384426 BLAKE2B 002518f44489aefc94c47a23438b176a4056ff4d995b3ed9f25a6c6c8d4c8d7437a3158d5c592d16cb6bfcd289b937d6ac1ef0573c346993d576a88aa1fcb118 SHA512 54a094f78c9e07acc997adfe0c8d4c2fb8e15c18adcc1805450e2180f8539aaec8619e781e985b289e097932637e2de3e6815e32f59ec2fc06cfc3762b832e13 EBUILD cifs-utils-6.4.ebuild 2974 BLAKE2B f469c0c94f3cba69c8847ffe956e23ed0525ac01360e4e966e73a83680d732251f0fb418df3f5b853bfa13ee1935e77eb6ea92220beca8939edf1437cff0d5c1 SHA512 c5c12c57c322a2a87f03426a2d08f1fe1e69213efbc4463b04b5d2b60ca1b06578a018336666b5a2f4213c3681d1d1ee3c35df4b0bdf802e4a1e564d423ee4e1 -EBUILD cifs-utils-6.7.ebuild 3239 BLAKE2B 22f48e5a904906536afc98750e15a8251d70af10f2340c9abecc2bb86f44dc3a57ad95b8f59f9eec9c26376f0db697729e4f09f9c6c5af9aa21499982266acf2 SHA512 b64cfe3dca6b8bcf0acc0f191a3ec5a6a4523ab57cf0908578beff855232cd655a6f33c95bc96314b3ba995e1075762ded62c664cba28cf1c27a886f00d8bcbc +EBUILD cifs-utils-6.7.ebuild 3238 BLAKE2B da996af82766a6655024468578c55981faadc683dbaadf6b20699e01e00bf8e9ef532959e0fcf421cefad64a57f1a58e66287b23b0c7536a1adba277dec921b0 SHA512 dc9efbcbdfcb4eca70b9c51f4b1bedcc3a8e5cbe79d43715f70a259a4f08725eca5d3eec32aa5f3825add1b645ff0e4c241fffe3eec0030b8acbad0b15c3c9c4 EBUILD cifs-utils-6.8.ebuild 3230 BLAKE2B 73e27d0cd239fc82c440d299a3a3ef07e4a4ad244e2980f0526e2ee8aa12b46e70fd46f66eaa587674a1c9bc2d0b02ba98f9943d38fbcb5a2db5a57bf1d82852 SHA512 311e7213a58ddc8df71ecf9ced69af3014de41465f57b8b46dc6bbe334b1a78199afbf142a74869087fd5bcb78d98feb55704f004dec65b61da2f04eac15f26c MISC metadata.xml 889 BLAKE2B 45b3f5f6cac2ca247c9d3a73d4f0e2703187e4a4eab2f850ef2f228489e365ac30d67d35187fab993af7611109c0e2a33bf8336e37496a131b641abade642ca7 SHA512 979960233f0941ecbfa1cadd79fae28898cf8f8333225483808cd25b84d0395d9a7dbc84a5912c2dedb38269d62b7d7f4a647b5d12e47b7706368b3640d90c66 diff --git a/net-fs/cifs-utils/cifs-utils-6.7.ebuild b/net-fs/cifs-utils/cifs-utils-6.7.ebuild index b7b7e849783c..db70c62afe70 100644 --- a/net-fs/cifs-utils/cifs-utils-6.7.ebuild +++ b/net-fs/cifs-utils/cifs-utils-6.7.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux" IUSE="+acl +ads +caps +caps-ng creds pam" RDEPEND=" diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index 6bc6d56f19ce..ec6d31c228d7 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -2,6 +2,7 @@ AUX exports 66 BLAKE2B 8ddc8e1b7888570cf7ce21ecebf0fb390ab394d25e60f1d914406396b AUX nfs-utils-1.1.4-mtab-sym.patch 1020 BLAKE2B 6f1315a02a6070443fbd8cc943e382a02ac8ee99dbbc78f6b1b6c835548b80a78238ae4f7de18c7f02687df370bc58d628ed2bdbf216a41e80b5b589f1952c3c SHA512 1cd916028a8515772f05ef63832d73a09e9720055aedc9e2e4ce3a08ce1820948700a4f00ca9c4ee684880f18e67aca888dd857fc7931d923021ba50964be998 AUX nfs-utils-1.2.8-cross-build.patch 1323 BLAKE2B 51ec6b58436725e78fd9000aa1d97a1a73e7884bea01e0d22d5ec0a88cc4d5c8f152baaeb2b602961232c08330b311f3e98cb79c40b7d700a279842430e484d9 SHA512 42a41411d0de384b66a2875fa9ea15e4b854150b5f75ba2db54ad7785fd147ee329eb8867d24a26b2b1d9ef89bd887caeaf0b5a59cdda15f5a11c47888882b9a AUX nfs-utils-2.3.1-svcgssd_undefined_reference.patch 1055 BLAKE2B a2f045f7886eb0772ad9b30ddc1c98294039e32f92eb811dcccde8926eda7d33c42b34e07912fcb536ed96a2f0b2114eb293689380751f3c786bdea6a6923ba7 SHA512 21361593415c497fa5a0bbd547b2cb0e0512ad8b3deb2397aba6a453cce840876d607015e46d8c3a367cd478395420d8b24e2f3a7f73d0e75d5a2445e4e46ef2 +AUX nfs-utils-2.3.2-junction_libs.patch 1487 BLAKE2B 5ecd4709fdcbc1c0885c91aea134ef5e5e00e6f58ace39d35d31b5de74d73bf05a4c27befc35f2c8a54d72452f63589c3a2912c3ef37752416389dd9537598e8 SHA512 d724ff25b7bbf03fc2c7d122bb338979ef50c59906a433ced5aa50e84030a375b2c268a05ee930c4f64ce58e938de7d30a9d0b5d3b7e660d8894013786d5bb4f AUX nfs-utils.conf 74 BLAKE2B 504c298c1e8e7eb596cd87813f1aeeac5cbc830bb85be9e26ed98f7ed85cdbd14ae2c47b0e111c912398ef28ef629e6de7e585a7b161624e9698ea208750fd9f SHA512 d72c0fbdf12cb1ddf8eaa5885e1ed93a2078c40ca48eb8868836fb72fa456c4865df15273fb7472f70dfe8098167e695b1340ff9a59b55e73b47690baaf977d6 AUX nfs.confd 930 BLAKE2B 4ef1662b31cffd78b0e96396ad74dc8b8135a9a18956fa1267639d2069893d4f218ded5809497b56d19a192e7e18408e1d1b56bd1535abed8db236bc1a1649cb SHA512 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535 AUX nfs.initd 4244 BLAKE2B 0df8f270cf38b16efb331202d300d0bd648ee90c9dc44704e4db6f6aaad53e1c16059e94e14278923db59ce17752e4f034ad948ed53d6f2aefe8ecd6faf808c9 SHA512 f7feb79cfcab0478affb640d1e5ad059757c88d51cc790fd54cde2fd7ed2e3cfd8f7f4c2de993d99da03e8ce3bdfb2750a4cb997b850fe33d0ef76d9b91c9018 @@ -16,18 +17,9 @@ AUX rpc.pipefs.initd 760 BLAKE2B 4c05275e59d7d19d80779964a3631096258704cec2097f1 AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c86216658fc89dafff1ae9f85a25b5386e4c89b86ca1b7b1fce7bb3045f944b7a1aee5b6544594d753cf8 SHA512 7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f DIST nfs-utils-1.3.4.tar.bz2 814545 BLAKE2B 4b8c5fa4c1c21858e19d05f973c6d94185cf6a15c88348dda5e47c6714f9dba00dfa05237d908479970440b2ea57287600e92cb4d49872127b3801e075d6bf1a SHA512 765c0bc55a9a0bdb2c25d8fb7189a9054fb9f2dd51726eda29f44e5d5c423e245b02307dfcfab9239276d8f44869a72732416f6e9ef5a1f80753d9243ba1b38c -DIST nfs-utils-2.1.1.tar.bz2 820083 BLAKE2B 2a8e3a4456c413436bbcc96654500c3eb9328df2591903c4ae6cb0a80d6849d97783037713f6bd944f3e6570485af072dadfd01434f4bd524827fd43cfe44b18 SHA512 ed358280b7e124154632040bf747f6e4c3c6e4156bf90e82ff6915b1488f1c0dd65251a3a0f9b7ca96b9664d64e24b379828da9b524e64a3c769a44f4c930448 -DIST nfs-utils-2.1.2_rc6.tar.gz 476695 BLAKE2B 98560d710d41d0077e69ad1f3e758f50d9a0acd334bed22f5c082e5d14b4b734d337026f23be538a6948407ced80a2f12a6a406044076f004e530090f5fb63d9 SHA512 d7c054074e2ea4370a5e47922785fa2a0cf595623d0222cb16f910c4946ed7f3d6f093b471557ce139c85ad0dd321bed0222f5c5aa5b7bca04b31d422eb35f75 -DIST nfs-utils-2.2.1.tar.bz2 853812 BLAKE2B bc973f8fe781f7658161d0d5895bc32ffeeab7a06276aed827926304f8e3b82287804aaa7e49c458d9b69992193c6c733fb6ae359063c076cfd15bd21185c432 SHA512 05e2aa4f413a4a4927995847211680baf87f956a435d0d903dd7b6239f72e66a15a089758d41874c05c2137e0626d72c1714010c2a9ce854943fef7798db9a24 -DIST nfs-utils-2.2.2_rc1.tar.gz 509381 BLAKE2B 8429cd9d01ce2a15451d21b89cabc6b50b54bd30d2e12a21f04d4be04a6e729a8bd3a8da3f0d120caf6ba2b0c91199f65f1c878a49d437e0c689bcba9f5d162f SHA512 5cc9a19e1ebf1831f1914419c0e7f12ff12037caa35e5866dfba8bf30c5355dcf2e039928b9b336c6755df856549ccac6ea646d61b57c68f96fd586d21a27f1a -DIST nfs-utils-2.2.2_rc1_p20171107.tar.gz 509543 BLAKE2B 44c5bf63b16b7727f6cdba0d1051929f6e132b87fcb8e9e18a0ad699dfeec1b26f9988fc7b5db5dbcc1dd3c04f1dd30fa0f89616fe86cbfd4dbb36f0d8aed08b SHA512 27e38fe3ff2d94aa45a526343c88c781b39db4f85b2fd50b632516be609f7a05dced115e26f73176ba28409cd38a3c7db6ddb8370ab75071150b1cf3fba46e43 DIST nfs-utils-2.3.1.tar.bz2 854899 BLAKE2B f9541b9dc103d978f21d57d8ba0c14a3b30f6ba874b112239d014076c1c72b6654e8e02b4bfea686e658dac84d1e896b872bc2054591275ef1713ae4e7b7d005 SHA512 de3e70f8656bc5b5aa98262685a9e80929c6314234d9bbb74d4c7efcb7a8b2640d48d2100850b403157ebefc8f0eb48598b48238fae795f64c7a0e9a8bff93e3 +DIST nfs-utils-2.3.2.tar.bz2 884068 BLAKE2B c4133cc12c5c1cd33346408e2d1286cf50880a89ec97cb8ce4453266ba5b145eb1ca7a4362ac1a91ea5c1ebddd4fcd1d6a4cd12f45637cd5d845cc6d8d5f139d SHA512 4b948d92f515e9340163f53ab26dd7189fa8b13909f5c668b7c66ae13f181ed778967edc0a20753763540b5a3f93a41a2de38a7276ffbfadfd866c5ed422520c EBUILD nfs-utils-1.3.4-r1.ebuild 5139 BLAKE2B 8c2504911449d130588e6293c0691ddaa881630e01b390e4f7cd891e02ebcf137984565867b21ad59261d38d5ae5bad89ce7d5a3684bc9ae6f3b8a0787d08d06 SHA512 828f39b3f7f117e5930b42c62908b9f6f5ba7cefacaf2a2149108b428b03da8ca1f1ca993a86264876f1103d6118ef6be62ec25babb4d6aff0270b24a4fe4e0a -EBUILD nfs-utils-2.1.1-r1.ebuild 5064 BLAKE2B f516fe09d1dd34b47d65fb44dd7eef7b55b50046efdd44e253c026ddb866b2915a7396f71ceda0fba42e038adb3e5d2a44e824a4e35e92d89bdf9cf444deafec SHA512 213f9a4905ee77a3e02ee5894cfc2aa8bbedcc81014f0d85eabb54c4994e3e7bb7ab70fe7c501796add31deb8abfc8aaffaf077c0d177067145c9de3802e491c -EBUILD nfs-utils-2.1.2_rc6.ebuild 5340 BLAKE2B 5be70892c6d4e42c22b5301f784370901ba4e3b17af3ace4b2882a7523ef9b4dd9a8554122fe98ff04eebd1d7a3fb2275a76b8fe7eb26c15401668cfb82fa5a4 SHA512 7626cec28aeeb377acb2f402fa870a94daea38854ceafeb25dbdf93f36ca5fbdd1439f0e92e51a3f865f50756b5af5051c8caeadf617f3b4fb39dbe4b81e750d -EBUILD nfs-utils-2.2.1-r1.ebuild 5399 BLAKE2B a44119f006ec1123ea235478ad0425a5dd99f62db5add4ef2562bee501da47595a652da72e3856f818f7211e599dc3403d124fb35040688b8e02de22f68e514c SHA512 4a9ab1965150b6cd9edf9487f886e7c0f6aa042f077eaca0c6828f042db7779ba5f72218b8bdcae464993098e90ea32808fa265747240fa116ffa627cb633be6 -EBUILD nfs-utils-2.2.2_rc1-r1.ebuild 5378 BLAKE2B 8e5cd7e2de1546fd148a7c295c4ab9830e7c250dee1ee5862ae8501075bdf0abf894362cca6954b05d69e2149f781420e0084b9bfe90e2c8c8662810546cb0c8 SHA512 85326df8b59fd0bfe1d0b862fe9270704fc69e05183ce4f9662e8af12b9033681ad70593336b29e5050e2d0bf14f6721787b59c1927064a1c53bed88d2d8679c -EBUILD nfs-utils-2.2.2_rc1_p20171107-r1.ebuild 5263 BLAKE2B 9edaccda54726385d778c22cf70c13e7532ba1c49ef7593dc0aec5e17376ca3bca0732a1a8182e753791313426c1c838d8e47baeba2bd904a0439c4154660a07 SHA512 043e4a3d76bf7e51d4199c566ac2dde2567715f24af27354672263d68572b500a8a1adaf34dfd6572fe833181761d8e9b84db0edf15e9b7a7bc1995961eb2d10 -EBUILD nfs-utils-2.3.1-r1.ebuild 5440 BLAKE2B aba69b2b931c7414d6ec266b6bc6bb38d105e0006c85c3ca66289d6e0dd10a5a229ca2516a75186fc1b82f3c8fc4b457010f34da42be90cfffa067efbaa785e1 SHA512 0774440f9e4d862122dd80d90d0d8b03d75e4cc2b898bf426c35fb5a80e19a237c682c040ffeda716c6335b4b7e57376d14f89825eca3410b591ec7112d1ca2f -EBUILD nfs-utils-2.3.1-r3.ebuild 5256 BLAKE2B 5f6c45757d2bdbe7e3c38b330c230bc13821bec3637998d288a192a0804810f6447f1bf7e60184d72faa9e8e02064365e5e6e20af601f5bdfec036e782a9e3ae SHA512 0531f8e5054038f0e8e1dacdb44c17a2c317c3f321ce526fdfd297b86ec4bb18eaa161b879b82e97db70913e05784b863ded043dcd991bfbbeabee74ec5793fa -MISC metadata.xml 861 BLAKE2B 14c4f9e530e9c3a695f615d698f7a96d1252c14936849a846536790059c79f992c79246028b1945f496fda813891e1079ef0a6ad3411d18e0ee8ad9b6e0315c3 SHA512 21e7e63ddddda196f114b98b6ae2c67abe9cbabf91d60ab7877b34ed96e749c0ea167169c6ffa0502c80f993bbd2243db7bf544b304900a07d2b6c84141d1cf5 +EBUILD nfs-utils-2.3.1-r3.ebuild 5295 BLAKE2B 3c66d0cf51aa3fd7e1de5ae0b6c353604c41515f8cb2287f356aaf0df9f37e455f27fb4f857e094165a69b8ef6d6205186e0b8d35a40b1a925311d0077478676 SHA512 e76e03f2abed280a62728fe12d88c08bffe05e39097d46dc6e3ad91c2217eea1dc6f219965e2e0fb4c477b1e5d1701a3999e146be79f64b437b112731b9ec334 +EBUILD nfs-utils-2.3.2.ebuild 5342 BLAKE2B f6c9ef2b8cbcdf74a9d2e34a8ef1af8978bad08a7e9c6bf933cac587dd30a91baf3f9928ae27e6b441c0152d9259933133e44b503e8ea656de80e9f1bdcaaa2d SHA512 30509c92f9e39f4591c0cf541bfb9280e25c52346c9d98a7d037d87e42b9e8f139fefe5f077e7ee744792656f6ba5e211dd0581105f8329af4bd4a5ad2870852 +MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5 diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch new file mode 100644 index 000000000000..f13f07a4c81f --- /dev/null +++ b/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch @@ -0,0 +1,45 @@ +From 8f3e4f4d6df9f813572051e12e974b35c26a1743 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Mon, 28 May 2018 12:13:10 +0200 +Subject: [PATCH] Fix undefined references and bad include when build with + junction support + +--- + support/junction/Makefile.am | 2 +- + utils/nfsref/Makefile.am | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/support/junction/Makefile.am b/support/junction/Makefile.am +index 97e7426..89cb532 100644 +--- a/support/junction/Makefile.am ++++ b/support/junction/Makefile.am +@@ -31,4 +31,4 @@ libjunction_la_SOURCES = display.c export-cache.c junction.c \ + + MAINTAINERCLEANFILES = Makefile.in + +-AM_CPPFLAGS = -I. -I../include -I/usr/include/libxml2 ++AM_CPPFLAGS = -I. -I../include -I/usr/include/libxml2 @TIRPC_CFLAGS@ +diff --git a/utils/nfsref/Makefile.am b/utils/nfsref/Makefile.am +index 2b2bb53..a652b03 100644 +--- a/utils/nfsref/Makefile.am ++++ b/utils/nfsref/Makefile.am +@@ -27,13 +27,13 @@ noinst_HEADERS = nfsref.h + + sbin_PROGRAMS = nfsref + nfsref_SOURCES = add.c lookup.c nfsref.c remove.c +-LDADD = $(LIBXML2) $(LIBCAP) \ +- ../../support/nfs/libnfs.la \ ++LIBS += $(LIBXML2) $(LIBCAP) ++LDADD = ../../support/nfs/libnfs.la \ + ../../support/junction/libjunction.la + + man8_MANS = nfsref.man + + MAINTAINERCLEANFILES = Makefile.in + +-AM_CPPFLAGS = -I. -I../../support/include ++AM_CPPFLAGS = -I. -I../../support/include @TIRPC_CFLAGS@ + ##AM_LDFLAGS = -Wl,--as-needed +-- +2.17.0 + diff --git a/net-fs/nfs-utils/metadata.xml b/net-fs/nfs-utils/metadata.xml index 34459d2e1627..45351e446376 100644 --- a/net-fs/nfs-utils/metadata.xml +++ b/net-fs/nfs-utils/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <longdescription>NFS client and server daemons</longdescription> <use> + <flag name="junction">Enable NFS junction support in nfsref</flag> <flag name="ldap">Add ldap support</flag> <flag name="libmount">Link mount.nfs with libmount</flag> <flag name="nfsdcld">Enable nfsdcld NFSv4 clientid tracking daemon</flag> diff --git a/net-fs/nfs-utils/nfs-utils-2.1.1-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.1.1-r1.ebuild deleted file mode 100644 index 54de57a47aca..000000000000 --- a/net-fs/nfs-utils/nfs-utils-2.1.1-r1.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic multilib autotools systemd - -DESCRIPTION="NFS client and server daemons" -HOMEPAGE="http://linux-nfs.org/" -SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" -REQUIRED_USE="kerberos? ( nfsv4 )" -RESTRICT="test" #315573 - -# kth-krb doesn't provide the right include -# files, and nfs-utils doesn't build against heimdal either, -# so don't depend on virtual/krb. -# (04 Feb 2005 agriffis) -DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers ) - caps? ( sys-libs/libcap ) - sys-libs/e2fsprogs-libs - >=net-nds/rpcbind-0.2.4 - net-libs/libtirpc:= - libmount? ( sys-apps/util-linux ) - nfsdcld? ( >=dev-db/sqlite-3.3 ) - nfsv4? ( - dev-libs/libevent:= - >=net-libs/libnfsidmap-0.21-r1 - kerberos? ( - >=net-libs/libtirpc-0.2.4-r1[kerberos] - app-crypt/mit-krb5 - ) - nfsidmap? ( - >=net-libs/libnfsidmap-0.24 - >=sys-apps/keyutils-1.5.9 - ) - ) - nfsv41? ( - sys-fs/lvm2 - ) - uuid? ( sys-apps/util-linux )" -RDEPEND="${DEPEND_COMMON} - !net-nds/portmap - !<sys-apps/openrc-0.13.9 - selinux? ( - sec-policy/selinux-rpc - sec-policy/selinux-rpcbind - ) -" -DEPEND="${DEPEND_COMMON} - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch - epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch - - sed \ - -e "/^sbindir/s:= := \"${EPREFIX}\":g" \ - -i utils/*/Makefile.am || die - - epatch_user - eautoreconf -} - -src_configure() { - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this. - export ac_cv_header_keyutils_h=$(usex nfsidmap) - econf \ - --with-statedir="${EPREFIX}"/var/lib/nfs \ - --enable-tirpc \ - --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ \ - $(use_enable libmount libmount-mount) \ - $(use_with tcpd tcp-wrappers) \ - $(use_enable nfsdcld nfsdcltrack) \ - $(use_enable nfsv4) \ - $(use_enable nfsv41) \ - $(use_enable ipv6) \ - $(use_enable caps) \ - $(use_enable uuid) \ - $(use_enable kerberos gss) \ - $(use_enable kerberos svcgss) \ - --without-gssglue -} - -src_compile(){ - # remove compiled files bundled in the tarball - emake clean - default -} - -src_install() { - default - rm linux-nfs/Makefile* || die - dodoc -r linux-nfs README - - # Don't overwrite existing xtab/etab, install the original - # versions somewhere safe... more info in pkg_postinst - keepdir /var/lib/nfs/{,sm,sm.bak} - mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die - - # Install some client-side binaries in /sbin - dodir /sbin - mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die - - if use nfsv4 && use nfsidmap ; then - # Install a config file for idmappers in newer kernels. #415625 - insinto /etc/request-key.d - echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf - doins id_resolver.conf - fi - - insinto /etc - doins "${FILESDIR}"/exports - keepdir /etc/exports.d - - local f list=() opt_need="" - if use nfsv4 ; then - opt_need="rpc.idmapd" - list+=( rpc.idmapd rpc.pipefs ) - use kerberos && list+=( rpc.gssd rpc.svcgssd ) - fi - for f in nfs nfsclient rpc.statd "${list[@]}" ; do - newinitd "${FILESDIR}"/${f}.initd ${f} - done - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01 - for f in nfs nfsclient ; do - newconfd "${FILESDIR}"/${f}.confd ${f} - done - sed -i \ - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \ - "${ED}"/etc/conf.d/nfs || die #234132 - - systemd_dounit systemd/*.{mount,service,target} - if ! use nfsv4 || ! use kerberos ; then - rm "${ED}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die - fi - if ! use nfsv41 ; then - rm "${ED}$(systemd_get_unitdir)"/nfs-blkmap.* || die - fi - sed -i -r \ - -e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \ - -e '/^(After|Wants)=nfs-config.service$/d' \ - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ - "${ED}$(systemd_get_unitdir)"/* || die -} - -pkg_postinst() { - # Install default xtab and friends if there's none existing. In - # src_install we put them in /usr/lib/nfs for safe-keeping, but - # the daemons actually use the files in /var/lib/nfs. #30486 - local f - mkdir -p "${EROOT}"/var/lib/nfs #368505 - for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do - [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue - einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs" - cp -pPR "${f}" "${EROOT}"/var/lib/nfs/ - done - - if systemd_is_booted; then - if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then - ewarn "We have switched to upstream systemd unit files. Since" - ewarn "they got renamed, you should probably enable the new ones." - ewarn "You can run 'equery files nfs-utils | grep systemd'" - ewarn "to know what services you need to enable now." - fi - else - ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient." - ewarn "If you were using nfsmount, please add nfsclient and netmount to the" - ewarn "same runlevel as nfsmount." - fi -} diff --git a/net-fs/nfs-utils/nfs-utils-2.1.2_rc6.ebuild b/net-fs/nfs-utils/nfs-utils-2.1.2_rc6.ebuild deleted file mode 100644 index 133e06869f03..000000000000 --- a/net-fs/nfs-utils/nfs-utils-2.1.2_rc6.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic multilib systemd - -DESCRIPTION="NFS client and server daemons" -HOMEPAGE="http://linux-nfs.org/" - -if [[ "${PV}" = *_rc* ]] ; then - inherit versionator - MY_PV="$(replace_all_version_separators -)" - SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${PN}-${MY_PV}" -else - SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" -REQUIRED_USE="kerberos? ( nfsv4 )" -RESTRICT="test" #315573 - -# kth-krb doesn't provide the right include -# files, and nfs-utils doesn't build against heimdal either, -# so don't depend on virtual/krb. -# (04 Feb 2005 agriffis) -DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers ) - caps? ( sys-libs/libcap ) - sys-libs/e2fsprogs-libs - >=net-nds/rpcbind-0.2.4 - net-libs/libtirpc:= - libmount? ( sys-apps/util-linux ) - nfsdcld? ( >=dev-db/sqlite-3.3 ) - nfsv4? ( - dev-libs/libevent:= - >=net-libs/libnfsidmap-0.21-r1 - kerberos? ( - >=net-libs/libtirpc-0.2.4-r1[kerberos] - app-crypt/mit-krb5 - ) - nfsidmap? ( - >=net-libs/libnfsidmap-0.24 - >=sys-apps/keyutils-1.5.9 - ) - ) - nfsv41? ( - sys-fs/lvm2 - ) - uuid? ( sys-apps/util-linux )" -RDEPEND="${DEPEND_COMMON} - !net-nds/portmap - !<sys-apps/openrc-0.13.9 - selinux? ( - sec-policy/selinux-rpc - sec-policy/selinux-rpcbind - ) -" -DEPEND="${DEPEND_COMMON} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch - "${FILESDIR}"/${PN}-1.2.8-cross-build.patch -) - -src_prepare() { - default - - sed \ - -e "/^sbindir/s:= := \"${EPREFIX}\":g" \ - -i utils/*/Makefile.am || die - - eautoreconf -} - -src_configure() { - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this. - export ac_cv_header_keyutils_h=$(usex nfsidmap) - local myeconfargs=( - --with-statedir="${EPREFIX}"/var/lib/nfs - --enable-tirpc - --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ - $(use_enable libmount libmount-mount) - $(use_with tcpd tcp-wrappers) - $(use_enable nfsdcld nfsdcltrack) - $(use_enable nfsv4) - $(use_enable nfsv41) - $(use_enable ipv6) - $(use_enable caps) - $(use_enable uuid) - $(use_enable kerberos gss) - $(use_enable kerberos svcgss) - --without-gssglue - ) - econf "${myeconfargs[@]}" -} - -src_compile(){ - # remove compiled files bundled in the tarball - emake clean - default -} - -src_install() { - default - rm linux-nfs/Makefile* || die - dodoc -r linux-nfs README - - # Don't overwrite existing xtab/etab, install the original - # versions somewhere safe... more info in pkg_postinst - keepdir /var/lib/nfs/{,sm,sm.bak} - mv "${ED%/}"/var/lib "${ED%/}"/usr/$(get_libdir) || die - - # Install some client-side binaries in /sbin - dodir /sbin - mv "${ED%/}"/usr/sbin/rpc.statd "${ED%/}"/sbin/ || die - - if use nfsv4 && use nfsidmap ; then - # Install a config file for idmappers in newer kernels. #415625 - insinto /etc/request-key.d - echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf - doins id_resolver.conf - fi - - insinto /etc - doins "${FILESDIR}"/exports - keepdir /etc/exports.d - - local f list=() opt_need="" - if use nfsv4 ; then - opt_need="rpc.idmapd" - list+=( rpc.idmapd rpc.pipefs ) - use kerberos && list+=( rpc.gssd rpc.svcgssd ) - fi - for f in nfs nfsclient rpc.statd "${list[@]}" ; do - newinitd "${FILESDIR}"/${f}.initd ${f} - done - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01 - for f in nfs nfsclient ; do - newconfd "${FILESDIR}"/${f}.confd ${f} - done - sed -i \ - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \ - "${ED%/}"/etc/conf.d/nfs || die #234132 - - local systemd_systemunitdir="$(systemd_get_systemunitdir)" - systemd_dounit systemd/*.{mount,service,target} - if ! use nfsv4 || ! use kerberos ; then - rm "${ED%/}${systemd_systemunitdir}"/rpc-{gssd,svcgssd}.service || die - fi - if ! use nfsv41 ; then - rm "${ED%/}${systemd_systemunitdir}"/nfs-blkmap.* || die - fi - sed -i \ - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ - "${ED%/}${systemd_systemunitdir}"/* || die - - keepdir /var/lib/nfs #368505 - keepdir /var/lib/nfs/v4recovery #603628 - -} - -pkg_postinst() { - # Install default xtab and friends if there's none existing. In - # src_install we put them in /usr/lib/nfs for safe-keeping, but - # the daemons actually use the files in /var/lib/nfs. #30486 - local f - for f in "${EROOT%/}"/usr/$(get_libdir)/nfs/*; do - [[ -e ${EROOT%/}/var/lib/nfs/${f##*/} ]] && continue - einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs" - cp -pPR "${f}" "${EROOT%/}"/var/lib/nfs/ - done - - if systemd_is_booted; then - if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then - ewarn "We have switched to upstream systemd unit files. Since" - ewarn "they got renamed, you should probably enable the new ones." - ewarn "You can run 'equery files nfs-utils | grep systemd'" - ewarn "to know what services you need to enable now." - fi - else - ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient." - ewarn "If you were using nfsmount, please add nfsclient and netmount to the" - ewarn "same runlevel as nfsmount." - fi -} diff --git a/net-fs/nfs-utils/nfs-utils-2.2.2_rc1-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.2.2_rc1-r1.ebuild deleted file mode 100644 index 82d9cfbed865..000000000000 --- a/net-fs/nfs-utils/nfs-utils-2.2.2_rc1-r1.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic multilib systemd - -DESCRIPTION="NFS client and server daemons" -HOMEPAGE="http://linux-nfs.org/" - -if [[ "${PV}" = *_rc* ]] ; then - inherit versionator - MY_PV="$(replace_all_version_separators -)" - SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${PN}-${MY_PV}" -else - SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps ipv6 kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" -REQUIRED_USE="kerberos? ( nfsv4 )" -RESTRICT="test" #315573 - -# kth-krb doesn't provide the right include -# files, and nfs-utils doesn't build against heimdal either, -# so don't depend on virtual/krb. -# (04 Feb 2005 agriffis) -DEPEND_COMMON=" - net-libs/libtirpc:= - >=net-nds/rpcbind-0.2.4 - sys-libs/e2fsprogs-libs - caps? ( sys-libs/libcap ) - ldap? ( net-nds/openldap ) - libmount? ( sys-apps/util-linux ) - nfsdcld? ( >=dev-db/sqlite-3.3 ) - nfsv4? ( - dev-libs/libevent:= - >=sys-apps/keyutils-1.5.9 - kerberos? ( - >=net-libs/libtirpc-0.2.4-r1[kerberos] - app-crypt/mit-krb5 - ) - ) - nfsv41? ( - sys-fs/lvm2 - ) - tcpd? ( sys-apps/tcp-wrappers ) - uuid? ( sys-apps/util-linux )" -RDEPEND="${DEPEND_COMMON} - !net-libs/libnfsidmap - !net-nds/portmap - !<sys-apps/openrc-0.13.9 - selinux? ( - sec-policy/selinux-rpc - sec-policy/selinux-rpcbind - ) -" -DEPEND="${DEPEND_COMMON} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch - "${FILESDIR}"/${PN}-1.2.8-cross-build.patch -) - -src_prepare() { - default - - sed \ - -e "/^sbindir/s:= := \"${EPREFIX}\":g" \ - -i utils/*/Makefile.am || die - - eautoreconf -} - -src_configure() { - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this. - export ac_cv_header_keyutils_h=$(usex nfsidmap) - local myeconfargs=( - --with-statedir="${EPREFIX}"/var/lib/nfs - --enable-tirpc - --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ - --with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap - $(use_enable libmount libmount-mount) - $(use_with tcpd tcp-wrappers) - $(use_enable nfsdcld nfsdcltrack) - $(use_enable nfsv4) - $(use_enable nfsv41) - $(use_enable ipv6) - $(use_enable caps) - $(use_enable uuid) - $(use_enable kerberos gss) - $(use_enable kerberos svcgss) - --without-gssglue - ) - econf "${myeconfargs[@]}" -} - -src_compile(){ - # remove compiled files bundled in the tarball - emake clean - default -} - -src_install() { - default - rm linux-nfs/Makefile* || die - dodoc -r linux-nfs README - - # Don't overwrite existing xtab/etab, install the original - # versions somewhere safe... more info in pkg_postinst - keepdir /var/lib/nfs/{,sm,sm.bak} - mv "${ED%/}"/var/lib "${ED%/}"/usr/$(get_libdir) || die - - # Install some client-side binaries in /sbin - dodir /sbin - mv "${ED%/}"/usr/sbin/rpc.statd "${ED%/}"/sbin/ || die - - if use nfsv4 && use nfsidmap ; then - # Install a config file for idmappers in newer kernels. #415625 - insinto /etc/request-key.d - echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf - doins id_resolver.conf - fi - - insinto /etc - doins "${FILESDIR}"/exports - keepdir /etc/exports.d - - local f list=() opt_need="" - if use nfsv4 ; then - opt_need="rpc.idmapd" - list+=( rpc.idmapd rpc.pipefs ) - use kerberos && list+=( rpc.gssd rpc.svcgssd ) - fi - for f in nfs nfsclient rpc.statd "${list[@]}" ; do - newinitd "${FILESDIR}"/${f}.initd ${f} - done - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01 - for f in nfs nfsclient ; do - newconfd "${FILESDIR}"/${f}.confd ${f} - done - sed -i \ - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \ - "${ED%/}"/etc/conf.d/nfs || die #234132 - - local systemd_systemunitdir="$(systemd_get_systemunitdir)" - systemd_dounit systemd/*.{mount,service,target} - if ! use nfsv4 || ! use kerberos ; then - rm "${ED%/}${systemd_systemunitdir}"/rpc-{gssd,svcgssd}.service || die - fi - if ! use nfsv41 ; then - rm "${ED%/}${systemd_systemunitdir}"/nfs-blkmap.* || die - fi - sed -i \ - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ - "${ED%/}${systemd_systemunitdir}"/* || die - - keepdir /var/lib/nfs #368505 - keepdir /var/lib/nfs/v4recovery #603628 - -} - -pkg_postinst() { - # Install default xtab and friends if there's none existing. In - # src_install we put them in /usr/lib/nfs for safe-keeping, but - # the daemons actually use the files in /var/lib/nfs. #30486 - local f - for f in "${EROOT%/}"/usr/$(get_libdir)/nfs/*; do - [[ -e ${EROOT%/}/var/lib/nfs/${f##*/} ]] && continue - einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs" - cp -pPR "${f}" "${EROOT%/}"/var/lib/nfs/ - done - - if systemd_is_booted; then - if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then - ewarn "We have switched to upstream systemd unit files. Since" - ewarn "they got renamed, you should probably enable the new ones." - ewarn "You can run 'equery files nfs-utils | grep systemd'" - ewarn "to know what services you need to enable now." - fi - else - ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient." - ewarn "If you were using nfsmount, please add nfsclient and netmount to the" - ewarn "same runlevel as nfsmount." - fi -} diff --git a/net-fs/nfs-utils/nfs-utils-2.2.2_rc1_p20171107-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.2.2_rc1_p20171107-r1.ebuild deleted file mode 100644 index 397170e68c6a..000000000000 --- a/net-fs/nfs-utils/nfs-utils-2.2.2_rc1_p20171107-r1.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic multilib systemd - -DESCRIPTION="NFS client and server daemons" -HOMEPAGE="http://linux-nfs.org/" - -MY_COMMIT="8d9bf479441d9d7a44a86b69026a7e9d431d3ade" -SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=${MY_COMMIT};sf=tgz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_COMMIT:0:7}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps ipv6 kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" -REQUIRED_USE="kerberos? ( nfsv4 )" -RESTRICT="test" #315573 - -# kth-krb doesn't provide the right include -# files, and nfs-utils doesn't build against heimdal either, -# so don't depend on virtual/krb. -# (04 Feb 2005 agriffis) -DEPEND_COMMON=" - net-libs/libtirpc:= - >=net-nds/rpcbind-0.2.4 - sys-libs/e2fsprogs-libs - caps? ( sys-libs/libcap ) - ldap? ( net-nds/openldap ) - libmount? ( sys-apps/util-linux ) - nfsdcld? ( >=dev-db/sqlite-3.3 ) - nfsv4? ( - dev-libs/libevent:= - >=sys-apps/keyutils-1.5.9 - kerberos? ( - >=net-libs/libtirpc-0.2.4-r1[kerberos] - app-crypt/mit-krb5 - ) - ) - nfsv41? ( - sys-fs/lvm2 - ) - tcpd? ( sys-apps/tcp-wrappers ) - uuid? ( sys-apps/util-linux )" -RDEPEND="${DEPEND_COMMON} - !net-libs/libnfsidmap - !net-nds/portmap - !<sys-apps/openrc-0.13.9 - selinux? ( - sec-policy/selinux-rpc - sec-policy/selinux-rpcbind - ) -" -DEPEND="${DEPEND_COMMON} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch - "${FILESDIR}"/${PN}-1.2.8-cross-build.patch -) - -src_prepare() { - default - - sed \ - -e "/^sbindir/s:= := \"${EPREFIX}\":g" \ - -i utils/*/Makefile.am || die - - eautoreconf -} - -src_configure() { - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this. - export ac_cv_header_keyutils_h=$(usex nfsidmap) - local myeconfargs=( - --with-statedir="${EPREFIX}"/var/lib/nfs - --enable-tirpc - --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ - --with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap - $(use_enable libmount libmount-mount) - $(use_with tcpd tcp-wrappers) - $(use_enable nfsdcld nfsdcltrack) - $(use_enable nfsv4) - $(use_enable nfsv41) - $(use_enable ipv6) - $(use_enable caps) - $(use_enable uuid) - $(use_enable kerberos gss) - $(use_enable kerberos svcgss) - --without-gssglue - ) - econf "${myeconfargs[@]}" -} - -src_compile(){ - # remove compiled files bundled in the tarball - emake clean - default -} - -src_install() { - default - rm linux-nfs/Makefile* || die - dodoc -r linux-nfs README - - # Don't overwrite existing xtab/etab, install the original - # versions somewhere safe... more info in pkg_postinst - keepdir /var/lib/nfs/{,sm,sm.bak} - mv "${ED%/}"/var/lib "${ED%/}"/usr/$(get_libdir) || die - - # Install some client-side binaries in /sbin - dodir /sbin - mv "${ED%/}"/usr/sbin/rpc.statd "${ED%/}"/sbin/ || die - - if use nfsv4 && use nfsidmap ; then - # Install a config file for idmappers in newer kernels. #415625 - insinto /etc/request-key.d - echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf - doins id_resolver.conf - fi - - insinto /etc - doins "${FILESDIR}"/exports - keepdir /etc/exports.d - - local f list=() opt_need="" - if use nfsv4 ; then - opt_need="rpc.idmapd" - list+=( rpc.idmapd rpc.pipefs ) - use kerberos && list+=( rpc.gssd rpc.svcgssd ) - fi - for f in nfs nfsclient rpc.statd "${list[@]}" ; do - newinitd "${FILESDIR}"/${f}.initd ${f} - done - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01 - for f in nfs nfsclient ; do - newconfd "${FILESDIR}"/${f}.confd ${f} - done - sed -i \ - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \ - "${ED%/}"/etc/conf.d/nfs || die #234132 - - local systemd_systemunitdir="$(systemd_get_systemunitdir)" - systemd_dounit systemd/*.{mount,service,target} - if ! use nfsv4 || ! use kerberos ; then - rm "${ED%/}${systemd_systemunitdir}"/rpc-{gssd,svcgssd}.service || die - fi - if ! use nfsv41 ; then - rm "${ED%/}${systemd_systemunitdir}"/nfs-blkmap.* || die - fi - sed -i \ - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ - "${ED%/}${systemd_systemunitdir}"/* || die - - keepdir /var/lib/nfs #368505 - keepdir /var/lib/nfs/v4recovery #603628 - -} - -pkg_postinst() { - # Install default xtab and friends if there's none existing. In - # src_install we put them in /usr/lib/nfs for safe-keeping, but - # the daemons actually use the files in /var/lib/nfs. #30486 - local f - for f in "${EROOT%/}"/usr/$(get_libdir)/nfs/*; do - [[ -e ${EROOT%/}/var/lib/nfs/${f##*/} ]] && continue - einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs" - cp -pPR "${f}" "${EROOT%/}"/var/lib/nfs/ - done - - if systemd_is_booted; then - if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then - ewarn "We have switched to upstream systemd unit files. Since" - ewarn "they got renamed, you should probably enable the new ones." - ewarn "You can run 'equery files nfs-utils | grep systemd'" - ewarn "to know what services you need to enable now." - fi - else - ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient." - ewarn "If you were using nfsmount, please add nfsclient and netmount to the" - ewarn "same runlevel as nfsmount." - fi -} diff --git a/net-fs/nfs-utils/nfs-utils-2.3.1-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.1-r1.ebuild deleted file mode 100644 index aed58ef0ff66..000000000000 --- a/net-fs/nfs-utils/nfs-utils-2.3.1-r1.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic multilib systemd - -DESCRIPTION="NFS client and server daemons" -HOMEPAGE="http://linux-nfs.org/" - -if [[ "${PV}" = *_rc* ]] ; then - inherit versionator - MY_PV="$(replace_all_version_separators -)" - SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${PN}-${MY_PV}" -else - SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps ipv6 kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" -REQUIRED_USE="kerberos? ( nfsv4 )" -RESTRICT="test" #315573 - -# kth-krb doesn't provide the right include -# files, and nfs-utils doesn't build against heimdal either, -# so don't depend on virtual/krb. -# (04 Feb 2005 agriffis) -DEPEND_COMMON=" - net-libs/libtirpc:= - >=net-nds/rpcbind-0.2.4 - sys-libs/e2fsprogs-libs - caps? ( sys-libs/libcap ) - ldap? ( net-nds/openldap ) - libmount? ( sys-apps/util-linux ) - nfsdcld? ( >=dev-db/sqlite-3.3 ) - nfsv4? ( - dev-libs/libevent:= - >=sys-apps/keyutils-1.5.9 - kerberos? ( - >=net-libs/libtirpc-0.2.4-r1[kerberos] - app-crypt/mit-krb5 - ) - ) - nfsv41? ( - sys-fs/lvm2 - ) - tcpd? ( sys-apps/tcp-wrappers ) - uuid? ( sys-apps/util-linux )" -RDEPEND="${DEPEND_COMMON} - !net-libs/libnfsidmap - !net-nds/portmap - !<sys-apps/openrc-0.13.9 - selinux? ( - sec-policy/selinux-rpc - sec-policy/selinux-rpcbind - ) -" -DEPEND="${DEPEND_COMMON} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch - "${FILESDIR}"/${PN}-1.2.8-cross-build.patch - "${FILESDIR}"/${P}-svcgssd_undefined_reference.patch #641912 -) - -src_prepare() { - default - - sed \ - -e "/^sbindir/s:= := \"${EPREFIX}\":g" \ - -i utils/*/Makefile.am || die - - eautoreconf -} - -src_configure() { - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this. - export ac_cv_header_keyutils_h=$(usex nfsidmap) - local myeconfargs=( - --with-statedir="${EPREFIX}"/var/lib/nfs - --enable-tirpc - --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ - --with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap - $(use_enable libmount libmount-mount) - $(use_with tcpd tcp-wrappers) - $(use_enable nfsdcld nfsdcltrack) - $(use_enable nfsv4) - $(use_enable nfsv41) - $(use_enable ipv6) - $(use_enable caps) - $(use_enable uuid) - $(use_enable kerberos gss) - $(use_enable kerberos svcgss) - --without-gssglue - ) - econf "${myeconfargs[@]}" -} - -src_compile(){ - # remove compiled files bundled in the tarball - emake clean - default -} - -src_install() { - default - rm linux-nfs/Makefile* || die - dodoc -r linux-nfs README - - # Don't overwrite existing xtab/etab, install the original - # versions somewhere safe... more info in pkg_postinst - keepdir /var/lib/nfs/{,sm,sm.bak} - mv "${ED%/}"/var/lib "${ED%/}"/usr/$(get_libdir) || die - - # Install some client-side binaries in /sbin - dodir /sbin - mv "${ED%/}"/usr/sbin/rpc.statd "${ED%/}"/sbin/ || die - - if use nfsv4 && use nfsidmap ; then - # Install a config file for idmappers in newer kernels. #415625 - insinto /etc/request-key.d - echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf - doins id_resolver.conf - fi - - insinto /etc - doins "${FILESDIR}"/exports - keepdir /etc/exports.d - - local f list=() opt_need="" - if use nfsv4 ; then - opt_need="rpc.idmapd" - list+=( rpc.idmapd rpc.pipefs ) - use kerberos && list+=( rpc.gssd rpc.svcgssd ) - fi - for f in nfs nfsclient rpc.statd "${list[@]}" ; do - newinitd "${FILESDIR}"/${f}.initd ${f} - done - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01 - for f in nfs nfsclient ; do - newconfd "${FILESDIR}"/${f}.confd ${f} - done - sed -i \ - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \ - "${ED%/}"/etc/conf.d/nfs || die #234132 - - local systemd_systemunitdir="$(systemd_get_systemunitdir)" - systemd_dounit systemd/*.{mount,service,target} - if ! use nfsv4 || ! use kerberos ; then - rm "${ED%/}${systemd_systemunitdir}"/rpc-{gssd,svcgssd}.service || die - fi - if ! use nfsv41 ; then - rm "${ED%/}${systemd_systemunitdir}"/nfs-blkmap.* || die - fi - sed -i \ - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ - "${ED%/}${systemd_systemunitdir}"/* || die - - keepdir /var/lib/nfs #368505 - keepdir /var/lib/nfs/v4recovery #603628 - -} - -pkg_postinst() { - # Install default xtab and friends if there's none existing. In - # src_install we put them in /usr/lib/nfs for safe-keeping, but - # the daemons actually use the files in /var/lib/nfs. #30486 - local f - for f in "${EROOT%/}"/usr/$(get_libdir)/nfs/*; do - [[ -e ${EROOT%/}/var/lib/nfs/${f##*/} ]] && continue - einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs" - cp -pPR "${f}" "${EROOT%/}"/var/lib/nfs/ - done - - if systemd_is_booted; then - if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then - ewarn "We have switched to upstream systemd unit files. Since" - ewarn "they got renamed, you should probably enable the new ones." - ewarn "You can run 'equery files nfs-utils | grep systemd'" - ewarn "to know what services you need to enable now." - fi - else - ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient." - ewarn "If you were using nfsmount, please add nfsclient and netmount to the" - ewarn "same runlevel as nfsmount." - fi -} diff --git a/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild index ed34d6a9f2ff..3d68614db314 100644 --- a/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild +++ b/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild @@ -59,6 +59,7 @@ RDEPEND="${DEPEND_COMMON} ) " DEPEND="${DEPEND_COMMON} + net-libs/rpcsvc-proto virtual/pkgconfig" PATCHES=( @@ -85,6 +86,7 @@ src_configure() { --enable-tirpc --with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/ --with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap + --with-rpcgen --with-systemd="$(systemd_get_systemunitdir)" --without-gssglue $(use_enable caps) diff --git a/net-fs/nfs-utils/nfs-utils-2.2.1-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.2.ebuild index 64ed6b745b67..16a7c4fd9cef 100644 --- a/net-fs/nfs-utils/nfs-utils-2.2.1-r1.ebuild +++ b/net-fs/nfs-utils/nfs-utils-2.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,7 +20,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="caps ipv6 kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" +IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" REQUIRED_USE="kerberos? ( nfsv4 )" RESTRICT="test" #315573 @@ -59,11 +59,14 @@ RDEPEND="${DEPEND_COMMON} ) " DEPEND="${DEPEND_COMMON} + dev-libs/libxml2 + net-libs/rpcsvc-proto virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch + "${FILESDIR}"/${PN}-2.3.2-junction_libs.patch ) src_prepare() { @@ -80,22 +83,25 @@ src_configure() { export libsqlite3_cv_is_recent=yes # Our DEPEND forces this. export ac_cv_header_keyutils_h=$(usex nfsidmap) local myeconfargs=( - --with-statedir="${EPREFIX}"/var/lib/nfs + --with-statedir="${EPREFIX%/}"/var/lib/nfs --enable-tirpc - --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ - --with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap + --with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/ + --with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap + --with-rpcgen + --with-systemd="$(systemd_get_systemunitdir)" + --without-gssglue + $(use_enable caps) + $(use_enable ipv6) + $(use_enable junction) + $(use_enable kerberos gss) + $(use_enable kerberos svcgss) $(use_enable ldap) $(use_enable libmount libmount-mount) - $(use_with tcpd tcp-wrappers) $(use_enable nfsdcld nfsdcltrack) $(use_enable nfsv4) $(use_enable nfsv41) - $(use_enable ipv6) - $(use_enable caps) $(use_enable uuid) - $(use_enable kerberos gss) - $(use_enable kerberos svcgss) - --without-gssglue + $(use_with tcpd tcp-wrappers) ) econf "${myeconfargs[@]}" } @@ -114,7 +120,7 @@ src_install() { # Don't overwrite existing xtab/etab, install the original # versions somewhere safe... more info in pkg_postinst keepdir /var/lib/nfs/{,sm,sm.bak} - mv "${ED%/}"/var/lib "${ED%/}"/usr/$(get_libdir) || die + mv "${ED%/}"/var/lib/nfs "${ED%/}"/usr/$(get_libdir)/ || die # Install some client-side binaries in /sbin dodir /sbin @@ -149,13 +155,6 @@ src_install() { "${ED%/}"/etc/conf.d/nfs || die #234132 local systemd_systemunitdir="$(systemd_get_systemunitdir)" - systemd_dounit systemd/*.{mount,service,target} - if ! use nfsv4 || ! use kerberos ; then - rm "${ED%/}${systemd_systemunitdir}"/rpc-{gssd,svcgssd}.service || die - fi - if ! use nfsv41 ; then - rm "${ED%/}${systemd_systemunitdir}"/nfs-blkmap.* || die - fi sed -i \ -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ "${ED%/}${systemd_systemunitdir}"/* || die |