[arch-commits] Commit in shadow/trunk (8 files)
Aaron Griffin
aaron at archlinux.org
Sun Aug 31 04:08:49 UTC 2008
Date: Sunday, August 31, 2008 @ 00:08:48
Author: aaron
Revision: 10734
upgpkg: shadow 4.1.2.1-1
Added:
shadow/trunk/defaults.pam
(from rev 10733, shadow/trunk/useradd)
shadow/trunk/useradd.defaults
Modified:
shadow/trunk/PKGBUILD
shadow/trunk/xstrdup.patch
Deleted:
shadow/trunk/shadow-4.0.18.2-useradd-fix-1.patch
shadow/trunk/shadow-UID_GID.patch
shadow/trunk/useradd
shadow/trunk/useradd-default.patch
-------------------------------------+
PKGBUILD | 84 ++++++++++++++--------------------
defaults.pam | 6 ++
shadow-4.0.18.2-useradd-fix-1.patch | 26 ----------
shadow-UID_GID.patch | 34 -------------
useradd | 6 --
useradd-default.patch | 14 -----
useradd.defaults | 9 +++
xstrdup.patch | 6 +-
8 files changed, 55 insertions(+), 130 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-08-30 18:48:46 UTC (rev 10733)
+++ PKGBUILD 2008-08-31 04:08:48 UTC (rev 10734)
@@ -1,9 +1,9 @@
# $Id$
-# Maintainer: judd <jvinet at zeroflux.org>
+# Maintainer: Aaron Griffin <aaron at archlinux.org>
pkgname=shadow
-pkgver=4.0.18.2
-pkgrel=2
+pkgver=4.1.2.1
+pkgrel=1
pkgdesc="Shadow password file utilities"
arch=(i686 x86_64)
url='http://pkg-shadow.alioth.debian.org/'
@@ -12,77 +12,67 @@
backup=(etc/login.defs
etc/pam.d/{chage,login,passwd,shadow,useradd,usermod,userdel}
etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod}
- etc/pam.d/{chfn,chgpasswd,groupmems,chsh}
+ etc/pam.d/{chfn,chgpasswd,groupmems,chsh}
etc/default/useradd)
depends=('pam')
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)
+ useradd.defaults login passwd defaults.pam login.defs adduser shadow.cron.daily
+ xstrdup.patch)
options=(!libtool)
install='shadow.install'
+md5sums=('c178e49c45495e296dabbe4ae01a0fbe'
+ 'beb64d09256ea46a4d96a783f096447f'
+ '0aa429de6773ebcdf89db80165379cc6'
+ 'b84204ab731bd02dca49d0637d44ebec'
+ 'a31374fef2cba0ca34dfc7078e2969e4'
+ '3699bed31154051c0508a890d6d95027'
+ '6ce67e423ee19c87ae64f661310b2408'
+ '1d64b4113e1d402746d9dd65f28a2c6f'
+ '0eebe9d13065bec4b5d7ccf3bf46c509')
build() {
cd $startdir/src/$pkgname-$pkgver
- patch -Np1 -i ../xstrdup.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
-
+ patch -Np1 -i $startdir/src/xstrdup.patch || return 1
+
# supress etc/pam.d/*, we provide our own
sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in
./configure \
- --prefix=/usr --libdir=/usr/lib \
- --mandir=/usr/man --sysconfdir=/etc \
- --enable-shared --with-libpam --without-selinux
+ --prefix=/usr --libdir=/lib \
+ --mandir=/usr/share/man --sysconfdir=/etc \
+ --with-libpam --without-selinux
make || return 1
make DESTDIR=$startdir/pkg install
# license
- install -v -D -m644 COPYING $startdir/pkg/usr/share/licenses/shadow/COPYING
+ install -D -m644 COPYING $startdir/pkg/usr/share/licenses/shadow/COPYING
# interactive useradd
- install -v -D -m755 ../adduser $startdir/pkg/usr/sbin/adduser
+ install -D -m755 $startdir/src/adduser $startdir/pkg/usr/sbin/adduser
+ # useradd defaults
+ install -D -m644 $startdir/src/useradd.defaults $startdir/pkg/etc/default/useradd
+
# cron job
- install -v -D -m744 ../shadow.cron.daily $startdir/pkg/etc/cron.daily/shadow
+ install -D -m744 $startdir/src/shadow.cron.daily $startdir/pkg/etc/cron.daily/shadow
# login.defs
- install -v -D -m644 ../login.defs $startdir/pkg/etc/login.defs
+ install -D -m644 $startdir/src/login.defs $startdir/pkg/etc/login.defs
- # PAM config
- local file
- for file in login passwd; do
- install -v -D -m644 ../$file $startdir/pkg/etc/pam.d/$file
- done
+ # PAM config - cutsom
+ install -D -m644 $startdir/src/login $startdir/pkg/etc/pam.d/login
+ install -D -m644 $startdir/src/passwd $startdir/pkg/etc/pam.d/passwd
+ # PAM config - from tarball
+ install -D -m644 etc/pam.d/chgpasswd $startdir/pkg/etc/pam.d/chgpasswd
+ install -D -m644 etc/pam.d/groupmems $startdir/pkg/etc/pam.d/groupmems
+
# we use the 'useradd' PAM file for other similar utilities
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
+ install -D -m644 $startdir/src/defaults.pam $startdir/pkg/etc/pam.d/$file
done
- # add leftover pam files
- for i in chgpasswd groupmems; do
- install -v -D -m644 etc/pam.d/$i $startdir/pkg/etc/pam.d/$i
- done
- cd $startdir/pkg
-
# Remove su - using su from coreutils instead
- rm -v bin/su
- find usr/man -name 'su.1' -exec rm -v {} \;
-
- # Move shared libs to /lib
- mkdir -pv lib
- mv -v usr/lib/libshadow.so.* lib/
- ln -svf ../../lib/libshadow.so.0 usr/lib/libshadow.so
+ rm -v $startdir/pkg/bin/su
+ find $startdir/pkg/usr/share/man -name 'su.1' -exec rm -v {} \;
}
-md5sums=('b900467e5c60c78b6d84b0353d1769d5'
- '0aa429de6773ebcdf89db80165379cc6'
- 'b84204ab731bd02dca49d0637d44ebec'
- 'a31374fef2cba0ca34dfc7078e2969e4'
- '3699bed31154051c0508a890d6d95027'
- '6ce67e423ee19c87ae64f661310b2408'
- '1d64b4113e1d402746d9dd65f28a2c6f'
- '1e49ee3b5b96b47782b22237b95c4bc2'
- '576c00b284b9c180667a56c6cd326f0c'
- '5c0b58c8bee13a57244ec783a8194970')
Copied: shadow/trunk/defaults.pam (from rev 10733, shadow/trunk/useradd)
===================================================================
--- defaults.pam (rev 0)
+++ defaults.pam 2008-08-31 04:08:48 UTC (rev 10734)
@@ -0,0 +1,6 @@
+#%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
Deleted: shadow-4.0.18.2-useradd-fix-1.patch
===================================================================
--- shadow-4.0.18.2-useradd-fix-1.patch 2008-08-30 18:48:46 UTC (rev 10733)
+++ shadow-4.0.18.2-useradd-fix-1.patch 2008-08-31 04:08:48 UTC (rev 10734)
@@ -1,26 +0,0 @@
-# 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);
- }
-
Deleted: shadow-UID_GID.patch
===================================================================
--- shadow-UID_GID.patch 2008-08-30 18:48:46 UTC (rev 10733)
+++ shadow-UID_GID.patch 2008-08-31 04:08:48 UTC (rev 10734)
@@ -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
Deleted: useradd
===================================================================
--- useradd 2008-08-30 18:48:46 UTC (rev 10733)
+++ useradd 2008-08-31 04:08:48 UTC (rev 10734)
@@ -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
Deleted: useradd-default.patch
===================================================================
--- useradd-default.patch 2008-08-30 18:48:46 UTC (rev 10733)
+++ useradd-default.patch 2008-08-31 04:08:48 UTC (rev 10734)
@@ -1,14 +0,0 @@
---- 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
Added: useradd.defaults
===================================================================
--- useradd.defaults (rev 0)
+++ useradd.defaults 2008-08-31 04:08:48 UTC (rev 10734)
@@ -0,0 +1,9 @@
+# useradd defaults file for ArchLinux
+# original changes by TomK
+GROUP=100
+HOME=/home
+INACTIVE=-1
+EXPIRE=
+SHELL=/bin/bash
+SKEL=/etc/skel
+CREATE_MAIL_SPOOL=no
Modified: xstrdup.patch
===================================================================
--- xstrdup.patch 2008-08-30 18:48:46 UTC (rev 10733)
+++ xstrdup.patch 2008-08-31 04:08:48 UTC (rev 10734)
@@ -1,6 +1,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 @@
+--- shadow-4.1.2.1/libmisc/xmalloc.c 2008-08-30 21:55:44.000000000 -0500
++++ shadow-4.1.2.1/libmisc/xmalloc.c.new 2008-08-30 21:55:36.000000000 -0500
+@@ -61,5 +61,6 @@
char *xstrdup (const char *str)
{
More information about the arch-commits
mailing list