[procps] - upgraded to new git snapshot (manual pages update) - added /etc/sysctl.d directory (#680529) - rem
Jan Görig
jgorig at fedoraproject.org
Wed Mar 2 09:51:29 UTC 2011
commit 48853e17b2d451f92c11804db307d44e82114a8d
Author: Jan Görig <jgorig at redhat.com>
Date: Wed Mar 2 10:49:21 2011 +0100
- upgraded to new git snapshot (manual pages update)
- added /etc/sysctl.d directory (#680529)
- removed merged or unneeded patches
.gitignore | 1 +
procps-3.2.7-free-hlmem.patch | 23 ------
procps-3.2.7-ps-man-fmt.patch | 12 ---
procps-3.2.7-psman.patch | 22 -----
procps-3.2.7-top-env-vmsize.patch | 11 +--
procps-3.2.7-top-manpage.patch | 24 ------
procps-3.2.7-top-rc.patch | 15 ----
procps-3.2.7-vmstat-timestamp-manpage.patch | 8 +-
procps-3.2.8-selinux.patch | 10 +-
procps-3.2.8git-cgroup-rewritten.patch | 113 ---------------------------
procps-3.2.8git-makefile.patch | 13 ---
procps.spec | 42 ++++------
sources | 2 +-
13 files changed, 34 insertions(+), 262 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5c97a20..ba00fae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
procps-3.2.8.tar.gz
/procps-3.2.8-20110131git.tar.gz
+/procps-3.2.8-20110302git.tar.gz
diff --git a/procps-3.2.7-top-env-vmsize.patch b/procps-3.2.7-top-env-vmsize.patch
index 1e57f61..1feb330 100644
--- a/procps-3.2.7-top-env-vmsize.patch
+++ b/procps-3.2.7-top-env-vmsize.patch
@@ -43,13 +43,12 @@ diff -up procps-3.2.7/top.c.p14 procps-3.2.7/top.c
diff -up procps-3.2.7/top.1.p14 procps-3.2.7/top.1
--- procps-3.2.7/top.1.p14 2006-06-19 06:33:51.000000000 +0200
+++ procps-3.2.7/top.1 2008-09-01 11:36:55.000000000 +0200
-@@ -401,7 +401,8 @@ A task's currently used share of availab
- o:\fB VIRT\fR \*(EM Virtual Image (kb)
+@@ -401,6 +401,8 @@ A task's currently used share of availab
The total amount of \*(MV used by the task.
It includes all code, data and shared libraries plus pages that have been
--swapped out.
-+swapped out. (Note: you can define the STATSIZE=1 environment variable and the VIRT
+ swapped out and pages that have been mapped but not used.
++(Note: you can define the STATSIZE=1 environment variable and the VIRT
+will be calculated from the /proc/#/state VmSize field.)
- VIRT = SWAP + RES.
-
+ .TP 3
+ p:\fB SWAP\fR \*(EM Swapped size (kb)
diff --git a/procps-3.2.7-vmstat-timestamp-manpage.patch b/procps-3.2.7-vmstat-timestamp-manpage.patch
index 37a1f48..6504e78 100644
--- a/procps-3.2.7-vmstat-timestamp-manpage.patch
+++ b/procps-3.2.7-vmstat-timestamp-manpage.patch
@@ -13,10 +13,10 @@ diff -up procps-3.2.7/vmstat.8.timestamp procps-3.2.7/vmstat.8
is represented by one or more tasks, depending on thread usage.
This display does not repeat.
.PP
--The \fB-m\fP displays slabinfo.
-+The \fB-t\fP switch adds timestamp to the output.
+-The \fB\-m\fP displays slabinfo.
++The \fB\-t\fP switch adds timestamp to the output.
+.PP
-+The \fB-m\fP switch displays slabinfo.
++The \fB\-m\fP switch displays slabinfo.
.PP
- The \fB-n\fP switch causes the header to be displayed only once rather than periodically.
+ The \fB\-n\fP switch causes the header to be displayed only once rather than periodically.
.PP
diff --git a/procps-3.2.8-selinux.patch b/procps-3.2.8-selinux.patch
index a8c1f74..596fc8d 100644
--- a/procps-3.2.8-selinux.patch
+++ b/procps-3.2.8-selinux.patch
@@ -70,15 +70,15 @@ index 64953d5..aab2584 100644
--- a/ps/ps.1
+++ b/ps/ps.1
@@ -450,6 +450,9 @@ display virtual memory format
- Do not show flags; show rss in place of addr.
- This option can only be used with \fB\-l\fR.
+ .opt Z
+ Add a column of security data. Identical to \fB\-M\fR (for\ SE\ Linux).
+.opt \-Z
+display security context format (SELinux, etc.)
+
- .opt \-\-format \ format
- user\-defined format. Identical to \fB\-o\fR and \fBo\fR.
-
+ .\" """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+ .PD
+ .PP
diff --git a/w.c b/w.c
index 1b2a0fc..207a8a1 100644
--- a/w.c
diff --git a/procps.spec b/procps.spec
index 3a165fb..7432685 100644
--- a/procps.spec
+++ b/procps.spec
@@ -1,9 +1,9 @@
-%define gitver 20110131git
+%define gitver 20110302git
Summary: System and process monitoring utilities
Name: procps
Version: 3.2.8
-Release: 17.%{gitver}%{?dist}
+Release: 18.%{gitver}%{?dist}
License: GPLv2+ and LGPLv2+
Group: Applications/System
URL: http://gitorious.org/procps
@@ -20,8 +20,6 @@ Patch3: procps-3.2.7-FAQ.patch
Patch6: procps-3.2.7-noproc.patch
Patch7: procps-3.2.7-pseudo.patch
Patch8: procps-3.2.7-0x9b.patch
-# 161449 - "top" ignores user and system toprc
-Patch10: procps-3.2.7-top-rc.patch
# 161303 - 'top' failed when remove cpus
# 186017 - Top "Cpu0" line never updates on single processor machine
Patch11: procps-3.2.7-top-remcpu.patch
@@ -35,7 +33,7 @@ Patch16: procps-3.2.7-vmstat-cpusteal.patch
Patch18: procps-3.2.7-vmstat-pgpg.patch
# 212637 - sysctl using deprecated syscall
# 228870 - process `sysctl' is using deprecated sysctl ...
-Patch21: procps-3.2.7-sysctl-ignore.patch
+#Patch21: procps-3.2.7-sysctl-ignore.patch
# 140975 - top corrupts screen when sorting on first column
Patch22: procps-3.2.7-top-sorthigh.path
# 234546 - 'w' doesn't give correct information about what's being run.
@@ -44,16 +42,10 @@ Patch23: procps-3.2.7-w-best.patch
Patch24: procps-3.2.7-watch-unicode.patch
#244152 - ps truncates eip and esp to 32-bit values on 64-bit systems
Patch28: procps-3.2.7-ps-eip64.patch
-#244960 - ps manpage formatted incorrectly
-Patch29: procps-3.2.7-psman.patch
#185994 - error when using "Single Cpu = Off" option
Patch31: procps-3.2.7-top-cpu0.patch
#354001 - CPU value in top is reported as an integer
Patch32: procps-3.2.7-top-cpuint.patch
-#296471 - update top man page
-Patch33: procps-3.2.7-top-manpage.patch
-#435453 - errors with man -t formatting of ps man page
-Patch35: procps-3.2.7-ps-man-fmt.patch
#472783 - 'vmstat -p <partition name>',
# the detailed statistics of the partition name is not output.
Patch36: procps-3.2.7-vmstat-partstats-long.patch
@@ -67,8 +59,6 @@ Patch39: procps-3.2.7-vmstat-timestamp.patch
Patch40: procps-3.2.7-vmstat-timestamp-manpage.patch
# 'requested writes' display in partition statistics
Patch42: procps-3.2.7-vmstat-partstats-reqwrites.patch
-# '-l' option of 'free' documented
-Patch43: procps-3.2.7-free-hlmem.patch
# bug in showing threads fixed
Patch44: procps-3.2.8-threads.patch
# enable core file generation (don't trap it)
@@ -78,9 +68,6 @@ Patch46: procps-3.2.8-setlocale.patch
# debian bug #505571 pmap -x should show more information
Patch47: procps-pmap-smaps.patch
-Patch50: procps-3.2.8git-makefile.patch
-#593267 - patch for procps cgroup display: supress root group
-Patch51: procps-3.2.8git-cgroup-rewritten.patch
BuildRequires: ncurses-devel
@@ -122,35 +109,28 @@ System and process monitoring utilities development headers
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch10 -p1
%patch11 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch18 -p1
-#%patch21 -p1
+#%%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch28 -p1
-%patch29 -p1
%patch31 -p1
%patch32 -p1
-%patch33 -p1
-%patch35 -p1
%patch36 -p1
%patch37 -p1
%patch38 -p1
%patch39 -p1
%patch40 -p1
%patch42 -p1
-%patch43 -p1
%patch44 -p1
%patch45 -p1
%patch46 -p1
%patch47 -p1
-%patch50 -p1
-%patch51 -p1
cp %SOURCE1 .
@@ -162,6 +142,7 @@ rm -rf %{buildroot}
make ldconfig=true DESTDIR=%{buildroot} lib64=%{_lib} install="install -D" \
SKIP="/bin/kill /usr/share/man/man1/kill.1" install
mkdir -p %{buildroot}/%{_docdir}/procps-%{version}
+mkdir -p %{buildroot}/etc/sysctl.d
# keep 'rpm' happy...
chmod -R u+w %{buildroot}/sbin
chmod -R u+w %{buildroot}/bin
@@ -188,6 +169,7 @@ rm -rf %{buildroot}
%attr(755,root,root) /bin/ps
%attr(755,root,root) /sbin/sysctl
%attr(755,root,root) /usr/bin/*
+%attr(755,root,root) /etc/sysctl.d
%attr(0644,root,root) %{_mandir}/man1/*
%attr(0644,root,root) %{_mandir}/man8/*
@@ -199,6 +181,18 @@ rm -rf %{buildroot}
/%{_lib}/libproc.so
%changelog
+* Wed Mar 03 2011 Jan Görig <jgorig at redhat.com> 3.2.8-18.20110302git
+- upgraded to new git snapshot (manual pages update)
+- added /etc/sysctl.d directory (#680529)
+- removed merged or unneeded patches
+ - procps-3.2.7-free-hlmem.patch
+ - procps-3.2.7-ps-man-fmt.patch
+ - procps-3.2.7-psman.patch
+ - procps-3.2.7-top-manpage.patch
+ - procps-3.2.7-top-rc.patch
+ - procps-3.2.8git-cgroup-rewritten.patch
+ - procps-3.2.8git-makefile.patch
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.8-17.20110131git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index c930784..3ede5db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a876022a4fabfcd20fb578e25a3e9a0 procps-3.2.8-20110131git.tar.gz
+608d46e24670ac5b8d1a7c313009dfc4 procps-3.2.8-20110302git.tar.gz
More information about the scm-commits
mailing list