| 1 |
commit: e7a6cbdba8e038f094b4719356a31a2e25a4d8e9 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 30 20:03:35 2016 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 30 22:03:07 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7a6cbdb |
| 7 |
|
| 8 |
sys-libs/glibc: add USE=audit & USE=caps #401677 |
| 9 |
|
| 10 |
sys-libs/glibc/files/eblits/src_configure.eblit | 7 +++++++ |
| 11 |
sys-libs/glibc/glibc-2.23.ebuild | 20 ++++++++++++++------ |
| 12 |
sys-libs/glibc/glibc-9999.ebuild | 20 ++++++++++++++------ |
| 13 |
3 files changed, 35 insertions(+), 12 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit b/sys-libs/glibc/files/eblits/src_configure.eblit |
| 16 |
index 41ba5dd..be6f52c 100644 |
| 17 |
--- a/sys-libs/glibc/files/eblits/src_configure.eblit |
| 18 |
+++ b/sys-libs/glibc/files/eblits/src_configure.eblit |
| 19 |
@@ -124,6 +124,10 @@ glibc_do_configure() { |
| 20 |
myconf+=( $(use_enable vanilla timezone-tools) ) |
| 21 |
fi |
| 22 |
|
| 23 |
+ # These libs don't have configure flags. |
| 24 |
+ ac_cv_lib_audit_audit_log_user_avc_message=$(in_iuse audit && usex audit || echo no) |
| 25 |
+ ac_cv_lib_cap_cap_init=$(in_iuse caps && usex caps || echo no) |
| 26 |
+ |
| 27 |
# There is no configure option for this and we need to export it |
| 28 |
# since the glibc build will re-run configure on itself |
| 29 |
export libc_cv_slibdir=/$(get_libdir) |
| 30 |
@@ -204,6 +208,9 @@ toolchain-glibc_headers_configure() { |
| 31 |
libc_cv_z_relro=yes |
| 32 |
libc_mips_abi=${ABI} |
| 33 |
libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard) |
| 34 |
+ # These libs don't have configure flags. |
| 35 |
+ ac_cv_lib_audit_audit_log_user_avc_message=no |
| 36 |
+ ac_cv_lib_cap_cap_init=no |
| 37 |
) |
| 38 |
einfo "Forcing cached settings:" |
| 39 |
for v in "${vars[@]}" ; do |
| 40 |
|
| 41 |
diff --git a/sys-libs/glibc/glibc-2.23.ebuild b/sys-libs/glibc/glibc-2.23.ebuild |
| 42 |
index c8cb72a..501ce19 100644 |
| 43 |
--- a/sys-libs/glibc/glibc-2.23.ebuild |
| 44 |
+++ b/sys-libs/glibc/glibc-2.23.ebuild |
| 45 |
@@ -30,7 +30,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1" |
| 46 |
PATCH_VER="3" # Gentoo patchset |
| 47 |
: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires |
| 48 |
|
| 49 |
-IUSE="debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" |
| 50 |
+IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" |
| 51 |
|
| 52 |
# Here's how the cross-compile logic breaks down ... |
| 53 |
# CTARGET - machine that will target the binaries |
| 54 |
@@ -64,13 +64,21 @@ SLOT="2.2" |
| 55 |
|
| 56 |
# General: We need a new-enough binutils/gcc to match upstream baseline. |
| 57 |
# arch: we need to make sure our binutils/gcc supports TLS. |
| 58 |
-DEPEND=">=app-misc/pax-utils-0.1.10 |
| 59 |
+COMMON_DEPEND=" |
| 60 |
+ nscd? ( selinux? ( |
| 61 |
+ audit? ( sys-process/audit ) |
| 62 |
+ caps? ( sys-libs/libcap ) |
| 63 |
+ ) ) |
| 64 |
+ suid? ( caps? ( sys-libs/libcap ) ) |
| 65 |
+ selinux? ( sys-libs/libselinux ) |
| 66 |
+" |
| 67 |
+DEPEND="${COMMON_DEPEND} |
| 68 |
+ >=app-misc/pax-utils-0.1.10 |
| 69 |
!<sys-apps/sandbox-1.6 |
| 70 |
- !<sys-apps/portage-2.1.2 |
| 71 |
- selinux? ( sys-libs/libselinux )" |
| 72 |
-RDEPEND="!sys-kernel/ps3-sources |
| 73 |
+ !<sys-apps/portage-2.1.2" |
| 74 |
+RDEPEND="${COMMON_DEPEND} |
| 75 |
+ !sys-kernel/ps3-sources |
| 76 |
sys-apps/gentoo-functions |
| 77 |
- selinux? ( sys-libs/libselinux ) |
| 78 |
!sys-libs/nss-db" |
| 79 |
|
| 80 |
if [[ ${CATEGORY} == cross-* ]] ; then |
| 81 |
|
| 82 |
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild |
| 83 |
index 3263afe..7ec5113 100644 |
| 84 |
--- a/sys-libs/glibc/glibc-9999.ebuild |
| 85 |
+++ b/sys-libs/glibc/glibc-9999.ebuild |
| 86 |
@@ -30,7 +30,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1" |
| 87 |
PATCH_VER="" # Gentoo patchset |
| 88 |
: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires |
| 89 |
|
| 90 |
-IUSE="debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" |
| 91 |
+IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" |
| 92 |
|
| 93 |
# Here's how the cross-compile logic breaks down ... |
| 94 |
# CTARGET - machine that will target the binaries |
| 95 |
@@ -64,13 +64,21 @@ SLOT="2.2" |
| 96 |
|
| 97 |
# General: We need a new-enough binutils/gcc to match upstream baseline. |
| 98 |
# arch: we need to make sure our binutils/gcc supports TLS. |
| 99 |
-DEPEND=">=app-misc/pax-utils-0.1.10 |
| 100 |
+COMMON_DEPEND=" |
| 101 |
+ nscd? ( selinux? ( |
| 102 |
+ audit? ( sys-process/audit ) |
| 103 |
+ caps? ( sys-libs/libcap ) |
| 104 |
+ ) ) |
| 105 |
+ suid? ( caps? ( sys-libs/libcap ) ) |
| 106 |
+ selinux? ( sys-libs/libselinux ) |
| 107 |
+" |
| 108 |
+DEPEND="${COMMON_DEPEND} |
| 109 |
+ >=app-misc/pax-utils-0.1.10 |
| 110 |
!<sys-apps/sandbox-1.6 |
| 111 |
- !<sys-apps/portage-2.1.2 |
| 112 |
- selinux? ( sys-libs/libselinux )" |
| 113 |
-RDEPEND="!sys-kernel/ps3-sources |
| 114 |
+ !<sys-apps/portage-2.1.2" |
| 115 |
+RDEPEND="${COMMON_DEPEND} |
| 116 |
+ !sys-kernel/ps3-sources |
| 117 |
sys-apps/gentoo-functions |
| 118 |
- selinux? ( sys-libs/libselinux ) |
| 119 |
!sys-libs/nss-db" |
| 120 |
|
| 121 |
if [[ ${CATEGORY} == cross-* ]] ; then |
Archives