misc. stuff, and 3.1.5 -> 3.1.6 version number

diff --git a/Makefile b/Makefile
index 40b4068558773aa73c6e18af6f1bcb9860fa1679..a7758cee55a1695824c20b835b6ad3d2711948b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,9 @@
 
 VERSION      := 3
 SUBVERSION   := 1
-MINORVERSION := 5
-TARVERSION   := 3.1.5
-LIBVERSION   := 3.1.5
+MINORVERSION := 6
+TARVERSION   := 3.1.6
+LIBVERSION   := 3.1.6
 
 ############ vars
 

diff --git a/proc/procps.h b/proc/procps.h
index bcda598c9e5e8f7c4f706fd10e423fb0e5c145e6..aefb1d94aa91940818386853d36f23f8363105da 100644 (file)
--- a/proc/procps.h
+++ b/proc/procps.h
@@ -22,9 +22,9 @@
 //
 // PowerPC: Big ugly problem! Macs are popular. :-/
 //
-// Unknown: HP-PA-RISC, zSeries, and x86-64
+// Unknown: PA-RISC, zSeries, and x86-64
 //
-#if defined(__sparc__)      // || defined(__mips__) || defined(__powerpc__)
+#if defined(k64test) || defined(__sparc__)  // || defined(__mips__) || defined(__powerpc__)
 #define KLONG long long    // not typedef; want "unsigned KLONG" to work
 #define KLF "L"
 #define STRTOUKL strtoull

diff --git a/procps.lsm b/procps.lsm
index fd78b87ec875fb3f098be8a273e7894a845096d6..78e06ec694bccaa1a06c02bb549ca10732a5ea3d 100644 (file)
--- a/procps.lsm
+++ b/procps.lsm
@@ -1,6 +1,6 @@
 Begin4
 Title: procps
-Version: 3.1.5
+Version: 3.1.6
 Entered-date: 2002-12-14
 Description: Linux system utilities
 Keywords: procps /proc libproc sysctl pmap
@@ -8,8 +8,8 @@ Keywords: procps /proc libproc sysctl pmap
 Author: Albert Cahalan, Michael K. Johnson, Jim Warner, etc.
 Maintained-by: various <procps-feedback@lists.sf.net>
 Primary-site: http://procps.sf.net/
-       236kB procps-3.1.5.tar.gz
+       236kB procps-3.1.6.tar.gz
 Alternate-site: http://www.debian.org/Packages/unstable/base/procps.html
-       236kB procps-3.1.5.tar.gz
+       236kB procps-3.1.6.tar.gz
 Copying-policy: mixed
 End

diff --git a/procps.spec b/procps.spec
index 6674608e467c73fbb48e46adb0cd446d91579e2b..228e1106311a7dfbcc3850bde4c2a71754b346b7 100644 (file)
--- a/procps.spec
+++ b/procps.spec
@@ -3,7 +3,7 @@ Summary: System and process monitoring utilities
 Name: procps
 %define major_version 3
 %define minor_version 1
-%define revision 5
+%define revision 6
 %define version %{major_version}.%{minor_version}.%{revision}
 Version: %{version}
 Release: 1

diff --git a/ps/ps.1 b/ps/ps.1
index c139a0288eb965db888a67394d99f9c9b8700135..4f2edc32738269f6a968022a83132af87a004500 100644 (file)
--- a/ps/ps.1
+++ b/ps/ps.1
@@ -96,9 +96,8 @@ s            display signal format
 u            display user-oriented format
 v            display virtual memory format
 --format     user-defined format
---context    (SELinux only) Display security context format; implies --SID
---secsid     (SELinux only) Display Security ID (SID)
---SID       (SELinux only) Display Security ID (SID)
+--context    (SELinux only) Display security context format; implies --secsid
+--secsid     (SELinux only) Display Security ID
 
 OUTPUT MODIFIERS
 -H           show process hierarchy (forest)