diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20241105: take out libcrypt_real hack +OLD_FILES+=usr/lib/libcrypt_real.a +OLD_FILES+=usr/lib32/libcrypt_real.a + # 20241104: remove the outdated c2x.7 symlink in favor of c23.7 OLD_FILES+=usr/share/man/man7/c2x.7.gz diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -33,21 +33,5 @@ SUBDIR.${MK_TESTS}+= tests LIBADD+= md -SHLIB_LDSCRIPT= libcrypt.ldscript -STATIC_LDSCRIPT= libcrypt.aldscript -CLEANFILES+= libcrypt.ald - -libcrypt.ald: ${.CURDIR}/${STATIC_LDSCRIPT} - sed -e 's,@@LIB@@,${LIB},g' \ - -e 's,@@STATICLIB_SUFFIX@@,${_STATICLIB_SUFFIX},g' \ - ${.ALLSRC} > ${.TARGET} - -all: ${STATIC_LDSCRIPT} libcrypt.ald - -install-libcrypt.a: libcrypt.ald - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} libcrypt.ald ${DESTDIR}${_LIBDIR}/lib${LIB}.a - -realinstall: install-libcrypt.a .include diff --git a/lib/libcrypt/crypt.3 b/lib/libcrypt/crypt.3 --- a/lib/libcrypt/crypt.3 +++ b/lib/libcrypt/crypt.3 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 26, 2019 +.Dd November 5, 2024 .Dt CRYPT 3 .Os .Sh NAME @@ -323,3 +323,15 @@ for a competent attacker to break. Its use is not recommended. +.Pp +Since +.Fx 15.0 , +.Fn crypt +and +.Fn crypt_r +pull hash functions from the message digest library. +While this is automatically handled for dynamic links, +consumers linking statically must link with +.Fl lcrypt lmd +instead of just +.Fl lcrypt . diff --git a/lib/libcrypt/libcrypt.aldscript b/lib/libcrypt/libcrypt.aldscript deleted file mode 100644 --- a/lib/libcrypt/libcrypt.aldscript +++ /dev/null @@ -1 +0,0 @@ -INPUT(-l@@LIB@@@@STATICLIB_SUFFIX@@ -lmd) diff --git a/lib/libcrypt/libcrypt.ldscript b/lib/libcrypt/libcrypt.ldscript deleted file mode 100644 --- a/lib/libcrypt/libcrypt.ldscript +++ /dev/null @@ -1 +0,0 @@ -INPUT(@@SHLIB@@ AS_NEEDED(-lmd))