From: Stefan Schantl <Stevee@ipfire.org>
Date: Thu, 23 Apr 2009 13:41:57 +0000 (+0200)
Subject: Updated shadow to version 4.1.3.1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03dbdcd35473b7121853ab922aa3d0c06873841b;p=ipfire-3.x.git

Updated shadow to version 4.1.3.1
---

diff --git a/lfs/shadow b/lfs/shadow
index 24cf46d63..9b68ee983 100644
--- a/lfs/shadow
+++ b/lfs/shadow
@@ -25,25 +25,53 @@
 include Config
 
 PKG_NAME   = shadow
-PKG_VER    = 4.1.2.2
+PKG_VER    = 4.1.3.1
+PKG_REL    = 0
 
 THISAPP    = $(PKG_NAME)-$(PKG_VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+ifneq "$(STAGE)" "base"
+        CONFIGURE_ARGS = --with-libpam
+	EXTRA_DEPS = pam
+else
+	CONFIGURE_ARGS = --without-libpam
+endif
+
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
+MAINTAINER =
+GROUP      = System/Base
+EXTRA      = no
+DEBUG      = no
+DEPS       = $(EXTRA_DEPS)
+
+URL        = ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/
+LICENSE    = GPLv2+
+SHORT_DESC = Utilities to deal with user accounts. 
+
+define LONG_DESC
+	
+endef
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
 objects = $(DL_FILE)
 
-install : $(OBJECT)
+download: $(objects)
+
+info:
+	$(DO_PKG_INFO)
+
+install: $(OBJECT)
 
-download : $(objects)
+package:
+	@$(DO_PACKAGE)
 
-$(objects) :
+$(objects):
 	@$(LOAD)
 
 ###############################################################################
@@ -52,13 +80,13 @@ $(objects) :
 
 $(OBJECT) : 
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && \
 		./configure \
 			$(CONFIGURE_ARCH) \
 			--sysconfdir=/etc \
 			--without-selinux \
-			--with-libcrack
+			$(CONFIGURE_ARGS)
 	cd $(DIR_APP) && sed -i 's/groups$$(EXEEXT) //' src/Makefile
 	cd $(DIR_APP) && find man -name Makefile -exec sed -i 's/groups\.1 / /' {} \;
 	cd $(DIR_APP) && sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile
diff --git a/src/rootfiles/core/shadow-pam b/src/rootfiles/core/shadow-pam
index 80c1cd450..e980df000 100644
--- a/src/rootfiles/core/shadow-pam
+++ b/src/rootfiles/core/shadow-pam
@@ -1,17 +1,7 @@
 etc/pam.d
-etc/pam.d/chage
 etc/pam.d/chfn
-etc/pam.d/chgpasswd
-etc/pam.d/chpasswd
 etc/pam.d/chsh
-etc/pam.d/groupadd
-etc/pam.d/groupdel
 etc/pam.d/groupmems
-etc/pam.d/groupmod
 etc/pam.d/login
-etc/pam.d/newusers
 etc/pam.d/passwd
 etc/pam.d/su
-etc/pam.d/useradd
-etc/pam.d/userdel
-etc/pam.d/usermod