From 4b19be30aa626b327c885dae62c559ec0e9fb935 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 13 Oct 2019 22:19:36 +0100
Subject: gentoo resync : 13.10.2019

---
 profiles/features/hardened/make.defaults                       |  2 +-
 profiles/features/hardened/package.use.mask                    |  2 +-
 .../features/prefix/standalone/kernel-2.6.16+/profile.bashrc   | 10 ----------
 profiles/features/prefix/standalone/package.use.mask           |  6 ++++++
 4 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'profiles/features')

diff --git a/profiles/features/hardened/make.defaults b/profiles/features/hardened/make.defaults
index 8435f024ae44..0646f4850056 100644
--- a/profiles/features/hardened/make.defaults
+++ b/profiles/features/hardened/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation.
+# Copyright 1999-2019 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (2011-11-16)
diff --git a/profiles/features/hardened/package.use.mask b/profiles/features/hardened/package.use.mask
index e02b6fa64f67..c903d0bed882 100644
--- a/profiles/features/hardened/package.use.mask
+++ b/profiles/features/hardened/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 sys-apps/hwloc gl
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc b/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
index c08217181df4..049bbfe48ee6 100644
--- a/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
@@ -11,16 +11,6 @@ elif [[ ${CATEGORY}/${PN} == dev-qt/qtcore && ${EBUILD_PHASE} == configure ]]; t
 elif [[ ${CATEGORY}/${PN} == dev-lang/ocaml && ${EBUILD_PHASE} == configure ]]; then
     einfo "Removing dup3 and pipe2 definitions..."
     sed -e '/hasgot dup3/,/^fi/d;/hasgot pipe2/,/^fi/d' -i "${S}"/configure || die
-elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == compile ]]; then
-    einfo "Removing F_DUPFD_CLOEXEC definitions..."
-    sed -e '/define.*F_DUPFD_CLOEXEC/,/*\//d' -i "${S}"/sysdeps/unix/sysv/linux/bits/fcntl-linux.h || die
-    einfo "Removing pipe2 definitions..."
-    sed -e '/^extern int pipe2/d' -i "${S}"/posix/unistd.h || die
-    einfo "Removing epoll_create1 definitions..."
-    sed -e '/^extern int epoll_create1/d' -i "${S}"/sysdeps/unix/sysv/linux/sys/epoll.h || die
-    einfo "Removing lutimes and utimensat definitions..."
-    sed -e '/^extern int lutimes/,/__THROW/d' -i "${S}"/time/sys/time.h || die
-    sed -e '/^extern int utimensat/,/__THROW/d' -i "${S}"/io/sys/stat.h || die
 fi
 
 # Local Variables:
diff --git a/profiles/features/prefix/standalone/package.use.mask b/profiles/features/prefix/standalone/package.use.mask
index 7653e7fd7c1d..d875d29e2a2e 100644
--- a/profiles/features/prefix/standalone/package.use.mask
+++ b/profiles/features/prefix/standalone/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Benda Xu <heroxbd@gentoo.org> (2019-10-09)
+# Do not draw pam from @system. Bug 695966.
+# runuser is not necessary for Prefix.
+sys-apps/util-linux pam
+net-misc/openssh pam
+
 # Benda Xu <heroxbd@gentoo.org> (2019-01-26)
 # native-extensions requires >=linux=4.6 for __NR_copy_file_range
 sys-apps/portage native-extensions
-- 
cgit v1.2.3