[Frugalware-git] frugalware-current: shadow-4.1.1-1-i686

[Miklos Vajna]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=463cfb46edefe4344b5b22972f0193773fa73fab

commit 463cfb46edefe4344b5b22972f0193773fa73fab
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Thu Apr 3 18:57:23 2008 +0200

shadow-4.1.1-1-i686
- version bump
- useradd.diff is now in upstream, we just need to Fsed the default in config

diff --git a/source/base/shadow/FrugalBuild b/source/base/shadow/FrugalBuild
index 503e9fc..5face44 100644
--- a/source/base/shadow/FrugalBuild
+++ b/source/base/shadow/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: VMiklos <vmiklos at frugalware.org>

pkgname=shadow
-pkgver=4.1.0
-pkgrel=4
+pkgver=4.1.1
+pkgrel=1
pkgdesc="Shadow password file utilities"
url="http://pkg-shadow.alioth.debian.org/"
pkgurl="ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow"
@@ -15,11 +15,15 @@ archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump $pkgurl |Flasttar"
source=($pkgurl/shadow-$pkgver.tar.gz \
adduser group passwd shadow $pkgname-4.0.13-login_defs.diff \
-	shadow-4.0.16-useradd.diff adduser.conf)
-signatures=($source.sig '' '' '' '' '' '' '')
+	adduser.conf)
+signatures=($source.sig '' '' '' '' '' '')

build()
{
+	# change the gid of 'users'
+	Fsed '1000' '100' etc/useradd
+	# don't create a new group for each user by default
+	Fsed 'USERGROUPS_ENAB yes' 'USERGROUPS_ENAB no' etc/login.defs
Fbuild --enable-static=yes --enable-shared=no --disable-desrpc \
--mandir=/usr/man --without-selinux
Frm /bin/{vigr,sg}
diff --git a/source/base/shadow/shadow-4.0.16-useradd.diff b/source/base/shadow/shadow-4.0.16-useradd.diff
deleted file mode 100644
index 5757f6f..0000000
--- a/source/base/shadow/shadow-4.0.16-useradd.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur shadow-4.0.16.orig/etc/useradd shadow-4.0.16/etc/useradd
---- shadow-4.0.16.orig/etc/useradd	2003-05-07 16:04:53.000000000 +0200
-+++ shadow-4.0.16/etc/useradd	2006-06-28 17:37:09.000000000 +0200
-@@ -1,6 +1,6 @@
- # useradd defaults file
--GROUP=1000
--HOME=/home/users
-+GROUP=100
-+HOME=/home
- INACTIVE=-1
- EXPIRE=
- SHELL=/bin/bash
-diff -Naur shadow-4.0.16.orig/src/useradd.c shadow-4.0.16/src/useradd.c
---- shadow-4.0.16.orig/src/useradd.c	2006-05-30 20:28:45.000000000 +0200
-+++ shadow-4.0.16/src/useradd.c	2006-06-28 17:37:40.000000000 +0200
-@@ -1757,13 +1757,6 @@
- 		find_new_uid ();
- 	}
-
--	/* do we have to add a group for that user? This is why we need to
--	 * open the group files in the open_files() function  --gafton */
--	if (!(nflg || gflg)) {
--		find_new_gid ();
--		grp_add ();
--	}
--
- 	usr_update ();
-
- 	if (mflg) {