[Lunar-commits] <moonbase> shadow: Version bump to 4.1.4.2

[Stefan Wold]

commit 5231f2c7e7dafead13105bd1b299650501fd8dee
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Sun Nov 1 22:32:22 2009 +0100

    shadow: Version bump to 4.1.4.2
    
    * Updated ./configure options
    * Removed SOURCE2 login.defs
    * Building a login.defs from the original in BUILD, for pam and non-pam systems
---
 security/shadow/BUILD   |   32 +++++++++++++++++++++++++++-----
 security/shadow/DETAILS |   10 +++-------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/security/shadow/BUILD b/security/shadow/BUILD
index 8a1e0b4..7e38e1a 100644
--- a/security/shadow/BUILD
+++ b/security/shadow/BUILD
@@ -1,5 +1,16 @@
 (
 
+  set_login_opts() {
+    local option=$1 value=$2
+    if [[ -z $value ]]; then
+      # comment
+      sed -r -i "/^#?${option}/s;.*;#&;" etc/login.defs
+     else
+      # uncomment and set value
+      sed -r -i "/^#?${option}/s;.*;${option} ${value};" etc/login.defs
+     fi
+  }
+
   # Keep shadow from installing it's own pam.d files
   sedit '/^SUBDIRS/ n; s/etc//' Makefile.in Makefile.am &&
 
@@ -15,10 +26,11 @@
               --infodir=/usr/share/info \
               --mandir=/usr/share/man \
               --localedir=/usr/share/locale \
-              --with-libcrypt \
+              --with-sha-crypt \
               --with-libcrack \
               --without-selinux \
               --without-skey \
+              --without-group-name-max-length \
               $OPTS &&
 
   make &&
@@ -32,14 +44,24 @@
 
   # We only need these files without PAM
   if ! module_installed Linux-PAM; then
-    sedit 's|^CRACKLIB_DICTPATH.*$|CRACKLIB_DICTPATH /lib/cracklib/pw_dict|' etc/login.defs
-    sedit 's|#MD5_CRYPT_ENAB.*$|MD5_CRYPT_ENAB yes|' etc/login.defs
-    sedit 's|^USERGROUPS_ENAB.*|USERGROUPS_ENAB no|' etc/login.defs
+    set_login_opts CRACKLIB_DICTPATH /lib/cracklib/pw_dict
+    set_login_opts ENCRYPT_METHOD SHA512
+    set_login_opts LOGON_RETRIES 3
+
     [ -e /etc/limits ] || install -m 0644 etc/limits /etc/
     [ -e /etc/login.access ] || install -m 0644 etc/login.access /etc/
     [ -e /etc/login.defs ] || install -m 0644 etc/login.defs /etc/
   else
-    [ -e /etc/login.defs ] || install -m 0644 $SOURCE_CACHE/$SOURCE2 /etc/login.defs
+    # Disable pam incompatible options
+    for lopt in FAILLOG_ENAB LASTLOG_ENAB MAIL_CHECK_ENAB \
+                OBSCURE_CHECKS_ENAB PORTTIME_CHECKS_ENAB QUOTAS_ENAB \
+                MOTD_FILE FTMP_FILE NOLOGINS_FILE ENV_HZ PASS_MIN_LEN \
+                SU_WHEEL_ONLY CRACKLIB_DICTPATH PASS_CHANGE_TRIES \
+                PASS_ALWAYS_WARN CHFN_AUTH ENVIRON_FILE; do
+      set_login_opts $lopt
+    done
+
+    [ -e /etc/login.defs ] || install -m 0644 etc/login.defs /etc/login.defs
   fi &&
 
   [ -e /etc/securetty  ] || install -m 0644 $SCRIPT_DIRECTORY/securetty /etc/ &&
diff --git a/security/shadow/DETAILS b/security/shadow/DETAILS
index 3ccdb3b..45c4e0a 100644
--- a/security/shadow/DETAILS
+++ b/security/shadow/DETAILS
@@ -1,16 +1,12 @@
           MODULE=shadow
-         VERSION=4.1.2.2
+         VERSION=4.1.4.2
           SOURCE=$MODULE-$VERSION.tar.bz2
-         SOURCE2=login-1.3.defs.pam
       SOURCE_URL=ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/
-     SOURCE2_URL=$PATCH_URL
-     SOURCE3_URL=$PATCH_URL
-      SOURCE_VFY=sha1:6cbd29104c219ff6776eececb8068f7326d57a45
-     SOURCE2_VFY=sha1:92676e80ec2e8e83d0dcbd688e1e4026b647232e
+      SOURCE_VFY=sha1:43e29471057c671de51360b10e3ee2b419c78ffa
         WEB_SITE=http://packages.qa.debian.org/s/shadow.html
       MAINTAINER=ratler at lunar-linux.org
          ENTERED=20010922
-         UPDATED=20081230
+         UPDATED=20091101
            SHORT="Contains the shadow password file utilities"
 PSAFE=no