X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fpkg%2Fshadow;h=a8314a901cd9ddb839487b2f70b44bba1814d272;hb=40fc12878275aeef31000fc758a50aadcc68aa20;hp=fac61fa79e24ee7f31a06876b7ce04751fa260ab;hpb=c51f2ef66e47551d392dc34f62a7898b5346ff00;p=hvlinux.git

diff --git a/stage2/pkg/shadow b/stage2/pkg/shadow
index fac61fa..a8314a9 100644
--- a/stage2/pkg/shadow
+++ b/stage2/pkg/shadow
@@ -2,29 +2,20 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
-        --without-selinux"
+    CONFIGURE_OPTS+=" --without-selinux"
 
     cd ${LFS_TMP}/${PACKAGE}
 
-    # Fix an issue with the Russian man pages:
-    sed -i 's/man_MANS = $(man_nopam) /man_MANS = /' man/ru/Makefile.in
-
     # Disable the installation of the groups program and its man page, as
     # Coreutils provides a better version.
     sed -i 's/groups$(EXEEXT) //' src/Makefile.in
     find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;
 
-    # Disable the installation of Chinese and Korean manual pages, since Man-DB
-    # cannot format them properly:
-    sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile.in
-
-    # Instead of using the default crypt method, use the more secure MD5 method
+    # Instead of using the default crypt method, use the more secure SHA-512 method
     # of password encryption, which also allows passwords longer than 8 characters.
     # It is also necessary to change the obsolete /var/spool/mail location for user
     # mailboxes that Shadow uses by default to the /var/mail location used currently:
-    sed -i -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD MD5@' \
+    sed -i -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD SHA512@' \
         -e 's@/var/spool/mail@/var/mail@' etc/login.defs
 }