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

Stefan Wold ratler at lunar-linux.org
Tue Jul 15 23:28:24 CEST 2008


commit 005dc47e40733f6d137f9d312d1ec0d19a9be3a5
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Thu Jun 26 08:29:37 2008 +0200

    shadow: Version bump to 4.1.2
    * General cleanup in the module
    * Updated many of the pam.d files
    * Project now hosted at a debian site
---
 security/shadow/BUILD           |   14 ++++++++------
 security/shadow/DETAILS         |   18 +++++++-----------
 security/shadow/PRE_BUILD       |   13 -------------
 security/shadow/pam.d/chage     |    4 +---
 security/shadow/pam.d/chfn      |    5 ++---
 security/shadow/pam.d/chgpasswd |    4 +---
 security/shadow/pam.d/chpasswd  |    4 +---
 security/shadow/pam.d/chsh      |    6 +++---
 security/shadow/pam.d/groupadd  |    6 ++----
 security/shadow/pam.d/groupdel  |    6 ++----
 security/shadow/pam.d/login     |    5 ++---
 security/shadow/pam.d/shadow    |    6 ------
 security/shadow/pam.d/su        |    7 +++++--
 security/shadow/pam.d/useradd   |    6 ++----
 security/shadow/pam.d/userdel   |    6 ++----
 security/shadow/pam.d/usermod   |    7 ++-----
 16 files changed, 40 insertions(+), 77 deletions(-)

