rpms/psmisc/devel psmisc-22.1-fuser-silent.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 psmisc.spec, 1.25, 1.26 sources, 1.11, 1.12 psmisc-21.7-fuser-pid.patch, 1.1, NONE psmisc-21.7-killall-scanf.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Mar 7 21:54:01 UTC 2006
- Previous message (by thread): rpms/bind/FC-4 bind-9.3.1-dbus_archdep_libdir_sdb.patch, NONE, 1.1 filter_requires.sh, NONE, 1.1 namedGetForwarders, NONE, 1.1 namedSetForwarders, NONE, 1.1 bind-9.3.1-dbus_archdep_libdir.patch, 1.1, 1.2 bind.spec, 1.67, 1.68 named.init, 1.34, 1.35
- Next message (by thread): rpms/pykickstart/devel .cvsignore, 1.23, 1.24 pykickstart.spec, 1.23, 1.24 sources, 1.24, 1.25
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kzak
Update of /cvs/dist/rpms/psmisc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11277
Modified Files:
.cvsignore psmisc.spec sources
Added Files:
psmisc-22.1-fuser-silent.patch
Removed Files:
psmisc-21.7-fuser-pid.patch psmisc-21.7-killall-scanf.patch
Log Message:
update to upstream cvs version
psmisc-22.1-fuser-silent.patch:
fuser.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
--- NEW FILE psmisc-22.1-fuser-silent.patch ---
--- psmisc-22.1.03072006cvs/src/fuser.c.kzak 2006-03-07 22:25:22.000000000 +0100
+++ psmisc-22.1.03072006cvs/src/fuser.c 2006-03-07 22:29:21.000000000 +0100
@@ -695,7 +695,7 @@
break;
case 'l':
list_signals();
- break;
+ return 0;
case 'm':
opts |= OPT_MOUNTS;
break;
@@ -849,7 +849,9 @@
int have_match = 0;
for (nptr = names_head; nptr != NULL ; nptr = nptr->next) {
- if (! (opts & OPT_SILENT)) { /* We're not silent */
+ if (opts & OPT_SILENT) {
+ have_match = nptr->matched_procs ? 1 : have_match;
+ } else { /* We're not silent */
if (nptr->matched_procs != NULL || opts & OPT_ALLFILES) {
if (head == 0 && opts & OPT_VERBOSE) {
fprintf(stderr, _("\n%*s USER PID ACCESS COMMAND\n"),
@@ -919,7 +921,7 @@
putc('\n', stderr);
} /* be silent */
if (opts & OPT_KILL)
- kill_matched_proc(nptr->matched_procs, opts, sig_number);
+ kill_matched_proc(nptr->matched_procs, opts, sig_number);
} /* next name */
return (have_match==1?0:1);
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/psmisc/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 30 Nov 2005 22:49:34 -0000 1.11
+++ .cvsignore 7 Mar 2006 21:53:59 -0000 1.12
@@ -1 +1 @@
-psmisc-21.8.tar.gz
+psmisc-22.1.03072006cvs.tar.gz
Index: psmisc.spec
===================================================================
RCS file: /cvs/dist/rpms/psmisc/devel/psmisc.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- psmisc.spec 11 Feb 2006 05:18:45 -0000 1.25
+++ psmisc.spec 7 Mar 2006 21:53:59 -0000 1.26
@@ -1,7 +1,7 @@
Summary: Utilities for managing processes on your system.
Name: psmisc
-Version: 21.8
-Release: 1.2.1
+Version: 22.1.03072006cvs
+Release: 1
License: BSD/GPL
Group: Applications/System
Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
@@ -10,8 +10,7 @@
BuildRequires: libtermcap-devel
BuildRequires: libselinux-devel
-Patch0: psmisc-21.7-fuser-pid.patch
-Patch1: psmisc-21.7-killall-scanf.patch
+Patch0: psmisc-22.1-fuser-silent.patch
%description
The psmisc package contains utilities for managing processes on your
@@ -23,11 +22,11 @@
%prep
%setup -q
-%patch0 -p1 -b .pid
-%patch1 -p1 -b .scanf
+%patch0 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
+./autogen.sh
%configure --prefix=/usr --enable-selinux
make
@@ -36,12 +35,10 @@
# 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
rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/pidof.1*
+rm -f $RPM_BUILD_ROOT/%{_bindir}/oldfuser
%find_lang %name
@@ -59,6 +56,12 @@
%{_mandir}/man1/pstree.1*
%changelog
+* Tue Mar 7 2006 Karel Zak <kzak at redhat.com> 22.1.03072006cvs-1
+- update to new upstream CVS version
+- enable new fuser version
+- fix fuser return code
+- fix #183897 - "pstree -a" call results in segmentation fault
+
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 21.8-1.2.1
- bump again for double-long bug on ppc(64)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/psmisc/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 30 Nov 2005 22:49:34 -0000 1.11
+++ sources 7 Mar 2006 21:53:59 -0000 1.12
@@ -1 +1 @@
-d6276e071c10ddf4b0d98856e5573e1a psmisc-21.8.tar.gz
+25f607bb96467f2b094201d81b50c8cb psmisc-22.1.03072006cvs.tar.gz
--- psmisc-21.7-fuser-pid.patch DELETED ---
--- psmisc-21.7-killall-scanf.patch DELETED ---
- Previous message (by thread): rpms/bind/FC-4 bind-9.3.1-dbus_archdep_libdir_sdb.patch, NONE, 1.1 filter_requires.sh, NONE, 1.1 namedGetForwarders, NONE, 1.1 namedSetForwarders, NONE, 1.1 bind-9.3.1-dbus_archdep_libdir.patch, 1.1, 1.2 bind.spec, 1.67, 1.68 named.init, 1.34, 1.35
- Next message (by thread): rpms/pykickstart/devel .cvsignore, 1.23, 1.24 pykickstart.spec, 1.23, 1.24 sources, 1.24, 1.25
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list