diff options
| author | root <root@rshg054.dnsready.net> | 2012-02-15 20:35:25 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-02-15 20:35:25 +0000 |
| commit | 650a87f5a67f6e71d4a56e52139a718d86ebbb46 (patch) | |
| tree | a1fbbc8a6502d8f7fbee0529d283d788eb80f416 /testing/shadow | |
| parent | 812b715ebd89fb9049df7000c721990084b525c6 (diff) | |
Wed Feb 15 20:35:25 UTC 2012
Diffstat (limited to 'testing/shadow')
| -rw-r--r-- | testing/shadow/PKGBUILD | 7 | ||||
| -rw-r--r-- | testing/shadow/nscd-error-reporting.patch | 17 |
2 files changed, 22 insertions, 2 deletions
diff --git a/testing/shadow/PKGBUILD b/testing/shadow/PKGBUILD index 7409f0f9f..b47226ed4 100644 --- a/testing/shadow/PKGBUILD +++ b/testing/shadow/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150166 2012-02-14 01:55:53Z dreisner $ +# $Id: PKGBUILD 150202 2012-02-14 16:39:16Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=shadow pkgver=4.1.5 -pkgrel=2 +pkgrel=3 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/' @@ -30,6 +30,7 @@ source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{ passwd shadow.cron.daily useradd.defaults + nscd-error-reporting.patch xstrdup.patch shadow-strncpy-usage.patch shadow-add-missing-include.patch) @@ -46,6 +47,7 @@ sha1sums=('3ab1ae0e30af36d04445314fcb5a079bdf05de41' '611be25d91c3f8f307c7fe2485d5f781e5dee75f' '5d83ba7e11c765c951867cbe00b0ae7ff57148fa' '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19' + 'ae6eebb842c433ac4022c493294a13ed68e06acc' '6010fffeed1fc6673ad9875492e1193b1a847b53' '21e12966a6befb25ec123b403cd9b5c492fe5b16' '0697a21f7519de30821da7772677035652df4ad2') @@ -62,6 +64,7 @@ build() { patch -Np1 <"$srcdir/xstrdup.patch" patch -Np1 <"$srcdir/shadow-strncpy-usage.patch" patch -Np1 <"$srcdir/shadow-add-missing-include.patch" + patch -Np1 <"$srcdir/nscd-error-reporting.patch" # supress etc/pam.d/*, we provide our own sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in diff --git a/testing/shadow/nscd-error-reporting.patch b/testing/shadow/nscd-error-reporting.patch new file mode 100644 index 000000000..a4075756e --- /dev/null +++ b/testing/shadow/nscd-error-reporting.patch @@ -0,0 +1,17 @@ +diff --git a/upstream/trunk/lib/nscd.c b/upstream/trunk/lib/nscd.c +index 227c205..7adb58f 100644 +--- a/lib/nscd.c ++++ b/lib/nscd.c +@@ -39,8 +39,11 @@ int nscd_flush_cache (const char *service) + /* nscd is not installed, or it is installed but uses an + interpreter that is missing. Probably the former. */ + return 0; ++ } else if (code == 1) { ++ /* nscd is installed, but it isn't active. */ ++ return 0; + } else if (code != 0) { +- (void) fprintf (stderr, _("%s: nscd exited with status %d"), ++ (void) fprintf (stderr, _("%s: nscd exited with status %d\n"), + Prog, code); + (void) fprintf (stderr, _(MSG_NSCD_FLUSH_CACHE_FAILED), Prog); + return -1; |