Update for new BUILD_DIR and SRC_DIR variables

[hvlinux.git] / stage2 / pkg / shadow

diff --git a/stage2/pkg/shadow b/stage2/pkg/shadow
old mode 100755 (executable)
new mode 100644 (file)
index 723f5e7..fb083b1
--- a/stage2/pkg/shadow
+++ b/stage2/pkg/shadow
@@ -2,26 +2,21 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \    
-        --without-selinux"
-    
-    cd ${LFS_TMP}/${PACKAGE}
+    CONFIGURE_OPTS+=" --without-selinux"
+
+    cd ${SRC_DIR}
 
     # 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
-    # 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@' \
+    # 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 SHA512@' \
         -e 's@/var/spool/mail@/var/mail@' etc/login.defs
 }
 
@@ -41,4 +36,13 @@ hvbuild_post()
 
     # To enable shadowed group passwords:
     grpconv
+
+    # Set system group ID range from 1 to 90:
+    #    0 is reserved for group 'root'
+    #   99 is reserved for group 'nogroup'
+    sed -e "s/\(SYS_UID_MIN\s\+\)[0-9]\+/\1  1/" \
+        -e "s/\(SYS_UID_MAX\s\+\)[0-9]\+/\1 90/" \
+        -e "s/\(SYS_GID_MIN\s\+\)[0-9]\+/\1  1/" \
+        -e "s/\(SYS_GID_MAX\s\+\)[0-9]\+/\1 90/" \
+        -i /etc/login.defs
 }