diff options
| author | Matt Turner <mattst88@gmail.com> | 2021-07-16 09:20:03 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2021-07-16 09:20:03 -0700 |
| commit | 40fbc898648273d2140f22f0fff988a80b68cb18 (patch) | |
| tree | ca0ee2a8ac252abaf915f7b6704f14136626d211 /base/etc | |
| parent | be210850ab6b364211fb0851f393d0a953f42d62 (diff) | |
Switch to libxcrypt
Diffstat (limited to 'base/etc')
| -rw-r--r-- | base/etc/portage/package.accept_keywords/xcrypt | 6 | ||||
| -rw-r--r-- | base/etc/portage/package.use/xcrypt | 5 | ||||
| -rw-r--r-- | base/etc/portage/profile/package.unmask/xcrypt | 2 | ||||
| -rw-r--r-- | base/etc/portage/profile/package.use.force/xcrypt | 2 | ||||
| -rw-r--r-- | base/etc/portage/profile/package.use.mask/xcrypt | 2 |
5 files changed, 17 insertions, 0 deletions
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 |