glibc: Disable libcrypt and ship libxcrypt instead

libcrypt is deprecated in glibc, and is now explicitely disabled.

Instead we ship libxcrypt which is an alternative implemenation and can be used as a drop-in replacement.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2021-02-05 09:51:26 -05:00
parent 83e6fa56a5
commit cf6c8e67fb
8 changed files with 115 additions and 24 deletions

View File

@@ -9,8 +9,6 @@ lib/libanl-2.32.so
lib/libanl.so.1
lib/libc-2.32.so
lib/libc.so.6
lib/libcrypt-2.32.so
lib/libcrypt.so.1
lib/libdl-2.32.so
lib/libdl.so.2
lib/libm-2.32.so
@@ -279,7 +277,6 @@ usr/bin/locale
#usr/include/byteswap.h
#usr/include/complex.h
#usr/include/cpio.h
#usr/include/crypt.h
#usr/include/ctype.h
#usr/include/dirent.h
#usr/include/dlfcn.h
@@ -794,8 +791,6 @@ usr/lib/gconv
#usr/lib/libc.a
#usr/lib/libc.so
#usr/lib/libc_nonshared.a
#usr/lib/libcrypt.a
#usr/lib/libcrypt.so
#usr/lib/libdl.a
#usr/lib/libdl.so
#usr/lib/libg.a

View File

@@ -9,8 +9,6 @@ lib/libanl-2.32.so
lib/libanl.so.1
lib/libc-2.32.so
lib/libc.so.6
lib/libcrypt-2.32.so
lib/libcrypt.so.1
lib/libdl-2.32.so
lib/libdl.so.2
lib/libm-2.32.so
@@ -279,7 +277,6 @@ usr/bin/locale
#usr/include/byteswap.h
#usr/include/complex.h
#usr/include/cpio.h
#usr/include/crypt.h
#usr/include/ctype.h
#usr/include/dirent.h
#usr/include/dlfcn.h
@@ -796,8 +793,6 @@ usr/lib/gconv
#usr/lib/libc.a
#usr/lib/libc.so
#usr/lib/libc_nonshared.a
#usr/lib/libcrypt.a
#usr/lib/libcrypt.so
#usr/lib/libdl.a
#usr/lib/libdl.so
#usr/lib/libg.a

View File

@@ -9,8 +9,6 @@ lib/libanl-2.32.so
lib/libanl.so.1
lib/libc-2.32.so
lib/libc.so.6
lib/libcrypt-2.32.so
lib/libcrypt.so.1
lib/libdl-2.32.so
lib/libdl.so.2
lib/libm-2.32.so
@@ -280,7 +278,6 @@ usr/bin/locale
#usr/include/byteswap.h
#usr/include/complex.h
#usr/include/cpio.h
#usr/include/crypt.h
#usr/include/ctype.h
#usr/include/dirent.h
#usr/include/dlfcn.h
@@ -802,8 +799,6 @@ usr/lib/gconv
#usr/lib/libc.a
#usr/lib/libc.so
#usr/lib/libc_nonshared.a
#usr/lib/libcrypt.a
#usr/lib/libcrypt.so
#usr/lib/libdl.a
#usr/lib/libdl.so
#usr/lib/libg.a

View File

@@ -0,0 +1,20 @@
#usr/include/crypt.h
#usr/include/xcrypt.h
#usr/lib/libcrypt.la
#usr/lib/libcrypt.so
usr/lib/libcrypt.so.1
usr/lib/libcrypt.so.1.1.0
#usr/lib/libowcrypt.so
#usr/lib/libowcrypt.so.1
#usr/lib/libxcrypt.so
#usr/lib/pkgconfig/libcrypt.pc
#usr/lib/pkgconfig/libxcrypt.pc
#usr/share/man/man3/crypt_checksalt.3
#usr/share/man/man3/crypt_gensalt.3
#usr/share/man/man3/crypt_gensalt_ra.3
#usr/share/man/man3/crypt_gensalt_rn.3
#usr/share/man/man3/crypt_preferred_method.3
#usr/share/man/man3/crypt_r.3
#usr/share/man/man3/crypt_ra.3
#usr/share/man/man3/crypt_rn.3
#usr/share/man/man5/crypt.5

View File

@@ -9,8 +9,6 @@ lib/libanl-2.32.so
lib/libanl.so.1
lib/libc-2.32.so
lib/libc.so.6
lib/libcrypt-2.32.so
lib/libcrypt.so.1
lib/libdl-2.32.so
lib/libdl.so.2
lib/libm-2.32.so
@@ -281,7 +279,6 @@ usr/bin/locale
#usr/include/byteswap.h
#usr/include/complex.h
#usr/include/cpio.h
#usr/include/crypt.h
#usr/include/ctype.h
#usr/include/dirent.h
#usr/include/dlfcn.h
@@ -800,8 +797,6 @@ usr/lib/gconv
#usr/lib/libc.a
#usr/lib/libc.so
#usr/lib/libc_nonshared.a
#usr/lib/libcrypt.a
#usr/lib/libcrypt.so
#usr/lib/libdl.a
#usr/lib/libdl.so
#usr/lib/libg.a