From 40687e98255c5440e46387a9633ff782873e3ff1 Mon Sep 17 00:00:00 2001
From: kzak <kzak@fedoraproject.org>
Date: Thu, 8 Sep 2005 11:59:39 +0000
Subject: [PATCH] - new release 21.6

---
 .cvsignore  |  2 +-
 psmisc.spec | 23 ++++++++++++++++-------
 sources     |  2 +-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index ea89ce6..a916d1b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-psmisc-21.5.tar.gz
+psmisc-21.6.tar.gz
diff --git a/psmisc.spec b/psmisc.spec
index d562b15..145756c 100644
--- a/psmisc.spec
+++ b/psmisc.spec
@@ -5,14 +5,14 @@
 
 Summary: Utilities for managing processes on your system.
 Name: psmisc
-Version: 21.5
-Release: 4
+Version: 21.6
+Release: 1
 License: BSD/GPL
 Group: Applications/System
 Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
 Patch0: psmisc-20.2-56186.patch
-Patch1: psmisc-21.5-selinux.patch
-Patch2: psmisc-21.5-term.patch
+Patch1: psmisc-21.6-selinux.patch
+Patch2: psmisc-21.6-fuser-pid.patch
 URL: http://psmisc.sourceforge.net
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtermcap-devel
@@ -31,14 +31,18 @@ of processes that are using specified files or filesystems.
 %prep
 %setup -q
 %patch0 -p1 -b .56186
+
 %if %{WITH_SELINUX}
 %patch1 -p1 -b .selinux
-%patch2 -p1 -b .term
 %endif
 
-%build
+%patch2 -p1 -b .pid
 
-perl -pi -e "s/^CFLAGS =/CFLAGS = $RPM_OPT_FLAGS -D_GNU_SOURCE/g" */Makefile.*
+%build
+aclocal
+automake -a
+autoconf
+export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
 
 # FIXME: Is --prefix actually necessary here?  I think it's redundant... test later...
 %if %{WITH_SELINUX}
@@ -78,6 +82,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Sep  8 2005 Karel Zak <kzak@redhat.com> 21.6-1
+- sync with upstream release 21.6
+- cleanup selinux patch
+- fix #165167 - buffer overflow detected in fuser
+
 * Sat Mar  5 2005 Karel Zak <kzak@redhat.com> 21.5-4
 - fixed problem with perl expression in the build .spec section
 
diff --git a/sources b/sources
index 98167ae..b898d9e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c62b09ad5129e2f7e4611019d1d3d4b8  psmisc-21.5.tar.gz
+6994f227b38b09cb3f3bdd3bc5fc65fe  psmisc-21.6.tar.gz