diff options
Diffstat (limited to 'shadow')
| -rw-r--r-- | shadow/.md5sum | 4 | ||||
| -rw-r--r-- | shadow/Pkgfile | 10 | ||||
| -rw-r--r-- | shadow/shadow-4.1.5-copydir.patch | 12 | ||||
| -rw-r--r-- | shadow/shadow-4.1.5-nscd.patch | 17 |
4 files changed, 4 insertions, 39 deletions
diff --git a/shadow/.md5sum b/shadow/.md5sum index 4180ee98..037f107f 100644 --- a/shadow/.md5sum +++ b/shadow/.md5sum @@ -1,5 +1,3 @@ 05a85f1ea6bf26aec66a91b5f98a51b0 login.defs be8f69c2701118093af3d7f3bc02af16 pwck -c1767c5cb75a6de6b764f66d94becf2e shadow-4.1.5-copydir.patch -9c65ef2271bc23aa264bd28b309d58ea shadow-4.1.5-nscd.patch -d5f7a588fadb79faeb4b08b1eee82e9a shadow-4.1.5.tar.bz2 +a00449aa439c69287b6d472191dc2247 shadow-4.1.5.1.tar.bz2 diff --git a/shadow/Pkgfile b/shadow/Pkgfile index e166f653..640d6bf1 100644 --- a/shadow/Pkgfile +++ b/shadow/Pkgfile @@ -4,18 +4,14 @@ # Depends on: acl name=shadow -version=4.1.5 -release=2 +version=4.1.5.1 +release=1 source=(http://pkg-shadow.alioth.debian.org/releases/$name-$version.tar.bz2 - pwck login.defs - $name-$version-{copydir,nscd}.patch) + pwck login.defs) build() { cd $name-$version - patch -p2 -i $SRC/$name-$version-copydir.patch - patch -p2 -i $SRC/$name-$version-nscd.patch - ./configure --prefix=/usr \ --mandir=/usr/man \ --sysconfdir=/etc \ diff --git a/shadow/shadow-4.1.5-copydir.patch b/shadow/shadow-4.1.5-copydir.patch deleted file mode 100644 index 747b1144..00000000 --- a/shadow/shadow-4.1.5-copydir.patch +++ /dev/null @@ -1,12 +0,0 @@ -# http://anonscm.debian.org/viewvc/pkg-shadow?view=revision&sortby=date&revision=3706 - ---- upstream/trunk/libmisc/copydir.c 2011/12/09 22:13:02 3655 -+++ upstream/trunk/libmisc/copydir.c 2012/02/13 19:16:29 3706 -@@ -46,6 +46,7 @@ - #include <selinux/selinux.h> - #endif /* WITH_SELINUX */ - #if defined(WITH_ACL) || defined(WITH_ATTR) -+#include <stdarg.h> - #include <attr/error_context.h> - #endif /* WITH_ACL || WITH_ATTR */ - #ifdef WITH_ACL diff --git a/shadow/shadow-4.1.5-nscd.patch b/shadow/shadow-4.1.5-nscd.patch deleted file mode 100644 index 34f26459..00000000 --- a/shadow/shadow-4.1.5-nscd.patch +++ /dev/null @@ -1,17 +0,0 @@ -# http://anonscm.debian.org/viewvc/pkg-shadow?view=revision&revision=3709 - ---- upstream/trunk/lib/nscd.c 2011/10/18 20:16:00 3519 -+++ upstream/trunk/lib/nscd.c 2012/02/13 20:09:59 3709 -@@ -39,8 +39,11 @@ - /* 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; |