From 30f3024f752e3003570e39fe89af80bbfad74d1c Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Tue, 20 Jul 2010 09:20:10 +0000 Subject: [PATCH] fix pwck/grpck hang --- shadow-4.1.4.2-fixes.patch | 12 ------------ shadow-utils.spec | 6 +++++- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/shadow-4.1.4.2-fixes.patch b/shadow-4.1.4.2-fixes.patch index a7ab5b4..8451675 100644 --- a/shadow-4.1.4.2-fixes.patch +++ b/shadow-4.1.4.2-fixes.patch @@ -1,15 +1,3 @@ -diff -up shadow-4.1.4.2/lib/commonio.c.fixes shadow-4.1.4.2/lib/commonio.c ---- shadow-4.1.4.2/lib/commonio.c.fixes 2009-09-07 15:51:28.312139467 +0200 -+++ shadow-4.1.4.2/lib/commonio.c 2009-09-07 15:52:00.788140456 +0200 -@@ -710,7 +710,7 @@ commonio_sort (struct commonio_db *db, i - db->tail->prev = entries[n - 1]; - db->tail->next = NULL; - -- for (i = 1; i < n; i++) { -+ for (i = 1; i < (n-1); i++) { - entries[i]->prev = entries[i - 1]; - entries[i]->next = entries[i + 1]; - } diff -up shadow-4.1.4.2/libmisc/cleanup.c.fixes shadow-4.1.4.2/libmisc/cleanup.c --- shadow-4.1.4.2/libmisc/cleanup.c.fixes 2009-09-07 15:52:22.449035388 +0200 +++ shadow-4.1.4.2/libmisc/cleanup.c 2009-09-07 15:55:06.632033653 +0200 diff --git a/shadow-utils.spec b/shadow-utils.spec index ec06437..a09e6d8 100644 --- a/shadow-utils.spec +++ b/shadow-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for managing accounts and shadow password files Name: shadow-utils Version: 4.1.4.2 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 2 URL: http://pkg-shadow.alioth.debian.org/ Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2 @@ -192,6 +192,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/vigr.8* %changelog +* Tue Jul 20 2010 Peter Vrabec - 2:4.1.4.2-8 +- fix pwck/grpck hang + Resolves: #586322 + * Mon Jun 14 2010 Peter Vrabec - 2:4.1.4.2-7 - fix integer underflow in faillog (#603683) - use preferred GID for reserved static IDs