From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7AC80158D91 for ; Thu, 19 Aug 2021 18:37:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51BD3E0848; Thu, 19 Aug 2021 18:37:17 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10CCAE084A for ; Thu, 19 Aug 2021 18:37:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D544335D75 for ; Thu, 19 Aug 2021 18:37:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B7C4725 for ; Thu, 19 Aug 2021 18:37:12 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1629398222.15e52a540301f86835a5d174d1ef453ba94ae4b8.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/files/, net-fs/nfs-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild net-fs/nfs-utils/nfs-utils-2.5.4.ebuild X-VCS-Directories: net-fs/nfs-utils/files/ net-fs/nfs-utils/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 15e52a540301f86835a5d174d1ef453ba94ae4b8 X-VCS-Branch: master Date: Thu, 19 Aug 2021 18:37:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 497bd6ab-e193-4425-9f59-004078b30781 X-Archives-Hash: bd7ae7638064e08868df8ed3844542e0 commit: 15e52a540301f86835a5d174d1ef453ba94ae4b8 Author: David Seifert gentoo org> AuthorDate: Thu Aug 19 18:37:02 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Thu Aug 19 18:37:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e52a54 net-fs/nfs-utils: remove dead patch * The patch was being double applied, because the original commit is already part of all releases. Signed-off-by: David Seifert gentoo.org> ...utils-2.4.2-Ensure-consistent-struct-stat.patch | 115 --------------------- net-fs/nfs-utils/nfs-utils-2.5.3-r1.ebuild | 5 +- net-fs/nfs-utils/nfs-utils-2.5.4.ebuild | 5 +- 3 files changed, 2 insertions(+), 123 deletions(-) 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 8541a985ffa..00000000000 --- 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 -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 -Signed-off-by: Steve Dickson ---- - 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 - #endif - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #include - #include - -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 - #endif - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #include - - #include -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 - #endif - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #include - #include "xcommon.h" - #include -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 - #endif - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #include - #include - #include -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 - #endif - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #include - #include - #include -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 - #endif - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #include - #include - #include --- -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 f23ef6c8d92..9d0e1b2310b 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 f23ef6c8d92..9d0e1b2310b 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