diff options
Diffstat (limited to 'net-fs/nfs-utils')
| -rw-r--r-- | net-fs/nfs-utils/Manifest | 5 | ||||
| -rw-r--r-- | net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch | 115 | ||||
| -rw-r--r-- | net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild | 5 | ||||
| -rw-r--r-- | net-fs/nfs-utils/nfs-utils-2.5.4.ebuild | 5 |
4 files changed, 4 insertions, 126 deletions
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index 7347c5510009..32305dce33aa 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -1,5 +1,4 @@ AUX exports 66 BLAKE2B 8ddc8e1b7888570cf7ce21ecebf0fb390ab394d25e60f1d914406396b23cb3cbf243a15a199f30608ac7e3c0abde73f48e0ccea605a3dadad654dfd8d6572dcd SHA512 fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220 -AUX nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch 2681 BLAKE2B 146fde57e821c15671d226ba8d714a442e2ee740183fcf68cab56680b1131a435ee4ae08eca3a7a2e17e4c7267de6cd2273a7a771f04be5c47294c411686bde6 SHA512 77a11af3d6262d53034d6aac4bcb7c2c5c1d52bc23d1323e5fb844a247ae6b8ed58ffb0e6f76ce7b71692e2f89ae965893179a6b978a1081792b1ef2ef08ba36 AUX nfs-utils-2.5.2-no-werror.patch 1907 BLAKE2B 8d9ac90d445dd029d8db80ff39559d3f4f25f7560c17ce72a62b489998e1d4d4875d574b27fe057388bcd7f0062703b812ce043b23dfe46fdabc9ba53591edcb SHA512 9cabbfa67d193c2c944c257089d67bc33230fb804d3a350ee2bcd5595594ff35ba6485c1ab240b956f5c08c40a41a0adc87c9ad9f967d2b7eb1d2dd51c9a6e9e AUX nfs.confd 930 BLAKE2B 4ef1662b31cffd78b0e96396ad74dc8b8135a9a18956fa1267639d2069893d4f218ded5809497b56d19a192e7e18408e1d1b56bd1535abed8db236bc1a1649cb SHA512 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535 AUX nfs.initd 4010 BLAKE2B 002a2df50cafec59caf05db520afc1432501b1fc86c51299f941417f3c9ea6af59849c3fa2656bd7b68cc6ffeb1b88e89fcd7bc38e8b76bb30e60f3fcd39be32 SHA512 14fa9ec9b58855539b0c4a8246041c1b607412a7e7030305bfa8315cd18ddcad6011ffea911e20db710f23d009b15183dc03bf1acc35a833bf114134ea998d0c @@ -13,6 +12,6 @@ AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c8621 AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f DIST nfs-utils-2.5.3.tar.bz2 937544 BLAKE2B 817af2c302cf110519e64353a507645137ffd3b93b46eb94e71d45a1869c9e831e344f0baa33b1b39514962798cca542cf56a2830520c67e96e78995f2bf901f SHA512 3be82f42c5da2bbbca4429459c858c58ae7333725749213c824d0c01b78f0beb7384455f314fc1cc1799968f9f40fd616297c7baf3514ca0e31d4686e9d6e732 DIST nfs-utils-2.5.4.tar.bz2 943373 BLAKE2B 72ed871613701f5b035941a7aed957771fe3b6a19fefee203130442c292bbbefde35721f2287fef19046d2d837faeda43b06a93a5acdb8ac6240eef90e6dd12c SHA512 b1395c5b06a06246666c48174594b1e08b71cf40b8f94b533497bd92625401a669e2c40e48dbd665891ad2247bc94d7d604d0c5d0f0b66bfe957b03d42e5d305 -EBUILD nfs-utils-2.5.3-r1.ebuild 5851 BLAKE2B fefbb4190c3addefc2282317c1e2f260e7c353afc981d3d119917910d0fc0566eb20184d68444e3b69ed5d81beaf2cc3cc4a39ac7e6416100c752ea4c57032a3 SHA512 2dd920059f921562b32a432d8022c4f3678741a6c2dff2850aead6af9f02594cc7cac7a99314ccce0357eb8f7d20934db9ebc70b0bd9071583f3d14ee6c34779 -EBUILD nfs-utils-2.5.4.ebuild 5851 BLAKE2B fefbb4190c3addefc2282317c1e2f260e7c353afc981d3d119917910d0fc0566eb20184d68444e3b69ed5d81beaf2cc3cc4a39ac7e6416100c752ea4c57032a3 SHA512 2dd920059f921562b32a432d8022c4f3678741a6c2dff2850aead6af9f02594cc7cac7a99314ccce0357eb8f7d20934db9ebc70b0bd9071583f3d14ee6c34779 +EBUILD nfs-utils-2.5.3-r1.ebuild 5787 BLAKE2B d36962dfd822d8eb1115a6c615f051ea5b91096b63e691d6a6c4c930b27a7947e1afa6b475c567e6f03c833e6922344a484511a5abebb0d6c9f96081da9ffcbb SHA512 e3da198d03bfead59e195d295966552ce95bccf659b1fc22ba035b3dcf60c8f9207b3546612385dce7ce05f4318631b1aeb811103e1e196befcefa465d15c650 +EBUILD nfs-utils-2.5.4.ebuild 5787 BLAKE2B d36962dfd822d8eb1115a6c615f051ea5b91096b63e691d6a6c4c930b27a7947e1afa6b475c567e6f03c833e6922344a484511a5abebb0d6c9f96081da9ffcbb SHA512 e3da198d03bfead59e195d295966552ce95bccf659b1fc22ba035b3dcf60c8f9207b3546612385dce7ce05f4318631b1aeb811103e1e196befcefa465d15c650 MISC metadata.xml 865 BLAKE2B b0f6be692417a8af07b26e95555c5aba8416ed9d1afa59d15bf9df313b727db2a0331500dc93ae34ee9ed4c693c3505bad2dbc405facdbca5447cf37d92340fc SHA512 df1dd59066480b5e3eb8b46091d134ea1701600c20766b259d60c8a81786f4f06edbe7441a20bb62f10b53d6d8c5d76ae073f392254caa12d3dea3b09c172973 diff --git a/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch b/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch deleted file mode 100644 index 8541a985ffa5..000000000000 --- a/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 1378280398ef9f5cd45f5542ae2945b9a360b132 Mon Sep 17 00:00:00 2001 -From: Doug Nazar <nazard@nazar.ca> -Date: Sun, 17 Nov 2019 14:31:33 -0500 -Subject: [PATCH] Ensure consistent struct stat definition - -Although 2fbc62e2a13fc ("Fix include order between config.h and stat.h") -reorganized those files that were already including config.h, not all -files were including config.h. - -Fixes at least stack smashing crashes in mountd on 32-bit systems. - -Signed-off-by: Doug Nazar <nazard@nazar.ca> -Signed-off-by: Steve Dickson <steved@redhat.com> ---- - support/junction/junction.c | 4 ++++ - support/misc/file.c | 4 ++++ - support/misc/mountpoint.c | 4 ++++ - support/nfs/cacheio.c | 4 ++++ - utils/mount/fstab.c | 4 ++++ - utils/nfsdcld/legacy.c | 4 ++++ - 6 files changed, 24 insertions(+) - -diff --git a/support/junction/junction.c b/support/junction/junction.c -index ab6caa6..41cce26 100644 ---- a/support/junction/junction.c -+++ b/support/junction/junction.c -@@ -27,6 +27,10 @@ - #include <config.h> - #endif - -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ - #include <sys/types.h> - #include <sys/stat.h> - -diff --git a/support/misc/file.c b/support/misc/file.c -index e7c3819..06f6bb2 100644 ---- a/support/misc/file.c -+++ b/support/misc/file.c -@@ -22,6 +22,10 @@ - #include <config.h> - #endif - -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ - #include <sys/stat.h> - - #include <string.h> -diff --git a/support/misc/mountpoint.c b/support/misc/mountpoint.c -index c6217f2..14d6731 100644 ---- a/support/misc/mountpoint.c -+++ b/support/misc/mountpoint.c -@@ -7,6 +7,10 @@ - #include <config.h> - #endif - -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ - #include <string.h> - #include "xcommon.h" - #include <sys/stat.h> -diff --git a/support/nfs/cacheio.c b/support/nfs/cacheio.c -index 9dc4cf1..7c4cf37 100644 ---- a/support/nfs/cacheio.c -+++ b/support/nfs/cacheio.c -@@ -19,6 +19,10 @@ - #include <config.h> - #endif - -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ - #include <nfslib.h> - #include <inttypes.h> - #include <stdio.h> -diff --git a/utils/mount/fstab.c b/utils/mount/fstab.c -index eedbdda..8b0aaf1 100644 ---- a/utils/mount/fstab.c -+++ b/utils/mount/fstab.c -@@ -11,6 +11,10 @@ - #include <config.h> - #endif - -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ - #include <errno.h> - #include <stdio.h> - #include <fcntl.h> -diff --git a/utils/nfsdcld/legacy.c b/utils/nfsdcld/legacy.c -index 07f477a..3c6bea6 100644 ---- a/utils/nfsdcld/legacy.c -+++ b/utils/nfsdcld/legacy.c -@@ -19,6 +19,10 @@ - #include <config.h> - #endif - -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ - #include <stdio.h> - #include <dirent.h> - #include <string.h> --- -1.8.3.1 - diff --git a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild index f23ef6c8d927..9d0e1b2310be 100644 --- a/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild +++ b/net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild @@ -63,10 +63,7 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( - "${FILESDIR}"/${PN}-2.5.2-no-werror.patch - "${FILESDIR}"/${PN}-2.4.2-Ensure-consistent-struct-stat.patch -) +PATCHES=( "${FILESDIR}"/${PN}-2.5.2-no-werror.patch ) pkg_setup() { linux-info_pkg_setup diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild index f23ef6c8d927..9d0e1b2310be 100644 --- a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild +++ b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild @@ -63,10 +63,7 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( - "${FILESDIR}"/${PN}-2.5.2-no-werror.patch - "${FILESDIR}"/${PN}-2.4.2-Ensure-consistent-struct-stat.patch -) +PATCHES=( "${FILESDIR}"/${PN}-2.5.2-no-werror.patch ) pkg_setup() { linux-info_pkg_setup |