diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
| commit | bd4aeefe33e63f613512604e47bfca7b2187697d (patch) | |
| tree | adb35b5a9a00ee7ea591ab0c987f70167c23b597 /net-fs/nfs-utils | |
| parent | 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff) | |
gentoo resync : 03.11.2019
Diffstat (limited to 'net-fs/nfs-utils')
| -rw-r--r-- | net-fs/nfs-utils/Manifest | 3 | ||||
| -rw-r--r-- | net-fs/nfs-utils/files/nfs-utils-2.4.1-statx.patch | 31 | ||||
| -rw-r--r-- | net-fs/nfs-utils/nfs-utils-2.4.1-r3.ebuild (renamed from net-fs/nfs-utils/nfs-utils-2.4.1-r2.ebuild) | 1 |
3 files changed, 34 insertions, 1 deletions
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index db64845a9617..b0a83c03742b 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -4,6 +4,7 @@ AUX nfs-utils-1.2.8-cross-build.patch 1323 BLAKE2B 51ec6b58436725e78fd9000aa1d97 AUX nfs-utils-2.3.4-no-werror.patch 1832 BLAKE2B 6e0f3da6a355c3b828bbaae3135c3a6c8bab29008cf160ca728ff5b72402f108221b4def304e9bf36f98310407bee9c26d828ab833bb7a9619fdaf609e66d06c SHA512 ce76f46c8dcef8b151040b9d198843746b6c20507c23a0dc511b3d3dec7681b3ac65c089de3f09d4e496ffa1bd011c034ce70198def374058a0805daf4ec8292 AUX nfs-utils-2.4.1-Fix-include-order-between-config.h-and-stat.h.patch 4020 BLAKE2B 9f9079879be7bbaaf7748d4c2e5711fdeacac8b389fdb48d7fdc1c781191dc283f2dc05c9aded7558eb0cf3801cf7eda7032d091592e45cb8eb47018a0ce5430 SHA512 36b80e0f1ef0826e25ee719980171f4d6215db246392e1dbceef6aab4f1fbe78e4e1222256dfb23232b7da1b5328a23050966f3608a10c8b70b2f75491603f31 AUX nfs-utils-2.4.1-gssd-Look-in-lib32-for-gss-libs-aswell.patch 1608 BLAKE2B 761eb16d6556b0df1029556453922925ccac7bdc88c4f769382afdf659dfccdd90aa6a183d317667c638e2d2d4d8fc080cfe49070c5fec5bb5f5dc2f66d2040e SHA512 cc4a7a7dde84854b52f57afe09bbff9e241712a19784febd0992b5b53b4b14905b6daf6620a8e9049fbda1dfe0a1619f322adc0517d9747466d7974d4c3eac06 +AUX nfs-utils-2.4.1-statx.patch 976 BLAKE2B 22441e3a872603978ea6d397554de76be60addf04e115cc85b0899ed471446759010bcd30e77656082be9553cdb4454e0e384140034b87af1240f810a6f7a94c SHA512 8528282344a036ce8de2173cf370141d9dac93eae4616e39748dd07bb20592464479b53ac89e02159d65f1f7c2290410122c27e9f878bee07e950ac5f4b8d423 AUX nfs-utils.conf 74 BLAKE2B 504c298c1e8e7eb596cd87813f1aeeac5cbc830bb85be9e26ed98f7ed85cdbd14ae2c47b0e111c912398ef28ef629e6de7e585a7b161624e9698ea208750fd9f SHA512 d72c0fbdf12cb1ddf8eaa5885e1ed93a2078c40ca48eb8868836fb72fa456c4865df15273fb7472f70dfe8098167e695b1340ff9a59b55e73b47690baaf977d6 AUX nfs.confd 930 BLAKE2B 4ef1662b31cffd78b0e96396ad74dc8b8135a9a18956fa1267639d2069893d4f218ded5809497b56d19a192e7e18408e1d1b56bd1535abed8db236bc1a1649cb SHA512 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535 AUX nfs.initd 4013 BLAKE2B 3ccbafc56cb1aaf7b091ca5e895e71516a899177dbf5b74d3b8ecd7cb369ed2a3108cef8f76f6abc72272fbc1c692bc50a219025a9abc05d2ffb0e9caf2309d9 SHA512 2bfd641d1ff3b377aef81632ceba75e1e9aa0305d776ac8ca03217f253040ea3e6349d6d2d1815b91c5f6c90d076d6cb86294e41ecd19f31c288219620703ecc @@ -18,5 +19,5 @@ AUX rpc.pipefs.initd 760 BLAKE2B 4c05275e59d7d19d80779964a3631096258704cec2097f1 AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c86216658fc89dafff1ae9f85a25b5386e4c89b86ca1b7b1fce7bb3045f944b7a1aee5b6544594d753cf8 SHA512 7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f DIST nfs-utils-2.4.1.tar.bz2 910791 BLAKE2B 4419eff7fca21747e0bc4969ebb8a8b863aa951984af8f23f197e7dfc4faad3770173808862b84178714ca75f021be1af96f9e4408fecd7ef97999d261f2f21b SHA512 655a115955f35177b761f821e29c752693d614f4c6c2a90d392e0ab83b615247a397cf18e8ad453a93c6dc528d1fa90cfdf8b04de6626e0f4083b10e2e54f540 -EBUILD nfs-utils-2.4.1-r2.ebuild 5954 BLAKE2B bb9adec2c148b07d5d09fcf77c04da15fe126bab11a1f81eee62b19115a80cb767b914f94a9fe4500b17365b33d9b99f6877d7e5652b9d0b1b8e4f552eb767d7 SHA512 da682d165e31fbb3fe913591ab7a5e2d4da69f30f486435cbf512d5cc14a8a07c41b8b23da4b0c1b3b6251f808f02de91eca55862ecdbe8dd21ced5d32989d20 +EBUILD nfs-utils-2.4.1-r3.ebuild 6001 BLAKE2B 2cc1e77beb725f3d78b80d881865eb11ca50db5d1f9fe3e1d09236e355d0d2c65b661ea294f54a8310976439fc543fce83555afcc26844a9a09492335f681ad2 SHA512 a81ac62e01ddf000515f48bca196896cd56acec1fd447d912a659b825489b196e54b86b46606c1411f0eae4d740ce55fa95583b9b56c7d76b232c20eef889d22 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5 diff --git a/net-fs/nfs-utils/files/nfs-utils-2.4.1-statx.patch b/net-fs/nfs-utils/files/nfs-utils-2.4.1-statx.patch new file mode 100644 index 000000000000..7515a819915c --- /dev/null +++ b/net-fs/nfs-utils/files/nfs-utils-2.4.1-statx.patch @@ -0,0 +1,31 @@ +From c8953944c5d34095d42f604f911022fbe144918c Mon Sep 17 00:00:00 2001 +From: Andreas Steinmetz <ast@domdv.de> +Date: Wed, 30 Oct 2019 16:57:00 +0100 +Subject: [PATCH] Old kernels don't know statx calls and return EINVAL + +On a system with glibc-2.29 and kernel 4.9.128 nfs v3 mount fails as +statx() with mask=STATX_BASIC_STATS returns EINVAL, probably from +glibc, as strace of rpc.mountd shows no system call. + +Fixes: https://bugs.gentoo.org/688644 +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + support/misc/xstat.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/support/misc/xstat.c b/support/misc/xstat.c +index fa047880..6aca6e29 100644 +--- a/support/misc/xstat.c ++++ b/support/misc/xstat.c +@@ -47,6 +47,8 @@ statx_do_stat(int fd, const char *pathname, struct stat *statbuf, int flags) + statx_copy(statbuf, &stxbuf); + return 0; + } ++ if (errno == EINVAL) ++ errno = ENOSYS; + if (errno == ENOSYS) + statx_supported = 0; + } else +-- +2.24.0.rc1 + diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1-r2.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1-r3.ebuild index 26c3bbb3348d..24e426f2374b 100644 --- a/net-fs/nfs-utils/nfs-utils-2.4.1-r2.ebuild +++ b/net-fs/nfs-utils/nfs-utils-2.4.1-r3.ebuild @@ -69,6 +69,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.3.4-no-werror.patch "${FILESDIR}"/${P}-gssd-Look-in-lib32-for-gss-libs-aswell.patch "${FILESDIR}"/${P}-Fix-include-order-between-config.h-and-stat.h.patch + "${FILESDIR}"/${PN}-2.4.1-statx.patch #688644 ) pkg_setup() { |