[arch-commits] CVS update of core/base/shadow (12 files)
Tom Killian
tom at archlinux.org
Fri Nov 30 11:40:33 UTC 2007
Date: Friday, November 30, 2007 @ 06:40:33
Author: tom
Path: /home/cvs-core/core/base/shadow
Added: shadow-4.0.18.2-useradd-fix-1.patch (1.1)
useradd-default.patch (1.1)
Modified: PKGBUILD (1.49 -> 1.50) adduser (1.2 -> 1.3) login (1.4 -> 1.5)
login.defs (1.1 -> 1.2) shadow.install (1.2 -> 1.3)
xstrdup.patch (1.1 -> 1.2)
Removed: chage (1.1) chsh (1.1) shadow (1.1) shadow-UID_GID.patch (1.1)
upgpkg: shadow 4.0.18.2-1
fixes FS#8050/8051/8724/8742, general PKGBUILD tidy-up
-------------------------------------+
PKGBUILD | 56 ++++++++++++++--------------------
adduser | 8 ----
chage | 6 ---
chsh | 6 ---
login | 2 -
login.defs | 4 +-
shadow | 6 ---
shadow-4.0.18.2-useradd-fix-1.patch | 26 +++++++++++++++
shadow-UID_GID.patch | 34 --------------------
shadow.install | 3 -
useradd-default.patch | 14 ++++++++
xstrdup.patch | 7 +---
12 files changed, 70 insertions(+), 102 deletions(-)
Index: core/base/shadow/PKGBUILD
diff -u core/base/shadow/PKGBUILD:1.49 core/base/shadow/PKGBUILD:1.50
--- core/base/shadow/PKGBUILD:1.49 Wed Nov 28 20:49:39 2007
+++ core/base/shadow/PKGBUILD Fri Nov 30 06:40:32 2007
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD,v 1.49 2007/11/29 01:49:39 dan Exp $
+# $Id: PKGBUILD,v 1.50 2007/11/30 11:40:32 tom Exp $
# Maintainer: judd <jvinet at zeroflux.org>
+
pkgname=shadow
-pkgver=4.0.18.1
-pkgrel=8
+pkgver=4.0.18.2
+pkgrel=1
pkgdesc="Shadow password file utilities"
arch=(i686 x86_64)
-#url='http://shadow.pld.org.pl' # Broken
+url='http://pkg-shadow.alioth.debian.org/'
license=('custom')
groups=('base')
backup=(etc/login.defs
@@ -14,25 +15,19 @@
etc/pam.d/{chfn,chgpasswd,groupmems,chsh}
etc/default/useradd)
depends=('pam')
-# official sources are MIA
-# ftp://ftp.pld.org.pl/software/$pkgname/$pkgname-$pkgver.tar.bz2
-source=("http://www.diy-linux.org/downloads/thirdparty/shadow-$pkgver.tar.bz2"
- login passwd chsh useradd login.defs adduser shadow.cron.daily
- xstrdup.patch shadow-UID_GID.patch)
+source=(ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-$pkgver.tar.bz2
+ login passwd useradd login.defs adduser shadow.cron.daily
+ useradd-default.patch xstrdup.patch shadow-4.0.18.2-useradd-fix-1.patch)
options=(!libtool)
-
install='shadow.install'
-md5sums=('e7751d46ecf219c07ae0b028ab3335c6' '76a759c07104fcd0708fcf91337961b5'
- 'b84204ab731bd02dca49d0637d44ebec' 'a31374fef2cba0ca34dfc7078e2969e4'
- '640cdc998d996152155905dbbaf22b6d' '0365b9983675df485280fe5f570411f1'
- '1d64b4113e1d402746d9dd65f28a2c6f' 'a57478bc078f94c0884dfcd50e1939eb'
- 'dd72bf6dd1253ed6f338eb16dc0abdc5')
build() {
cd $startdir/src/$pkgname-$pkgver
patch -Np1 -i ../xstrdup.patch || return 1
- patch -Np1 -i ../shadow-UID_GID.patch || return 1
-
+ patch -Np1 -i ../shadow-4.0.18.2-useradd-fix-1.patch || return 1
+ # patch etc/default/useradd for Arch defaults - Tom K
+ patch -Np1 -i ../useradd-default.patch || return 1
+
# supress etc/pam.d/*, we provide our own
sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in
@@ -57,11 +52,11 @@
# PAM config
local file
- for file in login passwd chsh; do
+ for file in login passwd; do
install -v -D -m644 ../$file $startdir/pkg/etc/pam.d/$file
done
# we use the 'useradd' PAM file for other similar utilities
- for file in chage chpasswd chfn groupadd groupdel groupmod \
+ for file in chage chpasswd chfn chsh groupadd groupdel groupmod \
newusers shadow useradd usermod userdel; do
install -v -D -m644 ../useradd $startdir/pkg/etc/pam.d/$file
done
@@ -70,18 +65,6 @@
install -v -D -m644 etc/pam.d/$i $startdir/pkg/etc/pam.d/$i
done
- # useradd defaults
- cat > "$startdir"/pkg/etc/default/useradd <<_EOF
-# useradd defaults file
-GROUP=100
-HOME=/home
-INACTIVE=-1
-EXPIRE=
-SHELL=/bin/bash
-SKEL=/etc/skel
-_EOF
-
-
cd $startdir/pkg
# Remove su - using su from coreutils instead
@@ -92,5 +75,14 @@
mkdir -pv lib
mv -v usr/lib/libshadow.so.* lib/
ln -svf ../../lib/libshadow.so.0 usr/lib/libshadow.so
-
}
+md5sums=('b900467e5c60c78b6d84b0353d1769d5'
+ '0aa429de6773ebcdf89db80165379cc6'
+ 'b84204ab731bd02dca49d0637d44ebec'
+ 'a31374fef2cba0ca34dfc7078e2969e4'
+ '31b2d463b68deb2b2cf50fa081c103ca'
+ '6ce67e423ee19c87ae64f661310b2408'
+ '1d64b4113e1d402746d9dd65f28a2c6f'
+ '1e49ee3b5b96b47782b22237b95c4bc2'
+ '576c00b284b9c180667a56c6cd326f0c'
+ '5c0b58c8bee13a57244ec783a8194970')
Index: core/base/shadow/adduser
diff -u core/base/shadow/adduser:1.2 core/base/shadow/adduser:1.3
--- core/base/shadow/adduser:1.2 Sat Nov 6 00:32:17 2004
+++ core/base/shadow/adduser Fri Nov 30 06:40:32 2007
@@ -85,12 +85,10 @@
useradd=/usr/sbin/useradd
chfn=/usr/bin/chfn
passwd=/usr/bin/passwd
-chmod=/bin/chmod
# Defaults
defhome=/home
defshell=/bin/bash
-defchmod=711 # home dir permissions - may be preferable to use 701, however.
defgroup=users
# Determine what the minimum UID is (for UID recycling)
@@ -394,12 +392,6 @@
exit 1
fi
-# If it was created (it should have been!), set the permissions for that user's dir
-HME="$(echo "$HME" | awk '{print $2}')" # We have to remove the -g prefix
-if [ -d "$HME" ]; then
- $chmod $defchmod "$HME"
-fi
-
echo
echo
echo "Account setup complete."
Index: core/base/shadow/chage
diff -u core/base/shadow/chage:1.1 core/base/shadow/chage:removed
--- core/base/shadow/chage:1.1 Thu Jun 5 15:59:01 2003
+++ core/base/shadow/chage Fri Nov 30 06:40:33 2007
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth sufficient pam_rootok.so
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
-password required pam_permit.so
Index: core/base/shadow/chsh
diff -u core/base/shadow/chsh:1.1 core/base/shadow/chsh:removed
--- core/base/shadow/chsh:1.1 Wed Aug 8 14:58:03 2007
+++ core/base/shadow/chsh Fri Nov 30 06:40:33 2007
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth sufficient pam_rootok.so
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
-password required pam_permit.so
Index: core/base/shadow/login
diff -u core/base/shadow/login:1.4 core/base/shadow/login:1.5
--- core/base/shadow/login:1.4 Thu Sep 22 14:23:10 2005
+++ core/base/shadow/login Fri Nov 30 06:40:33 2007
@@ -1,5 +1,5 @@
#%PAM-1.0
-auth requisite pam_securetty.so
+auth required pam_securetty.so
auth requisite pam_nologin.so
auth required pam_unix.so nullok
auth required pam_tally.so onerr=succeed file=/var/log/faillog
Index: core/base/shadow/login.defs
diff -u core/base/shadow/login.defs:1.1 core/base/shadow/login.defs:1.2
--- core/base/shadow/login.defs:1.1 Thu Sep 22 05:24:40 2005
+++ core/base/shadow/login.defs Fri Nov 30 06:40:33 2007
@@ -1,7 +1,7 @@
#
# /etc/login.defs - Configuration control definitions for the login package.
#
-# $Id: login.defs,v 1.1 2005/09/22 09:24:40 judd Exp $
+# $Id: login.defs,v 1.2 2007/11/30 11:40:33 tom Exp $
#
# Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH.
# If unspecified, some arbitrary (and possibly incorrect) value will
@@ -115,7 +115,7 @@
#
ERASECHAR 0177
KILLCHAR 025
-UMASK 022
+UMASK 077
#
# Password aging controls:
Index: core/base/shadow/shadow
diff -u core/base/shadow/shadow:1.1 core/base/shadow/shadow:removed
--- core/base/shadow/shadow:1.1 Thu Jun 5 15:59:01 2003
+++ core/base/shadow/shadow Fri Nov 30 06:40:33 2007
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth sufficient pam_rootok.so
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
-password required pam_permit.so
Index: core/base/shadow/shadow-4.0.18.2-useradd-fix-1.patch
diff -u /dev/null core/base/shadow/shadow-4.0.18.2-useradd-fix-1.patch:1.1
--- /dev/null Fri Nov 30 06:40:33 2007
+++ core/base/shadow/shadow-4.0.18.2-useradd-fix-1.patch Fri Nov 30 06:40:33 2007
@@ -0,0 +1,26 @@
+# DIY Linux Patch
+Date: 2007-11-08
+Author: Greg Schafer <gschafer at zip.com.au>
+Origin: Modelled on the same upstream fix for usermod.
+Maker: Greg Schafer <gschafer at zip.com.au>
+Upstream Status: Submitted, applied.
+Description: Fix -g problems in useradd.
+
+diff -Naur shadow-4.0.18.2.orig/src/useradd.c shadow-4.0.18.2/src/useradd.c
+--- shadow-4.0.18.2.orig/src/useradd.c 2007-10-07 14:36:51.000000000 +0000
++++ shadow-4.0.18.2/src/useradd.c 2007-11-08 06:33:32.433004367 +0000
+@@ -204,12 +204,8 @@
+ char *errptr;
+
+ gid = strtol (grname, &errptr, 10);
+- if (*errptr || errno == ERANGE || gid < 0) {
+- fprintf (stderr,
+- _("%s: invalid numeric argument '%s'\n"), Prog,
+- grname);
+- exit (E_BAD_ARG);
+- }
++ if (*grname != '\0' && *errptr == '\0' && errno != ERANGE && gid >= 0)
++ return getgrgid (gid);
+ return getgrnam (grname);
+ }
+
Index: core/base/shadow/shadow-UID_GID.patch
diff -u core/base/shadow/shadow-UID_GID.patch:1.1 core/base/shadow/shadow-UID_GID.patch:removed
--- core/base/shadow/shadow-UID_GID.patch:1.1 Sat Sep 9 06:33:50 2006
+++ core/base/shadow/shadow-UID_GID.patch Fri Nov 30 06:40:33 2007
@@ -1,34 +0,0 @@
---- shadow-4.0.18.1.orig/src/useradd.c 2006-08-25 11:57:00.202525241 +0200
-+++ shadow-4.0.18.1/src/useradd.c 2006-08-25 11:57:26.106735752 +0200
-@@ -206,11 +206,8 @@
- char *errptr;
-
- gid = strtol (grname, &errptr, 10);
-- if (*errptr || errno == ERANGE || gid < 0) {
-- fprintf (stderr,
-- _("%s: invalid numeric argument '%s'\n"), Prog, grname);
-- exit (E_BAD_ARG);
-- }
-+ if (*grname != '\0' && *errptr == '\0' && errno != ERANGE && gid >= 0)
-+ return getgrgid (gid);
- return getgrnam (grname);
- }
-
-Index: shadow-4.0.18.1/src/usermod.c
-===================================================================
---- shadow-4.0.18.1.orig/src/usermod.c 2006-08-25 11:57:18.938677504 +0200
-+++ shadow-4.0.18.1/src/usermod.c 2006-08-25 11:57:26.114735817 +0200
-@@ -167,11 +167,8 @@
- char *errptr;
-
- val = strtol (grname, &errptr, 10);
-- if (*errptr || errno == ERANGE || val < 0) {
-- fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
-- grname);
-- exit (E_BAD_ARG);
-- }
-+ if (*grname != '\0' && *errptr == '\0' && errno != ERANGE && val >= 0)
-+ return getgrgid (val);
- return getgrnam (grname);
- }
-
\ No newline at end of file
Index: core/base/shadow/shadow.install
diff -u core/base/shadow/shadow.install:1.2 core/base/shadow/shadow.install:1.3
--- core/base/shadow/shadow.install:1.2 Tue Nov 27 23:14:00 2007
+++ core/base/shadow/shadow.install Fri Nov 30 06:40:33 2007
@@ -1,6 +1,3 @@
-# This is a default template for a post-install scriptlet. You can
-# remove any functions you don't need (and this header).
-
post_upgrade() {
# fix gshadow
if [ "$(grpck -r)" ]; then
Index: core/base/shadow/useradd-default.patch
diff -u /dev/null core/base/shadow/useradd-default.patch:1.1
--- /dev/null Fri Nov 30 06:40:33 2007
+++ core/base/shadow/useradd-default.patch Fri Nov 30 06:40:33 2007
@@ -0,0 +1,14 @@
+--- shadow-4.0.18.1/etc/useradd 2003-05-07 15:04:53.000000000 +0100
++++ shadow-4.0.18.1/etc/useradd.default 2007-11-27 22:06:56.000000000 +0000
+@@ -1,8 +1,8 @@
+ # useradd defaults file
+-GROUP=1000
+-HOME=/home/users
++# Modified for Arch Linux
++GROUP=100
++HOME=/home
+ INACTIVE=-1
+ EXPIRE=
+ SHELL=/bin/bash
+ SKEL=/etc/skel
+-CREATE_MAIL_SPOOL=yes
Index: core/base/shadow/xstrdup.patch
diff -u core/base/shadow/xstrdup.patch:1.1 core/base/shadow/xstrdup.patch:1.2
--- core/base/shadow/xstrdup.patch:1.1 Thu Jan 13 15:11:09 2005
+++ core/base/shadow/xstrdup.patch Fri Nov 30 06:40:33 2007
@@ -1,7 +1,6 @@
-diff -Naur shadow-4.0.6-orig/libmisc/xmalloc.c shadow-4.0.6/libmisc/xmalloc.c
---- shadow-4.0.6-orig/libmisc/xmalloc.c 2004-05-06 14:31:33.000000000 -0700
-+++ shadow-4.0.6/libmisc/xmalloc.c 2005-01-13 11:49:38.000000000 -0800
-@@ -28,5 +28,6 @@
+--- shadow-4.0.18.2/libmisc/xmalloc.c 2007-10-07 12:47:22.000000000 +0100
++++ shadow-4.0.18.2/libmisc/xmalloc.c.new 2007-11-27 22:43:05.000000000 +0000
+@@ -27,5 +27,6 @@
char *xstrdup (const char *str)
{
More information about the arch-commits
mailing list