X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fpkg%2Fshadow;h=d8181d8aa2ee9be364e0f1ff7f31ceb4b8420937;hb=776bbd8c7e1ad388b0e0966f01cb06aae9ec3fae;hp=5dbd099ba1c26e27f5b8229c286842607450da55;hpb=b5bfb2006502b57fab234345a2393fd04e6d55ad;p=hvlinux.git

diff --git a/stage2/pkg/shadow b/stage2/pkg/shadow
old mode 100755
new mode 100644
index 5dbd099..d8181d8
--- a/stage2/pkg/shadow
+++ b/stage2/pkg/shadow
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-CONFIGURE_OPTS="\
-    --without-selinux
-    ${CONFIGURE_OPTS}"
-
 hvconfig_pre()
 {
+    CONFIGURE_OPTS="\
+        ${CONFIGURE_OPTS} \
+        --without-selinux"
+
     cd ${LFS_TMP}/${PACKAGE}
 
     # Disable the installation of the groups program and its man page, as
@@ -13,15 +13,11 @@ hvconfig_pre()
     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
 }