From 40fbc898648273d2140f22f0fff988a80b68cb18 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 16 Jul 2021 09:20:03 -0700 Subject: Switch to libxcrypt --- base/etc/portage/package.accept_keywords/xcrypt | 6 ++++++ base/etc/portage/package.use/xcrypt | 5 +++++ base/etc/portage/profile/package.unmask/xcrypt | 2 ++ base/etc/portage/profile/package.use.force/xcrypt | 2 ++ base/etc/portage/profile/package.use.mask/xcrypt | 2 ++ 5 files changed, 17 insertions(+) create mode 100644 base/etc/portage/package.accept_keywords/xcrypt create mode 100644 base/etc/portage/package.use/xcrypt create mode 100644 base/etc/portage/profile/package.unmask/xcrypt create mode 100644 base/etc/portage/profile/package.use.force/xcrypt create mode 100644 base/etc/portage/profile/package.use.mask/xcrypt (limited to 'base/etc/portage') diff --git a/base/etc/portage/package.accept_keywords/xcrypt b/base/etc/portage/package.accept_keywords/xcrypt new file mode 100644 index 0000000..b28792f --- /dev/null +++ b/base/etc/portage/package.accept_keywords/xcrypt @@ -0,0 +1,6 @@ +# Allow the new libcrypt virtual which includes libxcrypt +>=virtual/libcrypt-2 + +# Needed if you're on non-amd64/x86 for now (stabilisation ongoing) +# (* copies stable keywords anywhere) +sys-libs/libxcrypt * diff --git a/base/etc/portage/package.use/xcrypt b/base/etc/portage/package.use/xcrypt new file mode 100644 index 0000000..9a98efd --- /dev/null +++ b/base/etc/portage/package.use/xcrypt @@ -0,0 +1,5 @@ +# Disable libcrypt in glibc +sys-libs/glibc -crypt + +# Provide libcrypt +sys-libs/libxcrypt system diff --git a/base/etc/portage/profile/package.unmask/xcrypt b/base/etc/portage/profile/package.unmask/xcrypt new file mode 100644 index 0000000..118f8be --- /dev/null +++ b/base/etc/portage/profile/package.unmask/xcrypt @@ -0,0 +1,2 @@ +# Allow virtual which specifies libxcrypt +~virtual/libcrypt-2 diff --git a/base/etc/portage/profile/package.use.force/xcrypt b/base/etc/portage/profile/package.use.force/xcrypt new file mode 100644 index 0000000..bacb024 --- /dev/null +++ b/base/etc/portage/profile/package.use.force/xcrypt @@ -0,0 +1,2 @@ +# Don't force glibc to provide libcrypt +sys-libs/glibc -crypt diff --git a/base/etc/portage/profile/package.use.mask/xcrypt b/base/etc/portage/profile/package.use.mask/xcrypt new file mode 100644 index 0000000..7c8ec53 --- /dev/null +++ b/base/etc/portage/profile/package.use.mask/xcrypt @@ -0,0 +1,2 @@ +# Allow libxcrypt to be the system provider of libcrypt, not glibc +sys-libs/libxcrypt -system -split-usr -- cgit v1.2.3