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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AF75D158094 for ; Tue, 16 Aug 2022 22:53:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2298E07D3; Tue, 16 Aug 2022 22:53:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C1E33E07D3 for ; Tue, 16 Aug 2022 22:53:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D9DBA341347 for ; Tue, 16 Aug 2022 22:53:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50DAE558 for ; Tue, 16 Aug 2022 22:53:50 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1660690420.2f1281ade31419d6e1f9370790faab77b7a8d1f1.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/autofs/files/, net-fs/autofs/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/autofs/autofs-5.1.8-r1.ebuild net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch X-VCS-Directories: net-fs/autofs/ net-fs/autofs/files/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: 2f1281ade31419d6e1f9370790faab77b7a8d1f1 X-VCS-Branch: master Date: Tue, 16 Aug 2022 22:53:50 +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: 8ccf9100-29df-472f-be44-d5c96017bbf6 X-Archives-Hash: 870878b67630b176c1edb972b13de9d0 commit: 2f1281ade31419d6e1f9370790faab77b7a8d1f1 Author: Yixun Lan gentoo org> AuthorDate: Tue Aug 16 09:01:31 2022 +0000 Commit: Yixun Lan gentoo org> CommitDate: Tue Aug 16 22:53:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f1281ad net-fs/autofs: fix redefinition of struct mount_attr err Closes: https://bugs.gentoo.org/863791 Signed-off-by: Yixun Lan gentoo.org> net-fs/autofs/autofs-5.1.8-r1.ebuild | 1 + .../autofs/files/autofs-5.1.8-mount_conflict.patch | 30 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/net-fs/autofs/autofs-5.1.8-r1.ebuild b/net-fs/autofs/autofs-5.1.8-r1.ebuild index acf7831595cd..908f5077ea02 100644 --- a/net-fs/autofs/autofs-5.1.8-r1.ebuild +++ b/net-fs/autofs/autofs-5.1.8-r1.ebuild @@ -45,6 +45,7 @@ PATCHES=( "${WORKDIR}"/${P}-patches/ "${FILESDIR}/${P}-dmalloc.patch" "${FILESDIR}/${P}-nfsv4-mount.patch" + "${FILESDIR}/${P}-mount_conflict.patch" ) pkg_setup() { diff --git a/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch b/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch new file mode 100644 index 000000000000..e2a94bf82542 --- /dev/null +++ b/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch @@ -0,0 +1,30 @@ +Avoid conflicts between sys/mount.h and linux/mount.h + +linux/fs.h includes linux/mount.h and this include file is unused so +do not include it and avoid conflict too with glibc 2.36+ see [1] + +[1] https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- a/modules/parse_amd.c ++++ b/modules/parse_amd.c +@@ -27,7 +27,6 @@ + #include + #include + #include +-#include + + #define MODULE_PARSE + #include "automount.h" +--- a/modules/parse_sun.c ++++ b/modules/parse_sun.c +@@ -30,7 +30,6 @@ + #include + #include + #include +-#include + + #define MODULE_PARSE + #include "automount.h"