diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-01 19:40:51 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-01 19:40:51 -0300 |
commit | 3dc4525661db2630038e019a2a31b71fdcbfb74a (patch) | |
tree | ea19d09158589c89b949b8cc80d5cd61f8d5b64e /core/shadow/PKGBUILD | |
parent | e41246bc4c78478a71fe801a745210c931c5f2c5 (diff) | |
parent | 76400556d9e8a5dedc692487c13b76a541813a23 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/wml/PKGBUILD
community/exaile/PKGBUILD
community/libquicktime/PKGBUILD
community/mime-editor/PKGBUILD
community/rutilt/PKGBUILD
community/synbak/PKGBUILD
community/thunar-thumbnailers/PKGBUILD
community/tripwire/PKGBUILD
community/wifi-radar/PKGBUILD
community/xulrunner-oss/PKGBUILD
core/bash/PKGBUILD
core/shadow/PKGBUILD
extra/audacity/PKGBUILD
extra/clucene/PKGBUILD
extra/darcs/PKGBUILD
extra/fprint_demo/PKGBUILD
extra/haskell-binary/PKGBUILD
extra/haskell-dataenc/PKGBUILD
extra/haskell-hashed-storage/PKGBUILD
extra/haskell-haskeline/PKGBUILD
extra/haskell-mmap/PKGBUILD
extra/haskell-tar/PKGBUILD
extra/haskell-terminfo/PKGBUILD
extra/haskell-utf8-string/PKGBUILD
extra/libfprint/PKGBUILD
extra/liferea/PKGBUILD
extra/llvm/PKGBUILD
extra/pam_fprint/PKGBUILD
extra/windowmaker-extra/PKGBUILD
kde-unstable/kdebindings-python/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-libao/PKGBUILD
Diffstat (limited to 'core/shadow/PKGBUILD')
-rw-r--r-- | core/shadow/PKGBUILD | 70 |
1 files changed, 39 insertions, 31 deletions
diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD index 2d586265a..b3a130166 100644 --- a/core/shadow/PKGBUILD +++ b/core/shadow/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 111984 2011-03-02 21:59:18Z eric $ +# $Id: PKGBUILD 129320 2011-06-26 16:36:48Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=shadow pkgver=4.1.4.3 -pkgrel=1 -pkgdesc="Shadow password file utilities" -arch=('i686' 'x86_64' 'mips64el') +pkgrel=2 +pkgdesc="Password and account management tool suite with support for shadow files and PAM" +arch=('i686' 'x86_64') url='http://pkg-shadow.alioth.debian.org/' -license=('custom') +license=('BSD') groups=('base') -depends=('bash' 'pam') +depends=('bash' 'pam' 'acl') backup=(etc/login.defs etc/pam.d/{chage,login,passwd,shadow,useradd,usermod,userdel} etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod} @@ -17,26 +17,32 @@ backup=(etc/login.defs etc/default/useradd) options=('!libtool') install=shadow.install -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) -md5sums=('b8608d8294ac88974f27b20f991c0e79' 'beb64d09256ea46a4d96a783f096447f'\ - 'bf137fac19884d71dc55c24b6d08e16c' 'b84204ab731bd02dca49d0637d44ebec'\ - '65e9ebce249a5b9ed021e2790452b9e1' '453a98456b297d2a69ca7e9b5f40d10b'\ - '453a98456b297d2a69ca7e9b5f40d10b' 'a31374fef2cba0ca34dfc7078e2969e4'\ - 'fad9a7116366f7775b1099290be840da' '6ce67e423ee19c87ae64f661310b2408'\ - '1d64b4113e1d402746d9dd65f28a2c6f' '0eebe9d13065bec4b5d7ccf3bf46c509'\ - '7b747f7dca38b0b6e8ee56434378baae') -sha1sums=('ad9b85b5531ce8e68f4695efc4ac53ba7266269e' '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'\ - '0b2d98a0ee3bfde8551ade48d4d35cc20ec702a1' '6f183bc7709b0a8d20ad17481a4ad025cf6e5056'\ - '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' 'd66096ed9477bd7242e8d2cc28eaa23170269788'\ - 'd66096ed9477bd7242e8d2cc28eaa23170269788' '0e56fed7fc93572c6bf0d8f3b099166558bb46f1'\ - 'fceb6defbf959f9bee5598e89378a49297968d1a' '78ec184a499f9708adcfcf0b7a3b22a60bf39f91'\ - '5d83ba7e11c765c951867cbe00b0ae7ff57148fa' '6010fffeed1fc6673ad9875492e1193b1a847b53'\ - '5823f38c0085b27e7e4327ab17ecc13563a43650') +#http://pkg-shadow.alioth.debian.org/releases/shadow-$pkgver.tar.bz2 +# shadow 4.1.4.3 is just shadow 4.1.4.2 with shadow_CVE-2011-0721.patch applied +source=(ftp://ftp.archlinux.org/other/shadow/shadow_4.1.4.2+svn3283.orig.tar.gz + adduser chgpasswd chpasswd defaults.pam login login.defs newusers + passwd shadow.cron.daily useradd.defaults LICENSE + xstrdup.patch shadow_CVE-2011-0721.patch shadow-strncpy-usage.patch + shadow-add-missing-include.patch) +sha1sums=('8b704b8f07718e329205f23d457c3121c0f3679e' + '78ec184a499f9708adcfcf0b7a3b22a60bf39f91' + '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' + 'd66096ed9477bd7242e8d2cc28eaa23170269788' + '0e56fed7fc93572c6bf0d8f3b099166558bb46f1' + '0b2d98a0ee3bfde8551ade48d4d35cc20ec702a1' + 'e5cab2118ecb1e61874cde842d7d04d1003f35cb' + 'd66096ed9477bd7242e8d2cc28eaa23170269788' + '6f183bc7709b0a8d20ad17481a4ad025cf6e5056' + '5d83ba7e11c765c951867cbe00b0ae7ff57148fa' + '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19' + '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' + '6010fffeed1fc6673ad9875492e1193b1a847b53' + '6bfe6528391eb38d338beacedd620407877b637d' + '9db9e62ad173f31e1039121c0124cf60826ffd7e' + '0697a21f7519de30821da7772677035652df4ad2') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-4.1.4.2+svn3283" #Ugh, force this to build shared libraries, for god's sake sed -i "s/noinst_LTLIBRARIES/lib_LTLIBRARIES/g" lib/Makefile.am @@ -44,8 +50,10 @@ build() { autoreconf export LDFLAGS="$LDFLAGS -lcrypt" - patch -Np1 -i "$srcdir/xstrdup.patch" - patch -Np1 -i "$srcdir/shadow-4.1.4.2-groupmod-pam-check.patch" + patch -p1 -i "$srcdir/xstrdup.patch" + patch -p1 -i "$srcdir/shadow_CVE-2011-0721.patch" + patch -p1 -i "$srcdir/shadow-strncpy-usage.patch" + patch -p1 -i "$srcdir/shadow-add-missing-include.patch" # supress etc/pam.d/*, we provide our own sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in @@ -59,11 +67,11 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-4.1.4.2+svn3283" make DESTDIR="$pkgdir" install # license - install -Dm644 COPYING "$pkgdir/usr/share/licenses/shadow/COPYING" + install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE" # interactive useradd install -Dm755 "$srcdir/adduser" "$pkgdir/usr/sbin/adduser" @@ -77,7 +85,7 @@ package() { # login.defs install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs" - # PAM config - cutsom + # PAM config - custom 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" @@ -93,6 +101,6 @@ package() { 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 "$pkgdir/bin/su" + find "$pkgdir/usr/share/man" -name 'su.1' -delete } |