summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2014-11-18 14:54:12 +0000
committerTim Harder <radhermit@gentoo.org>2014-11-18 14:54:12 +0000
commitaa21b034642b1aa0a34d62b8a178fbaa1317f076 (patch)
treea407ca4ddb2683a42211f0f1f449ac1a9ec46cdc /net-fs/nfs-utils
parentSlightly reword USE=zenmap. (diff)
downloadhistorical-aa21b034642b1aa0a34d62b8a178fbaa1317f076.tar.gz
historical-aa21b034642b1aa0a34d62b8a178fbaa1317f076.tar.bz2
historical-aa21b034642b1aa0a34d62b8a178fbaa1317f076.zip
Remove old.
Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x4F064CA3
Diffstat (limited to 'net-fs/nfs-utils')
-rw-r--r--net-fs/nfs-utils/ChangeLog30
-rw-r--r--net-fs/nfs-utils/Manifest72
-rw-r--r--net-fs/nfs-utils/files/0001-mountd-Fix-is_subdirectory-again.patch81
-rw-r--r--net-fs/nfs-utils/files/0001-statd-exit-if-a-statd-is-already-running.patch126
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-1.1.4-ascii-man.patch16
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-1.1.4-no-exec.patch15
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-1.1.4-rpcgen-ioctl.patch13
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-1.2.2-nfsv4.patch13
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-1.2.2-optional-libcap.patch79
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-1.2.3-ti-rpc-static-ports.patch352
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-1.2.4-conditional.patch26
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-1.2.4-cross-build.patch68
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-skip-dir.patch36
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-xlog.patch56
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-1.2.4-nfsidmap.patch57
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-1.2.4-no-nfsctl.patch43
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-1.2.6-conditionals.patch58
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-1.2.6-cross-build.patch69
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-1.2.6-osd-install.patch49
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-1.2.7-libio.patch50
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-1.2.7-nfsiostat-python3.patch287
-rw-r--r--net-fs/nfs-utils/files/nfsd.service16
-rw-r--r--net-fs/nfs-utils/files/rpc-mountd.service12
-rw-r--r--net-fs/nfs-utils/files/rpc-statd.service13
-rw-r--r--net-fs/nfs-utils/files/rpc-statd.service-r114
-rw-r--r--net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild114
-rw-r--r--net-fs/nfs-utils/nfs-utils-1.1.5.ebuild111
-rw-r--r--net-fs/nfs-utils/nfs-utils-1.2.1.ebuild107
-rw-r--r--net-fs/nfs-utils/nfs-utils-1.2.2-r2.ebuild112
-rw-r--r--net-fs/nfs-utils/nfs-utils-1.2.3-r1.ebuild109
-rw-r--r--net-fs/nfs-utils/nfs-utils-1.2.3.ebuild107
-rw-r--r--net-fs/nfs-utils/nfs-utils-1.2.4.ebuild125
-rw-r--r--net-fs/nfs-utils/nfs-utils-1.2.5.ebuild124
-rw-r--r--net-fs/nfs-utils/nfs-utils-1.2.6.ebuild133
-rw-r--r--net-fs/nfs-utils/nfs-utils-1.2.7-r1.ebuild140
-rw-r--r--net-fs/nfs-utils/nfs-utils-1.2.8-r1.ebuild140
-rw-r--r--net-fs/nfs-utils/nfs-utils-1.2.8-r2.ebuild141
-rw-r--r--net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild141
-rw-r--r--net-fs/nfs-utils/nfs-utils-1.2.9-r2.ebuild146
-rw-r--r--net-fs/nfs-utils/nfs-utils-1.2.9.ebuild141
40 files changed, 38 insertions, 3504 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 60f0a90197ba..86590e15d818 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,34 @@
# ChangeLog for net-fs/nfs-utils
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.256 2014/11/02 08:54:13 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.257 2014/11/18 14:54:08 radhermit Exp $
+
+ 18 Nov 2014; Tim Harder <radhermit@gentoo.org> -nfs-utils-1.1.4-r1.ebuild,
+ -nfs-utils-1.1.5.ebuild, -nfs-utils-1.2.1.ebuild, -nfs-utils-1.2.2-r2.ebuild,
+ -nfs-utils-1.2.3.ebuild, -nfs-utils-1.2.3-r1.ebuild, -nfs-utils-1.2.4.ebuild,
+ -nfs-utils-1.2.5.ebuild, -nfs-utils-1.2.6.ebuild, -nfs-utils-1.2.7-r1.ebuild,
+ -nfs-utils-1.2.8-r1.ebuild, -nfs-utils-1.2.8-r2.ebuild,
+ -nfs-utils-1.2.9.ebuild, -nfs-utils-1.2.9-r1.ebuild,
+ -nfs-utils-1.2.9-r2.ebuild,
+ -files/0001-mountd-Fix-is_subdirectory-again.patch,
+ -files/0001-statd-exit-if-a-statd-is-already-running.patch,
+ -files/nfs-utils-1.1.4-ascii-man.patch, -files/nfs-utils-1.1.4-no-exec.patch,
+ -files/nfs-utils-1.1.4-rpcgen-ioctl.patch,
+ -files/nfs-utils-1.2.2-nfsv4.patch,
+ -files/nfs-utils-1.2.2-optional-libcap.patch,
+ -files/nfs-utils-1.2.3-ti-rpc-static-ports.patch,
+ -files/nfs-utils-1.2.4-conditional.patch,
+ -files/nfs-utils-1.2.4-cross-build.patch,
+ -files/nfs-utils-1.2.4-exportfs-skip-dir.patch,
+ -files/nfs-utils-1.2.4-exportfs-xlog.patch,
+ -files/nfs-utils-1.2.4-nfsidmap.patch,
+ -files/nfs-utils-1.2.4-no-nfsctl.patch,
+ -files/nfs-utils-1.2.6-conditionals.patch,
+ -files/nfs-utils-1.2.6-cross-build.patch,
+ -files/nfs-utils-1.2.6-osd-install.patch, -files/nfs-utils-1.2.7-libio.patch,
+ -files/nfs-utils-1.2.7-nfsiostat-python3.patch, -files/nfsd.service,
+ -files/rpc-mountd.service, -files/rpc-statd.service,
+ -files/rpc-statd.service-r1:
+ Remove old.
02 Nov 2014; Sven Vermeulen <swift@gentoo.org> nfs-utils-1.2.9-r3.ebuild,
nfs-utils-1.3.0-r1.ebuild:
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 86166a730567..1cf7b762adf6 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,43 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX 0001-mountd-Fix-is_subdirectory-again.patch 2704 SHA256 1c1204dc5fc62debb8cc66ca299a741a3d8e515f480ff7aecb4ad72819658de7 SHA512 59a29c72096357fc35e805f0a1e443c7a6ee9b07c96ed85481b1101a6090311937b39f45aefa60325f968a5c7d2bc5550c2a43f2f54bd8522b615b84bdf71c86 WHIRLPOOL fc0c806c3c68f6d215f24a418b92b94188e23cc9249a8e0cea6ec22a1139747ab05cccab253bddff6787a15301225792658dadc8d6d1c4c6aba5543ea893d600
-AUX 0001-statd-exit-if-a-statd-is-already-running.patch 3593 SHA256 d3e402c73b204d4b5e161563005269318dad6e992792c902da76ff8368b872cb SHA512 e04d451618d6f6197dc0692844cc115fec93575525cd0569d582f9278007e2dbec692ef46065c675de13d608e034161f39a60d46766873933d05d18b94633f6c WHIRLPOOL fdf6de89a5ae3f26c1091f8b314684ba0cac3aab68731d3d56e5a909a2211b8f84b8212fbf0f7179427f98bdb102b9bb3d1c3828e66e283bc70abddc9ef3964d
AUX exports 66 SHA256 5d6356df546682e2f1a87131d1bb67de9b1f9a34d3a5742343dc64e890cf71d5 SHA512 fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220 WHIRLPOOL 7cc6b59c1f7013a0ad98518623b03d1cba784ecaf6d6a085b85282192c6f41ac1c649a39dc6e1b42ff38a571c00a85aed6e04ea57d6339a072cc4f2c41d5d74e
-AUX nfs-utils-1.1.4-ascii-man.patch 571 SHA256 5f1cd9789b4963df22df914f61a33412d61d3c8fdde9b71b8c9dd4c2506852f7 SHA512 1b0d5ec2952b0df23254fb63a952f7700adde4638473edf43f5a4abd1ccc6fbe7102d2a613d48ebc6c77078842eea6507d1967f85342d261f6a15f818b66298f WHIRLPOOL 64bcc4e4ec2f50d199f5a580143d51c8dc02f44363660ac5665acb324922551389a873c7ef859efb4802c8c39f696a988645020074dc081520ca3b0dc1217508
AUX nfs-utils-1.1.4-mtab-sym.patch 1020 SHA256 0232799d085151649a1eb1f31644105de7e5cfba888794354005499a0db277c3 SHA512 1cd916028a8515772f05ef63832d73a09e9720055aedc9e2e4ce3a08ce1820948700a4f00ca9c4ee684880f18e67aca888dd857fc7931d923021ba50964be998 WHIRLPOOL c16ecee3228ad4522cf4ede1d05ca50cece3910955314c96eb88a61cfe07b7f6a95c42bb15a7f7f9fd211fa62cdcbb02925e68702d5066338b4543baf56fb2df
-AUX nfs-utils-1.1.4-no-exec.patch 297 SHA256 f66af9d046a3524ae8920f8e4b5d0fa206de31d4e7747bfc716a10ac86537b0f SHA512 4aee60a2510ea4999c4697ad079704e13d6b8043cf3c713f700a5971a1a9a8d7c4a9281e1a60b695e7bf5d7eb30f2871e286199d85ac076780afdc352b67d29d WHIRLPOOL c13fad093f0513c0e98af3d966cea0b240312ee9197aa5918f87092b6ca1557a02709e012df84a33c86ff27e9dbffe341e1dd21c101683ee71f2bc7ebada57ae
-AUX nfs-utils-1.1.4-rpcgen-ioctl.patch 414 SHA256 78ae8ba33a600e6eb1153521eeb0ec5c3c5c503bd20074b1687703b3f83be678 SHA512 d80f3525c5775d13742042aaf8604466aa16387e5ee7246645c1306b4998e4f3ec48c990a295f5224cae2f853908d01ac3bca3098b15e1a4e2218744c0b2ba7b WHIRLPOOL 7242d9b562f2e2de43f69c82223c77d3db765b4eec93f36a8301d57054b6d7ccf07a683365afd0cb74b7cadd63bf748e280bcc1a3afd5fe0c86b7a8d3779bf11
-AUX nfs-utils-1.2.2-nfsv4.patch 479 SHA256 ce601318e17f108c9fffcef9963430a01e2cb7dffb5189e4ca6de53413bb153f SHA512 e4c348bcc33719e33f09d998e4f52d360e4ce6a27149306cc71927be52281ecb49e11f85525a2d1724bff2ef7cb21f27f0adbc0302c0389b663eb666c7c1892c WHIRLPOOL b095dc9fe4aad658615a9de6b311617b40b5e673c0a68983ac1b4602de5eef02eee40c9cd8958e1c5a4e0a6943904ce8095d79af212bfb7e04b386ff0ffc019c
-AUX nfs-utils-1.2.2-optional-libcap.patch 2213 SHA256 75135cc2c90aacc7adb43c6ced308099ac5b2d9c8cfcc74d395ead4dc583a75a SHA512 ef7c611f53d14eb3b1d2788f06f697da4c2da046da78b5dee29942e487d2ba7fa5db49feab574ae3d46ce692867e0e09f058341957ec8bfdba2e6a81959e6060 WHIRLPOOL 2a70e7ca37ba5e2c55a5288d482e1170d9faa49239b800b0594f3d6b049b839c8e8d9b88128b3ebea9040781941f8300360b1adf900d08c9186b80c980d9ef61
-AUX nfs-utils-1.2.3-ti-rpc-static-ports.patch 10290 SHA256 8f188be765d5aa41eaa9d15df7cf0dc6b7ba29413866e8ada6c54973b0a942e9 SHA512 218c0806d9445e841ca135bca9adff765e642730b24597ade7d4c3d39ab703b89dd2ab6ba2e1682d3e58779dfba8bae6a4c55f457c34f7f5fc6e7f9986ce0bf9 WHIRLPOOL 9ef11c480d9c0d84ff2521b7bef8fa7caaed1bd2286400ea35fd42e9dce73d5c9b1525995eb212f5a5a86a992f29ebfe1b352a57763d94917bcd28e3c58c7fdb
-AUX nfs-utils-1.2.4-conditional.patch 756 SHA256 b911b2ae5a87fdcb8c906e49c6787853daed6bd79179f3ee2f67c7a10b761d7e SHA512 748825f2e9242a0e1ef67c3fbde3c046604ed0e0730bbccef527c570fe5dc871b08653732aef327102921b83c5a4b50a720b508cc6b6f38068d5c39544605beb WHIRLPOOL b6b65bc82c07cbce86199f8b68001e795732681e69aec58e2601bf29f7f1587fdc3378b0fa750145f0781ae1024ed3ce17a75c6a802e06c86a5f2f941a23a4e6
-AUX nfs-utils-1.2.4-cross-build.patch 1883 SHA256 ec7792cf496d66d82476c92be89ae58cd21add1888837827b8114a35b5f0b150 SHA512 041da2461026251f4b0b9f292441375531eff0dd6453be8602a70cc161349050c89924ed4c1bac42719cfebba20b2f8e8d5ca9f55209c24d7b5e8bbe8b48a1fa WHIRLPOOL 0c2c8862dc7822e88f7fc45e6a9a5123ca4f9132c2dde51f0f71061be3d3390d01111f01f4b6eafbde27cb1b548ae03a33677119f4986f76ebb2414ce75f032a
-AUX nfs-utils-1.2.4-exportfs-skip-dir.patch 1079 SHA256 16476adcec288a302fded2c8e1dbfc8012a57f98a6710a182623c45c889f85e4 SHA512 c7dd829c9bab0cae99356dd4a35aa0d80978893f15bebc17e2edd7bee75fe53eefe0cd2bb00685640e67ee1e0df38f4b968974e9e317ae2b4a5fe8b0e2cea3f2 WHIRLPOOL 5d4329c31ba6b532af4a90ff8437c823b25add120d4d647317f8909a513897051b0a4c68b1c360a46bf51662bd6c1f2066e18134ce6d5cf4dfb993fc43bb31c9
-AUX nfs-utils-1.2.4-exportfs-xlog.patch 1757 SHA256 b9a7bcb4c4f619dee1b4a7faabbeb07875ff0e8ba04a97a77cd4cd2dbaac51ce SHA512 f388ce0101ba30a4427c1ab6039385cdf2b498f516c4455befed0c4b4dcc4a90cbf5354031eaf61b752bb5444d766012943e28f522c647d165d755a1c4a8e31a WHIRLPOOL b0ba5bc10b71558ce35155755b7e73a81c497f3cc739034449be80a938e432d21fc3261347af8683c74ae86d1cc78ddc6c52a86bceb4d69eda5c4c772538899d
-AUX nfs-utils-1.2.4-nfsidmap.patch 1925 SHA256 ae15774002b877a75376c176bb313ca950100ba95be2d1641b1dacb8aaa0c33c SHA512 dfee20ed30d06f6ae60d3cad8e3d35466e90281794c17b44aecc899330455e6225d3d9ce065bbc6563fc0a0f36baff90fe9b6168c658e7e773f3d41b6566b154 WHIRLPOOL ee9d23dd65523899455921344215331e257be707ce966665d03d6e7de2d8726703b405e74c542a90b2c9076b6b446f5039a24317b5cf700580b74b72c710682e
-AUX nfs-utils-1.2.4-no-nfsctl.patch 1043 SHA256 cb2f92895762337e377989835a360f423f6f0e3e2b4a82bde600496da16631b5 SHA512 be554123641b20a54f207b7ee3aa3fbc052a04f35bce00f12b0c57962c37b1a45debd44b046c8ff72e71fec0ec0fa6c539c7baa3a1635d3db3f128fc5a7e5c00 WHIRLPOOL d89c13af1a0d1a6e5487cfabfb7ef58f8dd30157ee0d3149c309a68e0632b82893c9060ad366a771608d5183dde97c3d2b1ee5802b97375e23a2f5f4d91abdcb
-AUX nfs-utils-1.2.6-conditionals.patch 2020 SHA256 3f083ad6efa96110e46df09743a6988a004a73ce6213a954b303f191b9c76582 SHA512 11961b5b77cb9d01e5119c121ce4060ec7c322e97f0beb02f11d2512823f565a3b8ce4cb5db651760f763710a5d26d1bb07e235d4e3648b3b3d6cb92c7b6d1f0 WHIRLPOOL 0cc692c71abd697098927b356e97daf6d189e50c678da950982a4623f1c8a8e2f71e66f4797ca00a0f3fbe5125db8db8bcf4d7bc752f7726cc17a60fb37fa6d8
-AUX nfs-utils-1.2.6-cross-build.patch 1909 SHA256 847f22436f8f389c390beb9bc99195cad182910eff68769317a5dd9902f8c0ab SHA512 ea2fd45ad9f526a72cbc669cb748268aaed5b4e5f01eec8bdeb143226795a09c305732433958261d1b65302eddb68c104eb89d1ad34718038d8b3b06817ae799 WHIRLPOOL 71e398dc619e2971a0f7a3c9c24d9cc2b3a99c4d49568c3a51ac363265e89a13534b73f8e5a744884aff32c8bfebdbfb78b2635dc19caa527bbd3801dc02cac7
-AUX nfs-utils-1.2.6-osd-install.patch 1726 SHA256 04ee2915fcba7c9d459b0f1b701314ad997e61e6898dda03fe670f63113cf155 SHA512 93f4fcb84f17cb7303dc5804d7767947d26aa33f7a8bb55ad4bffd7bc3bb4a11543963062371b25770887195c218727b1b9dbf2a2d9d4ebcd7dbbbc4be3ff879 WHIRLPOOL 032c131226311800eba29c84e3fb392a31dc5171c55a27fcbd4bdc05d69651e56cd2a81922d63a698fd90f987f0e68090676507eccd760e75349b05720b21f9f
-AUX nfs-utils-1.2.7-libio.patch 1601 SHA256 788b6bcca6ec03a8690b5cbabef06ad325211ab79a332b33d17708e8b0b63093 SHA512 a9643fd3689c95bf82c28a6aa5a82540459e0e6eafbb1a774ff74ad69b4f3f28bc0624f84913a78405cbdcb3321a02f912ace2407bb5534c292f5fdd930b68c3 WHIRLPOOL cb382521d1bbfb2ab823d5d44f788f1e9f1a608f7cdd632f84c046787920237569bd57fda8f298ed255254e6bdb56ef8a845cf3013ba1766e9636ce71e63c788
-AUX nfs-utils-1.2.7-nfsiostat-python3.patch 11260 SHA256 c71f3d53c3b076e609ba2de1a1565deacc7a797a2b8c8325341bd6c5b08de6ac SHA512 778640c90ab5a751b9613c02a13a4332e994620c4ff2301bd141edd563bed00ebd1fed7d850adc9d72b3eb3a64d44d7791fef4501fbe0772e7aeb0b14d7d1daa WHIRLPOOL 7c89f6152fe6e1f20c1c57168f98d872cfb55ad34ea8940b5a737c57f21adddf0be5be9a696141e3f45a5848a29c5990a02dba25c804b472848d24b944fc4fc6
AUX nfs-utils-1.2.8-cross-build.patch 1323 SHA256 281ae4f2af4d28adc936be961c2ab4aa4f77c4fb74ba08f2cef1038c6e03b30e SHA512 42a41411d0de384b66a2875fa9ea15e4b854150b5f75ba2db54ad7785fd147ee329eb8867d24a26b2b1d9ef89bd887caeaf0b5a59cdda15f5a11c47888882b9a WHIRLPOOL 52f5704ec8b88eeb3fab37e4aa9a7ca64ca76f0665c66347ab663624cb3b70309a262d86b21882dc5f687741c73974dc6efbc01d6c386e3ea607bbdb89619edb
AUX nfs-utils-1.3.0-gcc-4.9.patch 1821 SHA256 44a566b56ee6471b5da9531eea0e610a58e03457bd68f72c9ffa0bc8389838f8 SHA512 39f7fcf57836e38bdd7a7646c535afedc77a724933c2b3b0b7a50a8882374bc44fce0dc92fd85a0aa5831716bd915a5994f8d2c7c8a5e821ffd1875840849819 WHIRLPOOL 87ec15b374f78466ee9ccb81b3d390451ee3f5c75a88ea4fa76eb7ec4dd38fea70384506ce7395387e22caa6dbce7de7c125b4681a220078f1aa727b68a28336
AUX nfs-utils.conf 74 SHA256 a09f97a40b5c75a3fb65bd60feb4c4b7d2b569ced004464eef4e5136d850ddd6 SHA512 d72c0fbdf12cb1ddf8eaa5885e1ed93a2078c40ca48eb8868836fb72fa456c4865df15273fb7472f70dfe8098167e695b1340ff9a59b55e73b47690baaf977d6 WHIRLPOOL 295e80d0e6f51ad7b89ff40ecc06f56a4f41dec580da40f9fd5c6d7f1c61b39a3676bf2ab5bce230682193b2b23ed34154b9b0ac613eb3b6c24b3d36e35798ef
AUX nfs.confd 948 SHA256 22bba4ee5d58bae422650875c7c8a797a52fc121ddd02d48297c075b8a35401e SHA512 0981f9ea34d5aaf25b558aa1f4c32f6750b657b450d5d22b999e1556b583207c8d88b83f6f803747c56cc70531556f5a8741589125429f93d0bbc73ae31c137e WHIRLPOOL ff6db7d613126c4fd76a6b99dc432a44f086ea22c78a42e3bcb2df04b95c31e9552cb2c080345b71027c71f97b0b7470fd53ffb81502b3f77bc9bb80a38fe9cc
AUX nfs.initd 4351 SHA256 1e77bc6fb2ceb266f724818898bd42bec47512a5a7ede6660e0565ea1c58d619 SHA512 32a231fd04a2bb68b235b6d8294eefea4fd3e5eac2d84f3a8a8ec929b21b85788c5548338556f2246180261f82435cc2141c60f8b9c164c1e5ec1897fa18bce6 WHIRLPOOL 72324e4b73be6532d849f24a8d2e97ec43d70231e6cbdf73a5f8b0ae15b9dd9c48df8d3c67628a4445f1379c2201ec662fbcebc41385f90c2b1a6c180995be1e
-AUX nfsd.service 339 SHA256 fada3d017779466e28a6b84c5adda1d9ef7c9b9e9458884f4456efc7e85a87c7 SHA512 4accd4aa77b3f91b1472b24ba5303cb5442aee1ecc1b813605bb4815320144cfe6505265659f8ec79ba6259c8e41ee968462d67b71981cc46dd830764fe786eb WHIRLPOOL 3fca5f83bf62f4d06854066940592cad2a3d636adf6a20e103c6344f8f3abdedfc94aeed280fa285b195b461f78674a07a334215048f83655c1f1bd17bbfc55a
AUX nfsd.service-r1 294 SHA256 b98575ae9803d0e75159a32f8bed61f6666f8ae130bb93069de13e76943f2577 SHA512 256c78317e5af15cca7f10e247d086d1a0b04ca34d93e8afe4f940d841c93a95ddc119c80aba287d777fe87830dfc8b52f9b558a3663de0ee5e05aa64fbbadbb WHIRLPOOL 8f492d40a44658ab8bbee760c29f738c531ea361081cb18ab7ed85d28d3e9736c2d8e040fe91554a19e8f49e1d26d064d73370f2b6e3ad2cd0927597ab09618d
AUX nfsmount.confd 326 SHA256 b9389e143c2c4f95c11f97a8a379e007f140559016f60011c9d2ff0935758bcb SHA512 6e23897885cc33c49d9c7353b456585a1e0c7300822edba81bc48ba4ccc18297adce137260cc0aa9487aa5ef0aab3eecf931532cfa5bd40fd03bc9e0ddacfb28 WHIRLPOOL 97939b074a9b5717184512088388c9c22a31f37009996b69137023a0f8a97ce6eb41f7cb0a25843ea088f00d37cb45f6b3bd1ba0f801de7cb8f6dc2e5d374dfb
AUX nfsmount.initd 1126 SHA256 b57637c7eb8e40b5cc1655e8afa69dc0aaecbd3186bdca3301586d1e9b797357 SHA512 e2c4d2bf9690b092d7062d95f4242e2591e3ed0aa8b9b36eae977d5d0350b0d90d339f7e75bdcc794abef27cf1541642a8a6dbbaed90e58cc823db4c92af9336 WHIRLPOOL 54a2bdb24015a6d8184fdde3351b152c5625cb6e4ff17876d592a1600fedec1724081b4ff233711ad9d290ea761827067c40ba8ae21121fc6066ba7ed230e483
AUX proc-fs-nfsd.mount 123 SHA256 39ca215bd3ff124a5872d3535f7cfd403455469350a9495f0ac1f6fb169264c2 SHA512 cd129a6cb7286c175d1dde512bb7cf51c5e56648870cb0082ffeb4068636c78c58c8f3935ebf0c8f177943a4a69b4d02eef80851f88415ad0dffffadaee3dd1b WHIRLPOOL 273581c5e30f4495b12ed5fd35c1cdaaf38351d6a30a17ee45b79406d9c3185c835a2e15c5c1887f1c1bfd98c4669179c7492a9ae7961a2c30ee81bb8f8cb14d
AUX rpc-gssd.service 289 SHA256 1a322ed002c4e3c1e9166f169b8a8467c51bab51897459982cfe73d19c7e7bc6 SHA512 84e8a043b62b6f371dfc19670bd95cf81aef624482072b06e5a1877be23466102775898605ceace0823feb53e0c066c156ab7d16f41fb23833f32d6e06739aa3 WHIRLPOOL 5f1307780deadf454229c1a5a337c4d99e8a4a121d90e37eeadc3981e4bee75a80db36f816f4934fe09f760f504ae1382d29997cbc033a3bab0a0045224b02d3
AUX rpc-idmapd.service 269 SHA256 996c02401f0a5f2516650bd205e993987ca0781b6040a6fbcd6736d6eedf2b62 SHA512 973b0aa83c42f4f22a982680669a0d4109db498362c9c8cbf4da445c04c7be059cb89fe67f839892b53f44c0fd1b4e767f8d8a834ac3d3180c62c83267c5fab1 WHIRLPOOL 4ed69ec063368a0064fe999eb685c113c3aa63d6b6484dd3747722134018e8d774a6803d7617d7b670b938683b8f3de2b46480a5be75c10df86156daed307766
-AUX rpc-mountd.service 251 SHA256 d48a2bedfc62e20a21e2b55b822290ca849cc43bd8aafafd72687a389956e44b SHA512 6d9d163d35ebfeb2cd2d00f4d3c4d7973c6f6b9615c59e1e05e5431b91e0ade3cdd414896245f53ad0bf897ad70dcb0d06eb94c71d52c9ea3787df08483f2e1b WHIRLPOOL 5aa94ae3d682919790e485a5c00b8b396674e8059b563472dd007e8be0084ab6a8aadf9a72f0a01ee68260d71e51075cbd9c86de36b713495a7beb275a3f4cab
AUX rpc-mountd.service-r1 192 SHA256 a322bcd80f9029066524fb707c67ed565d4443ed5e0bb3de026ea9d46805d5a8 SHA512 7229b044668a7a84696261e040004d09ea117786a06b6b8f620790c067254caa22dafb9ee9ad91bf11af7a8bbc1fe83e9b0e44c2756019b69773e1de30b4ad26 WHIRLPOOL fbb46a198359f163db758441561ab29bc6b4041dc3559b1f8f4e4cb6327ac01291c1d973be0f3b3e898110e1c3dbfceb7fbc02b2c5b8118913a90bd100d6c56b
-AUX rpc-statd.service 268 SHA256 f6e9479410ea3c41949ef8c552c0246cfc4324d60a69900fa14d10c50dc2c305 SHA512 6e0ff528f98b669c33e810082c772161c9750b626e755f0bc07e2134e43ab26eb3b73d92d1da5e05926a88c1ddbd44c2670c9388de470d2a90a82c7f34253775 WHIRLPOOL 97d1fff09f4dbda3a54a88c2323df594c6170fb3891d8e542370757bd80916b0e8b027358e81fdf08ae4a8e2a79ca1c0361320fc552221626fbcbb17a4ece937
-AUX rpc-statd.service-r1 295 SHA256 f6bf14cc4ad506b4af6eae332f1befa1ec837fb0a4431a02f4ab3593dc1f55ad SHA512 fc5ef04ddcd7c4fdf041d7b45e92c84f10d264e767f5c9f8f3b8e989f792e605de9177449d4c267fd1cf1ffdae1d0f9faebf33bd0de2fdf8fd9cc4262374f86c WHIRLPOOL 17ba4cc83a2e93052c424154efdb4d82c1a9b1fdd1127613c4b4440ce631648b24710144e840e1d5e4356b403d379b48fc1fea85ea6fb50003c518bf967d4ce6
AUX rpc-statd.service-r2 237 SHA256 59e7009a15d28e73df0238ded9a2b6691c2b522a6dd516ea5eedf2342030db84 SHA512 b4a6a0b9a649ee5de64f3c727287aacbba71307edd63f79571e8e45a627c46f8a195f7429c35af03830b71279c7e03af5fabf8eb8264f7b30801d06ac825d329 WHIRLPOOL e95920d0d8c4d4b01d3801a3a99a8a11868442f376c046bd0c70b65aae28c073559f3931da06b631a0bc07a2a192b6fa934691a97f5c3a9647e16f58412be532
AUX rpc-svcgssd.service 259 SHA256 ee585a6448c3f211e431431d547378531eea5137b8968ae1c663e79a490999dd SHA512 ff5cfcb9f5f616b8418535b6337410133c60824def55dcefea2622c64352c4a1c295933f291361917148402cba7f7b0fbf218d7a33b427ee7a174c938a73594e WHIRLPOOL b45aac6b7d0fd2a0be18c0e00df2a95d31d433327e0838da680a582623028376d44242875fa0bd563049c61cf183c962c373e005e6c47e291fabb36b1f61de81
AUX rpc.gssd.initd 567 SHA256 00d9c29280a83e8458c33139d04a9b38c6fdba9d7cb9b420ca83bf6b10e6435d SHA512 cd4f763c7cced0eecb03e2d4c8fb1d5fbbddd119a014dee4e9cb881d3750fb01a50daa4475700914785cb1313ceef638b7de4d8dddac90cbab63888cc81938f6 WHIRLPOOL d9f4c381f18b76a2c5b1c0c2adb56b0005264a3230c436d4556c45e13372bea09cf1fc35f02d734cac7081322f72873e46d2b2d451334ad908f14ad7fcd54acc
@@ -46,51 +23,20 @@ AUX rpc.pipefs.initd 873 SHA256 ebee63e81fb952474c34b745913e8774b29c9cc65180d363
AUX rpc.statd.initd 818 SHA256 0c7bd35a14da6c0c2577f09ae82a41ddb693a88157eeaf80684616f79be6c304 SHA512 e7c85a5437f65c82bcab6818fa3aa27fdf746ce745b41987d0e59d620b59529b7a8613aad59e831a5b46fee1fe4410d6982a3e76e7834c79675c4c271b0db3b0 WHIRLPOOL b3c6c4147634f3db39f0a50307a7433e0d28f8cf2d89452d90f9db1b56d55c41add68336640a442508ebfc75270dd627154af787b00f603659a5c730ab724340
AUX rpc.svcgssd.initd 584 SHA256 f1c460d8b0e91e54a551397d755135d05a3728d81de596535bf8bda074455677 SHA512 844e8d41a6a8b632d98585724aca2e9ae596f72c67e17e4e8fb9eb81e6c58eed9e10cf8b2a96896dba8fd1efaa95d846954e712bdf3402a847ae17742dae2157 WHIRLPOOL f1e4a38168c112ce07e40432527a77e17aa80b4a37aeccb8b01a9e655f0437e67e4c12998d62ea7c162319cca956c18edd3cb3c64cfd8e17370782ea30fef677
AUX var-lib-nfs-rpc_pipefs.mount 111 SHA256 59e05e4e6d6af92d5fafaf2d6b8e87670bcda4de5c9fb748d1be40a21f594500 SHA512 f4502bf53fd3014987e53ffc5d4b9b8678103052289dfe9f9304bb7eab66b6b59d80e3a29c19e3bc794657c2e3dbb25e275f78e09bc25808ed9849cc4a748034 WHIRLPOOL c684e43627f4e9ec4c97f0db28ce28682fc5f17627573c0902bb17946b0012969e070bd9030e0c20b9bd10e140e2901a9c2246a7e70700cf7541d90aa7293c76
-DIST nfs-utils-1.1.4.tar.bz2 588368 SHA256 27704e3637b5e0ae141b56d5395272b685c4ca844ea0a20c777626bbfc52a94f SHA512 2e11a56e0beb442de999937ef4d2721efb0ebf098db693578fcb57cc92807045540b37c57099350d0b2151e3c34d1c92869a597695d9890fd287f39eabffa715 WHIRLPOOL 9a59089a068463234d539875b1bb0c95cb2cce9fca84360da495944996b988b1ffa71b53107714693b2422143de7cf305004bf09cb915a612474d6750425f855
-DIST nfs-utils-1.1.5.tar.bz2 605790 SHA256 9a5da7cd85dc9087222ab348ce82577c38547177d5d4dc7fccc9e939c97d47dc SHA512 8ff6165f3c97ac9133257ea29070c716f47545cbd861345c5d8ca5530bfb4ea66001bf93652530392ca3d238b8edffd5e360325a36186a3859c43f546f2a4a79 WHIRLPOOL 05e1346363fbdb700c42d30bf1870140b585162f5d5187f3642c75b02e92cc46053f33f3da1bb701d17b440b46337e0984f8b14872b3587971d969a1387288de
-DIST nfs-utils-1.2.1.tar.bz2 685942 SHA256 f4fc8fd71f562564de051d681997be3dd7753fb93f8a3a0eb7c5835f0f04fa6d SHA512 ec905750a250a778c7d0f334e29e9dfaca94dce49b6c30c11bdf411b510f2ed6b6527b2f25a2e4feaecda91b6b739e9ecae643e8798c36f5fc5be5850fe0c4ef WHIRLPOOL 69d1a37441a1b9e8d725066c9bb2a7d3684a079d530c94fa4e5302b035c472e51f5528d44d517eb27d689765ea53c6b59b88d982cf8da44f3d6d6a5fa456fb80
-DIST nfs-utils-1.2.2.tar.bz2 721051 SHA256 fd47277666968cf1f6bf3fe4df91a0dd45122bcdf0e24403ea84c5a2dbc9d01e SHA512 5b0f3881d8d7d094d0dad85900ddd9b6dc3402bb0d34eb3c8698a83c416ffa19155d367d68227b60e2459afda749918c4edec6521c846fb35144cd664108e279 WHIRLPOOL c30bd904e6ec62b6c7b4bf5aeea31bfe045b09a3ef6967df4487821aa646080dbf5fc84a9cc92262ce8f0497fcfa06909b7b27dec5b97d9a74d5b59d430548dd
-DIST nfs-utils-1.2.3.tar.bz2 672759 SHA256 5575ece941097cbfa67fbe0d220dfa11b73f5e6d991e7939c9339bd72259ff19 SHA512 3571559681608bc02f6f45ce9e7a32f47148bad929af1c14e90db7e6522027b8347b8e1e065dc8282d5a36188d10e1914c99e370b48ec2690ad6752f8e9a836b WHIRLPOOL 48d386c4e3f7da7117333ea8bb37629dfbf18819c7e7f8a9cd448d1a2dddb2b6a76793e1dac7c4e9310e7b0ba730a7574fac9b143eecb5ee5df277fd188554ac
-DIST nfs-utils-1.2.4.tar.bz2 664358 SHA256 6ff1c702b1d61dc6e8c69cd977f79ab7d662dc870337ef89ca6d1b41bad026c0 SHA512 baab62086859aaa5581c47b27f209456b85c9940523bd3c36c02053f03fe57f237a3c03ef5689e2445b3cf1738c45969368388c35d54ef160c18f2f739d13904 WHIRLPOOL 87d4734eddfae2e74e0b03e3441615735ff26989f8b739d4c51cb0d4a0b7f3b2f27bc6c9123c4d23d5c75ebe25cc348bab7c1aabde9ac2632d901e1dc1f41a49
-DIST nfs-utils-1.2.5.tar.bz2 698148 SHA256 3595ed4f6ee5c13514540861ad5e89907aa4fd6897bfa99577515233e4745a9b SHA512 2af72c04786804f3de43901e1b40919ba73964697f9e7bf1f8b1370314e2f6a8ba1c11e161ba50aade37ed44d5e1e0ebbd17a4cd6b497ea3aad8cd3466d2238b WHIRLPOOL 45fc1eba3c0f89693cf6b768585e23eb75a6a29ef40da7c2360dfd1521833aacdfdcb6d8c08aa18596b3f31dc772974f942b9656663685d91459489361ae5050
-DIST nfs-utils-1.2.6.tar.bz2 755305 SHA256 70267288500408495085b7c54a667c4e8cfde5882f3193da095fc7dad2da0b83 SHA512 634f6d71d081fd9a06e28f25d9270d04d92cacc7bd1f99507ed610bd703d4df9e9ce4fab0de1463dd25ac64a99ae5a54f65340edb12ac007583b83a872dcbc25 WHIRLPOOL b87b0e543aacaa74ea305dccfd966c4f7717929636c8ed6f0bfd1bfec1ef2e6e913855b4a704ffd31215582931a795707455eaa3d639e601b154eb0ea77d13a2
-DIST nfs-utils-1.2.7.tar.bz2 2902130 SHA256 7ef8e0a8b22cd7ff33f3afd28e770d45643fae303468a180640c2967833fe75e SHA512 c63b28be8e7b9cbc3ccb4950f31fd30f3ddc9c8707dcad4c3f2ee78fb464df9e0f1f58dc0c47e530c5afaa604712b4dc5e15af795810374e833c09a19dfd32e1 WHIRLPOOL 785511e2eb03649027977d81f11d7a5b1f960d4fdc57b790af5a3d441aa63858d8c2876e851049ea1b799a93796b209c9a3d22837f3aa3744ba17395a4fc8dbc
-DIST nfs-utils-1.2.8.tar.bz2 2747577 SHA256 1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6 SHA512 abe13f37dccb40258ac2f654143e540b9ac8c41ca10fe88f104ebb558334d41c0e31220dbae0122836e43236cac763fbcfc1d5bd708aca3b282152ac3ac7213b WHIRLPOOL 95bc97e572aebae4b99d20b67845e081d75f4126fc74e9f081a6bc1a913796f5370befb5a21c7626668bd430b8671c4732ddfbf319e6a2ef8df8e15f4ef213a1
DIST nfs-utils-1.2.9.tar.bz2 774112 SHA256 90b76d5692a520b74273e607a4fd69df4cc35f65e242e22e2bc61b58759722f3 SHA512 c71f986a7e8f38492f8411540b32fef904f689b45b831e0e3c193628085d09742c6352dc42d6d374b8ded12e2b54f8fb3c8de66695a36cf038fc4afa5c29879e WHIRLPOOL 22e86859e9bf7a9a298c91f73a8afea63aa1e39753062ff664a17601d311d62f8f0efed8a0c5271751b53bb46cfc91bf721ca852dc1e744e4bb51f321a34c119
DIST nfs-utils-1.3.0.tar.bz2 780749 SHA256 25f1c974018c944347d74eebe89643e1004c822a6145153136b192d1acfaf60d SHA512 9cb9efa26d2b1bd6ae3e0c516ac50b17b4c7993366ae36c7786da734dc8ea4dd7a05f0d6fabb6fba6df36ead8642341a095f1972cb46b400840705356d410a6a WHIRLPOOL c4e6f7aecaa94808a2827297ce0ed8f1b97d88171d37a201a6a217ee2c69e8cf172ac751939fb95ea6c8022a344e04921ee45c6f46dd16057cc679caf8563882
-EBUILD nfs-utils-1.1.4-r1.ebuild 3167 SHA256 c0f3eedc4f31424c7788e55f504980bb530464d1bed49ed0cc0e431eef633403 SHA512 2173b772ffba0f6ffc361e846ed58a78247eedf1b7beb2b87a37fe71c654d65681e666d32e73f3ed767f9a421e65c228b9242022c02cde7aa7a31383469b88d4 WHIRLPOOL 300ceb5299d93ae8539c6e154dba43da535c39b6318f4979b635c1d0d25c9fba8761f8ea25988e793a2bd23613e2a4e2b24182291e92530aa2120a50b0f8b3e7
-EBUILD nfs-utils-1.1.5.ebuild 3098 SHA256 35a23dde75f23c921c1731f4bce5bfd6a9ab4aa66416e73864b7c8909e89a964 SHA512 f25708af1eb291a2d4df9ac795c396a9d3b0e844d9478f23567e0d90cbd33414d9a3d250135c801536ce6ed4f4de2d364a7f90d70ee7d1daab2a248f304c88ad WHIRLPOOL b9fb0cfb27a52cb71eb95e4c266e8077b0fabfcbafcb3d5a891c5350f04d604bfa2a6314179f07755eb28c1a24ff23f84e64ac8cc34e79e42169b774407950cc
-EBUILD nfs-utils-1.2.1.ebuild 3120 SHA256 5342652c52e345a17ef3d000a4a78aa0513edf863dad7adaa665975194d9771c SHA512 0e0bf20e7b2e52aeebe9034983c856bcacd77da837e67d8f8fcc12a8241bbe9c02cac2bc186b6867cc3662a144d1cc4ae6a9c810973e12714573e8ea1423f1b4 WHIRLPOOL 0d41bb515ebf6db49ddd19101b8e67bfbcfe1cafb019b6b18238ad6643aa54c6b4f1cd1e9584a0a41e751731b47747c8b947934f3ee8e1e3b973515aacb2b79e
-EBUILD nfs-utils-1.2.2-r2.ebuild 3387 SHA256 9dd1368b530d093538f6adb4715ec6634fe050e664b6ae0b004f65a8fae9c4f4 SHA512 df4877e8e54e43dc7b5417db2e0a9deb072353394753fef9760c7aadd1de43f572c57ad9502aef5ced29e566fdf0f12e93fe041e15d62abe070b223204598cb2 WHIRLPOOL 61602162879402da7b353d2041d9aee57c80487bf2faab46a8d199077777a8045a524ac6ec18d5ed42d0c2e8d222e46dccbe126cf98dd52ef808856c9895ac6f
-EBUILD nfs-utils-1.2.3-r1.ebuild 3243 SHA256 5660e204ebd82df18a3ea663115dd821bc73828192e9e54862b5bb01121c81b0 SHA512 dde032879ec65fff56c2fbfa5d470c9b768ed4c9e0fd3d29f1213d614b2c1430432aad51b6f61b004498bee5836fc4ebe33ba5743f6522b6035dd03cecce1851 WHIRLPOOL 467f483d4d2c2083e8cfb74f4e29c4954ad26c4e53016ff9034b5d82d4dd3d823fce50463cc6b5ef4d7e9e18b1d84d75d87e8c90ad4181eebea713f802ce175c
-EBUILD nfs-utils-1.2.3.ebuild 3150 SHA256 b1c484e0cc4b032cd44ff66d9e73866e0dfcea87c22917994f2aa6312db1bcba SHA512 2d580cfd94cdf1f49f3cd1a23f87c94ff6be6ee833d41c478ae0bcd6c35d9bc23db04299a99c237c174b623006f0fa0a337b913f1587824fd295c3f1dcac97ae WHIRLPOOL dd8b739e382284b5af862ecf2a7c5baebe8633574e0b4deb44dd24b329b806a38643ce4d71604a690b7526aff93d9f20c8a19e03069066f89d33f3f92f09e8ba
-EBUILD nfs-utils-1.2.4.ebuild 3737 SHA256 13042431e301d9181e6d8d54fa207a2581f675c3a2cb766c47b7fb6037ca088e SHA512 e0fe6e9ef9441311688e88310194c5cb0bf5ae6053d590eab07ca7469413d4183256d4806dc99d0f512eb4d32ab4736a5b8c60a2dff51a925d50134f14e659bc WHIRLPOOL fdb0e2e9e2648c20f8ca89b8d28dcad0646939640a88a2e900bd3601e374f31c157d1cf33de35c67600fb1773406ce0e722ff6b6bb34f5b4c0694f46b2668553
-EBUILD nfs-utils-1.2.5.ebuild 3515 SHA256 f666cf561ecbfe6e4a5c1eed271957ba296c5b90a1bfefbfc741f033661d952c SHA512 0e944552e2e1f8b74d3f571df541f6577aedcac21ee88c9fb6db88e4fd7cb1455939037322c2633830582a228307fc3835afd74afc59121d2babe23da5c29d92 WHIRLPOOL e4bd59dee38ff4e2b735c9711973bd92fc9a180858d22396f5e1b7af8b3891d6ccec3deab4305d7244cdbf7ca8f97166fcb8462919e500cf0ad8e0f9b542d24a
-EBUILD nfs-utils-1.2.6.ebuild 3864 SHA256 b9b8d50f103d596ff47718cb96c9bed767f3a50464d832e2119b5c8875716a10 SHA512 ff899f49b30c7614edceb9402c7db6fddd7600a5fddc654f6cf62730830a78e5a3e364b7051ffef2b1997535784bf5d7d03b94a32194418d9fac4df5c7f3dbd4 WHIRLPOOL 444908e3de5fcc8f1f034aeb44ce311166e0a600ac2edb921d27c03dc2b2a77d70a124e398259acd48856ec8322a4c604fbb6e5798a33908206b7e9926d65719
-EBUILD nfs-utils-1.2.7-r1.ebuild 4005 SHA256 0c46b606419416fce029b219ac136a87f645cee93e489eb29924a08c1981cfbf SHA512 7cc1b85aba2ab31cf5c1d1922d4e817a68554189aa5726953e86e9acab3a68a8566430d3c08878f7060c00d346872b5a12194774cc548527256a5b8b0e4fd1c5 WHIRLPOOL 0a813b0f59daeea05c93c6f5b21f8e7553f98b44cb7668dc5b2c0635f15e02fdfc91ec53970a7581a4cedaf66d8a779bef18ac63f830bb393788221a6c0fb603
-EBUILD nfs-utils-1.2.8-r1.ebuild 4027 SHA256 19055b182c8bca25dc47efd2516ef11a623939a7f1e15a95e5e10c256258e2cd SHA512 76d8be488fffdbeb0f3e56f5854896e28ae04e0262e26250f613a4fda063fd13a337e761ba12f57034452867d425f20d4c32c24c8e3d56f6f0ee35305237d548 WHIRLPOOL d0d9c4571987cda56c9d6be354b1f3a963ecadb3f9ab4cc1ad26139346cb1f5637655153f8f23dfc810308fbbd354c1916fdc83257682de0fed60137d163c004
-EBUILD nfs-utils-1.2.8-r2.ebuild 4095 SHA256 76fcc1ef5d657251f8b348938ac224c2a6b9a9efe797ccda8246c772fe51cb77 SHA512 32f7b226591017489302766483a7675f503d9c8990cdcedd8c4d4447fdb069e9b235de053f93d42bd1eb588faf640beea8c9691a8fe68cd9379f887c8b9f0d6e WHIRLPOOL 20bcb1ed15f50ae06244e640550fbce704c4e9734406e532be9f639b25b2664ee046bc855b004efac0b5aa0abd4a5738d48cf88c88d268b7497edcd838a06dc1
-EBUILD nfs-utils-1.2.9-r1.ebuild 4068 SHA256 41d9d9f2580dc1554afecb787f657036800e049e2d260db6a8db3990c732a4f5 SHA512 1cf2fa93feb2c50347c0facb332792c1d10199eed38a133218c174fd9f4af371b2c2844677826bd17e3358674f223371c60c558ab06e526f290dfa37ea63b55c WHIRLPOOL bc33f1fb0b4052ea4a5611ef6eb56de0b1e9dec8ee66ef98dad3a7a7b3792a03106d87717936d68027c4ce03a439129a62486bfc3d81e8253c53e3e0cce226da
-EBUILD nfs-utils-1.2.9-r2.ebuild 4367 SHA256 eac06d8f714370e8b5f7be317bc7eb9f2fc4394dbb0631e4e7ed010ad5e929e8 SHA512 e4cfc841eec2e993deb1c352eb306eb96e9e6aab5d9d4c7ca2b01c16cb2c467813a6cde2999f1e81eeaa55199e1901cd07d36b185b44c944f6640e74b7da543f WHIRLPOOL 62cca1460fb134eff41a9b882bc752ca3522c86d5e1b2b2a1c131e5ae5855caf159843ce3015b2176b387b35a8cc53a73f4236482795f694af87cdfd9d432016
EBUILD nfs-utils-1.2.9-r3.ebuild 4446 SHA256 bfdf40524e42edb4714b33e7edc21c77a316fed63616c2ba21eecb7f9b0aa40e SHA512 8770ccf5cac0348f0513413691c211c88731e964c85dd50eab18b5c0bd9e1196b77213351b0ce01939242c61cde4d4c04bfa79ecfbf1a399afed24bd6dfb4349 WHIRLPOOL 66f9068cbdaaf9998049c99854174cc37bee1e40fdc2a4c9f83761662e4a1997e5a00a15ba654b4a1077364c4561ad6d8855213452113e18533506ca32f64a3f
-EBUILD nfs-utils-1.2.9.ebuild 4029 SHA256 0739c6faff846ab605635750fcb1a3ebdf24271833fa572a76217e8b7d79189b SHA512 3cca8936433fdfb0b2aa7cf23b0e92daeef1e094a3f9192e8bd61e6f92dbdf7c6544670828ae707a146044dd828074eac704fb58989e4f9a3b879f876502ab94 WHIRLPOOL 212d9f84f923b234e84238d7b0b9ddc1f6fa8f2f5c7cd47fe512e8173e603dd0a2dfa0e4a6dd8884c2026162cf1130fcfe07abbd53a9e12d24a92bd576f3c546
EBUILD nfs-utils-1.3.0-r1.ebuild 4849 SHA256 1793141abbe923bfbf6077d90b5da3ac84347c0eed82209f3f71c133b67423e0 SHA512 486e1e0eb287755606ce47595eb2d427f0d24f40abdb5723cd55404e7de6b11fc74c8e7592bd76afd068cb9a0339b4cc9fefec1a8b17b0b30e7fd5bc3654876c WHIRLPOOL 418b1a3d5372198008f94874becc2e92ee4d19d2226e4c94f011cead89acbfe274d4cb71340bcd9006d8116ee86400ea69f2aae1f3e9e6d6dc1283690ca860bf
-MISC ChangeLog 40353 SHA256 57e4aadff11aae6e9fcd1aa25f19e73328fcb23427f75a8fe21d34d03a0e7209 SHA512 f6a029c8caf832af52366064f424cbd21eb1e115a1362ff510d30da5aa580e963547d1ffba28bafd6cc1746144fb8462b5091e4a8c1dd60b257ba0a1d50adddd WHIRLPOOL 773c3699a5f052d6eac0dfc56056b6db276b4ca09ced58c58acafb9c62da841eb9a783bb944dc8ea78ab0bab3d3b860820ee4751fdd24fe6f40b44898ccf19db
+MISC ChangeLog 41804 SHA256 05e2812238f3fb92ca1139a372ef832faba43be3be1a9c8e3fe019f2534ea99f SHA512 18148a60b34c0008661bd6756427327c08e6e2d9d8282bfe11828a6d10d32ee98bacd008466a540575e811c539edb991c7723c9666ee713c4852d0b09d9d57a4 WHIRLPOOL 779f693e8f994cf36ecb19ea01fa709fd9a08cbd9d4adc30deaf3beaaa1614e7d0728155470de9c7ffbed23df9273a729c83d822a36e990659b27b7404ecb3d3
MISC metadata.xml 749 SHA256 aa6af1c43f6adcc82d29502f5945eb417485d609036983f9adda8b2529d66644 SHA512 aae31fb1933fa3b10e7e2c712cae0437929e183b009853adaaca94a95ea6902b0f9d67dfe0295df795b75b7f6d1d7e8b8e891a4543a51873bbfeaaffd90375ea WHIRLPOOL 2a4afdbb93a76c5b7fb4d3d7b72068cab8bed4e68c30d82dbffeea4fc778b7f695223d77d768f0ba01ebfc47b59b803e0bed71307c7474d051600aa8b9b61f33
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
-iQIcBAEBCAAGBQJUVfCtAAoJEC7dUkA7aK9H2QQP/j/TfByMLo1jCSX5EokRowN4
-S8kZfNjFeOdNAXJr3TSMgxGBKCGjbGMA9xeWSFUGwtNeR0sc1ihhDjpaDuhQuHVr
-4MXgEu/8N9G1FJ6vPbpZAVzCRMMytQXYQ+eKt+Wjf+2dldKWXhpNs5daKgHU3pWm
-wfHjPUdk+6hh8x75XDBhmx7pcAsdX9PZe2ezhA3Q2+DJUHZv96rj3ivbPjeUwY5l
-WkOH1S/tUTXLRJ+l5n4M07olZPwRYO088WiHJ8qLw9c0iwE3ud3q5XFKufhMQ1L5
-i/zx7SNur34K5bClDGXJX7gy6NHB3dFYkkm64YMJLizusIkbHkiEt1oZuL3H97hi
-75+AmGMWYw6Aoe2Uu+zf2qe0U722C3P6cWO37jqssLjmKeWLbFtvjvyWhRSzFMs/
-3oyZlmB2R3wVwA/e4kJkS43tUzsL/bOJaGLg8/qW3khPngwxiqYDKnyni+LpHukg
-S+WslxWdeTZtSirp8LtrK05id9HUEF+TzyaMXXdPhH04E1Qq+KnWntRbfD5Ktne1
-1KJ9zTAdWasr1fD7d/sJxHwcIci1MFCCr+GMVkrt7+rT8kZAY3pXK7X7/zC7LAQK
-iBG7O9d3y/rXQ8obWLhAi9CUf+0895Yea4re7jCAc+iCQLvvgFBeOh9kxOUzqZ1E
-gFKD0B+M4qJNV/S91WvS
-=CL7s
+iQEcBAEBCAAGBQJUa12yAAoJEEqz6FtPBkyjmMMIAI2ZGQi8ZCiReij/Xw1Svvj6
+q8OxakYY8oItYD8SaN0HcIoCH0z+f1FChQqGem8lh3oxBwIUxfUqNDosN2Tf7QsE
+Dkb/1XD50vPNOG/LJ95iz/rSGvGRNfOAsVrOLkKK1ZmufeVsuqCh2Lnu/axyqtWm
+oThcNEqj+XRD/5tX3UbBks9V3sDp5nZuBMTCvYfDZpUdpiz9iSH7OV5RGwjvO28I
+8wgYxO2KjV5h8GFwMVwLXUMoniKc9u5D75a3XXu/1uaV0VyDVyrxUS5mPzQryaFy
+8OwX/d1SB8pFgzI6NThxipeTCQDlvNq154GbDeowNLXuWzWko41EeCFg69y/BpU=
+=35ic
-----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/0001-mountd-Fix-is_subdirectory-again.patch b/net-fs/nfs-utils/files/0001-mountd-Fix-is_subdirectory-again.patch
deleted file mode 100644
index e6f372b75850..000000000000
--- a/net-fs/nfs-utils/files/0001-mountd-Fix-is_subdirectory-again.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 23d3980b6cfea4e9056d9b7b81e48b4fefc645e0 Mon Sep 17 00:00:00 2001
-From: NeilBrown <neilb@suse.de>
-Date: Tue, 7 May 2013 11:46:18 -0400
-Subject: [PATCH] mountd: Fix is_subdirectory again
-
-The problem was that is_subdirectory() would also succeed if the two
-directories were the same. This is needed for path_matches() which
-needs to see if the child is same-or-descendant.
-
-So this patch rearranges path_matches() to do the "are they the same"
-test itself and only bother with is_subdirectory() if it they are not
-the same.
-
-So now is_subdirectory() can be strict, and so can be usable for
-subexport(), which needs a strong 'in subdirectory - not the same' test.
-
-Acked-by: J. Bruce Fields <bfields@redhat.com>
-Signed-off-by: NeilBrown <neilb@suse.de>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- utils/mountd/cache.c | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
-index 737927c..517aa62 100644
---- a/utils/mountd/cache.c
-+++ b/utils/mountd/cache.c
-@@ -347,20 +347,26 @@ static char *next_mnt(void **v, char *p)
-
- static int is_subdirectory(char *child, char *parent)
- {
-+ /* Check is child is strictly a subdirectory of
-+ * parent or a more distant descendant.
-+ */
- size_t l = strlen(parent);
-
-- if (strcmp(parent, "/") == 0)
-+ if (strcmp(parent, "/") == 0 && child[1] != 0)
- return 1;
-
-- return strcmp(child, parent) == 0
-- || (strncmp(child, parent, l) == 0 && child[l] == '/');
-+ return (strncmp(child, parent, l) == 0 && child[l] == '/');
- }
-
- static int path_matches(nfs_export *exp, char *path)
- {
-- if (exp->m_export.e_flags & NFSEXP_CROSSMOUNT)
-- return is_subdirectory(path, exp->m_export.e_path);
-- return strcmp(path, exp->m_export.e_path) == 0;
-+ /* Does the path match the export? I.e. is it an
-+ * exact match, or does the export have CROSSMOUNT, and path
-+ * is a descendant?
-+ */
-+ return strcmp(path, exp->m_export.e_path) == 0
-+ || ((exp->m_export.e_flags & NFSEXP_CROSSMOUNT)
-+ && is_subdirectory(path, exp->m_export.e_path));
- }
-
- static int
-@@ -369,15 +375,13 @@ export_matches(nfs_export *exp, char *dom, char *path, struct addrinfo *ai)
- return path_matches(exp, path) && client_matches(exp, dom, ai);
- }
-
--/* True iff e1 is a child of e2 and e2 has crossmnt set: */
-+/* True iff e1 is a child of e2 (or descendant) and e2 has crossmnt set: */
- static bool subexport(struct exportent *e1, struct exportent *e2)
- {
- char *p1 = e1->e_path, *p2 = e2->e_path;
-- size_t l2 = strlen(p2);
-
- return e2->e_flags & NFSEXP_CROSSMOUNT
-- && strncmp(p1, p2, l2) == 0
-- && p1[l2] == '/';
-+ && is_subdirectory(p1, p2);
- }
-
- struct parsed_fsid {
---
-1.8.3.2
-
diff --git a/net-fs/nfs-utils/files/0001-statd-exit-if-a-statd-is-already-running.patch b/net-fs/nfs-utils/files/0001-statd-exit-if-a-statd-is-already-running.patch
deleted file mode 100644
index 4e8be2fd43eb..000000000000
--- a/net-fs/nfs-utils/files/0001-statd-exit-if-a-statd-is-already-running.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 342446a4a624d4ee8254af859bb7f1de6d268679 Mon Sep 17 00:00:00 2001
-From: Weston Andros Adamson <dros@netapp.com>
-Date: Tue, 7 May 2013 11:25:29 -0400
-Subject: [PATCH] statd: exit if a statd is already running
-
-Moves nfs_probe_statd from mount to nfs support lib to share with statd.
-
-Acked-by: Chuck Lever <chuck.lever@oracle.com>
-Signed-off-by: Weston Andros Adamson <dros@netapp.com>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- support/include/nfsrpc.h | 5 +++++
- support/nfs/getport.c | 22 ++++++++++++++++++++++
- utils/mount/network.c | 17 -----------------
- utils/statd/statd.c | 7 +++++++
- 4 files changed, 34 insertions(+), 17 deletions(-)
-
-diff --git a/support/include/nfsrpc.h b/support/include/nfsrpc.h
-index a0b80e1..1bfae7a 100644
---- a/support/include/nfsrpc.h
-+++ b/support/include/nfsrpc.h
-@@ -156,6 +156,11 @@ extern unsigned long nfs_pmap_getport(const struct sockaddr_in *,
- const struct timeval *);
-
- /*
-+ * Use nfs_pmap_getport to see if statd is running locally
-+ */
-+extern int nfs_probe_statd(void);
-+
-+/*
- * Contact a remote RPC service to discover whether it is responding
- * to requests.
- */
-diff --git a/support/nfs/getport.c b/support/nfs/getport.c
-index 3331ad4..081594c 100644
---- a/support/nfs/getport.c
-+++ b/support/nfs/getport.c
-@@ -1102,3 +1102,25 @@ unsigned long nfs_pmap_getport(const struct sockaddr_in *sin,
-
- return port;
- }
-+
-+static const char *nfs_ns_pgmtbl[] = {
-+ "status",
-+ NULL,
-+};
-+
-+/*
-+ * nfs_probe_statd - use nfs_pmap_getport to see if statd is running locally
-+ *
-+ * Returns non-zero if statd is running locally.
-+ */
-+int nfs_probe_statd(void)
-+{
-+ struct sockaddr_in addr = {
-+ .sin_family = AF_INET,
-+ .sin_addr.s_addr = htonl(INADDR_LOOPBACK),
-+ };
-+ rpcprog_t program = nfs_getrpcbyname(NSMPROG, nfs_ns_pgmtbl);
-+
-+ return nfs_getport_ping((struct sockaddr *)(char *)&addr, sizeof(addr),
-+ program, (rpcvers_t)1, IPPROTO_UDP);
-+}
-diff --git a/utils/mount/network.c b/utils/mount/network.c
-index 4be48cd..e2cdcaf 100644
---- a/utils/mount/network.c
-+++ b/utils/mount/network.c
-@@ -65,11 +65,6 @@ extern int nfs_mount_data_version;
- extern char *progname;
- extern int verbose;
-
--static const char *nfs_ns_pgmtbl[] = {
-- "status",
-- NULL,
--};
--
- static const char *nfs_mnt_pgmtbl[] = {
- "mount",
- "mountd",
-@@ -761,18 +756,6 @@ int probe_bothports(clnt_addr_t *mnt_server, clnt_addr_t *nfs_server)
- &nfs_server->pmap);
- }
-
--static int nfs_probe_statd(void)
--{
-- struct sockaddr_in addr = {
-- .sin_family = AF_INET,
-- .sin_addr.s_addr = htonl(INADDR_LOOPBACK),
-- };
-- rpcprog_t program = nfs_getrpcbyname(NSMPROG, nfs_ns_pgmtbl);
--
-- return nfs_getport_ping(SAFE_SOCKADDR(&addr), sizeof(addr),
-- program, (rpcvers_t)1, IPPROTO_UDP);
--}
--
- /**
- * start_statd - attempt to start rpc.statd
- *
-diff --git a/utils/statd/statd.c b/utils/statd/statd.c
-index 652546c..8c51bcc 100644
---- a/utils/statd/statd.c
-+++ b/utils/statd/statd.c
-@@ -28,6 +28,7 @@
-
- #include "statd.h"
- #include "nfslib.h"
-+#include "nfsrpc.h"
- #include "nsm.h"
-
- /* Socket operations */
-@@ -237,6 +238,12 @@ int main (int argc, char **argv)
- /* Set hostname */
- MY_NAME = NULL;
-
-+ /* Refuse to start if another statd is running */
-+ if (nfs_probe_statd()) {
-+ fprintf(stderr, "Statd service already running!\n");
-+ exit(1);
-+ }
-+
- /* Process command line switches */
- while ((arg = getopt_long(argc, argv, "h?vVFNH:dn:p:o:P:L", longopts, NULL)) != EOF) {
- switch (arg) {
---
-1.8.3.2
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.1.4-ascii-man.patch b/net-fs/nfs-utils/files/nfs-utils-1.1.4-ascii-man.patch
deleted file mode 100644
index 83ed4aa42661..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.1.4-ascii-man.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-ripped from Debian
-
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=493659
-patch by nbreen@ofb.net (Nicholas Breen)
-
---- nfs-utils-1.1.3/utils/mount/nfs.man
-+++ nfs-utils-1.1.3/utils/mount/nfs.man
-@@ -799,7 +799,7 @@
- and server load.
- .P
- However, UDP can be quite effective in specialized settings where
--the network’s MTU is large relative to NFS’s data transfer size (such
-+the network's MTU is large relative to NFS's data transfer size (such
- as network environments that enable jumbo Ethernet frames). In such
- environments, trimming the
- .B rsize
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.1.4-no-exec.patch b/net-fs/nfs-utils/files/nfs-utils-1.1.4-no-exec.patch
deleted file mode 100644
index ea50a21d85dc..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.1.4-no-exec.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-ripped from Debian
-
---- nfs-utils-1.1.2/utils/mount/mount.c
-+++ nfs-utils-1.1.2/utils/mount/mount.c
-@@ -381,10 +381,6 @@
- mount_error(NULL, mount_point, ENOTDIR);
- return 1;
- }
-- if (access(mount_point, X_OK) < 0) {
-- mount_error(NULL, mount_point, errno);
-- return 1;
-- }
-
- return 0;
- }
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.1.4-rpcgen-ioctl.patch b/net-fs/nfs-utils/files/nfs-utils-1.1.4-rpcgen-ioctl.patch
deleted file mode 100644
index 176541845ed9..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.1.4-rpcgen-ioctl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/174393
-
---- tools/rpcgen/rpc_main.c
-+++ tools/rpcgen/rpc_main.c
-@@ -548,7 +548,7 @@
- f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n");
- #else
- if( !tirpcflag )
-- f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n");
-+ f_print(fout, "#include <sys/ioctl.h>/* TIOCNOTTY */\n");
- #endif
- if( Cflag && (inetdflag || pmflag ) ) {
- f_print(fout, "#ifdef __cplusplus\n");
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.2-nfsv4.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.2-nfsv4.patch
deleted file mode 100644
index cef774fe4b47..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.2-nfsv4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: nfs-utils-1.2.2/configure.ac
-===================================================================
---- nfs-utils-1.2.2.orig/configure.ac
-+++ nfs-utils-1.2.2/configure.ac
-@@ -81,7 +81,7 @@ AC_ARG_ENABLE(nfsv41,
- if test "$enable_nfsv41" = yes; then
- AC_DEFINE(NFS41_SUPPORTED, 1, [Define this if you want NFSv41 support compiled in])
- else
-- enable_nfsv4=
-+ enable_nfsv41=
- fi
- AC_SUBST(enable_nfsv41)
- AM_CONDITIONAL(CONFIG_NFSV41, [test "$enable_nfsv41" = "yes"])
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.2-optional-libcap.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.2-optional-libcap.patch
deleted file mode 100644
index eb8ce44d595c..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.2-optional-libcap.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 655f6933b5db66c560098d039e3c91812399beca Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 20 Apr 2010 04:45:35 -0400
-Subject: [PATCH] make capabilities support optional
-
-The new code using libcap is quite minor, so rather than always reqiure
-libcap support, make it a normal --enable type flag. Current default
-behavior is retained -- if libcap is found, it is enabled, else it is
-disabled like every nfs-utils version in the past.
-
-URL: https://bugs.gentoo.org/314777
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- aclocal/libcap.m4 | 18 +++++++++++++-----
- support/nsm/file.c | 4 ++++
- 2 files changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/aclocal/libcap.m4 b/aclocal/libcap.m4
-index eabe507..68a624c 100644
---- a/aclocal/libcap.m4
-+++ b/aclocal/libcap.m4
-@@ -5,11 +5,19 @@ AC_DEFUN([AC_LIBCAP], [
- dnl look for prctl
- AC_CHECK_FUNC([prctl], , )
-
-- dnl look for the library; do not add to LIBS if found
-- AC_CHECK_LIB([cap], [cap_get_proc], [LIBCAP=-lcap], ,)
-- AC_SUBST(LIBCAP)
-+ AC_ARG_ENABLE([caps],
-+ [AS_HELP_STRING([--disable-caps], [Disable capabilities support])])
-+
-+ LIBCAP=
-+
-+ if test "x$enable_caps" != "xno" ; then
-+ dnl look for the library; do not add to LIBS if found
-+ AC_CHECK_LIB([cap], [cap_get_proc], [LIBCAP=-lcap], ,)
-
-- AC_CHECK_HEADERS([sys/capability.h], ,
-- [AC_MSG_ERROR([libcap headers not found.])])
-+ AC_CHECK_HEADERS([sys/capability.h], ,
-+ [test "x$enable_caps" = "xyes" && AC_MSG_ERROR([libcap headers not found.])])
-+ fi
-+
-+ AC_SUBST(LIBCAP)
-
- ])dnl
-diff --git a/support/nsm/file.c b/support/nsm/file.c
-index d469219..f4baeb9 100644
---- a/support/nsm/file.c
-+++ b/support/nsm/file.c
-@@ -67,7 +67,9 @@
- #endif
-
- #include <sys/types.h>
-+#ifdef HAVE_SYS_CAPABILITY_H
- #include <sys/capability.h>
-+#endif
- #include <sys/prctl.h>
- #include <sys/stat.h>
-
-@@ -347,6 +349,7 @@ nsm_is_default_parentdir(void)
- static _Bool
- nsm_clear_capabilities(void)
- {
-+#ifdef HAVE_SYS_CAPABILITY_H
- cap_t caps;
-
- caps = cap_from_text("cap_net_bind_service=ep");
-@@ -362,6 +365,7 @@ nsm_clear_capabilities(void)
- }
-
- (void)cap_free(caps);
-+#endif
- return true;
- }
-
---
-1.7.0.2
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.3-ti-rpc-static-ports.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.3-ti-rpc-static-ports.patch
deleted file mode 100644
index b66e981b44a3..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.3-ti-rpc-static-ports.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-http://bugs.gentoo.org/340797
-
-From 656028f9925f5817c5a37565d27159973db84ec3 Mon Sep 17 00:00:00 2001
-From: Chuck Lever <chuck.lever@oracle.com>
-Date: Wed, 13 Oct 2010 11:22:07 -0400
-Subject: [PATCH] libnfs.a: Allow multiple RPC listeners to share listener port number
-
-Normally, when "-p" is not specified on the mountd command line, the
-TI-RPC library chooses random port numbers for each listener. If a
-port number _is_ specified on the command line, all the listeners
-will get the same port number, so SO_REUSEADDR needs to be set on
-each socket.
-
-Thus we can't let TI-RPC create the listener sockets for us in this
-case; we must create them ourselves and then set SO_REUSEADDR (and
-other socket options) by hand.
-
-Different versions of the same RPC program have to share the same
-listener and SVCXPRT, so we have to cache xprts we create, and re-use
-them when additional requests for registration come from the
-application.
-
-Though it doesn't look like it, this fix was "copied" from the legacy
-rpc_init() function. It's more complicated for TI-RPC, of course,
-since a TI-RPC application can set up listeners with a nearly
-arbitrary number of address families and socket types, not just the
-two listeners that legacy RPC applications can set up (one for AF_INET
-UDP and one for AF_INET TCP).
-
-See:
- https://bugzilla.linux-nfs.org/show_bug.cgi?id=190
-
-Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- support/nfs/svc_create.c | 252 ++++++++++++++++++++++++++++++++++++++++++++-
- 1 files changed, 246 insertions(+), 6 deletions(-)
-
-diff --git a/support/nfs/svc_create.c b/support/nfs/svc_create.c
-index 59ba505..b3f75ed 100644
---- a/support/nfs/svc_create.c
-+++ b/support/nfs/svc_create.c
-@@ -27,6 +27,7 @@
- #include <memory.h>
- #include <signal.h>
- #include <unistd.h>
-+#include <errno.h>
- #include <netdb.h>
-
- #include <netinet/in.h>
-@@ -41,11 +42,68 @@
- #include "tcpwrapper.h"
- #endif
-
-+#include "sockaddr.h"
- #include "rpcmisc.h"
- #include "xlog.h"
-
- #ifdef HAVE_LIBTIRPC
-
-+#define SVC_CREATE_XPRT_CACHE_SIZE (8)
-+static SVCXPRT *svc_create_xprt_cache[SVC_CREATE_XPRT_CACHE_SIZE] = { NULL, };
-+
-+/*
-+ * Cache an SVC xprt, in case there are more programs or versions to
-+ * register against it.
-+ */
-+static void
-+svc_create_cache_xprt(SVCXPRT *xprt)
-+{
-+ unsigned int i;
-+
-+ /* Check if we've already got this one... */
-+ for (i = 0; i < SVC_CREATE_XPRT_CACHE_SIZE; i++)
-+ if (svc_create_xprt_cache[i] == xprt)
-+ return;
-+
-+ /* No, we don't. Cache it. */
-+ for (i = 0; i < SVC_CREATE_XPRT_CACHE_SIZE; i++)
-+ if (svc_create_xprt_cache[i] == NULL) {
-+ svc_create_xprt_cache[i] = xprt;
-+ return;
-+ }
-+
-+ xlog(L_ERROR, "%s: Failed to cache an xprt", __func__);
-+}
-+
-+/*
-+ * Find a previously cached SVC xprt structure with the given bind address
-+ * and transport semantics.
-+ *
-+ * Returns pointer to a cached SVC xprt.
-+ *
-+ * If no matching SVC XPRT can be found, NULL is returned.
-+ */
-+static SVCXPRT *
-+svc_create_find_xprt(const struct sockaddr *bindaddr, const struct netconfig *nconf)
-+{
-+ unsigned int i;
-+
-+ for (i = 0; i < SVC_CREATE_XPRT_CACHE_SIZE; i++) {
-+ SVCXPRT *xprt = svc_create_xprt_cache[i];
-+ struct sockaddr *sap;
-+
-+ if (xprt == NULL)
-+ continue;
-+ if (strcmp(nconf->nc_netid, xprt->xp_netid) != 0)
-+ continue;
-+ sap = (struct sockaddr *)xprt->xp_ltaddr.buf;
-+ if (!nfs_compare_sockaddr(bindaddr, sap))
-+ continue;
-+ return xprt;
-+ }
-+ return NULL;
-+}
-+
- /*
- * Set up an appropriate bind address, given @port and @nconf.
- *
-@@ -98,17 +156,113 @@ svc_create_bindaddr(struct netconfig *nconf, const uint16_t port)
- return ai;
- }
-
-+/*
-+ * Create a listener socket on a specific bindaddr, and set
-+ * special socket options to allow it to share the same port
-+ * as other listeners.
-+ *
-+ * Returns an open, bound, and possibly listening network
-+ * socket on success.
-+ *
-+ * Otherwise returns -1 if some error occurs.
-+ */
-+static int
-+svc_create_sock(const struct sockaddr *sap, socklen_t salen,
-+ struct netconfig *nconf)
-+{
-+ int fd, type, protocol;
-+ int one = 1;
-+
-+ switch(nconf->nc_semantics) {
-+ case NC_TPI_CLTS:
-+ type = SOCK_DGRAM;
-+ break;
-+ case NC_TPI_COTS_ORD:
-+ type = SOCK_STREAM;
-+ break;
-+ default:
-+ xlog(D_GENERAL, "%s: Unrecognized bind address semantics: %u",
-+ __func__, nconf->nc_semantics);
-+ return -1;
-+ }
-+
-+ if (strcmp(nconf->nc_proto, NC_UDP) == 0)
-+ protocol = (int)IPPROTO_UDP;
-+ else if (strcmp(nconf->nc_proto, NC_TCP) == 0)
-+ protocol = (int)IPPROTO_TCP;
-+ else {
-+ xlog(D_GENERAL, "%s: Unrecognized bind address protocol: %s",
-+ __func__, nconf->nc_proto);
-+ return -1;
-+ }
-+
-+ fd = socket((int)sap->sa_family, type, protocol);
-+ if (fd == -1) {
-+ xlog(L_ERROR, "Could not make a socket: (%d) %m",
-+ errno);
-+ return -1;
-+ }
-+
-+#ifdef IPV6_SUPPORTED
-+ if (sap->sa_family == AF_INET6) {
-+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY,
-+ &one, sizeof(one)) == -1) {
-+ xlog(L_ERROR, "Failed to set IPV6_V6ONLY: (%d) %m",
-+ errno);
-+ (void)close(fd);
-+ return -1;
-+ }
-+ }
-+#endif /* IPV6_SUPPORTED */
-+
-+ if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
-+ &one, sizeof(one)) == -1) {
-+ xlog(L_ERROR, "Failed to set SO_REUSEADDR: (%d) %m",
-+ errno);
-+ (void)close(fd);
-+ return -1;
-+ }
-+
-+ if (bind(fd, sap, salen) == -1) {
-+ xlog(L_ERROR, "Could not bind socket: (%d) %m",
-+ errno);
-+ (void)close(fd);
-+ return -1;
-+ }
-+
-+ if (nconf->nc_semantics == NC_TPI_COTS_ORD)
-+ if (listen(fd, SOMAXCONN) == -1) {
-+ xlog(L_ERROR, "Could not listen on socket: (%d) %m",
-+ errno);
-+ (void)close(fd);
-+ return -1;
-+ }
-+
-+ return fd;
-+}
-+
-+/*
-+ * The simple case is allowing the TI-RPC library to create a
-+ * transport itself, given just the bind address and transport
-+ * semantics.
-+ *
-+ * Our local xprt cache is ignored in this path, since the
-+ * caller is not interested in sharing listeners or ports, and
-+ * the library automatically avoids ports already in use.
-+ *
-+ * Returns the count of started listeners (one or zero).
-+ */
- static unsigned int
--svc_create_nconf(const char *name, const rpcprog_t program,
-+svc_create_nconf_rand_port(const char *name, const rpcprog_t program,
- const rpcvers_t version,
- void (*dispatch)(struct svc_req *, SVCXPRT *),
-- const uint16_t port, struct netconfig *nconf)
-+ struct netconfig *nconf)
- {
- struct t_bind bindaddr;
- struct addrinfo *ai;
- SVCXPRT *xprt;
-
-- ai = svc_create_bindaddr(nconf, port);
-+ ai = svc_create_bindaddr(nconf, 0);
- if (ai == NULL)
- return 0;
-
-@@ -119,7 +273,7 @@ svc_create_nconf(const char *name, const rpcprog_t program,
- freeaddrinfo(ai);
- if (xprt == NULL) {
- xlog(D_GENERAL, "Failed to create listener xprt "
-- "(%s, %u, %s)", name, version, nconf->nc_netid);
-+ "(%s, %u, %s)", name, version, nconf->nc_netid);
- return 0;
- }
-
-@@ -133,6 +287,93 @@ svc_create_nconf(const char *name, const rpcprog_t program,
- return 1;
- }
-
-+/*
-+ * If a port is specified on the command line, that port value will be
-+ * the same for all listeners created here. Create each listener
-+ * socket in advance and set SO_REUSEADDR, rather than allowing the
-+ * RPC library to create the listeners for us on a randomly chosen
-+ * port via svc_tli_create(RPC_ANYFD).
-+ *
-+ * Some callers want to listen for more than one RPC version using the
-+ * same port number. For example, mountd could want to listen for MNT
-+ * version 1, 2, and 3 requests. This means mountd must use the same
-+ * set of listener sockets for multiple RPC versions, since, on one
-+ * system, you can't have two listener sockets with the exact same
-+ * bind address (and port) and transport protocol.
-+ *
-+ * To accomplish this, this function caches xprts as they are created.
-+ * This cache is checked to see if a previously created xprt can be
-+ * used, before creating a new xprt for this [program, version]. If
-+ * there is a cached xprt with the same bindaddr and transport
-+ * semantics, we simply register the new version with that xprt,
-+ * rather than creating a fresh xprt for it.
-+ *
-+ * The xprt cache implemented here is local to a process. Two
-+ * separate RPC daemons can not share a set of listeners.
-+ *
-+ * Returns the count of started listeners (one or zero).
-+ */
-+static unsigned int
-+svc_create_nconf_fixed_port(const char *name, const rpcprog_t program,
-+ const rpcvers_t version,
-+ void (*dispatch)(struct svc_req *, SVCXPRT *),
-+ const uint16_t port, struct netconfig *nconf)
-+{
-+ struct addrinfo *ai;
-+ SVCXPRT *xprt;
-+
-+ ai = svc_create_bindaddr(nconf, port);
-+ if (ai == NULL)
-+ return 0;
-+
-+ xprt = svc_create_find_xprt(ai->ai_addr, nconf);
-+ if (xprt == NULL) {
-+ int fd;
-+
-+ fd = svc_create_sock(ai->ai_addr, ai->ai_addrlen, nconf);
-+ if (fd == -1)
-+ goto out_free;
-+
-+ xprt = svc_tli_create(fd, nconf, NULL, 0, 0);
-+ if (xprt == NULL) {
-+ xlog(D_GENERAL, "Failed to create listener xprt "
-+ "(%s, %u, %s)", name, version, nconf->nc_netid);
-+ (void)close(fd);
-+ goto out_free;
-+ }
-+ }
-+
-+ if (!svc_reg(xprt, program, version, dispatch, nconf)) {
-+ /* svc_reg(3) destroys @xprt in this case */
-+ xlog(D_GENERAL, "Failed to register (%s, %u, %s)",
-+ name, version, nconf->nc_netid);
-+ goto out_free;
-+ }
-+
-+ svc_create_cache_xprt(xprt);
-+
-+ freeaddrinfo(ai);
-+ return 1;
-+
-+out_free:
-+ freeaddrinfo(ai);
-+ return 0;
-+}
-+
-+static unsigned int
-+svc_create_nconf(const char *name, const rpcprog_t program,
-+ const rpcvers_t version,
-+ void (*dispatch)(struct svc_req *, SVCXPRT *),
-+ const uint16_t port, struct netconfig *nconf)
-+{
-+ if (port != 0)
-+ return svc_create_nconf_fixed_port(name, program,
-+ version, dispatch, port, nconf);
-+
-+ return svc_create_nconf_rand_port(name, program,
-+ version, dispatch, nconf);
-+}
-+
- /**
- * nfs_svc_create - start up RPC svc listeners
- * @name: C string containing name of new service
-@@ -145,8 +386,7 @@ svc_create_nconf(const char *name, const rpcprog_t program,
- * the RPC dispatcher. Returns the number of started network transports.
- */
- unsigned int
--nfs_svc_create(__attribute__((unused)) char *name,
-- const rpcprog_t program, const rpcvers_t version,
-+nfs_svc_create(char *name, const rpcprog_t program, const rpcvers_t version,
- void (*dispatch)(struct svc_req *, SVCXPRT *),
- const uint16_t port)
- {
---
-1.7.3.1
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.4-conditional.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.4-conditional.patch
deleted file mode 100644
index 248de34c5073..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.4-conditional.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-taken from upstream git
-
-diff --git a/configure.ac b/configure.ac
-index ca12f9e..593808c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -256,9 +256,6 @@ if test "$enable_nfsv4" = yes; then
- dnl check for nfsidmap libraries and headers
- AC_LIBNFSIDMAP
-
-- dnl enable nfsidmap when its support by libnfsidmap
-- AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap" = "yes"])
--
- dnl check for the keyutils libraries and headers
- AC_KEYUTILS
-
-@@ -268,6 +265,9 @@ if test "$enable_nfsv4" = yes; then
- AC_RPCSEC_VERSION
- fi
- fi
-+dnl enable nfsidmap when its support by libnfsidmap
-+AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap" = "yes"])
-+
-
- if test "$knfsd_cv_glibc2" = no; then
- AC_CHECK_LIB(bsd, daemon, [LIBBSD="-lbsd"])
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.4-cross-build.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.4-cross-build.patch
deleted file mode 100644
index c8f5fb9ee8fe..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.4-cross-build.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-this is kind of hacky, but automake doesn't make this easy
-for us atm, so hack away :(
-
-(recent autotools will always add $(CFLAGS)/etc... to the compile)
-
---- a/tools/locktest/Makefile.am
-+++ b/tools/locktest/Makefile.am
-@@ -1,12 +1,11 @@
- ## Process this file with automake to produce Makefile.in
-
- CC=$(CC_FOR_BUILD)
--LIBTOOL = @LIBTOOL@ --tag=CC
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
-
- noinst_PROGRAMS = testlk
- testlk_SOURCES = testlk.c
--testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
--testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
--testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
-
- MAINTAINERCLEANFILES = Makefile.in
---- a/tools/rpcdebug/Makefile.am
-+++ b/tools/rpcdebug/Makefile.am
-@@ -1,15 +1,14 @@
- ## Process this file with automake to produce Makefile.in
-
- CC=$(CC_FOR_BUILD)
--LIBTOOL = @LIBTOOL@ --tag=CC
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
-
- man8_MANS = rpcdebug.man
- EXTRA_DIST = $(man8_MANS)
-
- sbin_PROGRAMS = rpcdebug
- rpcdebug_SOURCES = rpcdebug.c
--rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD)
--rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
--rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD)
-
- MAINTAINERCLEANFILES = Makefile.in
---- a/tools/rpcgen/Makefile.am
-+++ b/tools/rpcgen/Makefile.am
-@@ -1,7 +1,9 @@
- ## Process this file with automake to produce Makefile.in
-
- CC=$(CC_FOR_BUILD)
--LIBTOOL = @LIBTOOL@ --tag=CC
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
-
- noinst_PROGRAMS = rpcgen
- rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
-@@ -9,10 +11,6 @@
- rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \
- rpc_scan.h rpc_util.h
-
--rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
--rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
--rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
--
- MAINTAINERCLEANFILES = Makefile.in
-
- EXTRA_DIST = rpcgen.new.1
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-skip-dir.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-skip-dir.patch
deleted file mode 100644
index af14ab66aafb..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-skip-dir.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5dc4c89b6935fcfe327b77681362319e6fd407e0 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 1 Sep 2011 11:08:04 -0400
-Subject: [PATCH] exportfs: do not warn if /etc/exports.d/ does not exist
-
-It isn't uncommon for /etc/exports.d/ to not exist, and imo, it's not
-that big of a deal as often times, a simple /etc/exports is sufficient.
-So silently skip the case where the dir is missing.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- utils/exportfs/exportfs.c | 7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
-index 986a272..7432a65 100644
---- a/utils/exportfs/exportfs.c
-+++ b/utils/exportfs/exportfs.c
-@@ -529,9 +529,12 @@ export_d_read(const char *dname)
-
-
- n = scandir(dname, &namelist, NULL, versionsort);
-- if (n < 0)
-+ if (n < 0) {
-+ if (errno == ENOENT)
-+ /* Silently return */
-+ return;
- xlog(L_NOTICE, "scandir %s: %s", dname, strerror(errno));
-- else if (n == 0)
-+ } else if (n == 0)
- return;
-
- for (i = 0; i < n; i++) {
---
-1.7.6
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-xlog.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-xlog.patch
deleted file mode 100644
index 0e17e9538b08..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-xlog.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From aacec6914549f5bf4f5fb2aed0925a8a7e57b50c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 1 Sep 2011 11:00:39 -0400
-Subject: [PATCH] exportfs: drop extra newline in xlog
-
-Since xlog() itself appends a newline, we don't want to add our own
-otherwise we get extra in the output.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- utils/exportfs/exportfs.c | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
-index 12e8bf1..986a272 100644
---- a/utils/exportfs/exportfs.c
-+++ b/utils/exportfs/exportfs.c
-@@ -401,7 +401,7 @@ validate_export(nfs_export *exp)
- int fs_has_fsid = 0;
-
- if (stat(path, &stb) < 0) {
-- xlog(L_ERROR, "Failed to stat %s: %m \n", path);
-+ xlog(L_ERROR, "Failed to stat %s: %m", path);
- return;
- }
- if (!S_ISDIR(stb.st_mode) && !S_ISREG(stb.st_mode)) {
-@@ -530,7 +530,7 @@ export_d_read(const char *dname)
-
- n = scandir(dname, &namelist, NULL, versionsort);
- if (n < 0)
-- xlog(L_NOTICE, "scandir %s: %s\n", dname, strerror(errno));
-+ xlog(L_NOTICE, "scandir %s: %s", dname, strerror(errno));
- else if (n == 0)
- return;
-
-@@ -558,7 +558,7 @@ export_d_read(const char *dname)
-
- fname_len = snprintf(fname, PATH_MAX +1, "%s/%s", dname, d->d_name);
- if (fname_len > PATH_MAX) {
-- xlog(L_WARNING, "Too long file name: %s in %s\n", d->d_name, dname);
-+ xlog(L_WARNING, "Too long file name: %s in %s", d->d_name, dname);
- continue;
- }
-
-@@ -672,7 +672,7 @@ dump(int verbose)
- static void
- error(nfs_export *exp, int err)
- {
-- xlog(L_ERROR, "%s:%s: %s\n", exp->m_client->m_hostname,
-+ xlog(L_ERROR, "%s:%s: %s", exp->m_client->m_hostname,
- exp->m_export.e_path, strerror(err));
- }
-
---
-1.7.6
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.4-nfsidmap.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.4-nfsidmap.patch
deleted file mode 100644
index 13807b159be5..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.4-nfsidmap.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 5606a69f9981948e1d6a36df763b2f16c43f080b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 2 Sep 2011 14:56:59 -0400
-Subject: [PATCH] nfsidmap: auto disable when keyutils is not found
-
-Since we already auto-disable based on libnfsidmap capabilities, don't
-make keyutils a hard failure.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- aclocal/keyutils.m4 | 4 ++--
- aclocal/libnfsidmap.m4 | 3 +--
- configure.ac | 2 +-
- 3 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/aclocal/keyutils.m4 b/aclocal/keyutils.m4
-index 84bc112..a392c0e 100644
---- a/aclocal/keyutils.m4
-+++ b/aclocal/keyutils.m4
-@@ -6,6 +6,6 @@ AC_DEFUN([AC_KEYUTILS], [
- AC_CHECK_LIB([keyutils], [keyctl_instantiate], [LIBKEYUTILS=-lkeyutils], ,)
- AC_SUBST(LIBKEYUTILS)
-
-- AC_CHECK_HEADERS([keyutils.h], ,
-- [AC_MSG_ERROR([keyutils.h header not found.])])
-+ AC_CHECK_HEADERS([keyutils.h])
-+
- ])dnl
-diff --git a/aclocal/libnfsidmap.m4 b/aclocal/libnfsidmap.m4
-index 4faa923..484b1ec 100644
---- a/aclocal/libnfsidmap.m4
-+++ b/aclocal/libnfsidmap.m4
-@@ -15,7 +15,6 @@ AC_DEFUN([AC_LIBNFSIDMAP], [
- [Define to 1 if you have the `nfs4_set_debug' function.])])
-
- dnl only enable nfsidmap when libnfsidmap supports it
-- AC_CHECK_LIB([nfsidmap], [nfs4_owner_to_uid], [enable_nfsidmap=yes],
-- [enable_nfsidmap=no])
-+ AC_CHECK_LIB([nfsidmap], [nfs4_owner_to_uid])
-
- ])dnl
-diff --git a/configure.ac b/configure.ac
-index c9fb27b..1a28f8a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -266,7 +266,7 @@ if test "$enable_nfsv4" = yes; then
- fi
- fi
- dnl enable nfsidmap when its support by libnfsidmap
--AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap" = "yes"])
-+AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
-
-
- if test "$knfsd_cv_glibc2" = no; then
---
-1.7.6
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.4-no-nfsctl.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.4-no-nfsctl.patch
deleted file mode 100644
index e36ac25547f3..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.4-no-nfsctl.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b02133aaa4feec085627172b5466d8c64a11a5a6 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 8 Dec 2011 00:10:27 -0500
-Subject: [PATCH] nfsctl: fix building with newer arches
-
-Newer arches omitting both nfsctl and nfsservctl which breaks nfsctl.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- support/nfs/nfsctl.c | 8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-diff --git a/support/nfs/nfsctl.c b/support/nfs/nfsctl.c
-index 89fa1a4..fec775f 100644
---- a/support/nfs/nfsctl.c
-+++ b/support/nfs/nfsctl.c
-@@ -11,16 +11,22 @@
- #endif
-
- #include <unistd.h>
-+#include <errno.h>
- #include <asm/unistd.h>
- #include "nfslib.h"
-
- /* compatibility hack... */
--#ifndef __NR_nfsctl
-+#if !defined(__NR_nfsctl) && defined(__NR_nfsservctl)
- #define __NR_nfsctl __NR_nfsservctl
- #endif
-
- int
- nfsctl (int cmd, struct nfsctl_arg * argp, union nfsctl_res * resp)
- {
-+#ifdef __NR_nfsctl
- return syscall (__NR_nfsctl, cmd, argp, resp);
-+#else
-+ errno = ENOSYS;
-+ return -1;
-+#endif
- }
---
-1.7.6.1
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.6-conditionals.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.6-conditionals.patch
deleted file mode 100644
index a2342b36b969..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.6-conditionals.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 869d37a16d1e409cedd95b03cea29a6db65f9276 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
-Date: Thu, 17 May 2012 16:26:44 -0700
-Subject: [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional
- execution.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Automake does not support conditional AM_CONDITIONAL calls; what that
-means is that you always have to execute AM_CONDITIONAL one way or the
-other. Both the libsqlite3.m4 file and the nfsdcld conditionals are
-executed only when NFSv4 is enabled, which breaks building with
---disable-nfsv4.
-
-Remove the SQLite3 conditional altogether as it's never used, and move
-the nfsdcld conditional outside of the conditional code.
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
----
- aclocal/libsqlite3.m4 | 1 -
- configure.ac | 3 +--
- 2 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/aclocal/libsqlite3.m4 b/aclocal/libsqlite3.m4
-index 73d1e46..8c38993 100644
---- a/aclocal/libsqlite3.m4
-+++ b/aclocal/libsqlite3.m4
-@@ -29,5 +29,4 @@ AC_DEFUN([AC_SQLITE3_VERS], [
- LIBS="$saved_LIBS"])
-
- AC_MSG_RESULT($libsqlite3_cv_is_recent)
-- AM_CONDITIONAL(CONFIG_SQLITE3, [test "$libsqlite3_cv_is_recent" = "yes"])
- ])dnl
-diff --git a/configure.ac b/configure.ac
-index 9ba53e2..b408f1b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -278,8 +278,6 @@ if test "$enable_nfsv4" = yes; then
- fi
- fi
-
-- AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
--
- dnl librpcsecgss already has a dependency on libgssapi,
- dnl but we need to make sure we get the right version
- if test "$enable_gss" = yes; then
-@@ -293,6 +291,7 @@ if test "$enable_nfsv41" = yes; then
- fi
-
- dnl enable nfsidmap when its support by libnfsidmap
-+AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
- AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
-
-
---
-1.7.8.6
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.6-cross-build.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.6-cross-build.patch
deleted file mode 100644
index 2becf943a336..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.6-cross-build.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-this is kind of hacky, but automake doesn't make this easy
-for us atm, so hack away :(
-
-(recent autotools will always add $(CFLAGS)/etc... to the compile)
-
---- a/tools/locktest/Makefile.am
-+++ b/tools/locktest/Makefile.am
-@@ -1,12 +1,11 @@
- ## Process this file with automake to produce Makefile.in
-
- CC=$(CC_FOR_BUILD)
--LIBTOOL = @LIBTOOL@ --tag=CC
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
-
- noinst_PROGRAMS = testlk
- testlk_SOURCES = testlk.c
--testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
--testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
--testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
-
- MAINTAINERCLEANFILES = Makefile.in
---- a/tools/rpcdebug/Makefile.am
-+++ b/tools/rpcdebug/Makefile.am
-@@ -1,15 +1,14 @@
- ## Process this file with automake to produce Makefile.in
-
- CC=$(CC_FOR_BUILD)
--LIBTOOL = @LIBTOOL@ --tag=CC
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
-
- man8_MANS = rpcdebug.man
- EXTRA_DIST = $(man8_MANS)
-
- sbin_PROGRAMS = rpcdebug
- rpcdebug_SOURCES = rpcdebug.c
--rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD)
--rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
--rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD)
-
- MAINTAINERCLEANFILES = Makefile.in
---- a/tools/rpcgen/Makefile.am
-+++ b/tools/rpcgen/Makefile.am
-@@ -1,7 +1,9 @@
- ## Process this file with automake to produce Makefile.in
-
- CC=$(CC_FOR_BUILD)
--LIBTOOL = @LIBTOOL@ --tag=CC
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
-
- noinst_PROGRAMS = rpcgen
- rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
-@@ -9,10 +11,6 @@
- rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \
- rpc_scan.h rpc_util.h
-
--rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
--rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
--rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
--rpcgen_LDADD=$(LIBTIRPC)
-
- MAINTAINERCLEANFILES = Makefile.in
-
- EXTRA_DIST = rpcgen.new.1
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.6-osd-install.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.6-osd-install.patch
deleted file mode 100644
index 2b637d1b7c7e..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.6-osd-install.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 6cecc20831eacec397a8c88b76757aeb662621e2 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 17 May 2012 01:18:57 -0400
-Subject: [PATCH] osd_login: fix DESTDIR install
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If the destination dir doesn't exist, the current install fails:
-make install-data-hook
-make[4]: Entering directory `/var/tmp/portage/net-fs/nfs-utils-1.2.6/work/nfs-utils-1.2.6/utils/osd_login'
-/usr/bin/install -c --mode 755 osd_login /var/tmp/portage/net-fs/nfs-utils-1.2.6/image//sbin/osd_login
-/usr/bin/install: cannot create regular file ‘/var/tmp/portage/net-fs/nfs-utils-1.2.6/image//sbin/osd_login’: No such file or directory
-make[4]: *** [install-data-hook] Error 1
-
-Rewrite the code to use automake's existing script support rather
-than trying to install the file by hand.
-
-Reported-by: Branko BAdrljica <brankob@avtomatika.com>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- utils/osd_login/Makefile.am | 11 +++++------
- 1 files changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/utils/osd_login/Makefile.am b/utils/osd_login/Makefile.am
-index adc493a..c85584c 100644
---- a/utils/osd_login/Makefile.am
-+++ b/utils/osd_login/Makefile.am
-@@ -1,12 +1,11 @@
- ## Process this file with automake to produce Makefile.in
-
--OSD_LOGIN_FILES= osd_login
--
--EXTRA_DIST= $(OSD_LOGIN_FILES)
-+# These scripts go in /sbin (not /usr/sbin), and that cannot be
-+# overriden at config time.
-+sbindir = /sbin
-
--all-local: $(OSD_LOGIN_FILES)
-+OSD_LOGIN_FILES= osd_login
-
--install-data-hook:
-- $(INSTALL) --mode 755 osd_login $(DESTDIR)/sbin/osd_login
-+sbin_SCRIPTS= osd_login
-
- MAINTAINERCLEANFILES = Makefile.in
---
-1.7.8.6
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.7-libio.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.7-libio.patch
deleted file mode 100644
index 056ae7db97b0..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.7-libio.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://bugs.gentoo.org/459200
-
-From 2d9fb08c588970b842ce2a609088079181e6aafb Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 24 Mar 2013 17:41:19 -0400
-Subject: [PATCH [nfs-utils]] check for libio.h availability
-
-On some systems (like uClibc), there isn't a libio.h header. But it
-isn't also needed on them. So check for the header first.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure.ac | 2 +-
- support/include/sockaddr.h | 6 ++++++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index f461219..cc7f3b4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -358,7 +358,7 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h \
- stdlib.h string.h sys/file.h sys/ioctl.h sys/mount.h \
- sys/param.h sys/socket.h sys/time.h sys/vfs.h \
- syslog.h unistd.h com_err.h et/com_err.h \
-- ifaddrs.h nfs-plugin.h])
-+ ifaddrs.h nfs-plugin.h libio.h])
-
- dnl *************************************************************
- dnl Checks for typedefs, structures, and compiler characteristics
-diff --git a/support/include/sockaddr.h b/support/include/sockaddr.h
-index 72766db..a1c30f9 100644
---- a/support/include/sockaddr.h
-+++ b/support/include/sockaddr.h
-@@ -20,7 +20,13 @@
- #ifndef NFS_UTILS_SOCKADDR_H
- #define NFS_UTILS_SOCKADDR_H
-
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#ifdef HAVE_LIBIO_H
- #include <libio.h>
-+#endif
- #include <stdbool.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
---
-1.8.1.2
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.7-nfsiostat-python3.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.7-nfsiostat-python3.patch
deleted file mode 100644
index 994fc726001b..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.7-nfsiostat-python3.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-From b0e3dc0c1332884a82f509f98434abd78358c7ed Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 24 Mar 2013 15:59:12 -0400
-Subject: [PATCH] nfsiostat: make it work w/python3
-
-Simple fixes here to work with python 2 & 3:
- - use print() everywhere
- - dict.iteritems() -> dict.items()
- - file() -> open()
- - sys.maxint -> sys.maxsize
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- tools/nfs-iostat/nfs-iostat.py | 130 +++++++++++++++++++++--------------------
- 1 file changed, 66 insertions(+), 64 deletions(-)
-
-diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py
-index d909632..dfbef87 100644
---- a/tools/nfs-iostat/nfs-iostat.py
-+++ b/tools/nfs-iostat/nfs-iostat.py
-@@ -3,6 +3,8 @@
- """Emulate iostat for NFS mount points using /proc/self/mountstats
- """
-
-+from __future__ import print_function
-+
- __copyright__ = """
- Copyright (C) 2005, Chuck Lever <cel@netapp.com>
-
-@@ -201,9 +203,9 @@ class DeviceData:
- result = DeviceData()
-
- # copy self into result
-- for key, value in self.__nfs_data.iteritems():
-+ for key, value in self.__nfs_data.items():
- result.__nfs_data[key] = value
-- for key, value in self.__rpc_data.iteritems():
-+ for key, value in self.__rpc_data.items():
- result.__rpc_data[key] = value
-
- # compute the difference of each item in the list
-@@ -233,9 +235,9 @@ class DeviceData:
- client_bytes_read = float(nfs_stats['serverreadbytes'] - nfs_stats['directreadbytes'])
- ratio = ((app_bytes_read - client_bytes_read) * 100) / app_bytes_read
-
-- print
-- print 'app bytes: %f client bytes %f' % (app_bytes_read, client_bytes_read)
-- print 'Data cache hit ratio: %4.2f%%' % ratio
-+ print()
-+ print('app bytes: %f client bytes %f' % (app_bytes_read, client_bytes_read))
-+ print('Data cache hit ratio: %4.2f%%' % ratio)
-
- def __print_attr_cache_stats(self, sample_time):
- """Print attribute cache efficiency stats
-@@ -255,13 +257,13 @@ class DeviceData:
- data_invalidates = float(nfs_stats['datainvalidates'])
- attr_invalidates = float(nfs_stats['attrinvalidates'])
-
-- print
-- print '%d inode revalidations, hitting in cache %4.2f%% of the time' % \
-- (revalidates, ratio)
-- print '%d open operations (mandatory GETATTR requests)' % opens
-+ print()
-+ print('%d inode revalidations, hitting in cache %4.2f%% of the time' % \
-+ (revalidates, ratio))
-+ print('%d open operations (mandatory GETATTR requests)' % opens)
- if getattr_ops != 0:
-- print '%4.2f%% of GETATTRs resulted in data cache invalidations' % \
-- ((data_invalidates * 100) / getattr_ops)
-+ print('%4.2f%% of GETATTRs resulted in data cache invalidations' % \
-+ ((data_invalidates * 100) / getattr_ops))
-
- def __print_dir_cache_stats(self, sample_time):
- """Print directory stats
-@@ -277,13 +279,13 @@ class DeviceData:
- lookups = nfs_stats['vfslookup']
- getdents = nfs_stats['vfsreaddir']
-
-- print
-- print '%d open operations (pathname lookups)' % opens
-- print '%d dentry revalidates and %d vfs lookup requests' % \
-- (dentry_revals, lookups),
-- print 'resulted in %d LOOKUPs on the wire' % lookup_ops
-- print '%d vfs getdents calls resulted in %d READDIRs on the wire' % \
-- (getdents, readdir_ops)
-+ print()
-+ print('%d open operations (pathname lookups)' % opens)
-+ print('%d dentry revalidates and %d vfs lookup requests' % \
-+ (dentry_revals, lookups))
-+ print('resulted in %d LOOKUPs on the wire' % lookup_ops)
-+ print('%d vfs getdents calls resulted in %d READDIRs on the wire' % \
-+ (getdents, readdir_ops))
-
- def __print_page_stats(self, sample_time):
- """Print page cache stats
-@@ -297,33 +299,33 @@ class DeviceData:
- vfswritepages = nfs_stats['vfswritepages']
- pages_written = nfs_stats['writepages']
-
-- print
-- print '%d nfs_readpage() calls read %d pages' % \
-- (vfsreadpage, vfsreadpage)
-- print '%d nfs_readpages() calls read %d pages' % \
-- (vfsreadpages, pages_read - vfsreadpage),
-+ print()
-+ print('%d nfs_readpage() calls read %d pages' % \
-+ (vfsreadpage, vfsreadpage))
-+ print('%d nfs_readpages() calls read %d pages' % \
-+ (vfsreadpages, pages_read - vfsreadpage))
- if vfsreadpages != 0:
-- print '(%.1f pages per call)' % \
-- (float(pages_read - vfsreadpage) / vfsreadpages)
-+ print('(%.1f pages per call)' % \
-+ (float(pages_read - vfsreadpage) / vfsreadpages))
- else:
-- print
--
-- print
-- print '%d nfs_updatepage() calls' % nfs_stats['vfsupdatepage']
-- print '%d nfs_writepage() calls wrote %d pages' % \
-- (vfswritepage, vfswritepage)
-- print '%d nfs_writepages() calls wrote %d pages' % \
-- (vfswritepages, pages_written - vfswritepage),
-+ print()
-+
-+ print()
-+ print('%d nfs_updatepage() calls' % nfs_stats['vfsupdatepage'])
-+ print('%d nfs_writepage() calls wrote %d pages' % \
-+ (vfswritepage, vfswritepage))
-+ print('%d nfs_writepages() calls wrote %d pages' % \
-+ (vfswritepages, pages_written - vfswritepage))
- if (vfswritepages) != 0:
-- print '(%.1f pages per call)' % \
-- (float(pages_written - vfswritepage) / vfswritepages)
-+ print('(%.1f pages per call)' % \
-+ (float(pages_written - vfswritepage) / vfswritepages))
- else:
-- print
-+ print()
-
- congestionwaits = nfs_stats['congestionwait']
- if congestionwaits != 0:
-- print
-- print '%d congestion waits' % congestionwaits
-+ print()
-+ print('%d congestion waits' % congestionwaits)
-
- def __print_rpc_op_stats(self, op, sample_time):
- """Print generic stats for one RPC op
-@@ -351,15 +353,15 @@ class DeviceData:
- exe_per_op = 0.0
-
- op += ':'
-- print '%s' % op.lower().ljust(15),
-- print ' ops/s\t\t kB/s\t\t kB/op\t\tretrans\t\tavg RTT (ms)\tavg exe (ms)'
-+ print('%s' % op.lower().ljust(15))
-+ print(' ops/s\t\t kB/s\t\t kB/op\t\tretrans\t\tavg RTT (ms)\tavg exe (ms)')
-
-- print '\t\t%7.3f' % (ops / sample_time),
-- print '\t%7.3f' % (kilobytes / sample_time),
-- print '\t%7.3f' % kb_per_op,
-- print ' %7d (%3.1f%%)' % (retrans, retrans_percent),
-- print '\t%7.3f' % rtt_per_op,
-- print '\t%7.3f' % exe_per_op
-+ print('\t\t%7.3f' % (ops / sample_time))
-+ print('\t%7.3f' % (kilobytes / sample_time))
-+ print('\t%7.3f' % kb_per_op)
-+ print(' %7d (%3.1f%%)' % (retrans, retrans_percent))
-+ print('\t%7.3f' % rtt_per_op)
-+ print('\t%7.3f' % exe_per_op)
-
- def ops(self, sample_time):
- sends = float(self.__rpc_data['rpcsends'])
-@@ -384,14 +386,14 @@ class DeviceData:
- else:
- backlog = 0.0
-
-- print
-- print '%s mounted on %s:' % \
-- (self.__nfs_data['export'], self.__nfs_data['mountpoint'])
-- print
-+ print()
-+ print('%s mounted on %s:' % \
-+ (self.__nfs_data['export'], self.__nfs_data['mountpoint']))
-+ print()
-
-- print ' op/s\t\trpc bklog'
-- print '%7.2f' % (sends / sample_time),
-- print '\t%7.2f' % backlog
-+ print(' op/s\t\trpc bklog')
-+ print('%7.2f' % (sends / sample_time))
-+ print('\t%7.2f' % backlog)
-
- if which == 0:
- self.__print_rpc_op_stats('READ', sample_time)
-@@ -424,7 +426,7 @@ def parse_stats_file(filename):
- ms_dict = dict()
- key = ''
-
-- f = file(filename)
-+ f = open(filename)
- for line in f.readlines():
- words = line.split()
- if len(words) == 0:
-@@ -494,7 +496,7 @@ def list_nfs_mounts(givenlist, mountstats):
- if stats.is_nfs_mountpoint():
- list += [device]
- else:
-- for device, descr in mountstats.iteritems():
-+ for device, descr in mountstats.items():
- stats = DeviceData()
- stats.parse_stats(descr)
- if stats.is_nfs_mountpoint():
-@@ -527,7 +529,7 @@ client are listed.
- usage="usage: %prog [ <interval> [ <count> ] ] [ <options> ] [ <mount point> ]",
- description=mydescription,
- version='version %s' % Iostats_version)
-- parser.set_defaults(which=0, sort=False, list=sys.maxint)
-+ parser.set_defaults(which=0, sort=False, list=sys.maxsize)
-
- statgroup = OptionGroup(parser, "Statistics Options",
- 'File I/O is displayed unless one of the following is specified:')
-@@ -572,29 +574,29 @@ client are listed.
- try:
- interval = int(arg)
- except:
-- print 'Illegal <interval> value %s' % arg
-+ print('Illegal <interval> value %s' % arg)
- return
- if interval > 0:
- interval_seen = True
- else:
-- print 'Illegal <interval> value %s' % arg
-+ print('Illegal <interval> value %s' % arg)
- return
- elif not count_seen:
- try:
- count = int(arg)
- except:
-- print 'Ilegal <count> value %s' % arg
-+ print('Ilegal <count> value %s' % arg)
- return
- if count > 0:
- count_seen = True
- else:
-- print 'Illegal <count> value %s' % arg
-+ print('Illegal <count> value %s' % arg)
- return
-
- # make certain devices contains only NFS mount points
- devices = list_nfs_mounts(origdevices, mountstats)
- if len(devices) == 0:
-- print 'No NFS mount points were found'
-+ print('No NFS mount points were found')
- return
-
-
-@@ -616,7 +618,7 @@ client are listed.
- # we need to recheck the devices list when reparsing
- devices = list_nfs_mounts(origdevices,mountstats)
- if len(devices) == 0:
-- print 'No NFS mount points were found'
-+ print('No NFS mount points were found')
- return
- count -= 1
- else:
-@@ -630,7 +632,7 @@ client are listed.
- # we need to recheck the devices list when reparsing
- devices = list_nfs_mounts(origdevices,mountstats)
- if len(devices) == 0:
-- print 'No NFS mount points were found'
-+ print('No NFS mount points were found')
- return
-
- #
-@@ -641,7 +643,7 @@ prog = os.path.basename(sys.argv[0])
- try:
- iostat_command(prog)
- except KeyboardInterrupt:
-- print 'Caught ^C... exiting'
-+ print('Caught ^C... exiting')
- sys.exit(1)
-
- sys.exit(0)
---
-1.8.1.2
-
diff --git a/net-fs/nfs-utils/files/nfsd.service b/net-fs/nfs-utils/files/nfsd.service
deleted file mode 100644
index 80bfacbb6833..000000000000
--- a/net-fs/nfs-utils/files/nfsd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=NFS server
-After=rpcbind.service
-Requires=rpcbind.service
-
-[Service]
-Type=oneshot
-EnvironmentFile=/etc/conf.d/nfs
-ExecStart=/usr/sbin/rpc.nfsd $OPTS_RPC_NFSD
-ExecStartPost=/usr/sbin/exportfs -a
-ExecStop=/usr/sbin/rpc.nfsd 0
-ExecStopPost=/usr/sbin/exportfs -a -u
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-fs/nfs-utils/files/rpc-mountd.service b/net-fs/nfs-utils/files/rpc-mountd.service
deleted file mode 100644
index 0511dde8f3e9..000000000000
--- a/net-fs/nfs-utils/files/rpc-mountd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NFS Mount Daemon
-After=rpcbind.service nfsd.service
-Requires=rpcbind.service nfsd.service
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs
-ExecStart=/usr/sbin/rpc.mountd $OPTS_RPC_MOUNTD
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-fs/nfs-utils/files/rpc-statd.service b/net-fs/nfs-utils/files/rpc-statd.service
deleted file mode 100644
index 103b6fee06b9..000000000000
--- a/net-fs/nfs-utils/files/rpc-statd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=NFSv2/3 Network Status Monitor Daemon
-After=rpcbind.service
-Requires=rpcbind.service
-Before=remote-fs-pre.target
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs
-ExecStart=/sbin/rpc.statd $OPTS_RPC_STATD
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-fs/nfs-utils/files/rpc-statd.service-r1 b/net-fs/nfs-utils/files/rpc-statd.service-r1
deleted file mode 100644
index b19eb17f59f3..000000000000
--- a/net-fs/nfs-utils/files/rpc-statd.service-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=NFSv2/3 Network Status Monitor Daemon
-After=rpcbind.service
-Requires=rpcbind.service
-Before=remote-fs-pre.target
-Wants=remote-fs-pre.target
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs
-ExecStart=/sbin/rpc.statd $OPTS_RPC_STATD
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild
deleted file mode 100644
index bfc36fd2243e..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild,v 1.10 2010/03/31 18:06:59 solar Exp $
-
-inherit eutils flag-o-matic multilib
-
-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 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="nonfsv4 tcpd kerberos elibc_glibc"
-
-# 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)
-RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
- sys-libs/e2fsprogs-libs
- >=net-nds/portmap-5b-r6
- !nonfsv4? (
- >=dev-libs/libevent-1.0b
- >=net-libs/libnfsidmap-0.21-r1
- kerberos? (
- net-libs/librpcsecgss
- net-libs/libgssglue
- app-crypt/mit-krb5
- )
- )"
-# util-linux dep is to prevent man-page collision
-DEPEND="${RDEPEND}
- >=sys-apps/util-linux-2.12r-r7"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-1.1.4-rpcgen-ioctl.patch
- epatch "${FILESDIR}"/${PN}-1.1.4-ascii-man.patch
- epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
- epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch
-}
-
-src_compile() {
- local myconf
- if use nonfsv4 ; then
- myconf="--disable-gss"
- else
- myconf="$(use_enable kerberos gss)"
- fi
-
- econf \
- --mandir=/usr/share/man \
- --with-statedir=/var/lib/nfs \
- --disable-rquotad \
- --enable-nfsv3 \
- --enable-secure-statd \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable !nonfsv4 nfsv4) \
- ${myconf} \
- || die "Configure failed"
- emake || die "Failed to compile"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- # Don't overwrite existing xtab/etab, install the original
- # versions somewhere safe... more info in pkg_postinst
- dodir /usr/lib/nfs
- keepdir /var/lib/nfs/{sm,sm.bak}
- mv "${D}"/var/lib/nfs/* "${D}"/usr/lib/nfs
- keepdir /var/lib/nfs
-
- # Install some client-side binaries in /sbin
- dodir /sbin
- mv "${D}"/usr/sbin/rpc.statd "${D}"/sbin/ || die
-
- dodoc ChangeLog README
- docinto linux-nfs ; dodoc linux-nfs/*
-
- insinto /etc
- doins "${FILESDIR}"/exports
-
- local f list=""
- if use !nonfsv4 ; then
- list="${list} rpc.idmapd rpc.pipefs"
- use kerberos && list="${list} rpc.gssd rpc.svcgssd"
- fi
- for f in nfs nfsmount rpc.statd ${list} ; do
- newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
- done
- newconfd "${FILESDIR}"/nfs.confd nfs
-
- # uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
- if ! use elibc_glibc ; then
- dobin tools/rpcgen/rpcgen || die "rpcgen"
- newdoc tools/rpcgen/README README.rpcgen
- fi
-}
-
-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. This fixes
- # bug 30486
- local f
- for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
- cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
- done
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild
deleted file mode 100644
index 102781989778..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.5.ebuild,v 1.4 2010/03/31 18:06:59 solar Exp $
-
-inherit eutils flag-o-matic multilib
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nonfsv4 tcpd kerberos elibc_glibc"
-
-# 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)
-RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
- sys-libs/e2fsprogs-libs
- >=net-nds/portmap-5b-r6
- !nonfsv4? (
- >=dev-libs/libevent-1.0b
- >=net-libs/libnfsidmap-0.21-r1
- kerberos? (
- net-libs/librpcsecgss
- net-libs/libgssglue
- app-crypt/mit-krb5
- )
- )"
-# util-linux dep is to prevent man-page collision
-DEPEND="${RDEPEND}
- >=sys-apps/util-linux-2.12r-r7"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-1.1.4-rpcgen-ioctl.patch
- epatch "${FILESDIR}"/${PN}-1.1.4-ascii-man.patch
- epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
- epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch
-}
-
-src_compile() {
- local myconf
- if use nonfsv4 ; then
- myconf="--disable-gss"
- else
- myconf="$(use_enable kerberos gss)"
- fi
-
- econf \
- --with-statedir=/var/lib/nfs \
- --enable-nfsv3 \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable !nonfsv4 nfsv4) \
- ${myconf} \
- || die "Configure failed"
- emake || die "Failed to compile"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- # Don't overwrite existing xtab/etab, install the original
- # versions somewhere safe... more info in pkg_postinst
- dodir /usr/lib/nfs
- keepdir /var/lib/nfs/{sm,sm.bak}
- mv "${D}"/var/lib/nfs/* "${D}"/usr/lib/nfs
- keepdir /var/lib/nfs
-
- # Install some client-side binaries in /sbin
- dodir /sbin
- mv "${D}"/usr/sbin/rpc.statd "${D}"/sbin/ || die
-
- dodoc ChangeLog README
- docinto linux-nfs ; dodoc linux-nfs/*
-
- insinto /etc
- doins "${FILESDIR}"/exports
-
- local f list=""
- if use !nonfsv4 ; then
- list="${list} rpc.idmapd rpc.pipefs"
- use kerberos && list="${list} rpc.gssd rpc.svcgssd"
- fi
- for f in nfs nfsmount rpc.statd ${list} ; do
- newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
- done
- newconfd "${FILESDIR}"/nfs.confd nfs
-
- # uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
- if ! use elibc_glibc ; then
- dobin tools/rpcgen/rpcgen || die "rpcgen"
- newdoc tools/rpcgen/README README.rpcgen
- fi
-}
-
-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. This fixes
- # bug 30486
- local f
- for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
- cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
- done
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.1.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.1.ebuild
deleted file mode 100644
index 76b703b7b657..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.1.ebuild,v 1.3 2010/03/31 18:06:59 solar Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 kerberos +nfsv3 +nfsv4 tcpd elibc_glibc"
-
-# 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 )
- sys-libs/e2fsprogs-libs
- net-nds/rpcbind
- net-libs/libtirpc
- nfsv4? (
- >=dev-libs/libevent-1.0b
- >=net-libs/libnfsidmap-0.21-r1
- kerberos? (
- net-libs/librpcsecgss
- net-libs/libgssglue
- net-libs/libtirpc[kerberos]
- app-crypt/mit-krb5
- )
- )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-# util-linux dep is to prevent man-page collision
-DEPEND="${DEPEND_COMMON}
- >=sys-apps/util-linux-2.12r-r7"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
- epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch
-}
-
-src_configure() {
- econf \
- --with-statedir=/var/lib/nfs \
- --enable-tirpc \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable nfsv3) \
- $(use_enable nfsv4) \
- $(use_enable ipv6) \
- $(use nfsv4 && use_enable kerberos gss || echo "--disable-gss")
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- # Don't overwrite existing xtab/etab, install the original
- # versions somewhere safe... more info in pkg_postinst
- dodir /usr/lib/nfs
- keepdir /var/lib/nfs/{sm,sm.bak}
- mv "${D}"/var/lib/nfs/* "${D}"/usr/lib/nfs
- keepdir /var/lib/nfs
-
- # Install some client-side binaries in /sbin
- dodir /sbin
- mv "${D}"/usr/sbin/rpc.statd "${D}"/sbin/ || die
-
- dodoc ChangeLog README
- docinto linux-nfs ; dodoc linux-nfs/*
-
- insinto /etc
- doins "${FILESDIR}"/exports
-
- local f list="" opt_need=""
- if use nfsv4 ; then
- opt_need="rpc.idmapd"
- list="${list} rpc.idmapd rpc.pipefs"
- use kerberos && list="${list} rpc.gssd rpc.svcgssd"
- fi
- for f in nfs nfsmount rpc.statd ${list} ; do
- newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
- done
- newconfd "${FILESDIR}"/nfs.confd nfs
- dosed "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" /etc/conf.d/nfs #234132
-
- # uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
- if ! use elibc_glibc ; then
- dobin tools/rpcgen/rpcgen || die "rpcgen"
- newdoc tools/rpcgen/README README.rpcgen
- fi
-}
-
-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. This fixes
- # bug 30486
- local f
- for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
- cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
- done
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.2-r2.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.2-r2.ebuild
deleted file mode 100644
index 83272ff43265..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.2-r2.ebuild,v 1.2 2010/09/19 22:39:27 vapier Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib autotools
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="caps ipv6 kerberos +nfsv3 +nfsv4 tcpd elibc_glibc"
-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
- net-libs/libtirpc
- nfsv4? (
- >=dev-libs/libevent-1.0b
- >=net-libs/libnfsidmap-0.21-r1
- kerberos? (
- net-libs/librpcsecgss
- net-libs/libgssglue
- net-libs/libtirpc[kerberos]
- app-crypt/mit-krb5
- )
- )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-# util-linux dep is to prevent man-page collision
-DEPEND="${DEPEND_COMMON}
- >=sys-apps/util-linux-2.12r-r7"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
- epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch
- epatch "${FILESDIR}"/${PN}-1.2.2-optional-libcap.patch #314777
- epatch "${FILESDIR}"/${PN}-1.2.2-nfsv4.patch # fix typo
- chmod a+x tests/t0001-statd-basic-mon-unmon.sh || die
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-statedir=/var/lib/nfs \
- --enable-tirpc \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable nfsv3) \
- $(use_enable nfsv4) \
- $(use_enable ipv6) \
- $(use_enable caps) \
- $(use nfsv4 && use_enable kerberos gss || echo "--disable-gss")
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- # Don't overwrite existing xtab/etab, install the original
- # versions somewhere safe... more info in pkg_postinst
- dodir /usr/$(get_libdir)/nfs
- mv "${D}"/var/lib/nfs "${D}"/usr/$(get_libdir)/ || die
- keepdir /var/lib/nfs/{,sm,sm.bak}
-
- # Install some client-side binaries in /sbin
- dodir /sbin
- mv "${D}"/usr/sbin/rpc.statd "${D}"/sbin/ || die
-
- dodoc ChangeLog README
- docinto linux-nfs ; dodoc linux-nfs/*
-
- insinto /etc
- doins "${FILESDIR}"/exports
-
- local f list="" opt_need=""
- if use nfsv4 ; then
- opt_need="rpc.idmapd"
- list="${list} rpc.idmapd rpc.pipefs"
- use kerberos && list="${list} rpc.gssd rpc.svcgssd"
- fi
- for f in nfs nfsmount rpc.statd ${list} ; do
- newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
- done
- newconfd "${FILESDIR}"/nfs.confd nfs
- dosed "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" /etc/conf.d/nfs #234132
-
- # uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
- if ! use elibc_glibc ; then
- dobin tools/rpcgen/rpcgen || die "rpcgen"
- newdoc tools/rpcgen/README README.rpcgen
- fi
-}
-
-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 "${ROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
- cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
- done
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.3-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.3-r1.ebuild
deleted file mode 100644
index d98d6b0490e5..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.3-r1.ebuild,v 1.7 2011/05/29 00:34:58 vapier Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib
-
-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 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="caps ipv6 kerberos +nfsv3 +nfsv4 tcpd elibc_glibc"
-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
- net-libs/libtirpc
- nfsv4? (
- >=dev-libs/libevent-1.0b
- >=net-libs/libnfsidmap-0.21-r1
- kerberos? (
- net-libs/librpcsecgss
- net-libs/libgssglue
- net-libs/libtirpc[kerberos]
- app-crypt/mit-krb5
- )
- )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-# util-linux dep is to prevent man-page collision
-DEPEND="${DEPEND_COMMON}
- >=sys-apps/util-linux-2.12r-r7"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
- epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch
- epatch "${FILESDIR}"/${P}-ti-rpc-static-ports.patch #340797
-}
-
-src_configure() {
- econf \
- --with-statedir=/var/lib/nfs \
- --enable-tirpc \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable nfsv3) \
- $(use_enable nfsv4) \
- $(use_enable ipv6) \
- $(use_enable caps) \
- $(use nfsv4 && use_enable kerberos gss || echo "--disable-gss")
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- # 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 "${D}"/var/lib "${D}"/usr/$(get_libdir) || die
-
- # Install some client-side binaries in /sbin
- dodir /sbin
- mv "${D}"/usr/sbin/rpc.statd "${D}"/sbin/ || die
-
- dodoc ChangeLog README
- docinto linux-nfs ; dodoc linux-nfs/*
-
- insinto /etc
- doins "${FILESDIR}"/exports
-
- local f list="" opt_need=""
- if use nfsv4 ; then
- opt_need="rpc.idmapd"
- list="${list} rpc.idmapd rpc.pipefs"
- use kerberos && list="${list} rpc.gssd rpc.svcgssd"
- fi
- for f in nfs nfsmount rpc.statd ${list} ; do
- newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
- done
- newconfd "${FILESDIR}"/nfs.confd nfs
- dosed "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" /etc/conf.d/nfs #234132
-
- # uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
- if ! use elibc_glibc ; then
- dobin tools/rpcgen/rpcgen || die "rpcgen"
- newdoc tools/rpcgen/README README.rpcgen
- fi
-}
-
-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 "${ROOT}"/var/lib/nfs #368505
- for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
- cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
- done
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.3.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.3.ebuild
deleted file mode 100644
index 99278da429db..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.3.ebuild,v 1.1 2010/10/08 19:48:08 vapier Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="caps ipv6 kerberos +nfsv3 +nfsv4 tcpd elibc_glibc"
-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
- net-libs/libtirpc
- nfsv4? (
- >=dev-libs/libevent-1.0b
- >=net-libs/libnfsidmap-0.21-r1
- kerberos? (
- net-libs/librpcsecgss
- net-libs/libgssglue
- net-libs/libtirpc[kerberos]
- app-crypt/mit-krb5
- )
- )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-# util-linux dep is to prevent man-page collision
-DEPEND="${DEPEND_COMMON}
- >=sys-apps/util-linux-2.12r-r7"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
- epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch
-}
-
-src_configure() {
- econf \
- --with-statedir=/var/lib/nfs \
- --enable-tirpc \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable nfsv3) \
- $(use_enable nfsv4) \
- $(use_enable ipv6) \
- $(use_enable caps) \
- $(use nfsv4 && use_enable kerberos gss || echo "--disable-gss")
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- # 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 "${D}"/var/lib "${D}"/usr/$(get_libdir) || die
-
- # Install some client-side binaries in /sbin
- dodir /sbin
- mv "${D}"/usr/sbin/rpc.statd "${D}"/sbin/ || die
-
- dodoc ChangeLog README
- docinto linux-nfs ; dodoc linux-nfs/*
-
- insinto /etc
- doins "${FILESDIR}"/exports
-
- local f list="" opt_need=""
- if use nfsv4 ; then
- opt_need="rpc.idmapd"
- list="${list} rpc.idmapd rpc.pipefs"
- use kerberos && list="${list} rpc.gssd rpc.svcgssd"
- fi
- for f in nfs nfsmount rpc.statd ${list} ; do
- newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
- done
- newconfd "${FILESDIR}"/nfs.confd nfs
- dosed "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" /etc/conf.d/nfs #234132
-
- # uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
- if ! use elibc_glibc ; then
- dobin tools/rpcgen/rpcgen || die "rpcgen"
- newdoc tools/rpcgen/README README.rpcgen
- fi
-}
-
-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 "${ROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
- cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
- done
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild
deleted file mode 100644
index 9768e7e9faf8..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild,v 1.8 2012/05/03 04:06:33 jdhore Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib autotools
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="caps ipv6 kerberos nfsidmap +nfsv3 +nfsv4 nfsv41 selinux tcpd elibc_glibc"
-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
- net-libs/libtirpc
- nfsv4? (
- >=dev-libs/libevent-1.0b
- >=net-libs/libnfsidmap-0.21-r1
- kerberos? (
- net-libs/librpcsecgss
- net-libs/libgssglue
- net-libs/libtirpc[kerberos]
- app-crypt/mit-krb5
- )
- nfsidmap? (
- >=net-libs/libnfsidmap-0.24
- sys-apps/keyutils
- )
- )
- selinux? (
- sec-policy/selinux-rpc
- sec-policy/selinux-rpcbind
- )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-# util-linux dep is to prevent man-page collision
-DEPEND="${DEPEND_COMMON}
- virtual/pkgconfig
- !<sys-apps/util-linux-2.12r-r7"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
- epatch "${FILESDIR}"/${P}-exportfs-xlog.patch
- epatch "${FILESDIR}"/${P}-exportfs-skip-dir.patch
- epatch "${FILESDIR}"/${P}-conditional.patch
- epatch "${FILESDIR}"/${PN}-1.2.4-nfsidmap.patch
- epatch "${FILESDIR}"/${PN}-1.2.4-cross-build.patch
- epatch "${FILESDIR}"/${PN}-1.2.4-no-nfsctl.patch
- eautoreconf
-}
-
-src_configure() {
- export ac_cv_header_keyutils_h=$(use nfsidmap && echo yes || echo no)
- econf \
- --with-statedir=/var/lib/nfs \
- --enable-tirpc \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable nfsv3) \
- $(use_enable nfsv4) \
- $(use_enable nfsv41) \
- $(use_enable ipv6) \
- $(use_enable caps) \
- $(use nfsv4 && use_enable kerberos gss || echo "--disable-gss")
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- # 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 "${D}"/var/lib "${D}"/usr/$(get_libdir) || die
-
- # Install some client-side binaries in /sbin
- dodir /sbin
- mv "${D}"/usr/sbin/rpc.statd "${D}"/sbin/ || die
-
- dodoc ChangeLog README
- docinto linux-nfs ; dodoc linux-nfs/*
-
- insinto /etc
- doins "${FILESDIR}"/exports
-
- local f list="" opt_need=""
- if use nfsv4 ; then
- opt_need="rpc.idmapd"
- list="${list} rpc.idmapd rpc.pipefs"
- use kerberos && list="${list} rpc.gssd rpc.svcgssd"
- fi
- for f in nfs nfsmount rpc.statd ${list} ; do
- newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
- done
- newconfd "${FILESDIR}"/nfs.confd nfs
- dosed "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" /etc/conf.d/nfs #234132
-
- # uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
- if ! use elibc_glibc ; then
- dobin tools/rpcgen/rpcgen || die "rpcgen"
- newdoc tools/rpcgen/README README.rpcgen
- fi
-}
-
-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 "${ROOT}"/var/lib/nfs #368505
- for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
- cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
- done
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.5.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.5.ebuild
deleted file mode 100644
index a1f28f53e397..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.5.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.5.ebuild,v 1.5 2012/05/03 04:06:33 jdhore Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib autotools
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="caps ipv6 kerberos nfsidmap +nfsv4 nfsv41 selinux tcpd elibc_glibc"
-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
- net-libs/libtirpc
- nfsv4? (
- >=dev-libs/libevent-1.0b
- >=net-libs/libnfsidmap-0.21-r1
- kerberos? (
- net-libs/librpcsecgss
- >=net-libs/libgssglue-0.3
- net-libs/libtirpc[kerberos]
- app-crypt/mit-krb5
- )
- nfsidmap? (
- >=net-libs/libnfsidmap-0.24
- sys-apps/keyutils
- )
- )
- nfsv41? (
- sys-fs/lvm2
- )
- selinux? (
- sec-policy/selinux-rpc
- sec-policy/selinux-rpcbind
- )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-# util-linux dep is to prevent man-page collision
-DEPEND="${DEPEND_COMMON}
- virtual/pkgconfig
- !<sys-apps/util-linux-2.12r-r7"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
- epatch "${FILESDIR}"/${PN}-1.2.4-cross-build.patch
- epatch "${FILESDIR}"/${PN}-1.2.4-no-nfsctl.patch
- eautoreconf
-}
-
-src_configure() {
- export ac_cv_header_keyutils_h=$(usex nfsidmap)
- econf \
- --with-statedir=/var/lib/nfs \
- --enable-tirpc \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable nfsv4) \
- $(use_enable nfsv41) \
- $(use_enable ipv6) \
- $(use_enable caps) \
- $(use nfsv4 && use_enable kerberos gss || echo "--disable-gss")
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- rm linux-nfs/Makefile* || die
- dodoc -r linux-nfs ChangeLog 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
-
- insinto /etc
- doins "${FILESDIR}"/exports
-
- local f list="" opt_need=""
- if use nfsv4 ; then
- opt_need="rpc.idmapd"
- list="${list} rpc.idmapd rpc.pipefs"
- use kerberos && list="${list} rpc.gssd rpc.svcgssd"
- fi
- for f in nfs nfsmount rpc.statd ${list} ; do
- newinitd "${FILESDIR}"/${f}.initd ${f}
- done
- newconfd "${FILESDIR}"/nfs.confd nfs
- sed -i \
- -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
- "${ED}"/etc/conf.d/nfs || die #234132
-
- # uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
- if ! use elibc_glibc ; then
- dobin tools/rpcgen/rpcgen
- newdoc tools/rpcgen/README README.rpcgen
- fi
-}
-
-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 "${ROOT}"/var/lib/nfs #368505
- for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
- cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
- done
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild
deleted file mode 100644
index 1defede6a260..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild,v 1.16 2013/04/13 20:02:02 vapier Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib autotools
-
-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 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="caps ipv6 kerberos nfsdcld nfsidmap +nfsv4 nfsv41 selinux tcpd"
-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
- net-libs/libtirpc
- nfsdcld? ( >=dev-db/sqlite-3.3 )
- nfsv4? (
- >=dev-libs/libevent-1.0b
- >=net-libs/libnfsidmap-0.21-r1
- kerberos? (
- net-libs/librpcsecgss
- >=net-libs/libgssglue-0.3
- net-libs/libtirpc[kerberos]
- app-crypt/mit-krb5
- )
- nfsidmap? (
- >=net-libs/libnfsidmap-0.24
- sys-apps/keyutils
- )
- )
- nfsv41? (
- sys-fs/lvm2
- )
- selinux? (
- sec-policy/selinux-rpc
- sec-policy/selinux-rpcbind
- )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-# util-linux dep is to prevent man-page collision
-DEPEND="${DEPEND_COMMON}
- virtual/pkgconfig
- !<sys-apps/util-linux-2.12r-r7"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
- epatch "${FILESDIR}"/${PN}-1.2.6-cross-build.patch
- epatch "${FILESDIR}"/${PN}-1.2.6-osd-install.patch
- epatch "${FILESDIR}"/${PN}-1.2.6-conditionals.patch
- epatch "${FILESDIR}"/${PN}-1.2.7-nfsiostat-python3.patch #458934
- epatch "${FILESDIR}"/${PN}-1.2.7-libio.patch #459200
- eautoreconf
-}
-
-src_configure() {
- export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
- export ac_cv_header_keyutils_h=$(usex nfsidmap)
- econf \
- --with-statedir=/var/lib/nfs \
- --enable-tirpc \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable nfsdcld) \
- $(use_enable nfsv4) \
- $(use_enable nfsv41) \
- $(use_enable ipv6) \
- $(use_enable caps) \
- $(use nfsv4 && use_enable kerberos gss || echo "--disable-gss")
-}
-
-src_install() {
- default
- rm linux-nfs/Makefile* || die
- dodoc -r linux-nfs ChangeLog 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 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
-
- local f list="" opt_need=""
- if use nfsv4 ; then
- opt_need="rpc.idmapd"
- list="${list} rpc.idmapd rpc.pipefs"
- use kerberos && list="${list} rpc.gssd rpc.svcgssd"
- fi
- for f in nfs nfsmount rpc.statd ${list} ; do
- newinitd "${FILESDIR}"/${f}.initd ${f}
- done
- for f in nfs nfsmount ; do
- newconfd "${FILESDIR}"/${f}.confd ${f}
- done
- sed -i \
- -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
- "${ED}"/etc/conf.d/nfs || die #234132
-}
-
-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 "${ROOT}"/var/lib/nfs #368505
- for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
- cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
- done
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.7-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.7-r1.ebuild
deleted file mode 100644
index ab7b6f946e89..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.7-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.7-r1.ebuild,v 1.10 2013/11/09 15:40:00 pacho Exp $
-
-EAPI="4"
-
-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 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
-IUSE="caps ipv6 kerberos nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-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.0-r1
- net-libs/libtirpc
- nfsdcld? ( >=dev-db/sqlite-3.3 )
- nfsv4? (
- >=dev-libs/libevent-1.0b
- >=net-libs/libnfsidmap-0.21-r1
- kerberos? (
- net-libs/librpcsecgss
- >=net-libs/libgssglue-0.3
- net-libs/libtirpc[kerberos]
- app-crypt/mit-krb5
- )
- nfsidmap? (
- >=net-libs/libnfsidmap-0.24
- sys-apps/keyutils
- )
- )
- nfsv41? (
- sys-fs/lvm2
- )
- selinux? (
- sec-policy/selinux-rpc
- sec-policy/selinux-rpcbind
- )
- uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-DEPEND="${DEPEND_COMMON}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
- epatch "${FILESDIR}"/${PN}-1.2.6-cross-build.patch
- epatch "${FILESDIR}"/${PN}-1.2.7-nfsiostat-python3.patch #458934
- epatch "${FILESDIR}"/${PN}-1.2.7-libio.patch #459200
- eautoreconf
-}
-
-src_configure() {
- export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
- export ac_cv_header_keyutils_h=$(usex nfsidmap)
- econf \
- --with-statedir=/var/lib/nfs \
- --enable-tirpc \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable nfsdcld nfsdcltrack) \
- $(use_enable nfsv4) \
- $(use_enable nfsv41) \
- $(use_enable ipv6) \
- $(use_enable caps) \
- $(use_enable uuid) \
- $(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss")
-}
-
-src_compile(){
- # remove compiled files bundled in the tarball
- emake clean
- default
-}
-
-src_install() {
- default
- rm linux-nfs/Makefile* || die
- dodoc -r linux-nfs ChangeLog 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
-
- 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 nfsmount rpc.statd "${list[@]}" ; do
- newinitd "${FILESDIR}"/${f}.initd ${f}
- done
- for f in nfs nfsmount ; 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 "${FILESDIR}"/nfsd.service
- systemd_dounit "${FILESDIR}"/rpc-statd.service
- systemd_dounit "${FILESDIR}"/rpc-mountd.service
-}
-
-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 "${ROOT}"/var/lib/nfs #368505
- for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
- cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
- done
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.8-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.8-r1.ebuild
deleted file mode 100644
index 6bdb18c9ca7b..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.8-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.8-r1.ebuild,v 1.2 2013/08/07 13:54:00 xarthisius Exp $
-
-EAPI="4"
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="caps ipv6 kerberos nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-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.0-r1
- net-libs/libtirpc
- nfsdcld? ( >=dev-db/sqlite-3.3 )
- nfsv4? (
- >=dev-libs/libevent-1.0b
- >=net-libs/libnfsidmap-0.21-r1
- kerberos? (
- net-libs/librpcsecgss
- >=net-libs/libgssglue-0.3
- net-libs/libtirpc[kerberos]
- app-crypt/mit-krb5
- )
- nfsidmap? (
- >=net-libs/libnfsidmap-0.24
- sys-apps/keyutils
- )
- )
- nfsv41? (
- sys-fs/lvm2
- )
- selinux? (
- sec-policy/selinux-rpc
- sec-policy/selinux-rpcbind
- )
- uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-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
- epatch "${FILESDIR}"/0001-statd-exit-if-a-statd-is-already-running.patch
- epatch "${FILESDIR}"/0001-mountd-Fix-is_subdirectory-again.patch
- eautoreconf
-}
-
-src_configure() {
- export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
- export ac_cv_header_keyutils_h=$(usex nfsidmap)
- econf \
- --with-statedir=/var/lib/nfs \
- --enable-tirpc \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable nfsdcld nfsdcltrack) \
- $(use_enable nfsv4) \
- $(use_enable nfsv41) \
- $(use_enable ipv6) \
- $(use_enable caps) \
- $(use_enable uuid) \
- $(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss")
-}
-
-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
-
- 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 nfsmount rpc.statd "${list[@]}" ; do
- newinitd "${FILESDIR}"/${f}.initd ${f}
- done
- for f in nfs nfsmount ; 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 "${FILESDIR}"/nfsd.service
- systemd_dounit "${FILESDIR}"/rpc-statd.service
- systemd_dounit "${FILESDIR}"/rpc-mountd.service
-}
-
-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 "${ROOT}"/var/lib/nfs #368505
- for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
- cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
- done
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.8-r2.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.8-r2.ebuild
deleted file mode 100644
index caabeafa3a16..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.8-r2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.8-r2.ebuild,v 1.1 2013/08/27 07:00:20 radhermit Exp $
-
-EAPI="4"
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="caps ipv6 kerberos nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-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.0-r1
- net-libs/libtirpc
- nfsdcld? ( >=dev-db/sqlite-3.3 )
- nfsv4? (
- >=dev-libs/libevent-1.0b
- >=net-libs/libnfsidmap-0.21-r1
- kerberos? (
- net-libs/librpcsecgss
- >=net-libs/libgssglue-0.3
- net-libs/libtirpc[kerberos]
- app-crypt/mit-krb5
- )
- nfsidmap? (
- >=net-libs/libnfsidmap-0.24
- sys-apps/keyutils
- )
- )
- nfsv41? (
- sys-fs/lvm2
- )
- selinux? (
- sec-policy/selinux-rpc
- sec-policy/selinux-rpcbind
- )
- uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-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
- epatch "${FILESDIR}"/0001-statd-exit-if-a-statd-is-already-running.patch
- epatch "${FILESDIR}"/0001-mountd-Fix-is_subdirectory-again.patch
- eautoreconf
-}
-
-src_configure() {
- export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
- export ac_cv_header_keyutils_h=$(usex nfsidmap)
- econf \
- --with-statedir=/var/lib/nfs \
- --enable-tirpc \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable nfsdcld nfsdcltrack) \
- $(use_enable nfsv4) \
- $(use_enable nfsv41) \
- $(use_enable ipv6) \
- $(use_enable caps) \
- $(use_enable uuid) \
- $(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \
- $(usex nfsv4 "$(use_with kerberos gssglue)" "--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
-
- 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 nfsmount rpc.statd "${list[@]}" ; do
- newinitd "${FILESDIR}"/${f}.initd ${f}
- done
- for f in nfs nfsmount ; 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 "${FILESDIR}"/nfsd.service
- systemd_dounit "${FILESDIR}"/rpc-statd.service
- systemd_dounit "${FILESDIR}"/rpc-mountd.service
-}
-
-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 "${ROOT}"/var/lib/nfs #368505
- for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
- cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
- done
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild
deleted file mode 100644
index 0bcc1b810a08..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild,v 1.2 2014/01/18 05:56:45 vapier Exp $
-
-EAPI="4"
-
-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"
-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.0-r1
- net-libs/libtirpc
- libmount? ( sys-apps/util-linux )
- nfsdcld? ( >=dev-db/sqlite-3.3 )
- nfsv4? (
- >=dev-libs/libevent-1.0b
- >=net-libs/libnfsidmap-0.21-r1
- kerberos? (
- net-libs/librpcsecgss
- >=net-libs/libgssglue-0.3
- net-libs/libtirpc[kerberos]
- app-crypt/mit-krb5
- )
- nfsidmap? (
- >=net-libs/libnfsidmap-0.24
- sys-apps/keyutils
- )
- )
- nfsv41? (
- sys-fs/lvm2
- )
- selinux? (
- sec-policy/selinux-rpc
- sec-policy/selinux-rpcbind
- )
- uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-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
- eautoreconf
-}
-
-src_configure() {
- export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
- export ac_cv_header_keyutils_h=$(usex nfsidmap)
- econf \
- --with-statedir=/var/lib/nfs \
- --enable-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) \
- $(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \
- $(usex nfsv4 "$(use_with kerberos gssglue)" "--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
-
- 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 nfsmount rpc.statd "${list[@]}" ; do
- newinitd "${FILESDIR}"/${f}.initd ${f}
- done
- for f in nfs nfsmount ; 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 "${FILESDIR}"/nfsd.service
- systemd_newunit "${FILESDIR}"/rpc-statd.service-r1 rpc-statd.service
- systemd_dounit "${FILESDIR}"/rpc-mountd.service
-}
-
-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 "${ROOT}"/var/lib/nfs #368505
- for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
- cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
- done
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.9-r2.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.9-r2.ebuild
deleted file mode 100644
index e8fc6f4b2bf9..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.9-r2.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.9-r2.ebuild,v 1.1 2014/02/01 19:01:37 pacho Exp $
-
-EAPI="4"
-
-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"
-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.0-r1
- net-libs/libtirpc
- libmount? ( sys-apps/util-linux )
- nfsdcld? ( >=dev-db/sqlite-3.3 )
- nfsv4? (
- >=dev-libs/libevent-1.0b
- >=net-libs/libnfsidmap-0.21-r1
- kerberos? (
- net-libs/librpcsecgss
- >=net-libs/libgssglue-0.3
- net-libs/libtirpc[kerberos]
- app-crypt/mit-krb5
- )
- nfsidmap? (
- >=net-libs/libnfsidmap-0.24
- sys-apps/keyutils
- )
- )
- nfsv41? (
- sys-fs/lvm2
- )
- selinux? (
- sec-policy/selinux-rpc
- sec-policy/selinux-rpcbind
- )
- uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-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
- eautoreconf
-}
-
-src_configure() {
- export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
- export ac_cv_header_keyutils_h=$(usex nfsidmap)
- econf \
- --with-statedir=/var/lib/nfs \
- --enable-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) \
- $(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \
- $(usex nfsv4 "$(use_with kerberos gssglue)" "--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
-
- 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 nfsmount rpc.statd "${list[@]}" ; do
- newinitd "${FILESDIR}"/${f}.initd ${f}
- done
- for f in nfs nfsmount ; do
- newconfd "${FILESDIR}"/${f}.confd ${f}
- done
- sed -i \
- -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
- "${ED}"/etc/conf.d/nfs || die #234132
-
- systemd_dotmpfilesd "${FILESDIR}"/nfs-utils.conf
- systemd_newunit "${FILESDIR}"/nfsd.service-r1 nfsd.service
- systemd_newunit "${FILESDIR}"/rpc-statd.service-r2 rpc-statd.service
- systemd_newunit "${FILESDIR}"/rpc-mountd.service-r1 rpc-mountd.service
- systemd_dounit "${FILESDIR}"/rpc-idmapd.service
- systemd_dounit "${FILESDIR}"/{proc-fs-nfsd,var-lib-nfs-rpc_pipefs}.mount
- use nfsv4 && use kerberos && systemd_dounit "${FILESDIR}"/rpc-{gssd,svcgssd}.service
-}
-
-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 "${ROOT}"/var/lib/nfs #368505
- for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
- cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
- done
-}
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild
deleted file mode 100644
index e45679d7e9ca..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild,v 1.11 2014/01/18 20:02:58 ago Exp $
-
-EAPI="4"
-
-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"
-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.0-r1
- net-libs/libtirpc
- libmount? ( sys-apps/util-linux )
- nfsdcld? ( >=dev-db/sqlite-3.3 )
- nfsv4? (
- >=dev-libs/libevent-1.0b
- >=net-libs/libnfsidmap-0.21-r1
- kerberos? (
- net-libs/librpcsecgss
- >=net-libs/libgssglue-0.3
- net-libs/libtirpc[kerberos]
- app-crypt/mit-krb5
- )
- nfsidmap? (
- >=net-libs/libnfsidmap-0.24
- sys-apps/keyutils
- )
- )
- nfsv41? (
- sys-fs/lvm2
- )
- selinux? (
- sec-policy/selinux-rpc
- sec-policy/selinux-rpcbind
- )
- uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
-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
- eautoreconf
-}
-
-src_configure() {
- export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
- export ac_cv_header_keyutils_h=$(usex nfsidmap)
- econf \
- --with-statedir=/var/lib/nfs \
- --enable-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) \
- $(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \
- $(usex nfsv4 "$(use_with kerberos gssglue)" "--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
-
- 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 nfsmount rpc.statd "${list[@]}" ; do
- newinitd "${FILESDIR}"/${f}.initd ${f}
- done
- for f in nfs nfsmount ; 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 "${FILESDIR}"/nfsd.service
- systemd_dounit "${FILESDIR}"/rpc-statd.service
- systemd_dounit "${FILESDIR}"/rpc-mountd.service
-}
-
-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 "${ROOT}"/var/lib/nfs #368505
- for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
- cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
- done
-}