rpms/psmisc/devel psmisc-21.7-fuser-pid.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 psmisc.spec, 1.19, 1.20 sources, 1.9, 1.10 psmisc-20.2-56186.patch, 1.1, NONE psmisc-21.6-fuser-pid.patch, 1.1, NONE psmisc-21.6-selinux.patch, 1.1, NONE

Wed Oct 5 09:30:43 UTC 2005

Author: kzak

Update of /cvs/dist/rpms/psmisc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1123

Modified Files:
	.cvsignore psmisc.spec sources 
Added Files:
	psmisc-21.7-fuser-pid.patch 
Removed Files:
	psmisc-20.2-56186.patch psmisc-21.6-fuser-pid.patch 
	psmisc-21.6-selinux.patch 
Log Message:
update to upstrem cvs version

psmisc-21.7-fuser-pid.patch:
 oldfuser.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE psmisc-21.7-fuser-pid.patch ---
--- psmisc-21.7/src/oldfuser.c.pid	2005-10-05 11:10:16.000000000 +0200
+++ psmisc-21.7/src/oldfuser.c	2005-10-05 11:27:58.000000000 +0200
@@ -627,7 +627,7 @@
 static void
 kill_item (const FILE_DSC * file, const ITEM_DSC * item)
 {
-  char tmp[10];
+  char tmp[20];
 
   switch (item->type)
     {
@@ -638,7 +638,7 @@
 	return;
       if (kill (item->u.proc.pid, file->sig_num) >= 0)
 	break;
-      sprintf (tmp, _("kill %d"), item->u.proc.pid);
+      snprintf (tmp, sizeof(tmp), _("kill %d"), item->u.proc.pid);
       perror (tmp);
       break;
     case it_mount:
@@ -665,7 +665,7 @@
   FILE *f;
   const struct passwd *pw;
   const char *user, *scan;
-  char tmp[10], *path, comm[COMM_LEN + 1];
+  char tmp[20], *path, comm[COMM_LEN + 1];
   int length, header, first, dummy, last_namelen = 0;
   header = 1;
   for (file = files; file; file = file->next)
@@ -774,7 +774,7 @@
 		  user = pw->pw_name;
 		else
 		  {
-		    sprintf (tmp, "%d", uid);
+		    snprintf (tmp, sizeof(tmp), "%d", uid);
 		    user = tmp;
 		  }
 		if (!first)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/psmisc/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	8 Sep 2005 11:59:39 -0000	1.9
+++ .cvsignore	5 Oct 2005 09:30:40 -0000	1.10
@@ -1 +1 @@
-psmisc-21.6.tar.gz
+psmisc-21.7.tar.gz


Index: psmisc.spec
===================================================================
RCS file: /cvs/dist/rpms/psmisc/devel/psmisc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- psmisc.spec	8 Sep 2005 11:59:39 -0000	1.19
+++ psmisc.spec	5 Oct 2005 09:30:40 -0000	1.20
@@ -5,14 +5,11 @@
 
 Summary: Utilities for managing processes on your system.
 Name: psmisc
-Version: 21.6
-Release: 1
+Version: 21.7
+Release: 1.cvs20051005
 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.6-selinux.patch
-Patch2: psmisc-21.6-fuser-pid.patch
 URL: http://psmisc.sourceforge.net
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtermcap-devel
@@ -20,6 +17,8 @@
 BuildRequires: libselinux-devel
 %endif
 
+Patch0: psmisc-21.7-fuser-pid.patch
+
 %description
 The psmisc package contains utilities for managing processes on your
 system: pstree, killall and fuser.  The pstree command displays a tree
@@ -30,21 +29,11 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .56186
-
-%if %{WITH_SELINUX}
-%patch1 -p1 -b .selinux
-%endif
-
-%patch2 -p1 -b .pid
+%patch0 -p1 -b .pid
 
 %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...
+./autogen.sh
 %if %{WITH_SELINUX}
 %configure --prefix=/usr --enable-selinux
 %else
@@ -57,6 +46,9 @@
 # The rpm makeinstall macro breaks the build, so we do it the old way
 make install DESTDIR="$RPM_BUILD_ROOT"
 
+# install more stable old version of fuser
+mv $RPM_BUILD_ROOT%{_bindir}/oldfuser $RPM_BUILD_ROOT%{_bindir}/fuser
+
 mkdir -p $RPM_BUILD_ROOT/sbin
 mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT/sbin
 %if ! %{with_pidof}
@@ -82,6 +74,10 @@
 %endif
 
 %changelog
+* Wed Oct  5 2005 Karel Zak <kzak at redhat.com> 21.7-1.cvs20051005
+- sync with upstream CVS
+- use old version of fuser
+
 * Thu Sep  8 2005 Karel Zak <kzak at redhat.com> 21.6-1
 - sync with upstream release 21.6
 - cleanup selinux patch
@@ -186,7 +182,7 @@
 - Autogenerate the signal list from %{_includedir}/bits/signum.h
   to make sure it works on all arches and doesn't break again.
 
-* Wed May  8 2002 Trond Eivind Glomsrød <teg at redhat.com> 20.2-3
+* Wed May  8 2002 Trond Eivind Glomsrod <teg at redhat.com> 20.2-3
 - Fix the signal list
 - Don't strip when linking
 - Use a %%{_tmppath}


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/psmisc/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	8 Sep 2005 11:59:39 -0000	1.9
+++ sources	5 Oct 2005 09:30:40 -0000	1.10
@@ -1 +1 @@
-6994f227b38b09cb3f3bdd3bc5fc65fe  psmisc-21.6.tar.gz
+b77cf2279241eb580a10c8dd411cff79  psmisc-21.7.tar.gz


--- psmisc-20.2-56186.patch DELETED ---


--- psmisc-21.6-fuser-pid.patch DELETED ---


--- psmisc-21.6-selinux.patch DELETED ---