diff --git a/security/shadow/BUILD b/security/shadow/BUILD
index 610f5a3..2c6e854 100644
--- a/security/shadow/BUILD
+++ b/security/shadow/BUILD
@@ -1,13 +1,13 @@
 (
-  patch_it $SOURCE3 1 &&
+
+  # Keep shadow from installing it's own pam.d files
   sedit '/^SUBDIRS/ n; s/etc//' Makefile.in Makefile.am &&
-  sedit 's/4755/4711/g' src/Makefile.in src/Makefile.am &&
 
   if  module_installed  Linux-PAM;  then
     OPTS="$OPTS --with-libpam"
   else
     OPTS="$OPTS --without-libpam"
-  fi 
+  fi &&
 
   ./configure --prefix=/ \
               --libdir=/usr/lib \
@@ -20,7 +20,9 @@
               --without-skey \
               $OPTS &&
 
-  default_make &&
+  make &&
+  prepare_install &&
+  make suidperms=4711 install &&
 
   # libshadow.a and libshadow.la should not be installed,
   # they are for internal use only and may break compilation
@@ -37,9 +39,9 @@
     [ -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
-  fi 
+  fi &&
 
-  [ -e /etc/securetty  ] || install -m 0644 $SCRIPT_DIRECTORY/securetty /etc/
+  [ -e /etc/securetty  ] || install -m 0644 $SCRIPT_DIRECTORY/securetty /etc/ &&
   ln -sf /sbin/vipw /sbin/vigr &&
   install $SCRIPT_DIRECTORY/adduser /sbin/ &&
   install $SCRIPT_DIRECTORY/deluser /sbin/
diff --git a/security/shadow/DETAILS b/security/shadow/DETAILS
index acccec2..e1f5f6f 100644
--- a/security/shadow/DETAILS
+++ b/security/shadow/DETAILS
@@ -1,20 +1,16 @@
           MODULE=shadow
-         VERSION=4.0.18.1
+         VERSION=4.1.2
           SOURCE=$MODULE-$VERSION.tar.bz2
-         SOURCE2=login-1.2.defs.pam
-         SOURCE3=shadow-4.0.18.1-useradd-usermod.patch
-      SOURCE_URL=http://ftp.belnet.be/mirror/linuxfromscratch.org/ftp/hlfs-packages/unstable/
-   #SOURCE_URL[0]=ftp://ftp.pld.org.pl/software/$MODULE/
-   #SOURCE_URL[1]=ftp://ftp.pld.org.pl/software/$MODULE/old/
+         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:1a30458e9db05560bfc82529048bd5d60b45cf9b
-     SOURCE2_VFY=sha1:546d46907f02af0b32de91ed2ebd09224887a849
-     SOURCE3_VFY=sha1:c13cf8b5c566e129d4fc62ad3ac08b6c856c992e
-        WEB_SITE=ftp://ftp.pld.org.pl/software/shadow
+      SOURCE_VFY=sha1:ce005ce380b043dbfdbddcf0ac7b9a750217f0f6
+     SOURCE2_VFY=sha1:92676e80ec2e8e83d0dcbd688e1e4026b647232e
+        WEB_SITE=http://packages.qa.debian.org/s/shadow.html
       MAINTAINER=ratler at lunar-linux.org
          ENTERED=20010922
-         UPDATED=20071018
+         UPDATED=20080624
            SHORT="Contains the shadow password file utilities"
 PSAFE=no
 
diff --git a/security/shadow/PRE_BUILD b/security/shadow/PRE_BUILD
deleted file mode 100644
index 7f2e4a7..0000000
--- a/security/shadow/PRE_BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-
-# Due to major changes in pam.d files we
-# we need to be sure latest Linux-PAM is installed
-if module_installed Linux-PAM; then
-  PAMVER=`installed_version Linux-PAM | sed 's/\.//g'`
-  if [ "$PAMVER" -lt "09930" ]; then
-    message "${PROBLEM}Error:${DEFAULT_COLOR} Please update your Linux-PAM module"
-    exit 1
-  fi
-fi &&
-
-default_pre_build
-
diff --git a/security/shadow/pam.d/chage b/security/shadow/pam.d/chage
index ec387ab..8f49f5c 100644
--- a/security/shadow/pam.d/chage
+++ b/security/shadow/pam.d/chage
@@ -1,6 +1,4 @@
 #%PAM-1.0
 auth		sufficient	pam_rootok.so
-auth		include		system-auth
-account		include		system-auth
+account		required	pam_permit.so
 password	include		system-auth
-session		include		system-auth
diff --git a/security/shadow/pam.d/chfn b/security/shadow/pam.d/chfn
index ec387ab..0e74d3f 100644
--- a/security/shadow/pam.d/chfn
+++ b/security/shadow/pam.d/chfn
@@ -1,6 +1,5 @@
 #%PAM-1.0
 auth		sufficient	pam_rootok.so
-auth		include		system-auth
-account		include		system-auth
+auth        include     system-auth
+account		required	pam_permit.so
 password	include		system-auth
-session		include		system-auth
diff --git a/security/shadow/pam.d/chgpasswd b/security/shadow/pam.d/chgpasswd
index ec387ab..8f49f5c 100644
--- a/security/shadow/pam.d/chgpasswd
+++ b/security/shadow/pam.d/chgpasswd
@@ -1,6 +1,4 @@
 #%PAM-1.0
 auth		sufficient	pam_rootok.so
-auth		include		system-auth
-account		include		system-auth
+account		required	pam_permit.so
 password	include		system-auth
-session		include		system-auth
diff --git a/security/shadow/pam.d/chpasswd b/security/shadow/pam.d/chpasswd
index ec387ab..8f49f5c 100644
--- a/security/shadow/pam.d/chpasswd
+++ b/security/shadow/pam.d/chpasswd
@@ -1,6 +1,4 @@
 #%PAM-1.0
 auth		sufficient	pam_rootok.so
-auth		include		system-auth
-account		include		system-auth
+account		required	pam_permit.so
 password	include		system-auth
-session		include		system-auth
diff --git a/security/shadow/pam.d/chsh b/security/shadow/pam.d/chsh
index ec387ab..a246f4a 100644
--- a/security/shadow/pam.d/chsh
+++ b/security/shadow/pam.d/chsh
@@ -1,6 +1,6 @@
 #%PAM-1.0
 auth		sufficient	pam_rootok.so
-auth		include		system-auth
-account		include		system-auth
+auth        required    pam_shells.so
+auth        include     system-auth
+account		required	pam_permit.so
 password	include		system-auth
-session		include		system-auth
diff --git a/security/shadow/pam.d/groupadd b/security/shadow/pam.d/groupadd
index 91b633f..8f49f5c 100644
--- a/security/shadow/pam.d/groupadd
+++ b/security/shadow/pam.d/groupadd
@@ -1,6 +1,4 @@
 #%PAM-1.0
 auth		sufficient	pam_rootok.so
-auth		include		system-auth
-account		include		system-auth
-session		include		system-auth
-password	required	pam_permit.so
+account		required	pam_permit.so
+password	include		system-auth
diff --git a/security/shadow/pam.d/groupdel b/security/shadow/pam.d/groupdel
index 91b633f..8f49f5c 100644
--- a/security/shadow/pam.d/groupdel
+++ b/security/shadow/pam.d/groupdel
@@ -1,6 +1,4 @@
 #%PAM-1.0
 auth		sufficient	pam_rootok.so
-auth		include		system-auth
-account		include		system-auth
-session		include		system-auth
-password	required	pam_permit.so
+account		required	pam_permit.so
+password	include		system-auth
diff --git a/security/shadow/pam.d/login b/security/shadow/pam.d/login
index 6a8e73c..3b7e7af 100644
--- a/security/shadow/pam.d/login
+++ b/security/shadow/pam.d/login
@@ -1,11 +1,10 @@
 #%PAM-1.0
 auth		required	pam_securetty.so
 auth		include		system-auth
-auth		required	pam_nologin.so
+account		required	pam_nologin.so
 account		include		system-auth
 password	include		system-auth
 session		include		system-auth
+session		required	pam_loginuid.so
 session		optional	pam_motd.so
-# session		optional	pam_lastlog.so
-# session		optional	pam_mail.so standard noenv
 session		optional	pam_console.so
diff --git a/security/shadow/pam.d/shadow b/security/shadow/pam.d/shadow
deleted file mode 100644
index 07af099..0000000
--- a/security/shadow/pam.d/shadow
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient 	pam_rootok.so
-auth		include		system-auth
-account		include		system-auth
-session		include		system-auth
-password	include		system-auth
diff --git a/security/shadow/pam.d/su b/security/shadow/pam.d/su
index 3c6c3ba..6d7a3ec 100644
--- a/security/shadow/pam.d/su
+++ b/security/shadow/pam.d/su
@@ -1,8 +1,11 @@
 #%PAM-1.0
 auth		sufficient	pam_rootok.so
-# Uncomment the following row if a user is required to be in wheel group
-# auth		required	pam_wheel.so use_uid
+# Uncomment the following line to implicitly trust users in the "wheel" group.
+#auth           sufficient      pam_wheel.so trust use_uid
+# Uncomment the following line to require a user to be in the "wheel" group.
+#auth           required        pam_wheel.so use_uid
 auth		include		system-auth
+account		sufficient  pam_succeed_if.so uid = 0 use_uid quiet
 account		include		system-auth
 password	include		system-auth
 session		include		system-auth
diff --git a/security/shadow/pam.d/useradd b/security/shadow/pam.d/useradd
index 91b633f..8f49f5c 100644
--- a/security/shadow/pam.d/useradd
+++ b/security/shadow/pam.d/useradd
@@ -1,6 +1,4 @@
 #%PAM-1.0
 auth		sufficient	pam_rootok.so
-auth		include		system-auth
-account		include		system-auth
-session		include		system-auth
-password	required	pam_permit.so
+account		required	pam_permit.so
+password	include		system-auth
diff --git a/security/shadow/pam.d/userdel b/security/shadow/pam.d/userdel
index 91b633f..8f49f5c 100644
--- a/security/shadow/pam.d/userdel
+++ b/security/shadow/pam.d/userdel
@@ -1,6 +1,4 @@
 #%PAM-1.0
 auth		sufficient	pam_rootok.so
-auth		include		system-auth
-account		include		system-auth
-session		include		system-auth
-password	required	pam_permit.so
+account		required	pam_permit.so
+password	include		system-auth
diff --git a/security/shadow/pam.d/usermod b/security/shadow/pam.d/usermod
index f727c4a..8f49f5c 100644
--- a/security/shadow/pam.d/usermod
+++ b/security/shadow/pam.d/usermod
@@ -1,7 +1,4 @@
 #%PAM-1.0
 auth		sufficient	pam_rootok.so
-auth		include		system-auth
-account		include		system-auth
-session		include		system-auth
-password	required	pam_permit.so
-
+account		required	pam_permit.so
+password	include		system-auth


More information about the Lunar-commits mailing list