Date: Monday, December 13, 2010 @ 21:19:00 Author: eric Revision: 103013
Fixed duplicate depends array, Added quotes to pkgdir and srcdir reference Modified: shadow/trunk/PKGBUILD ----------+ PKGBUILD | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-12-14 00:35:32 UTC (rev 103012) +++ PKGBUILD 2010-12-14 02:19:00 UTC (rev 103013) @@ -9,13 +9,12 @@ url='http://pkg-shadow.alioth.debian.org/' license=('custom') groups=('base') -depends=('bash') +depends=('bash' 'pam') 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/default/useradd) -depends=('pam') source=(ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-$pkgver.tar.bz2 useradd.defaults login passwd chgpasswd chpasswd newusers defaults.pam login.defs adduser shadow.cron.daily xstrdup.patch shadow-4.1.4.2-groupmod-pam-check.patch) @@ -36,7 +35,7 @@ '7b747f7dca38b0b6e8ee56434378baae') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" #Ugh, force this to build shared libraries, for god's sake sed -i "s/noinst_LTLIBRARIES/lib_LTLIBRARIES/g" lib/Makefile.am @@ -44,8 +43,8 @@ autoreconf export LDFLAGS="$LDFLAGS -lcrypt" - patch -Np1 -i $srcdir/xstrdup.patch || return 1 - patch -Np1 -i $srcdir/shadow-4.1.4.2-groupmod-pam-check.patch || return 1 + patch -Np1 -i "$srcdir/xstrdup.patch" + patch -Np1 -i "$srcdir/shadow-4.1.4.2-groupmod-pam-check.patch" # supress etc/pam.d/*, we provide our own sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in @@ -55,40 +54,44 @@ --mandir=/usr/share/man --sysconfdir=/etc \ --enable-shared --disable-static \ --with-libpam --without-selinux - make || return 1 - make DESTDIR=$pkgdir install + make +} +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + # license - install -Dm644 COPYING $pkgdir/usr/share/licenses/shadow/COPYING + install -Dm644 COPYING "$pkgdir/usr/share/licenses/shadow/COPYING" # interactive useradd - install -Dm755 $srcdir/adduser $pkgdir/usr/sbin/adduser + install -Dm755 "$srcdir/adduser" "$pkgdir/usr/sbin/adduser" # useradd defaults - install -Dm644 $srcdir/useradd.defaults $pkgdir/etc/default/useradd + install -Dm644 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd" # cron job - install -Dm744 $srcdir/shadow.cron.daily $pkgdir/etc/cron.daily/shadow + install -Dm744 "$srcdir/shadow.cron.daily" "$pkgdir/etc/cron.daily/shadow" # login.defs - install -Dm644 $srcdir/login.defs $pkgdir/etc/login.defs + install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs" # PAM config - cutsom - install -Dm644 $srcdir/login $pkgdir/etc/pam.d/login - install -Dm644 $srcdir/passwd $pkgdir/etc/pam.d/passwd - install -Dm644 $srcdir/chgpasswd $pkgdir/etc/pam.d/chgpasswd - install -Dm644 $srcdir/chpasswd $pkgdir/etc/pam.d/chpasswd - install -Dm644 $srcdir/newusers $pkgdir/etc/pam.d/newusers + install -Dm644 "$srcdir/login" "$pkgdir/etc/pam.d/login" + install -Dm644 "$srcdir/passwd" "$pkgdir/etc/pam.d/passwd" + install -Dm644 "$srcdir/chgpasswd" "$pkgdir/etc/pam.d/chgpasswd" + install -Dm644 "$srcdir/chpasswd" "$pkgdir/etc/pam.d/chpasswd" + install -Dm644 "$srcdir/newusers" "$pkgdir/etc/pam.d/newusers" # PAM config - from tarball - install -Dm644 etc/pam.d/groupmems $pkgdir/etc/pam.d/groupmems + install -Dm644 etc/pam.d/groupmems "$pkgdir/etc/pam.d/groupmems" # we use the 'useradd' PAM file for other similar utilities for file in chage chfn chsh groupadd groupdel groupmod shadow \ useradd usermod userdel; do - install -Dm644 $srcdir/defaults.pam $pkgdir/etc/pam.d/$file + install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file" done # Remove su - using su from coreutils instead - rm -v $pkgdir/bin/su - find $pkgdir/usr/share/man -name 'su.1' -exec rm -v {} \; + rm -v "$pkgdir/bin/su" + find "$pkgdir/usr/share/man" -name 'su.1' -exec rm -v {} \; }
