--- /dev/null
+procps (3.2.8-4slp2) unstable; urgency=low
+
+ * Add git tag
+ * Git: 165.213.180.234:/git/slp/unmodified/procps
+ * Tag: procps_3.2.8-4slp2
+
+ -- DongGi Jang <dg0402@dg0402-desktop> Thu, 25 Nov 2010 12:09:47 +0900
+
+procps (3.2.8-3slp2) unstable; urgency=low
+
+ * case of un-modified open source package
+
+ -- DongGi Jang <dg0402@dg0402-desktop> Thu, 25 Nov 2010 12:09:46 +0900
+
+procps (3.2.8-2slp2) unstable; urgency=low
+
+ * Change version policy
+
+ -- DongGi Jang <dg0402.jang@samsung.com> Tue, 30 Mar 2010 14:52:50 +0900
+
+procps (3.2.8-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- DongGi Jang <dg0402.jang@samsung.com> Thu, 21 Jan 2010 15:07:11 +0900
--- /dev/null
+Source: procps
+Section: misc
+Priority: extra
+Maintainer: DongGi Jang <dg0402.jang@samsung.com>
+Uploaders: DongGi Jang <dg0402.jang@samsung.com>
+Build-Depends: debhelper (>= 5), libncurses5-dev
+Standards-Version: 3.2.8
+
+Package: procps
+Section: misc
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Procps
+ The /proc file system utilities
--- /dev/null
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+\f
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+\f
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+\f
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+\f
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+\f
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) 19yy <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
--- /dev/null
+@PREFIX@/bin/*
+@PREFIX@/etc/*
+@PREFIX@/libexec/*
+@PREFIX@/sbin/*
+@PREFIX@/share/*
--- /dev/null
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+config.status:
+ dh_testdir
+ # Add here commands to configure the package. --build=$(DEB_BUILD_GNU_TYPE)
+
+build: build-stamp
+
+build-stamp: config.status
+ dh_testdir
+ # Add here commands to compile the package.
+ $(MAKE)
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ # Add here commands to clean up after the build process.
+ rm -rf $(CURDIR)/debian/procps
+ $(MAKE) clean
+ dh_clean
+
+post-install:
+ rm -rf $(CURDIR)/debian/procps/usr
+ rm -rf $(CURDIR)/debian/procps/sbin
+ rm -f $(CURDIR)/debian/procps/bin/kill
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ # Add here commands to install the package into debian/procps.
+ $(MAKE) DESTDIR=$(CURDIR)/debian/procps install
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install post-install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+# dh_installdocs
+# dh_installexamples
+# dh_install --sourcedir=debian/temp
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_python
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+# dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
+++ /dev/null
-9532714b6846013ca9898984ba4cd7e0 procps-3.2.8.tar.gz
+++ /dev/null
-diff --git a/Makefile b/Makefile
-index 3f67bbf..e4a1adc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -67,7 +67,7 @@ TARFILES := AUTHORS BUGS NEWS README TODO COPYING COPYING.LIB \
- # plus the top-level Makefile to make it work stand-alone.
- _TARFILES := Makefile
-
--CURSES := -lncursesw
-+CURSES := -ltinfo -lncursesw
-
- # This seems about right for the dynamic library stuff.
- # Something like this is probably needed to make the SE Linux
+++ /dev/null
---- procps-3.2.1/w.c.selinux-workaround 2003-09-20 02:42:26.000000000 -0400
-+++ procps-3.2.1/w.c 2004-06-15 10:45:53.000000000 -0400
-@@ -162,6 +162,10 @@
- if(best && tmp->start_time <= best->start_time) continue;
- best = tmp;
- }
-+ /* It is there but SELinux wouldn't allow us to know the detail. Really
-+ w should just be given rights */
-+ if(!kill(u->ut_pid, 0) || errno != ESRCH)
-+ *found_utpid = 1;
- return best ? best : secondbest;
- }
-
+++ /dev/null
---- procps-3.2.6/ps/output.c~ 2005-10-29 23:18:19.000000000 -0400
-+++ procps-3.2.6/ps/output.c 2005-12-13 16:27:15.000000000 -0500
-@@ -1090,7 +1090,7 @@
- return snprintf(outbuf, COLWID, "*");
- }
-
--
-+#ifdef STATICLIB
- /****************** FLASK & seLinux security stuff **********************/
- // move the bulk of this to libproc sometime
-
-@@ -1122,7 +1122,7 @@
- return 1;
- }
-
--#if 0
-+#else
- // This needs more study, considering:
- // 1. the static linking option (maybe disable this in that case)
- // 2. the -z and -Z option issue
-@@ -1134,7 +1134,7 @@
- char *context;
-
- if(!ps_getpidcon && !tried_load){
-- void *handle = dlopen("libselinux.so.1", RTLD_NOW);
-+ void *handle = dlopen("libselinux.so", RTLD_NOW);
- if(handle){
- dlerror();
- ps_getpidcon = dlsym(handle, "getpidcon");
---- procps-3.2.6/Makefile~ 2005-10-30 01:27:04.000000000 -0500
-+++ procps-3.2.6/Makefile 2005-12-13 16:32:09.000000000 -0500
-@@ -73,12 +73,12 @@
- # Something like this is probably needed to make the SE Linux
- # library loading not conflict with embedded systems stuff.
- #
--#ifeq ($(SHARED),1)
--#ldl := -ldl
--#LIBTYPE := -DSHAREDLIB
--#else
--#LIBTYPE := -DSTATICLIB
--#endif
-+ifeq ($(SHARED),1)
-+ldl := -ldl
-+LIBTYPE := -DSHAREDLIB
-+else
-+LIBTYPE := -DSTATICLIB
-+endif
-
- # Preprocessor flags.
- PKG_CPPFLAGS := -D_GNU_SOURCE -I proc
-@@ -103,7 +103,7 @@
- # Note that some stuff below is conditional on CFLAGS containing
- # an option that starts with "-g". (-g, -g2, -g3, -ggdb, etc.)
- CFLAGS := -O2 -s
--ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS)
-+ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS) $(LIBTYPE)
-
- PKG_LDFLAGS := -Wl,-warn-common
- LDFLAGS :=
---- procps-3.2.4beta/proc/escape.c.0x9b 2004-10-23 19:44:28.000000000 +0200
-+++ procps-3.2.4beta/proc/escape.c 2004-11-04 15:22:00.196344424 +0100
-@@ -79,6 +79,7 @@
+diff -up procps-3.2.7/proc/escape.c.p8 procps-3.2.7/proc/escape.c
+--- procps-3.2.7/proc/escape.c.p8 2005-01-05 21:50:26.000000000 +0100
++++ procps-3.2.7/proc/escape.c 2008-09-01 11:31:15.000000000 +0200
+@@ -79,6 +79,7 @@ static int escape_str_utf8(char *restric
// multibyte - printable
// Got space?
if (my_cells+wlen > *maxcells || my_bytes+1+len >= bufsize) break;
// 0x9b is control byte for some terminals
if (memchr(src, 0x9B, len)) {
// unsafe multibyte
-@@ -87,13 +88,16 @@
+@@ -87,13 +88,16 @@ static int escape_str_utf8(char *restric
my_cells++;
my_bytes++;
} else {
---- procps-3.2.6/proc/version.h.FAQ 2002-12-15 01:08:32.000000000 +0100
-+++ procps-3.2.6/proc/version.h 2005-10-31 20:29:18.000000000 +0100
-@@ -16,6 +16,7 @@
+diff -up procps-3.2.7/ps/parser.c.p3 procps-3.2.7/ps/parser.c
+--- procps-3.2.7/ps/parser.c.p3 2008-09-01 11:11:50.000000000 +0200
++++ procps-3.2.7/ps/parser.c 2008-09-01 11:11:50.000000000 +0200
+@@ -1238,7 +1238,7 @@ try_bsd:
+ // as SysV options... and you're screwed if you've been patching
+ // out the friendly warning. Cut-over is likely to be in 2005.
+ if(!(personality & PER_FORCE_BSD))
+- fprintf(stderr, "Warning: bad ps syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html\n");
++ fprintf(stderr, "Warning: bad syntax, perhaps a bogus '-'? See /usr/share/doc/procps-%s/FAQ\n",procps_number_version);
+ // Remember: contact albert@users.sf.net or procps-feedback@lists.sf.net
+ // if you should feel tempted. Be damn sure you understand all
+ // the issues. The same goes for other stuff too, BTW. Please ask.
+diff -up procps-3.2.7/proc/version.h.p3 procps-3.2.7/proc/version.h
+--- procps-3.2.7/proc/version.h.p3 2002-12-15 01:08:32.000000000 +0100
++++ procps-3.2.7/proc/version.h 2008-09-01 11:11:50.000000000 +0200
+@@ -16,6 +16,7 @@ EXTERN_C_BEGIN
extern void display_version(void); /* display suite version */
extern const char procps_version[]; /* global buf for suite version */
extern int linux_version_code; /* runtime version of LINUX_VERSION_CODE
in /usr/include/linux/version.h */
---- procps-3.2.6/proc/version.c.FAQ 2003-01-29 02:11:43.000000000 +0100
-+++ procps-3.2.6/proc/version.c 2005-10-31 20:29:18.000000000 +0100
+diff -up procps-3.2.7/proc/library.map.p3 procps-3.2.7/proc/library.map
+--- procps-3.2.7/proc/library.map.p3 2005-03-14 05:32:40.000000000 +0100
++++ procps-3.2.7/proc/library.map 2008-09-01 11:11:50.000000000 +0200
+@@ -9,7 +9,7 @@ global:
+ escape_str; escape_strlist;
+ openproc; closeproc;
+ tty_to_dev; dev_to_tty; open_psdb_message; open_psdb; lookup_wchan;
+- display_version; procps_version; linux_version_code;
++ display_version; procps_version; procps_number_version; linux_version_code;
+ Hertz; smp_num_cpus; have_privs;
+ sprint_uptime; uptime; user_from_uid; print_uptime; loadavg;
+ pretty_print_signals; print_given_signals; unix_print_signals; signal_name_to_number; signal_number_to_name;
+diff -up procps-3.2.7/proc/version.c.p3 procps-3.2.7/proc/version.c
+--- procps-3.2.7/proc/version.c.p3 2003-01-29 02:11:43.000000000 +0100
++++ procps-3.2.7/proc/version.c 2008-09-01 11:11:50.000000000 +0200
@@ -16,8 +16,10 @@
#ifdef MINORVERSION
const char procps_version[] = "procps version " VERSION "." SUBVERSION "." MINORVERSION;
+const char procps_number_version[] = VERSION "." SUBVERSION "." MINORVERSION;
#else
--const char procps_version[] = "procps version " VERSION "." SUBVERSION;
-+const char procps_version[] = "procps version " VERSION "." SUBVERSION;
+ const char procps_version[] = "procps version " VERSION "." SUBVERSION;
+const char procps_number_version[] = VERSION "." SUBVERSION;
#endif
void display_version(void) {
---- procps-3.2.6/proc/library.map.FAQ 2005-03-14 05:32:40.000000000 +0100
-+++ procps-3.2.6/proc/library.map 2005-10-31 20:32:39.000000000 +0100
-@@ -9,7 +9,7 @@
- escape_str; escape_strlist;
- openproc; closeproc;
- tty_to_dev; dev_to_tty; open_psdb_message; open_psdb; lookup_wchan;
-- display_version; procps_version; linux_version_code;
-+ display_version; procps_version; procps_number_version; linux_version_code;
- Hertz; smp_num_cpus; have_privs;
- sprint_uptime; uptime; user_from_uid; print_uptime; loadavg;
- pretty_print_signals; print_given_signals; unix_print_signals; signal_name_to_number; signal_number_to_name;
---- procps-3.2.6/ps/parser.c.FAQ 2005-10-31 20:29:18.000000000 +0100
-+++ procps-3.2.6/ps/parser.c 2005-10-31 20:29:18.000000000 +0100
-@@ -1238,7 +1238,7 @@
- // as SysV options... and you're screwed if you've been patching
- // out the friendly warning. Cut-over is likely to be in 2005.
- if(!(personality & PER_FORCE_BSD))
-- fprintf(stderr, "Warning: bad ps syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html\n");
-+ fprintf(stderr, "Warning: bad syntax, perhaps a bogus '-'? See /usr/share/doc/procps-%s/FAQ\n",procps_number_version);
- // Remember: contact albert@users.sf.net or procps-feedback@lists.sf.net
- // if you should feel tempted. Be damn sure you understand all
- // the issues. The same goes for other stuff too, BTW. Please ask.
---- procps-3.2.2/watch.c.misc 2004-07-10 14:58:26.000000000 -0400
-+++ procps-3.2.2/watch.c 2004-07-19 10:54:05.905274300 -0400
-@@ -24,6 +24,9 @@
- #include <unistd.h>
+diff -up procps-3.2.7/watch.c.p2 procps-3.2.7/watch.c
+--- procps-3.2.7/watch.c.p2 2006-06-17 11:18:38.000000000 +0200
++++ procps-3.2.7/watch.c 2008-09-01 10:46:17.000000000 +0200
+@@ -25,6 +25,9 @@
+ #include <termios.h>
#include <locale.h>
#include "proc/procps.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
- static struct option longopts[] = {
- {"differences", optional_argument, 0, 'd'},
-@@ -93,6 +96,7 @@
+ #ifdef FORCE_8BIT
+ #undef isprint
+@@ -138,6 +141,7 @@ int
main(int argc, char *argv[])
{
int optc;
int option_differences = 0,
option_differences_cumulative = 0,
option_help = 0, option_version = 0;
-@@ -213,7 +217,13 @@
+@@ -260,7 +264,13 @@ main(int argc, char *argv[])
mvaddstr(0, width - tsl + 1, ts);
free(header);
}
---- procps-3.2.3/top.c~ 2004-09-28 13:39:31.352488862 -0400
-+++ procps-3.2.3/top.c 2004-09-28 13:42:47.659416849 -0400
-@@ -3201,12 +3201,15 @@
+diff -up procps-3.2.7/top.c.p6 procps-3.2.7/top.c
+--- procps-3.2.7/top.c.p6 2006-06-25 08:41:48.000000000 +0200
++++ procps-3.2.7/top.c 2008-09-01 11:28:15.000000000 +0200
+@@ -3331,12 +3331,15 @@ static void frame_make (void)
int main (int dont_care_argc, char *argv[])
{
--- /dev/null
+diff -up procps-3.2.7/ps/output.c.pom procps-3.2.7/ps/output.c
+--- procps-3.2.7/ps/output.c.pom 2009-02-15 13:16:27.000000000 +0100
++++ procps-3.2.7/ps/output.c 2009-02-15 14:02:34.000000000 +0100
+@@ -1097,6 +1097,40 @@ static int pr_sgi_p(char *restrict const
+ return snprintf(outbuf, COLWID, "*");
+ }
+
++static int pr_cgroup(char *restrict const outbuf, const proc_t *restrict const pp){
++ char filename[48];
++ FILE *fd;
++ int counter = 0;
++ int c;
++ int is_cgroup = 0;
++
++ outbuf[0]='\0';
++ snprintf(filename, sizeof filename, "/proc/%d/cgroup", pp->tgid);
++ fd = fopen(filename, "r");
++ if (likely(fd == NULL)) goto fail;
++ while (( (c = fgetc(fd)) != EOF) && (counter<665)) {
++ if (is_cgroup == 0) {
++ if (c == ':') {
++ is_cgroup = 1;
++ if (counter>0)
++ outbuf[counter++]=';';
++ }
++ }else
++ if ((c == '\n') || (c == '\0'))
++ is_cgroup = 0;
++ else
++ outbuf[counter++]=c;
++ }
++ outbuf[counter]='\0';
++ close(fd);
++ if (counter>0)
++ return counter;
++fail:
++ outbuf[0] = '-';
++ outbuf[1] = '\0';
++ return 1;
++}
++
+ #ifdef STATICLIB
+ /****************** FLASK & seLinux security stuff **********************/
+ // move the bulk of this to libproc sometime
+@@ -1291,6 +1325,7 @@ static const format_struct format_array[
+ {"bsdtime", "TIME", pr_bsdtime, sr_nop, 6, 0, LNX, ET|RIGHT},
+ {"c", "C", pr_c, sr_pcpu, 2, 0, SUN, ET|RIGHT},
+ {"caught", "CAUGHT", pr_sigcatch, sr_nop, 9, 0, BSD, TO|SIGNAL}, /*sigcatch*/
++{"cgroup", "CGROUP", pr_cgroup, sr_nop, 35, 0, LNX, PO|LEFT}, /* cgroups*/
+ {"class", "CLS", pr_class, sr_sched, 3, 0, XXX, TO|LEFT},
+ {"cls", "CLS", pr_class, sr_sched, 3, 0, HPU, TO|RIGHT}, /*says HPUX or RT*/
+ {"cmaj_flt", "-", pr_nop, sr_cmaj_flt, 1, 0, LNX, AN|RIGHT},
+diff -up procps-3.2.7/ps/ps.1.pom procps-3.2.7/ps/ps.1
+--- procps-3.2.7/ps/ps.1.pom 2009-02-15 13:16:27.000000000 +0100
++++ procps-3.2.7/ps/ps.1 2009-02-15 14:00:33.000000000 +0100
+@@ -908,6 +908,10 @@ width of the field, a 32 or 64 bits mask
+ displayed. (alias\ \fBsig_catch\fR,\ \fBsigcatch\fR).
+ T}
+
++cgroup CGROUP T{
++display control groups to which the process belonges.
++t}
++
+ class CLS T{
+ scheduling class of the process. (alias\ \fBpolicy\fR,\ \fBcls\fR).
+ Field's possible values are:
+
+++ /dev/null
---- procps-3.2.7/ps/output.c.libselinux 2007-08-27 08:34:13.000000000 +0200
-+++ procps-3.2.7/ps/output.c 2007-08-27 08:34:30.000000000 +0200
-@@ -1141,7 +1141,7 @@
- char *context;
-
- if(!ps_getpidcon && !tried_load){
-- void *handle = dlopen("libselinux.so", RTLD_NOW);
-+ void *handle = dlopen("libselinux.so.1", RTLD_NOW);
- if(handle){
- dlerror();
- ps_getpidcon = dlsym(handle, "getpidcon");
---- procps-3.2.5/top.h.pseudo 2005-03-17 13:32:05.305659080 +0100
-+++ procps-3.2.5/top.h 2005-03-17 13:34:04.837487480 +0100
-@@ -149,8 +149,13 @@
+diff -up procps-3.2.7/top.h.p7 procps-3.2.7/top.h
+--- procps-3.2.7/top.h.p7 2006-06-25 08:41:48.000000000 +0200
++++ procps-3.2.7/top.h 2008-09-01 11:29:15.000000000 +0200
+@@ -149,8 +149,13 @@ do {
int _len = 1 + snprintf(_str, sizeof(_str), fmt, ## arg); \
if (Batch) _ptr = _str; \
else { \
+++ /dev/null
---- procps-3.2.7/ps/parser.c.selinux 2006-06-25 09:14:58.000000000 +0200
-+++ procps-3.2.7/ps/parser.c 2006-07-10 10:14:22.000000000 +0200
-@@ -231,7 +231,7 @@
- // In the meantime, please do not add to it. The list is
- // intended to ONLY contain flags defined by the POSIX and UNIX
- // standards published by The Open Group, IEEE, and ISO.
-- if(!strchr("aAdefgGlnoptuU", *flagptr)) not_pure_unix = 1; // dude, -Z ain't in POSIX
-+ if(!strchr("aAdefgGlnoptuUZ", *flagptr)) not_pure_unix = 1; // dude, -Z ain't in POSIX
-
- switch(*flagptr){
- case 'A':
---- procps-3.2.7/ps/ps.1.selinux 2005-10-30 03:44:03.000000000 +0100
-+++ procps-3.2.7/ps/ps.1 2006-07-10 10:08:12.000000000 +0200
-@@ -450,6 +450,9 @@
- Do not show flags; show rss in place of addr.
- This option can only be used with \fB\-l\fR.
-
-+.opt \-Z
-+display security context format (SELinux, etc.)
-+
- .opt \-\-format \ format
- user\-defined format. Identical to \fB\-o\fR and \fBo\fR.
-
---- procps-3.2.6/sysctl.c.writeonly 2005-01-05 22:00:47.000000000 +0100
-+++ procps-3.2.6/sysctl.c 2005-11-08 11:24:19.000000000 +0100
-@@ -127,7 +127,8 @@
+diff -up procps-3.2.7/sysctl.c.p9 procps-3.2.7/sysctl.c
+--- procps-3.2.7/sysctl.c.p9 2006-06-25 02:51:51.000000000 +0200
++++ procps-3.2.7/sysctl.c 2008-09-01 11:31:58.000000000 +0200
+@@ -127,7 +127,8 @@ static int ReadSetting(const char *restr
char *restrict tmpname;
char *restrict outname;
char inbuf[1025];
if (!name || !*name) {
fprintf(stderr, ERR_INVALID_KEY, name);
-@@ -144,7 +145,13 @@
+@@ -144,7 +145,13 @@ static int ReadSetting(const char *restr
outname = strdup(name);
slashdot(outname,'/','.'); /* change / to . */
if (!fp) {
switch(errno) {
-@@ -158,12 +165,16 @@
+@@ -158,12 +165,16 @@ static int ReadSetting(const char *restr
fprintf(stderr, ERR_PERMISSION_DENIED, outname);
rc = -1;
break;
if(fgets(inbuf, sizeof inbuf - 1, fp)) {
// this loop is required, see
// /sbin/sysctl -a | egrep -6 dev.cdrom.info
-@@ -183,7 +194,9 @@
+@@ -183,7 +194,9 @@ static int ReadSetting(const char *restr
}
}
} while(fgets(inbuf, sizeof inbuf - 1, fp));
---- procps-3.2.7/top.c.kzak 2006-08-31 10:44:42.000000000 +0200
-+++ procps-3.2.7/top.c 2006-08-31 10:46:15.000000000 +0200
-@@ -121,6 +121,7 @@
+diff -up procps-3.2.7/top.c.p15 procps-3.2.7/top.c
+--- procps-3.2.7/top.c.p15 2008-09-01 11:37:51.000000000 +0200
++++ procps-3.2.7/top.c 2008-09-01 11:37:51.000000000 +0200
+@@ -121,6 +121,7 @@ static int No_ksyms = -1, // set t
Secure_mode = 0; // set if some functionality restricted
static int VIRT_vmsize = 0; //use vm_size for VIRT
/* Some cap's stuff to reduce runtime calls --
to accomodate 'Batch' mode, they begin life as empty strings */
-@@ -1679,6 +1680,8 @@
+@@ -1679,6 +1680,8 @@ static void before (char *me)
if (( getenv("STATSIZE")) && ( atoi(getenv("STATSIZE")) == 1 ))
VIRT_vmsize = 1;
}
-@@ -2978,6 +2981,7 @@
+@@ -2978,6 +2981,7 @@ static proc_t **summary_show (void)
{
static proc_t **p_table = NULL;
static CPU_t *smpcpu = NULL;
// whoa first time, gotta' prime the pump...
if (!p_table) {
-@@ -3025,6 +3029,28 @@
+@@ -3025,6 +3029,28 @@ static proc_t **summary_show (void)
smpcpu = cpus_refresh(smpcpu);
if (CHKw(Curwin, View_CPUSUM)) {
// display just the 1st /proc/stat line
summaryhlp(&smpcpu[Cpu_tot], "Cpu(s):");
-@@ -3050,6 +3076,8 @@
+@@ -3050,6 +3076,8 @@ static proc_t **summary_show (void)
}
SETw(Curwin, NEWFRAM_cwo);
return p_table;
}
---- procps-3.2.7/top.1.kzak 2006-08-31 10:44:42.000000000 +0200
-+++ procps-3.2.7/top.1 2006-08-31 10:44:42.000000000 +0200
-@@ -1183,6 +1183,13 @@
+diff -up procps-3.2.7/top.1.p15 procps-3.2.7/top.1
+--- procps-3.2.7/top.1.p15 2008-09-01 11:37:51.000000000 +0200
++++ procps-3.2.7/top.1 2008-09-01 11:37:51.000000000 +0200
+@@ -1183,6 +1183,13 @@ Then ponder this:
Send bug reports to:
Albert D\. Cahalan, <albert@users.sf.net>
---- procps-3.2.6/top.1.env-vmsize 2006-04-19 16:50:37.000000000 +0200
-+++ procps-3.2.6/top.1 2006-04-19 16:59:23.000000000 +0200
-@@ -395,7 +395,8 @@
- o:\fB VIRT\fR \*(EM Virtual Image (kb)
- 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
-+will be calculated from the /proc/#/state VmSize field.)
-
- VIRT = SWAP + RES.
-
---- procps-3.2.6/top.c.env-vmsize 2006-04-19 16:35:20.000000000 +0200
-+++ procps-3.2.6/top.c 2006-04-19 16:50:25.000000000 +0200
-@@ -120,6 +120,8 @@
+diff -up procps-3.2.7/top.c.p14 procps-3.2.7/top.c
+--- procps-3.2.7/top.c.p14 2008-09-01 11:36:55.000000000 +0200
++++ procps-3.2.7/top.c 2008-09-01 11:36:55.000000000 +0200
+@@ -120,6 +120,8 @@ static int No_ksyms = -1, // set t
Loops = -1, // number of iterations, -1 loops forever
Secure_mode = 0; // set if some functionality restricted
/* Some cap's stuff to reduce runtime calls --
to accomodate 'Batch' mode, they begin life as empty strings */
static char Cap_clr_eol [CAPBUFSIZ],
-@@ -1667,6 +1669,9 @@
+@@ -1674,6 +1676,9 @@ static void before (char *me)
Fieldstab[P_PPD].fmts = pid_fmt;
Fieldstab[P_PPD].head = " PPID" + 10 - pid_digits;
}
}
-@@ -2194,6 +2199,7 @@
+@@ -2207,6 +2212,7 @@ static void reframewins (void)
}
if (!Frames_libflags) Frames_libflags = L_DEFAULT;
if (selection_type=='p') Frames_libflags |= PROC_PID;
}
-@@ -3157,7 +3163,10 @@
+@@ -3186,7 +3192,10 @@ static void task_show (const WIN_t *q, c
MKCOL(p->ruser);
break;
case P_VRT:
break;
case P_WCH:
if (No_ksyms) {
+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)
+ 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
++will be calculated from the /proc/#/state VmSize field.)
+
+ VIRT = SWAP + RES.
+
---- procps-3.2.5/top.c.rc 2005-06-28 22:36:24.000000000 +0200
-+++ procps-3.2.5/top.c 2005-06-28 22:40:27.000000000 +0200
-@@ -2393,7 +2393,10 @@
+diff -up procps-3.2.7/top.c.p10 procps-3.2.7/top.c
+--- procps-3.2.7/top.c.p10 2008-09-01 11:33:06.000000000 +0200
++++ procps-3.2.7/top.c 2008-09-01 11:33:06.000000000 +0200
+@@ -2462,7 +2462,10 @@ static void windows_stage2 (void)
int i;
for (i = 0; i < GROUPSMAX; i++) {
--- /dev/null
+Description: Call libproc constructors in strict order
+ Having one constructor depend on another means if the order is reversed
+ you get a different result. Patched based on idea by Tom Evans.
+Bug-Debian: http://bugs.debian.org/460331
+Author: Craig Small <csmall@debian.org>
+Adapted to Fedora: Jan Görig <jgorig@redhat.com>
+--- a/proc/sysinfo.c
++++ b/proc/sysinfo.c
+@@ -213,6 +213,7 @@
+ static void init_libproc(void) __attribute__((constructor));
+ static void init_libproc(void){
+ have_privs = check_for_privs();
++ init_Linux_version(); /* Must be called before we check code */
+ // ought to count CPUs in /proc/stat instead of relying
+ // on glibc, which foolishly tries to parse /proc/cpuinfo
+ //
+--- a/proc/version.c
++++ b/proc/version.c
+@@ -33,8 +33,7 @@
+
+ int linux_version_code;
+
+-static void init_Linux_version(void) __attribute__((constructor));
+-static void init_Linux_version(void) {
++void init_Linux_version(void) {
+ static struct utsname uts;
+ int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */
+
+--- a/proc/version.h
++++ b/proc/version.h
+@@ -14,6 +14,7 @@
+
+ EXTERN_C_BEGIN
+
++void init_Linux_version(void); /* Get Linux version */
+ extern void display_version(void); /* display suite version */
+ extern const char procps_version[]; /* global buf for suite version */
+ extern const char procps_number_version[]; /* global buf for suite number version */
--- /dev/null
+diff -up procps-3.2.8/Makefile.make procps-3.2.8/Makefile
+--- procps-3.2.8/Makefile.make 2010-09-08 18:16:34.000000000 +0200
++++ procps-3.2.8/Makefile 2010-09-08 18:54:41.668727996 +0200
+@@ -174,7 +174,8 @@ INSTALL := $(BINFILES) $(MANFILES)
+ # want this rule first, use := on ALL, and ALL not filled in yet
+ all: do_all
+
+--include */module.mk
++-include proc/module.mk
++-include ps/module.mk
+
+ do_all: $(ALL)
+
--- /dev/null
+--- procps-3.2.8/ps/output.c 2010-05-18 06:00:18.000000000 +0200
++++ procps-3.2.8.lennart/ps/output.c 2010-05-18 05:59:46.000000000 +0200
+@@ -1109,7 +1109,7 @@
+ static int pr_cgroup(char *restrict const outbuf, const proc_t *restrict const pp){
+ char filename[48];
+ FILE *fd;
+- int counter = 0;
++ int counter = 0, last_begin = 0, slash = 0;
+ int c;
+ int is_cgroup = 0;
+
+@@ -1121,15 +1121,22 @@
+ if (is_cgroup == 0) {
+ if (c == ':') {
+ is_cgroup = 1;
++ slash = 0;
+ if (counter>0)
+ outbuf[counter++]=';';
+ }
+ }else
+- if ((c == '\n') || (c == '\0'))
+- is_cgroup = 0;
++ if ((c == '\n') || (c == '\0')){
++ if (slash) /* if the last char was a / this process is in the root cgroup which we should suppress */
++ counter = last_begin;
+ else
++ last_begin = counter;
++ is_cgroup = 0;
++ } else {
++ slash = c == '/';
+ outbuf[counter++]=c;
+ }
++ }
+ outbuf[counter]='\0';
+ close(fd);
+ if (counter>0)
--- /dev/null
+diff --git a/Makefile b/Makefile
+index 09fb3ed..4d05900 100644
+--- a/Makefile
++++ b/Makefile
+@@ -73,12 +73,12 @@ CURSES := -lncurses
+ # Something like this is probably needed to make the SE Linux
+ # library loading not conflict with embedded systems stuff.
+ #
+-#ifeq ($(SHARED),1)
+-#ldl := -ldl
+-#LIBTYPE := -DSHAREDLIB
+-#else
+-#LIBTYPE := -DSTATICLIB
+-#endif
++ifeq ($(SHARED),1)
++ldl := -ldl
++LIBTYPE := -DSHAREDLIB
++else
++LIBTYPE := -DSTATICLIB
++endif
+
+ # Preprocessor flags.
+ PKG_CPPFLAGS := -D_GNU_SOURCE -I proc
+@@ -103,7 +103,7 @@ PKG_CFLAGS := -fno-common -ffast-math \
+ # Note that some stuff below is conditional on CFLAGS containing
+ # an option that starts with "-g". (-g, -g2, -g3, -ggdb, etc.)
+ CFLAGS := -O2 -s
+-ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS)
++ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS) $(LIBTYPE)
+
+ PKG_LDFLAGS := -Wl,-warn-common
+ LDFLAGS :=
+diff --git a/ps/output.c b/ps/output.c
+index 87bf9de..edbb4cb 100644
+--- a/ps/output.c
++++ b/ps/output.c
+@@ -1099,7 +1099,7 @@ static int pr_sgi_p(char *restrict const outbuf, const proc_t *restrict const pp
+ return snprintf(outbuf, COLWID, "*");
+ }
+
+-
++#ifdef STATICLIB
+ /****************** FLASK & seLinux security stuff **********************/
+ // move the bulk of this to libproc sometime
+
+@@ -1131,7 +1131,7 @@ fail:
+ return 1;
+ }
+
+-#if 0
++#else
+ // This needs more study, considering:
+ // 1. the static linking option (maybe disable this in that case)
+ // 2. the -z and -Z option issue
+diff --git a/ps/parser.c b/ps/parser.c
+index 5ad9035..2659d4d 100644
+--- a/ps/parser.c
++++ b/ps/parser.c
+@@ -231,7 +231,7 @@ static const char *parse_sysv_option(void){
+ // In the meantime, please do not add to it. The list is
+ // intended to ONLY contain flags defined by the POSIX and UNIX
+ // standards published by The Open Group, IEEE, and ISO.
+- if(!strchr("aAdefgGlnoptuU", *flagptr)) not_pure_unix = 1; // dude, -Z ain't in POSIX
++ if(!strchr("aAdefgGlnoptuUZ", *flagptr)) not_pure_unix = 1; // dude, -Z ain't in POSIX
+
+ switch(*flagptr){
+ case 'A':
+diff --git a/ps/ps.1 b/ps/ps.1
+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
++display security context format (SELinux, etc.)
++
+ .opt \-\-format \ format
+ user\-defined format. Identical to \fB\-o\fR and \fBo\fR.
+
+diff --git a/w.c b/w.c
+index 1b2a0fc..207a8a1 100644
+--- a/w.c
++++ b/w.c
+@@ -163,6 +163,10 @@ static const proc_t *getproc(const utmp_t *restrict const u, const char *restric
+ if(best && tmp->start_time <= best->start_time) continue;
+ best = tmp;
+ }
++ /* It is there but SELinux wouldn't allow us to know the detail. Really
++ w should just be given rights */
++ if(!kill(u->ut_pid, 0) || errno != ESRCH)
++ *found_utpid = 1;
+ return best ? best : secondbest;
+ }
+
--- /dev/null
+diff -Nur procps-3.2.8-orig/proc/sysinfo.c procps-3.2.8/proc/sysinfo.c
+--- procps-3.2.8-orig/proc/sysinfo.c 2008-03-24 05:33:43.000000000 +0100
++++ procps-3.2.8/proc/sysinfo.c 2009-12-18 22:50:52.000000000 +0100
+@@ -74,17 +74,19 @@
+ /***********************************************************************/
+ int uptime(double *restrict uptime_secs, double *restrict idle_secs) {
+ double up=0, idle=0;
+- char *restrict savelocale;
++ char *savelocale;
+
+ FILE_TO_BUF(UPTIME_FILE,uptime_fd);
+- savelocale = setlocale(LC_NUMERIC, NULL);
++ savelocale = strdup(setlocale(LC_NUMERIC, NULL));
+ setlocale(LC_NUMERIC,"C");
+ if (sscanf(buf, "%lf %lf", &up, &idle) < 2) {
+ setlocale(LC_NUMERIC,savelocale);
++ free(savelocale);
+ fputs("bad data in " UPTIME_FILE "\n", stderr);
+ return 0;
+ }
+ setlocale(LC_NUMERIC,savelocale);
++ free(savelocale);
+ SET_IF_DESIRED(uptime_secs, up);
+ SET_IF_DESIRED(idle_secs, idle);
+ return up; /* assume never be zero seconds in practice */
+@@ -128,9 +130,9 @@
+ double up_1, up_2, seconds;
+ unsigned long long jiffies;
+ unsigned h;
+- char *restrict savelocale;
++ char *savelocale;
+
+- savelocale = setlocale(LC_NUMERIC, NULL);
++ savelocale = strdup(setlocale(LC_NUMERIC, NULL));
+ setlocale(LC_NUMERIC, "C");
+ do{
+ FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_1);
+@@ -141,6 +143,7 @@
+ /* uptime(&up_2, NULL); */
+ } while((long long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */
+ setlocale(LC_NUMERIC, savelocale);
++ free(savelocale);
+ jiffies = user_j + nice_j + sys_j + other_j;
+ seconds = (up_1 + up_2) / 2;
+ h = (unsigned)( (double)jiffies/seconds/smp_num_cpus );
+@@ -303,16 +306,18 @@
+ /***********************************************************************/
+ void loadavg(double *restrict av1, double *restrict av5, double *restrict av15) {
+ double avg_1=0, avg_5=0, avg_15=0;
+- char *restrict savelocale;
++ char *savelocale;
+
+ FILE_TO_BUF(LOADAVG_FILE,loadavg_fd);
+- savelocale = setlocale(LC_NUMERIC, NULL);
++ savelocale = strdup(setlocale(LC_NUMERIC, NULL));
+ setlocale(LC_NUMERIC, "C");
+ if (sscanf(buf, "%lf %lf %lf", &avg_1, &avg_5, &avg_15) < 3) {
+ fputs("bad data in " LOADAVG_FILE "\n", stderr);
++ free(savelocale);
+ exit(1);
+ }
+ setlocale(LC_NUMERIC, savelocale);
++ free(savelocale);
+ SET_IF_DESIRED(av1, avg_1);
+ SET_IF_DESIRED(av5, avg_5);
+ SET_IF_DESIRED(av15, avg_15);
--- /dev/null
+diff -up procps-3.2.8/top.c.threads procps-3.2.8/top.c
+--- procps-3.2.8/top.c.threads 2009-10-01 07:14:43.000000000 -0400
++++ procps-3.2.8/top.c 2009-10-05 14:05:00.000000000 -0400
+@@ -1138,6 +1138,7 @@ static proc_t **procs_refresh (proc_t **
+ #define ENTsz sizeof(proc_t)
+ static unsigned savmax = 0; // first time, Bypass: (i)
+ proc_t *ptsk = (proc_t *)-1; // first time, Force: (ii)
++ proc_t *saved_ptsk = NULL;
+ unsigned curmax = 0; // every time (jeeze)
+ PROCTAB* PT;
+ static int show_threads_was_enabled = 0; // optimization
+@@ -1172,6 +1173,8 @@ static proc_t **procs_refresh (proc_t **
+ while (curmax < savmax) {
+ proc_t *ttsk;
+ if (unlikely(!(ptsk = readproc(PT, NULL)))) break;
++ if(!show_threads_was_enabled)
++ saved_ptsk = ptsk;
+ show_threads_was_enabled = 1;
+ while (curmax < savmax) {
+ unsigned idx;
+@@ -1189,7 +1194,7 @@ static proc_t **procs_refresh (proc_t **
+ prochlp(ttsk);
+ ++curmax;
+ }
+- free(ptsk); // readproc() proc_t not used
++ if(!saved_ptsk) free(ptsk); // readproc() proc_t not used
+ }
+ }
+
+@@ -1208,7 +1213,8 @@ static proc_t **procs_refresh (proc_t **
+ else { // show each thread in a process separately
+ while (ptsk) {
+ proc_t *ttsk;
+- if (likely(ptsk = readproc(PT, NULL))) {
++ if (likely(ptsk = readproc(PT, NULL)) ||
++ unlikely(saved_ptsk && (ptsk = saved_ptsk)) ) {
+ show_threads_was_enabled = 1;
+ while (1) {
+ table = alloc_r(table, (curmax + 1) * PTRsz);
+@@ -1216,6 +1222,8 @@ static proc_t **procs_refresh (proc_t **
+ prochlp(ttsk);
+ table[curmax++] = ttsk;
+ }
++ if(saved_ptsk != ptsk) free(saved_ptsk);
++ saved_ptsk = NULL;
+ free(ptsk); // readproc() proc_t not used
+ }
+ }
--- /dev/null
+diff -up procps-3.2.8/vmstat.c.getopt procps-3.2.8/vmstat.c
+--- procps-3.2.8/vmstat.c.getopt 2010-04-06 14:39:24.000000000 +0200
++++ procps-3.2.8/vmstat.c 2010-04-06 14:47:52.000000000 +0200
+@@ -30,14 +30,15 @@
+ #include "proc/sysinfo.h"
+ #include "proc/version.h"
+
+-static unsigned long dataUnit=1024;
+-static char szDataUnit [16];
+ #define UNIT_B 1
+ #define UNIT_k 1000
+ #define UNIT_K 1024
+ #define UNIT_m 1000000
+ #define UNIT_M 1048576
+
++static unsigned long dataUnit=UNIT_K;
++static char szDataUnit[3] = "K";
++
+ #define VMSTAT 0
+ #define DISKSTAT 0x00000001
+ #define VMSUMSTAT 0x00000002
+@@ -609,12 +610,10 @@ static int winhi(void) {
+ ////////////////////////////////////////////////////////////////////////////
+
+ int main(int argc, char *argv[]) {
+- char partition[16];
+- argc=0; /* redefined as number of integer arguments */
+- for (argv++;*argv;argv++) {
+- if ('-' ==(**argv)) {
+- switch (*(++(*argv))) {
+-
++ char *partition = NULL;
++ int c;
++
++ while((c = getopt(argc, argv, "VdafmDnp:S:s")) != EOF) switch(c) {
+ case 'V':
+ display_version();
+ exit(0);
+@@ -630,7 +629,7 @@ int main(int argc, char *argv[]) {
+ fork_format();
+ exit(0);
+ case 'm':
+- statMode |= SLABSTAT;
++ statMode |= SLABSTAT;
+ break;
+ case 'D':
+ statMode |= DISKSUMSTAT;
+@@ -641,29 +640,21 @@ int main(int argc, char *argv[]) {
+ break;
+ case 'p':
+ statMode |= PARTITIONSTAT;
+- if (argv[1]){
+- char *cp = *++argv;
+- if(!memcmp(cp,"/dev/",5)) cp += 5;
+- snprintf(partition, sizeof partition, "%s", cp);
+- }else{
+- fprintf(stderr, "-p requires an argument\n");
+- exit(EXIT_FAILURE);
+- }
++ partition = optarg;
++ if (memcmp(partition, "/dev/", 5) == 0) partition += 5;
+ break;
+ case 'S':
+- if (argv[1]){
+- ++argv;
+- if (!strcmp(*argv, "k")) dataUnit=UNIT_k;
+- else if (!strcmp(*argv, "K")) dataUnit=UNIT_K;
+- else if (!strcmp(*argv, "m")) dataUnit=UNIT_m;
+- else if (!strcmp(*argv, "M")) dataUnit=UNIT_M;
+- else {fprintf(stderr, "-S requires k, K, m or M (default is kb)\n");
+- exit(EXIT_FAILURE);
+- }
+- strcpy(szDataUnit, *argv);
+- }else {fprintf(stderr, "-S requires an argument\n");
+- exit(EXIT_FAILURE);
+- }
++ switch(optarg[0]) {
++ case 'b': case 'B': dataUnit = UNIT_B; break;
++ case 'k': dataUnit = UNIT_k; break;
++ case 'K': dataUnit = UNIT_K; break;
++ case 'm': dataUnit = UNIT_m; break;
++ case 'M': dataUnit = UNIT_M; break;
++ default:
++ fprintf(stderr, "-S requires k, K, m or M (default is kb)\n");
++ exit(EXIT_FAILURE);
++ }
++ szDataUnit[0] = optarg[0];
+ break;
+ case 's':
+ statMode |= VMSUMSTAT;
+@@ -674,23 +665,18 @@ int main(int argc, char *argv[]) {
+ default:
+ /* no other aguments defined yet. */
+ usage();
+- }
+- }else{
+- argc++;
+- switch (argc) {
+- case 1:
+- if ((sleep_time = atoi(*argv)) == 0)
+- usage();
+- num_updates = ULONG_MAX;
+- break;
+- case 2:
+- num_updates = atol(*argv);
+- break;
+- default:
+- usage();
+- } /* switch */
+- }
+-}
++ }
++
++ if (optind < argc) {
++if ((sleep_time = atoi(argv[optind++])) == 0)
++ usage();
++ num_updates = ULONG_MAX;
++ }
++ if (optind < argc)
++ num_updates = atol(argv[optind++]);
++ if (optind < argc)
++ usage();
++
+ if (moreheaders) {
+ int tmp=winhi()-3;
+ height=((tmp>0)?tmp:22);
--- /dev/null
+diff -up procps-3.2.8/pmap.c.pmap procps-3.2.8/pmap.c
+--- procps-3.2.8/pmap.c.pmap 2008-10-19 21:34:34.000000000 +0200
++++ procps-3.2.8/pmap.c 2010-02-08 15:40:19.000000000 +0100
+@@ -126,24 +126,38 @@ static int one_proc(proc_t *p){
+ char buf[32];
+ char mapbuf[9600];
+ char cmdbuf[512];
++ FILE *fp;
+ unsigned long total_shared = 0ul;
+ unsigned long total_private_readonly = 0ul;
+ unsigned long total_private_writeable = 0ul;
+
++ char *cp2=NULL;
++ unsigned long long rss = 0ull;
++ unsigned long long private_dirty = 0ull;
++ unsigned long long shared_dirty = 0ull;
++ unsigned long long total_rss = 0ull;
++ unsigned long long total_private_dirty = 0ull;
++ unsigned long long total_shared_dirty = 0ull;
++ unsigned KLONG diff = 0;
++
+ // Overkill, but who knows what is proper? The "w" prog
+ // uses the tty width to determine this.
+ int maxcmd = 0xfffff;
+
+ sprintf(buf,"/proc/%u/maps",p->tgid);
+- if(!freopen(buf, "r", stdin)) return 1;
++ if ( (fp = fopen(buf, "r")) == NULL) return 1;
++ if (x_option) {
++ sprintf(buf,"/proc/%u/smaps",p->tgid);
++ if ( (fp = freopen(buf, "r", fp)) == NULL) return 1;
++ }
+
+ escape_command(cmdbuf, p, sizeof cmdbuf, &maxcmd, ESC_ARGS|ESC_BRACKETS);
+ printf("%u: %s\n", p->tgid, cmdbuf);
+
+ if(!q_option && (x_option|d_option)){
+ if(x_option){
+- if(sizeof(KLONG)==4) printf("Address Kbytes RSS Anon Locked Mode Mapping\n");
+- else printf("Address Kbytes RSS Anon Locked Mode Mapping\n");
++ if(sizeof(KLONG)==4) printf("Address Kbytes RSS Dirty Mode Mapping\n");
++ else printf("Address Kbytes RSS Dirty Mode Mapping\n");
+ }
+ if(d_option){
+ if(sizeof(KLONG)==4) printf("Address Kbytes Mode Offset Device Mapping\n");
+@@ -151,12 +165,54 @@ static int one_proc(proc_t *p){
+ }
+ }
+
+- while(fgets(mapbuf,sizeof mapbuf,stdin)){
++ while(fgets(mapbuf,sizeof mapbuf,fp)){
+ char flags[32];
+ char *tmp; // to clean up unprintables
+- unsigned KLONG start, end, diff;
++ unsigned KLONG start, end;
+ unsigned long long file_offset, inode;
+ unsigned dev_major, dev_minor;
++ unsigned long long smap_value;
++ char smap_key[20];
++
++ /* hex values are lower case or numeric, keys are upper */
++ if (mapbuf[0] >= 'A' && mapbuf[0] <= 'Z') {
++ /* Its a key */
++ if (sscanf(mapbuf,"%20[^:]: %llu", smap_key, &smap_value) == 2) {
++ if (strncmp("Rss", smap_key, 3) == 0) {
++ rss = smap_value;
++ total_rss += smap_value;
++ continue;
++ }
++ if (strncmp("Shared_Dirty", smap_key, 12) == 0) {
++ shared_dirty = smap_value;
++ total_shared_dirty += smap_value;
++ continue;
++ }
++ if (strncmp("Private_Dirty", smap_key, 13) == 0) {
++ private_dirty = smap_value;
++ total_private_dirty += smap_value;
++ continue;
++ }
++ if (strncmp("Swap", smap_key, 4) == 0) { /*doesnt matter as long as last*/
++ printf(
++ (sizeof(KLONG)==8)
++ ? "%016"KLF"x %7lu %7llu %7llu %s %s\n"
++ : "%08lx %7lu %7llu %7llu %s %s\n",
++ start,
++ (unsigned long)(diff>>10),
++ rss,
++ (private_dirty + shared_dirty),
++ flags,
++ cp2
++ );
++ /* reset some counters */
++ rss = shared_dirty = private_dirty = 0ull;
++ continue;
++ }
++ /* Other keys */
++ continue;
++ }
++ }
+ sscanf(mapbuf,"%"KLF"x-%"KLF"x %31s %Lx %x:%x %Lu", &start, &end, flags, &file_offset, &dev_major, &dev_minor, &inode);
+
+ if(start > range_high)
+@@ -186,16 +242,9 @@ static int one_proc(proc_t *p){
+ flags[5] = '\0';
+
+ if(x_option){
+- const char *cp = mapping_name(p, start, diff, mapbuf, 0, dev_major, dev_minor, inode);
+- printf(
+- (sizeof(KLONG)==8)
+- ? "%016"KLF"x %7lu - - - %s %s\n"
+- : "%08lx %7lu - - - %s %s\n",
+- start,
+- (unsigned long)(diff>>10),
+- flags,
+- cp
+- );
++ cp2 = mapping_name(p, start, diff, mapbuf, 0, dev_major, dev_minor, inode);
++ /* printed with the keys */
++ continue;
+ }
+ if(d_option){
+ const char *cp = mapping_name(p, start, diff, mapbuf, 0, dev_major, dev_minor, inode);
+@@ -232,10 +281,12 @@ static int one_proc(proc_t *p){
+ if(!q_option){
+ if(x_option){
+ if(sizeof(KLONG)==8){
+- printf("---------------- ------ ------ ------ ------\n");
++ printf("---------------- ------ ------ ------\n");
+ printf(
+- "total kB %15ld - - -\n",
+- (total_shared + total_private_writeable + total_private_readonly) >> 10
++ "total kB %15ld %7llu %7llu\n",
++ (total_shared + total_private_writeable + total_private_readonly) >> 10,
++ total_rss, (total_shared_dirty+total_private_dirty)
++
+ );
+ }else{
+ printf("-------- ------- ------- ------- -------\n");
+++ /dev/null
-* Wed Jul 28 2010 Ameya Palande <ameya.palande@nokia.com> 3.2.8
-- Fix for "Unknown HZ value! (??) Assume 100." problem
-
-* Mon Dec 14 2009 Yi Yang <yi.y.yang@intel.com> 3.2.7
-- Fix Makefile error when LD_AS_NEEDED is set
-
-* Mon Dec 14 2009 Yi Yang <yi.y.yang@intel.com> 3.2.7
-- Remove "unset LD_AS_NEEDED"
-
-* Thu May 7 2009 Arjan van de Ven <arjan@linux.intel.com> 3.2.7
-- not ready for LD_AS_NEEDED yet
-
-* Wed Jul 23 2008 Zhang Xin <xing.z.zhang@intel.com>
-- Mark man file as %doc
-
-* Tue Feb 12 2008 Tomas Smetana <tsmetana@redhat.com> 3.2.7-20
-- rebuild (gcc-4.3)
-
-* Thu Jan 24 2008 Tomas Smetana <tsmetana@redhat.com> 3.2.7-19.2
-- install slabtop again: kernel was fixed
-
-* Fri Jan 18 2008 Tomas Smetana <tsmetana@redhat.com> 3.2.7-19.1
-- rebuild because of errors on x86_64
-
-* Fri Jan 18 2008 Tomas Smetana <tsmetana@redhat.com> 3.2.7-19
-- fix #296471 - update top man page
-- fix #226319 - merge review
-
-* Fri Jan 11 2008 Tomas Smetana <tsmetana@redhat.com> 3.2.7-18
-- fix displaying the CPU column as integer (related #354001)
-- don't install slabtop -- there's no /proc/slabinfo
-
-* Wed Sep 12 2007 Tomas Smetana <tsmetana@redhat.com> 3.2.7-17
-- fix #185994 - top "Cpu0" line never updates when using
- "Single Cpu = Off" option on single processor machine
-
-* Mon Aug 27 2007 Tomas Smetana <tsmetana@redhat.com> 3.2.7-16.1
-- bump release
-
-* Mon Aug 27 2007 Tomas Smetana <tsmetana@redhat.com> 3.2.7-16
-- fix #255441 - ps requires libselinux-devel to display security contexts
-
-* Thu Aug 23 2007 Tomas Smetana <tsmetana@redhat.com> 3.2.7-15.1
-- rebuild
-
-* Mon Aug 20 2007 Tomas Smetana <tsmetana@redhat.com> 3.2.7-15
-- fix #244960 - ps manpage formatted incorrectly
-- update license tag
-
-* Mon Jun 18 2007 Tomas Smetana <tsmetana@redhat.com> 3.2.7-14
-- fix #244152 ps truncates eip and esp to 32-bit values on 64-bit systems
-
-* Tue May 22 2007 Tomas Smetana <tsmetana@redhat.com> 3.2.7-13
-- fix #208217 - ps does not accept '+' in sort specifier
-
-* Wed Apr 25 2007 Tomas Smetana <tsmetana@redhat.com> 3.2.7-12
-- fix #183029 - watch ignores multibyte characters
-- fix #222251 - STIME column can jitter
-- fix array overflow in sysctl
-
-* Tue Apr 3 2007 Karel Zak <kzak@redhat.com> 3.2.7-11
-- fix #234546 - 'w' doesn't give correct information about what's being run.
-- fix #228870 - process `sysctl' is using deprecated sysctl
-- cleanup spec file
-
-* Mon Feb 5 2007 Karel Zak <kzak@redhat.com> 3.2.7-10
-- fix #212637 - sysctl using deprecated syscall
-- fix #140975 - top corrupts screen when sorting on first column
-
-* Tue Jan 30 2007 Karel Zak <kzak@redhat.com> 3.2.7-9
-- fix procps_version in FAQ patch (thanks to Ian Kent)
-
-* Wed Sep 27 2006 Karel Zak <kzak@redhat.com> 3.2.7-8
-- remove zombie patch (needs more investigation)
-- fix #208100 - top command with '-c' option become not to display list of tasks
-- fix #199174 - top returns with exit code 1 even if no error occurs
-
-* Tue Sep 19 2006 Karel Zak <kzak@redhat.com> 3.2.7-7
-- fix #206551 - top fails to convert to cpu single mode when hit '1'
-
-* Tue Sep 5 2006 Karel Zak <kzak@redhat.com> 3.2.7-6
-- fix minor bug in procps-3.2.6-top-env-cpuloop.patch
-
-* Fri Aug 7 2006 Karel Zak <kzak@redhat.com> - 3.2.7-5
-- fix #189349 - 32bit vmstat on 64bit kernel
-
-* Thu Aug 3 2006 Karel Zak <kzak@redhat.com> - 3.2.7-4
-- fix #139827 - ps(1) outputs a multi-threads process as a defunct process.
-
-* Wed Jul 19 2006 Karel Zak <kzak@redhat.com> - 3.2.7-3
-- spec file cleanup
-
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 3.2.7-2.1
-- rebuild
-
-* Mon Jul 10 2006 Karel Zak <kzak@redhat.com> 3.2.7-2
-- fix #134516 - ps ignores /proc/#/cmdline if contents 2047 bytes
-
-* Mon Jul 10 2006 Karel Zak <kzak@redhat.com> 3.2.7-1
-- upgrade to 3.2.7 (and sync patches)
-
-* Thu Jun 1 2006 Karel Zak <kzak@redhat.com> 3.2.6-4
-- fix #191493 - watch -n doesn't handle large integers properly
-- fix #186017 - top "Cpu0" line never updates on single processor machine
- (bugfix added to the 'remcpu' patch)
-- fix #168444 - memory usage conflicts with /proc/meminfo
-- fix #174619 - top reports wrong values for CPU(s) in batch mode
-- fix #185299 - cpu steal time support
-
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 3.2.6-3.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 3.2.6-3.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Tue Dec 13 2005 Dan Walsh <dwalsh@redhat.com> 3.2.6-3
-- Translate context
-
-* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
-- rebuilt
-
-* Tue Nov 8 2005 Karel Zak <kzak@redhat.com> 3.2.6-2
-- fix #157725 - sysctl -A returns an error
-
-* Mon Oct 31 2005 Karel Zak <kzak@redhat.com> 3.2.6-1
-- update to new upstream release
-
-* Wed Oct 12 2005 Karel Zak <kzak@redhat.com> 3.2.5-8
-- fix #170083 - Top showing bad cpu usage numbers
-
-* Tue Sep 6 2005 Karel Zak <kzak@redhat.com> 3.2.5-7
-- improve procps-3.2.5-sysctl-writeonly.patch
-- fix #161449 - "top" ignores user and system toprc
-- fix #161559 - top segfaults when resizing console
-- fix #160796 - vmstat crashes when accessing LVM partition
-- fix #161303 - 'top' failed when remove cpus
-
-* Tue May 10 2005 Karel Zak <kzak@redhat.com> 3.2.5-6
-- fix permissions in the spec install section
-
-* Tue May 10 2005 Karel Zak <kzak@redhat.com> 3.2.5-5
-- fix debuginfo
-
-* Tue Apr 26 2005 Karel Zak <kzak@redhat.com> 3.2.5-4
-- fix #144459 - sysctl reports error: unknown error <...> reading key '<key>'
- (now sysctl doesn't read data from write-only /proc/sys files)
-
-* Thu Mar 17 2005 Karel Zak <kzak@redhat.com> 3.2.5-3
-- fix top crashes when terminal window is resized (#149319)
-
-* Sat Mar 5 2005 Karel Zak <kzak@redhat.com> 3.2.5-2
-- rebuilt
-
-* Tue Feb 1 2005 Karel Zak <kzak@redhat.com> 3.2.5-1
-- update to new upstream 3.2.5
-- recreate selinux patch
-- remove errno, slabinfo21 and fullpath patches -- all fixed by upstream
-
-* Mon Jan 25 2005 Karel Zak <kzak@redhat.com> 3.2.4-4
-- pmap truncates filenames of mappings (#142751)
-
-* Mon Jan 24 2005 Karel Zak <kzak@redhat.com> 3.2.4-3
-- add support for /proc/slabinfo 2.1 (#145369)
-
-* Fri Jan 7 2005 Karel Zak <kzak@redhat.com> 3.2.4-2
-- fix sysctl errno usage (#144459)
-
-* Wed Dec 1 2004 Karel Zak <kzak@redhat.com> 3.2.4-1
-- update to new upstream release
-
-* Mon Nov 1 2004 Karel Zak <kzak@redhat.com> 3.2.3-6
-- update FAQ
-- update spec description
-- fix text in .noproc patch
-- fix segv fault if cpu number exceeding 38 (#137159)
-
-* Tue Sep 28 2004 Dan Walsh <dwalsh@redhat.com> 3.2.3-5
-- Fix terminal handling when /proc is not available.
-- Patch provided by Karel Zak
-
-* Thu Sep 16 2004 Dan Walsh <dwalsh@redhat.com> 3.2.3-4
-- Fix spec file to use makefile
-
-* Mon Aug 30 2004 Dan Walsh <dwalsh@redhat.com> 3.2.3-3
-- Fix batch mode to use dumb terminal
-
-* Tue Aug 17 2004 Florian La Roche <Florian.LaRoche@redhat.de>
-- fix building as non-root, patch from Steve G <linux_4ever@yahoo.com>
-
-* Tue Aug 10 2004 Dan Walsh <dwalsh@redhat.com> 3.2.3-1
-- Latest from Upstream
-
-* Tue Jul 20 2004 Dan Walsh <dwalsh@redhat.com> 3.2.2-2
-- Reformat ps man page
-
-* Mon Jul 19 2004 Dan Walsh <dwalsh@redhat.com> 3.2.2-1
-- Update to upstream version.
-
-* Sat Jun 26 2004 Dan Walsh <dwalsh@redhat.com> 3.2.1-7
-- Add patch to display vm_size when STATSIZE env set
-
-* Tue Jun 15 2004 Alan Cox <alan@redhat.com> 3.2.1-6
-- Removed broken SELinux patch to w
-- Added a better alternative whereby we get less data but don't fall for
- vanished processes when SELinux is running
-
-* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Mon Jun 14 2004 Dan Walsh <dwalsh@redhat.com> 3.2.1-5
-- Fix FAQ Line
-
-* Mon Apr 09 2004 Colin Walters <walters@redhat.com> 3.2.1-4
-- Add little patch to make w/who work when getattr access
- to /proc/<pid> for the user's login process is denied
-
-* Sun Mar 28 2004 Dan Walsh <dwalsh@redhat.com> 3.2.1-3
-- bump for rhel3
-
-* Sun Mar 28 2004 Dan Walsh <dwalsh@redhat.com> 3.2.1-2
-- Removed addtask patch, very buggy,
-- Added FAQ to docdir
-
-* Sun Mar 28 2004 Dan Walsh <dwalsh@redhat.com> 3.2.1-1
-- Update to latest from upstream
-
-* Thu Mar 25 2004 Dan Walsh <dwalsh@redhat.com> 3.2.0-3
-- Add addtask patch to total all threads times.
-
-* Wed Mar 17 2004 Dan Walsh <dwalsh@redhat.com>
-- Clean up spec file.
-
-* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Tue Feb 24 2004 Dan Walsh <dwalsh@redhat.com> 3.2.0-1
-- New version from upstream
-
-* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Thu Jan 22 2004 Dan Walsh <dwalsh@redhat.com> 3.1.15-3
-- Match -Z to --context
-
-* Wed Jan 21 2004 Dan Walsh <dwalsh@redhat.com> 3.1.15-2
-- Add back in -Z support
-
-* Wed Jan 21 2004 Alexander Larsson <alexl@redhat.com> 3.1.15-1
-- upgrade to procps3
-- Some regressions, see bug #114012
-
-* Tue Jan 20 2004 Dan Walsh <dwalsh@redhat.com> 2.0.17-7
-- Remove LIBCURSES from skill and sysctl
-
-* Wed Dec 10 2003 Dan Walsh <dwalsh@redhat.com> 2.0.17-6
-- Turn on SELinux
-
-* Mon Dec 8 2003 Alexander Larsson <alexl@redhat.com> 2.0.17-5
-- Fix top total percentages (#109484)
-
-* Wed Oct 15 2003 Dan Walsh <dwalsh@redhat.com> 2.0.17-4
-- Turn off selinux
-
-* Wed Oct 15 2003 Dan Walsh <dwalsh@redhat.com> 2.0.17-3.sel
-- Fix help message
-
-* Thu Oct 9 2003 Dan Walsh <dwalsh@redhat.com> 2.0.17-2.sel
-- Turn on selinux
-
-* Fri Oct 3 2003 Alexander Larsson <alexl@redhat.com> 2.0.17-1
-- Update to 2.0.17, drop upstream patches, forward port remaining patches
-
-* Fri Sep 5 2003 Dan Walsh <dwalsh@redhat.com> 2.0.13-11
-- Turn off selinux
-
-* Thu Aug 28 2003 Dan Walsh <dwalsh@redhat.com> 2.0.13-10.sel
-- Add -Z switch for SELinux
-
-* Sun Aug 17 2003 Doug Ledford <dledford@redhat.com> 2.0.13-9E
-- Add patch to recognize irq and softirq time accounting in kernels that
- support this feature
-
-* Mon Aug 11 2003 Alexander Larsson <alexl@redhat.com> 2.0.13-8
-- rebuild
-
-* Mon Aug 11 2003 Alexander Larsson <alexl@redhat.com> 2.0.13-7E
-- Add swapped patch from rik van riel
-
-* Wed Aug 6 2003 Alexander Larsson <alexl@redhat.com> 2.0.13-6
-- rebuild
-
-* Wed Aug 6 2003 Alexander Larsson <alexl@redhat.com> 2.0.13-5E
-- Update iowait patch (#101657)
-- Add wchan 64bit patch from Mark DeWandel
-
-* Mon Jul 28 2003 Dan Walsh <dwalsh@redhat.com> 2.0.13-4E
-- Add SELinux patch
-
-* Wed Jul 16 2003 Matt Wilson <msw@redhat.com> 2.0.13-3E
-- display iowait with procps-2.0.13-iowait.patch (#99061)
-
-* Fri Jul 11 2003 Alexander Larsson <alexl@redhat.com> 2.0.13-2E
-- Disable linuxthreads thread hack
-
-* Mon Jul 7 2003 Alexander Larsson <alexl@redhat.com> 2.0.13-1E
-- rebuild
-
-* Fri Jul 4 2003 Alexander Larsson <alexl@redhat.com> 2.0.13-1
-- update to 2.0.13
-- Re-merged ntpl patch
-- Add hertz fix from Ernie Petrides <petrides@redhat.com>
-
-* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Fri May 23 2003 Alexander Larsson <alexl@redhat.com> 2.0.12-1
-- Update to 2.0.12
-- Add patch to fix segfault on ps axl (#91453)
-
-* Fri Mar 14 2003 Alexander Larsson <alexl@redhat.com> 2.0.11-7
-- Add patch that fixes negative priorities in top.
-
-* Thu Feb 20 2003 Alexander Larsson <alexl@redhat.com> 2.0.11-6
-- New NPTL patch:
-- Added skipthreads optimization to top
-- Don't read threads in 'w'
-
-* Thu Feb 20 2003 Alexander Larsson <alexl@redhat.com> 2.0.11-5
-- Update the NPTL patch since the kernel /proc was fixed
-- For kernels >= 2.4.20-2.50
-
-* Mon Feb 17 2003 Alexander Larsson <alexl@redhat.com> 2.0.11-4
-- Update nptl patch to new /proc layout.
-
-* Wed Jan 22 2003 Tim Powers <timp@redhat.com> 2.0.11-3
-- rebuilt
-
-* Wed Jan 22 2003 Alexander Larsson <alexl@redhat.com> 2.0.11-2
-- Created nptl patch after discussion with ingo and arjan
-
-* Tue Jan 21 2003 Alexander Larsson <alexl@redhat.com> 2.0.11-1
-- Update to 2.0.11
-
-* Mon Dec 16 2002 Elliot Lee <sopwith@redhat.com> 2.0.10-4
-- Fix %%install in changelog
-
-* Tue Nov 19 2002 Jakub Jelinek <jakub@redhat.com> 2.0.10-3
-- Fix for Hammer
-
-* Wed Oct 23 2002 Alexander Larsson <alexl@redhat.com> 2.0.10-2
-- Remove uninstalled files in %%install. Add pmap to %%files
-
-* Tue Oct 8 2002 Alexander Larsson <alexl@redhat.com> 2.0.10-1
-- Update to 2.0.10
-- Removed applied patches.
-
-* Mon Aug 12 2002 Alexander Larsson <alexl@redhat.com> 2.0.7-25
-- Add patch to protect against idle ticks going backwards. Fixes #71237
-
-* Thu Aug 8 2002 Alexander Larsson <alexl@redhat.com> 2.0.7-24
-- Fix saving of sort, fixes #32757
-- Fix printing size, fixes #48224
-- Fix float decimal point input #58163
-
-* Thu Aug 8 2002 Alexander Larsson <alexl@redhat.com> 2.0.7-23
-- Fix unsigned/signed bug. Closes #60998.
-- Update threadbadhack to correctly propagate process time to the main thread.
-
-* Wed Aug 7 2002 Alexander Larsson <alexl@redhat.com> 2.0.7-22
-- Don't strip binaries
-
-* Fri Jul 12 2002 Alexander Larsson <alexl@redhat.com> 2.0.7-21
-- Remove the X11 subpackage
-
-* Mon Jul 1 2002 Alexander Larsson <alexl@redhat.com> 2.0.7-19
-- Added patch that fixes #35174
-
-* Wed Jun 26 2002 Alexander Larsson <alexl@redhat.com> 2.0.7-18
-- New thread badhack patch. Fixes a segfault.
-
-* Mon Jun 24 2002 Alexander Larsson <alexl@redhat.com> 2.0.7-16
-- New thread badhack. Now enabled by default.
-
-* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Thu Jun 20 2002 Alexander Larsson <alexl@redhat.com> 2.0.7-14
-- Added badhack to support hiding threads
-
-* Thu May 23 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Mon Apr 15 2002 Bill Nottingham <notting@redhat.com> 2.0.7-12
-- add ldconfig in postun section
-
-* Mon Aug 27 2001 Trond Eivind Glomsrod <teg@redhat.com> 2.0.7-11
-- Add ncurses-devel as a build dependency (#49562)
-
-* Sat Jul 21 2001 Tim Powers <timp@redhat.com>
-- removed applnk entry, one of the things that's cluttering our menus
-
-* Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>
-- Bump release + rebuild.
-
-* Thu Apr 5 2001 Jakub Jelinek <jakub@redhat.com>
-- fix AIX style user defined formats (#34833)
-
-* Thu Mar 22 2001 Bill Nottingham <notting@redhat.com>
-- add a '-e' to sysctl to ignore errors (#31852)
-
-* Mon Mar 5 2001 Preston Brown <pbrown@redhat.com>
-- bigger buffer for reading /proc/stat fixes segfault (#27840)
-
-* Thu Feb 1 2001 Preston Brown <pbrown@redhat.com>
-- make sysctl return a value when errors occur (#18820).
-- support big UIDs (#22683)
-
-* Mon Jan 22 2001 Helge Deller <hdeller@redhat.com>
-- work-around for negative CPU output (Bug #18380)
-
-* Thu Aug 17 2000 Than Ngo <than@redhat.com>
-- fix failing in RPM post script (Bug #16226)
-
-* Wed Jul 26 2000 Michael K. Johnson <johnsonm@redhat.com>
-- Added Jakub's locale patch
-
-* Fri Jul 14 2000 Michael K. Johnson <johnsonm@redhat.com>
-- procps-2.0.7
-- integrated all patches except for signames patch, which is broken
- and unnecessary
-- See NEWS for changes between 2.0.6 and 2.0.7
-- Added patch to correctly install desktop file. Oops.
-
-* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
-- automatic rebuild
-
-* Tue Jul 03 2000 Preston Brown <pbrown@redhat.com>
-- larger buffers for reading /proc/stat
-
-* Tue Jun 13 2000 Preston Brown <pbrown@redhat.com>
-- FHS paths
-
-* Tue May 30 2000 Preston Brown <pbrown@redhat.com>
-- add smp, signal name patches from VA Linux. Thanks guys.
-
-* Mon May 22 2000 Harald Hoyer <harald@redhat.com>
-- added sysctl.conf (5) man page
-
-* Wed May 10 2000 Bill Nottingham <notting@redhat.com>
-- fix PAGE_SIZE mismatch on ia64
-
-* Sun May 7 2000 Bill Nottingham <notting@redhat.com>
-- rebuild with different optimizations for ia64
-
-* Fri Mar 24 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- rebuild with current ncurses
-
-* Tue Mar 7 2000 Bill Nottingham <notting@redhat.com>
-- fix end-of-file behavior in sysctl
-
-* Mon Feb 07 2000 Preston Brown <pbrown@redhat.com>
-- wmconfig -> desktop
-
-* Mon Feb 7 2000 Jakub Jelinek <jakub@redhat.com>
-- don't try to load System.map (and spit error messages if it does not
- exist) if ps or top are not going to use it, both to speed things up
- and remove the ugly messages when they don't make sense.
-- in top, print the possible error messages using standard top SHOWMESSAGE
- (because it will be now printed out when already in terminal mode).
-
-* Thu Feb 3 2000 Matt Wilson <msw@redhat.com>
-- added patch to prevent divide by zero on UltraSparc
-- gzip man pages
-
-#specfile originally created for Fedora, modified for Moblin Linux
Summary: System and process monitoring utilities
Name: procps
Version: 3.2.8
-Release: 1
+Release: 15%{?dist}
License: GPLv2+ and LGPLv2+
Group: Applications/System
URL: http://procps.sourceforge.net
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
-Patch1: procps-3.2.7-selinux.patch
-Patch2: procps-3.1.15-misc.patch
-Patch3: procps-3.2.3-FAQ.patch
-Patch4: procps-3.2.1-selinux-workaround.patch
-Patch6: procps-3.2.3-noproc.patch
-Patch7: procps-3.2.3-pseudo.patch
-Patch8: procps-3.2.4-0x9b.patch
+Patch1: procps-3.2.8-selinux.patch
+Patch2: procps-3.2.7-misc.patch
+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
# 157725 - sysctl -A returns an error
-Patch9: procps-3.2.5-sysctl-writeonly.patch
+Patch9: procps-3.2.7-sysctl-writeonly.patch
# 161449 - "top" ignores user and system toprc
-Patch10: procps-3.2.5-top-rc.patch
+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
-# Selinux
-Patch12: procps-3.2.6-libselinux.patch
# 177453 - for VIRT use proc->vm_size rather then proc->size (workaround)
-Patch13: procps-3.2.6-top-env-vmsize.patch
+Patch14: procps-3.2.7-top-env-vmsize.patch
# 174619 - workaround for reliable Cpu(s) data in the first loop
-Patch14: procps-3.2.6-top-env-cpuloop.patch
+Patch15: procps-3.2.7-top-env-cpuloop.patch
# 185299 - cpu steal time support
-Patch15: procps-3.2.7-vmstat-cpusteal.patch
+Patch16: procps-3.2.7-vmstat-cpusteal.patch
# 134516 - ps ignores /proc/#/cmdline if contents 2047 bytes
-Patch16: procps-3.2.7-longcmd.patch
+Patch17: procps-3.2.7-longcmd.patch
# 189349 - 32bit vmstat on 64bit kernel
-Patch17: procps-3.2.7-vmstat-pgpg.patch
+Patch18: procps-3.2.7-vmstat-pgpg.patch
# 212637 - sysctl using deprecated syscall
# 228870 - process `sysctl' is using deprecated sysctl ...
-Patch18: procps-3.2.7-sysctl-ignore.patch
+Patch21: procps-3.2.7-sysctl-ignore.patch
# 140975 - top corrupts screen when sorting on first column
-Patch19: procps-3.2.7-top-sorthigh.path
+Patch22: procps-3.2.7-top-sorthigh.path
# 234546 - 'w' doesn't give correct information about what's being run.
-Patch20: procps-3.2.7-w-best.patch
+Patch23: procps-3.2.7-w-best.patch
# 183029 - watch ignores unicode characters
-#Patch21: procps-3.2.7-watch-unicode.patch
+#Patch24: procps-3.2.7-watch-unicode.patch
# 222251 - STIME can jitter by one second
-Patch22: procps-3.2.7-ps-stime.patch
+Patch26: procps-3.2.7-ps-stime.patch
#244152 - ps truncates eip and esp to 32-bit values on 64-bit systems
-Patch23: procps-3.2.7-ps-eip64.patch
+Patch28: procps-3.2.7-ps-eip64.patch
#244960 - ps manpage formatted incorrectly
-Patch24: procps-3.2.7-psman.patch
-#255441 - ldopen libselinux.so.1 instead of libselinux.so
-Patch25: procps-3.2.7-ps-libselinux.patch
+Patch29: procps-3.2.7-psman.patch
#185994 - error when using "Single Cpu = Off" option
-Patch26: procps-3.2.7-top-cpu0.patch
+Patch31: procps-3.2.7-top-cpu0.patch
#354001 - CPU value in top is reported as an integer
-Patch27: procps-3.2.7-top-cpuint.patch
+Patch32: procps-3.2.7-top-cpuint.patch
#296471 - update top man page
-Patch28: procps-3.2.7-top-manpage.patch
+Patch33: procps-3.2.7-top-manpage.patch
#440694 - strange text after selecting few field
-Patch30: procps-3.2.7-top-clrscr.patch
+Patch34: procps-3.2.7-top-clrscr.patch
#435453 - errors with man -t formatting of ps man page
-Patch31: procps-3.2.7-ps-man-fmt.patch
+Patch35: procps-3.2.7-ps-man-fmt.patch
#472783 - 'vmstat -p <partition name>',
# the detailed statistics of the partition name is not output.
-Patch32: procps-3.2.7-vmstat-partstats-long.patch
+Patch36: procps-3.2.7-vmstat-partstats-long.patch
# Fix vmstat header to be 80 chars not 81
-Patch33: procps-3.2.7-vmstat-header.patch
+Patch37: procps-3.2.7-vmstat-header.patch
# rhel bug #475963: slabtop -o should display the info once
-Patch34: procps-3.2.7-slabtop-once.patch
+Patch38: procps-3.2.7-slabtop-once.patch
#476134 - added timestamp to vmstat with new option -t
-Patch35: procps-3.2.7-vmstat-timestamp.patch
+Patch39: procps-3.2.7-vmstat-timestamp.patch
#manual page updated to document the -t functionality
-Patch36: procps-3.2.7-vmstat-timestamp-manpage.patch
+Patch40: procps-3.2.7-vmstat-timestamp-manpage.patch
+#added cgroup display to ps
+Patch41: procps-3.2.7-ps-cgroup.patch
# 'requested writes' display in partition statistics
-Patch37: procps-3.2.7-vmstat-partstats-reqwrites.patch
+Patch42: procps-3.2.7-vmstat-partstats-reqwrites.patch
# '-l' option of 'free' documented
-Patch38: procps-3.2.7-free-hlmem.patch
-# enable core dump generation
-Patch39: procps-enable-core.patch
-# fix "Unknown HZ value! (??) Assume 100." issue
-Patch40: unknown-hz-value-fix.patch
+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)
+Patch45: procps-enable-core.patch
+#548711 - [abrt] crash in procps-3.2.8-3.fc12
+Patch46: procps-3.2.8-setlocale.patch
+# debian bug #505571 pmap -x should show more information
+Patch47: procps-pmap-smaps.patch
+#578798 - vmstat -SM doesn't work but vmstat -S M does
+#Patch48: procps-3.2.7-vmstat-sm.patch
+Patch48: procps-3.2.8-vmstat-getopt.patch
+Patch49: procps-3.2.8-ps-cgroup-suppress-root-group.patch
+#631340 - fixed build with make 3.82
+Patch50: procps-3.2.8-make.patch
+#632236: don't depend on constructor execution order
+Patch51: procps-3.2.8-constructor-order.patch
BuildRequires: ncurses-devel
I/O, traps, and CPU activity. The pwdx command reports the current
working directory of a process or processes.
+%package devel
+Summary: System and process monitoring utilities
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+System and process monitoring utilities development headers
+
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
-%patch12 -p1
-%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-#%patch21 -p1
+%patch21 -p1
%patch22 -p1
%patch23 -p1
-%patch24 -p1
-%patch25 -p1
+#%patch24 -p1
%patch26 -p1
-%patch27 -p1
%patch28 -p1
-%patch30 -p1
+%patch29 -p1
%patch31 -p1
%patch32 -p1
%patch33 -p1
%patch38 -p1
%patch39 -p1
%patch40 -p1
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1
+%patch44 -p1
+%patch45 -p1
+%patch46 -p1
+%patch47 -p1
+%patch48 -p1
+%patch49 -p1
+%patch50 -p1
+%patch51 -p1
cp %SOURCE1 .
%install
rm -rf %{buildroot}
make ldconfig=true DESTDIR=%{buildroot} lib64=%{_lib} install="install -D" \
- SKIP="/bin/kill /usr/share/man/man1/kill.1" install
+ SKIP="/bin/kill /usr/share/man/man1/kill.1" install
mkdir -p %{buildroot}/%{_docdir}/procps-%{version}
# keep 'rpm' happy...
chmod -R u+w %{buildroot}/sbin
chmod -R u+w %{buildroot}/usr/bin
chmod -R u+w %{buildroot}/lib*
+mkdir -p %{buildroot}/%{_includedir}/proc
+install -Dpm 644 proc/*.h %{buildroot}/%{_includedir}/proc
+pushd %{buildroot}/%{_lib}
+ln -s libproc-%{version}.so libproc.so
+popd
+
%clean
rm -rf %{buildroot}
%files
%defattr(0644,root,root,755)
%doc NEWS BUGS TODO FAQ
-%attr(755,root,root) /%{_lib}/*
+%attr(755,root,root) /%{_lib}/libproc-%{version}.so
%attr(755,root,root) /bin/ps
%attr(755,root,root) /sbin/sysctl
%attr(755,root,root) /usr/bin/*
-%doc %attr(0644,root,root) %{_mandir}/man1/*
-%doc %attr(0644,root,root) %{_mandir}/man8/*
-%doc %attr(0644,root,root) %{_mandir}/man5/*
+%attr(0644,root,root) %{_mandir}/man1/*
+%attr(0644,root,root) %{_mandir}/man8/*
+%attr(0644,root,root) %{_mandir}/man5/*
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/proc
+/%{_lib}/libproc.so
+
+%changelog
+* Tue Jan 11 2011 Jan Görig <jgorig@redhat.com> 3.2.8-15
+- fixed procps-3.2.8-threads.patch (SIGABRT) (#670289)
+
+* Tue Oct 19 2010 Jan Görig <jgorig@redhat.com> 3.2.8-14
+- added devel package (Hicham HAOUARI <hicham.haouari@gmail.com>)
+
+* Wed Sep 29 2010 jkeating - 3.2.8-13
+- Rebuilt for gcc bug 634757
+
+* Thu Sep 23 2010 Jan Görig <jgorig@redhat.com> 3.2.8-12
+- merged selinux patches into procps-3.2.7-selinux.patch
+- fixed #632236 - don't depend on constructor execution order
+
+* Wed Sep 8 2010 Jan Görig <jgorig@redhat.com> 3.2.8-11
+- fixed build with make 3.82
+
+* Tue May 18 2010 Daniel Novotny <dnovotny@redhat.com> 3.2.8-10
+- added patch for cgroup display (supress root group)
+ thanks to Lennart Poettering (#593267)
+
+* Tue Apr 06 2010 Daniel Novotny <dnovotny@redhat.com> 3.2.8-9
+- fix #579741 - vmstat should use getopt() for parsing commandline
+
+* Thu Apr 01 2010 Daniel Novotny <dnovotny@redhat.com> 3.2.8-8
+- fix #578798 - vmstat -SM doesn't work but vmstat -S M does
+
+* Mon Feb 08 2010 Daniel Novotny <dnovotny@redhat.com> 3.2.8-7
+- fixed the last pmap(1) patch
+
+* Fri Feb 05 2010 Daniel Novotny <dnovotny@redhat.com> 3.2.8-6
+- fixed RSS values display of pmap(1)
+
+* Mon Jan 11 2010 Daniel Novotny <dnovotny@redhat.com> 3.2.8-5
+- fix #548711 - [abrt] crash in procps-3.2.8-3.fc12
+
+* Mon Nov 16 2009 Daniel Novotny <dnovotny@redhat.com> 3.2.8-4
+- patch for enabling core file generation in ps (we don't trap the signal anymore)
+
+* Wed Oct 07 2009 Daniel Novotny <dnovotny@redhat.com> 3.2.8-3
+- fix #510181 - top doesn't add all threads if using pid option
+ and turn on show threads interactively
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon May 11 2009 Daniel Novotny <dnovotny@redhat.com> 3.2.8-1
+- new upstream version; rebase patches and drop upstreamed patches
+
+* Wed Apr 29 2009 Daniel Novotny <dnovotny@redhat.com> 3.2.7-28
+- fix #498182 - procps string size issue
+
+* Tue Feb 24 2009 Daniel Novotny <dnovotny@redhat.com> 3.2.7-27
+- included -l option in free man page
+
+* Mon Feb 23 2009 Daniel Novotny <dnovotny@redhat.com> 3.2.7-26
+- fix requested writes display in partition statistics
+ for big-endian machines
+
+* Mon Feb 16 2009 Daniel Novotny <dnovotny@redhat.com> 3.2.7-25
+- added cgroup support to ps (Ivana Varekova)
+
+*Tue Feb 03 2009 Daniel Novotny <dnovotny@redhat.com> 3.2.7-24
+- slabtop -o should display the info once and then exit (RHEL bug #475963)
+- added timestamp to vmstat with new option -t (#476134)
+
+* Wed Jan 07 2009 Adam Jackson <ajax@redhat.com> 3.2.7-23
+- procps-3.2.7-vmstat-header.patch: Fix vmstat header to fit on a single line.
+
+* Thu Dec 04 2008 Daniel Novotny <dnovotny@redhat.com> 3.2.7-22
+- fix #472783 vmstat -p <partition name> not working
+- extended diskstat parameters to unsigned long to avoid overflow
+
+* Mon Sep 01 2008 Tomas Smetana <tsmetana@redhat.com> 3.2.7-21
+- rebase patches
+- clear screen in top when switching windows
+- fix #435453 - errors with man -t formatting of ps man page
+
+* Tue Feb 12 2008 Tomas Smetana <tsmetana@redhat.com> 3.2.7-20
+- rebuild (gcc-4.3)
+
+* Thu Jan 24 2008 Tomas Smetana <tsmetana@redhat.com> 3.2.7-19.2
+- install slabtop again: kernel was fixed
+
+* Fri Jan 18 2008 Tomas Smetana <tsmetana@redhat.com> 3.2.7-19.1
+- rebuild because of errors on x86_64
+
+* Fri Jan 18 2008 Tomas Smetana <tsmetana@redhat.com> 3.2.7-19
+- fix #296471 - update top man page
+- fix #226319 - merge review
+
+* Fri Jan 11 2008 Tomas Smetana <tsmetana@redhat.com> 3.2.7-18
+- fix displaying the CPU column as integer (related #354001)
+- don't install slabtop -- there's no /proc/slabinfo
+
+* Wed Sep 12 2007 Tomas Smetana <tsmetana@redhat.com> 3.2.7-17
+- fix #185994 - top "Cpu0" line never updates when using
+ "Single Cpu = Off" option on single processor machine
+
+* Mon Aug 27 2007 Tomas Smetana <tsmetana@redhat.com> 3.2.7-16.1
+- bump release
+
+* Mon Aug 27 2007 Tomas Smetana <tsmetana@redhat.com> 3.2.7-16
+- fix #255441 - ps requires libselinux-devel to display security contexts
+
+* Thu Aug 23 2007 Tomas Smetana <tsmetana@redhat.com> 3.2.7-15.1
+- rebuild
+
+* Mon Aug 20 2007 Tomas Smetana <tsmetana@redhat.com> 3.2.7-15
+- fix #244960 - ps manpage formatted incorrectly
+- update license tag
+
+* Mon Jun 18 2007 Tomas Smetana <tsmetana@redhat.com> 3.2.7-14
+- fix #244152 ps truncates eip and esp to 32-bit values on 64-bit systems
+
+* Tue May 22 2007 Tomas Smetana <tsmetana@redhat.com> 3.2.7-13
+- fix #208217 - ps does not accept '+' in sort specifier
+
+* Wed Apr 25 2007 Tomas Smetana <tsmetana@redhat.com> 3.2.7-12
+- fix #183029 - watch ignores multibyte characters
+- fix #222251 - STIME column can jitter
+- fix array overflow in sysctl
+
+* Tue Apr 3 2007 Karel Zak <kzak@redhat.com> 3.2.7-11
+- fix #234546 - 'w' doesn't give correct information about what's being run.
+- fix #228870 - process `sysctl' is using deprecated sysctl
+- cleanup spec file
+
+* Mon Feb 5 2007 Karel Zak <kzak@redhat.com> 3.2.7-10
+- fix #212637 - sysctl using deprecated syscall
+- fix #140975 - top corrupts screen when sorting on first column
+
+* Tue Jan 30 2007 Karel Zak <kzak@redhat.com> 3.2.7-9
+- fix procps_version in FAQ patch (thanks to Ian Kent)
+
+* Wed Sep 27 2006 Karel Zak <kzak@redhat.com> 3.2.7-8
+- remove zombie patch (needs more investigation)
+- fix #208100 - top command with '-c' option become not to display list of tasks
+- fix #199174 - top returns with exit code 1 even if no error occurs
+
+* Tue Sep 19 2006 Karel Zak <kzak@redhat.com> 3.2.7-7
+- fix #206551 - top fails to convert to cpu single mode when hit '1'
+
+* Tue Sep 5 2006 Karel Zak <kzak@redhat.com> 3.2.7-6
+- fix minor bug in procps-3.2.6-top-env-cpuloop.patch
+
+* Fri Aug 7 2006 Karel Zak <kzak@redhat.com> - 3.2.7-5
+- fix #189349 - 32bit vmstat on 64bit kernel
+
+* Thu Aug 3 2006 Karel Zak <kzak@redhat.com> - 3.2.7-4
+- fix #139827 - ps(1) outputs a multi-threads process as a defunct process.
+
+* Wed Jul 19 2006 Karel Zak <kzak@redhat.com> - 3.2.7-3
+- spec file cleanup
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 3.2.7-2.1
+- rebuild
+
+* Mon Jul 10 2006 Karel Zak <kzak@redhat.com> 3.2.7-2
+- fix #134516 - ps ignores /proc/#/cmdline if contents 2047 bytes
+
+* Mon Jul 10 2006 Karel Zak <kzak@redhat.com> 3.2.7-1
+- upgrade to 3.2.7 (and sync patches)
+
+* Thu Jun 1 2006 Karel Zak <kzak@redhat.com> 3.2.6-4
+- fix #191493 - watch -n doesn't handle large integers properly
+- fix #186017 - top "Cpu0" line never updates on single processor machine
+ (bugfix added to the 'remcpu' patch)
+- fix #168444 - memory usage conflicts with /proc/meminfo
+- fix #174619 - top reports wrong values for CPU(s) in batch mode
+- fix #185299 - cpu steal time support
+
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 3.2.6-3.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 3.2.6-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Tue Dec 13 2005 Dan Walsh <dwalsh@redhat.com> 3.2.6-3
+- Translate context
+
+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
+- rebuilt
+
+* Tue Nov 8 2005 Karel Zak <kzak@redhat.com> 3.2.6-2
+- fix #157725 - sysctl -A returns an error
+
+* Mon Oct 31 2005 Karel Zak <kzak@redhat.com> 3.2.6-1
+- update to new upstream release
+
+* Wed Oct 12 2005 Karel Zak <kzak@redhat.com> 3.2.5-8
+- fix #170083 - Top showing bad cpu usage numbers
+
+* Tue Sep 6 2005 Karel Zak <kzak@redhat.com> 3.2.5-7
+- improve procps-3.2.5-sysctl-writeonly.patch
+- fix #161449 - "top" ignores user and system toprc
+- fix #161559 - top segfaults when resizing console
+- fix #160796 - vmstat crashes when accessing LVM partition
+- fix #161303 - 'top' failed when remove cpus
+
+* Tue May 10 2005 Karel Zak <kzak@redhat.com> 3.2.5-6
+- fix permissions in the spec install section
+
+* Tue May 10 2005 Karel Zak <kzak@redhat.com> 3.2.5-5
+- fix debuginfo
+
+* Tue Apr 26 2005 Karel Zak <kzak@redhat.com> 3.2.5-4
+- fix #144459 - sysctl reports error: unknown error <...> reading key '<key>'
+ (now sysctl doesn't read data from write-only /proc/sys files)
+
+* Thu Mar 17 2005 Karel Zak <kzak@redhat.com> 3.2.5-3
+- fix top crashes when terminal window is resized (#149319)
+
+* Sat Mar 5 2005 Karel Zak <kzak@redhat.com> 3.2.5-2
+- rebuilt
+
+* Tue Feb 1 2005 Karel Zak <kzak@redhat.com> 3.2.5-1
+- update to new upstream 3.2.5
+- recreate selinux patch
+- remove errno, slabinfo21 and fullpath patches -- all fixed by upstream
+
+* Mon Jan 25 2005 Karel Zak <kzak@redhat.com> 3.2.4-4
+- pmap truncates filenames of mappings (#142751)
+
+* Mon Jan 24 2005 Karel Zak <kzak@redhat.com> 3.2.4-3
+- add support for /proc/slabinfo 2.1 (#145369)
+
+* Fri Jan 7 2005 Karel Zak <kzak@redhat.com> 3.2.4-2
+- fix sysctl errno usage (#144459)
+
+* Wed Dec 1 2004 Karel Zak <kzak@redhat.com> 3.2.4-1
+- update to new upstream release
+
+* Mon Nov 1 2004 Karel Zak <kzak@redhat.com> 3.2.3-6
+- update FAQ
+- update spec description
+- fix text in .noproc patch
+- fix segv fault if cpu number exceeding 38 (#137159)
+
+* Tue Sep 28 2004 Dan Walsh <dwalsh@redhat.com> 3.2.3-5
+- Fix terminal handling when /proc is not available.
+- Patch provided by Karel Zak
+
+* Thu Sep 16 2004 Dan Walsh <dwalsh@redhat.com> 3.2.3-4
+- Fix spec file to use makefile
+
+* Mon Aug 30 2004 Dan Walsh <dwalsh@redhat.com> 3.2.3-3
+- Fix batch mode to use dumb terminal
+
+* Tue Aug 17 2004 Florian La Roche <Florian.LaRoche@redhat.de>
+- fix building as non-root, patch from Steve G <linux_4ever@yahoo.com>
+
+* Tue Aug 10 2004 Dan Walsh <dwalsh@redhat.com> 3.2.3-1
+- Latest from Upstream
+
+* Tue Jul 20 2004 Dan Walsh <dwalsh@redhat.com> 3.2.2-2
+- Reformat ps man page
+
+* Mon Jul 19 2004 Dan Walsh <dwalsh@redhat.com> 3.2.2-1
+- Update to upstream version.
+
+* Sat Jun 26 2004 Dan Walsh <dwalsh@redhat.com> 3.2.1-7
+- Add patch to display vm_size when STATSIZE env set
+
+* Tue Jun 15 2004 Alan Cox <alan@redhat.com> 3.2.1-6
+- Removed broken SELinux patch to w
+- Added a better alternative whereby we get less data but don't fall for
+ vanished processes when SELinux is running
+
+* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Mon Jun 14 2004 Dan Walsh <dwalsh@redhat.com> 3.2.1-5
+- Fix FAQ Line
+
+* Mon Apr 09 2004 Colin Walters <walters@redhat.com> 3.2.1-4
+- Add little patch to make w/who work when getattr access
+ to /proc/<pid> for the user's login process is denied
+
+* Sun Mar 28 2004 Dan Walsh <dwalsh@redhat.com> 3.2.1-3
+- bump for rhel3
+
+* Sun Mar 28 2004 Dan Walsh <dwalsh@redhat.com> 3.2.1-2
+- Removed addtask patch, very buggy,
+- Added FAQ to docdir
+
+* Sun Mar 28 2004 Dan Walsh <dwalsh@redhat.com> 3.2.1-1
+- Update to latest from upstream
+
+* Thu Mar 25 2004 Dan Walsh <dwalsh@redhat.com> 3.2.0-3
+- Add addtask patch to total all threads times.
+
+* Wed Mar 17 2004 Dan Walsh <dwalsh@redhat.com>
+- Clean up spec file.
+
+* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue Feb 24 2004 Dan Walsh <dwalsh@redhat.com> 3.2.0-1
+- New version from upstream
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Thu Jan 22 2004 Dan Walsh <dwalsh@redhat.com> 3.1.15-3
+- Match -Z to --context
+
+* Wed Jan 21 2004 Dan Walsh <dwalsh@redhat.com> 3.1.15-2
+- Add back in -Z support
+
+* Wed Jan 21 2004 Alexander Larsson <alexl@redhat.com> 3.1.15-1
+- upgrade to procps3
+- Some regressions, see bug #114012
+
+* Tue Jan 20 2004 Dan Walsh <dwalsh@redhat.com> 2.0.17-7
+- Remove LIBCURSES from skill and sysctl
+
+* Wed Dec 10 2003 Dan Walsh <dwalsh@redhat.com> 2.0.17-6
+- Turn on SELinux
+
+* Mon Dec 8 2003 Alexander Larsson <alexl@redhat.com> 2.0.17-5
+- Fix top total percentages (#109484)
+
+* Wed Oct 15 2003 Dan Walsh <dwalsh@redhat.com> 2.0.17-4
+- Turn off selinux
+
+* Wed Oct 15 2003 Dan Walsh <dwalsh@redhat.com> 2.0.17-3.sel
+- Fix help message
+
+* Thu Oct 9 2003 Dan Walsh <dwalsh@redhat.com> 2.0.17-2.sel
+- Turn on selinux
+
+* Fri Oct 3 2003 Alexander Larsson <alexl@redhat.com> 2.0.17-1
+- Update to 2.0.17, drop upstream patches, forward port remaining patches
+
+* Fri Sep 5 2003 Dan Walsh <dwalsh@redhat.com> 2.0.13-11
+- Turn off selinux
+
+* Thu Aug 28 2003 Dan Walsh <dwalsh@redhat.com> 2.0.13-10.sel
+- Add -Z switch for SELinux
+
+* Sun Aug 17 2003 Doug Ledford <dledford@redhat.com> 2.0.13-9E
+- Add patch to recognize irq and softirq time accounting in kernels that
+ support this feature
+
+* Mon Aug 11 2003 Alexander Larsson <alexl@redhat.com> 2.0.13-8
+- rebuild
+
+* Mon Aug 11 2003 Alexander Larsson <alexl@redhat.com> 2.0.13-7E
+- Add swapped patch from rik van riel
+
+* Wed Aug 6 2003 Alexander Larsson <alexl@redhat.com> 2.0.13-6
+- rebuild
+
+* Wed Aug 6 2003 Alexander Larsson <alexl@redhat.com> 2.0.13-5E
+- Update iowait patch (#101657)
+- Add wchan 64bit patch from Mark DeWandel
+
+* Mon Jul 28 2003 Dan Walsh <dwalsh@redhat.com> 2.0.13-4E
+- Add SELinux patch
+
+* Wed Jul 16 2003 Matt Wilson <msw@redhat.com> 2.0.13-3E
+- display iowait with procps-2.0.13-iowait.patch (#99061)
+
+* Fri Jul 11 2003 Alexander Larsson <alexl@redhat.com> 2.0.13-2E
+- Disable linuxthreads thread hack
+
+* Mon Jul 7 2003 Alexander Larsson <alexl@redhat.com> 2.0.13-1E
+- rebuild
+
+* Fri Jul 4 2003 Alexander Larsson <alexl@redhat.com> 2.0.13-1
+- update to 2.0.13
+- Re-merged ntpl patch
+- Add hertz fix from Ernie Petrides <petrides@redhat.com>
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Fri May 23 2003 Alexander Larsson <alexl@redhat.com> 2.0.12-1
+- Update to 2.0.12
+- Add patch to fix segfault on ps axl (#91453)
+
+* Fri Mar 14 2003 Alexander Larsson <alexl@redhat.com> 2.0.11-7
+- Add patch that fixes negative priorities in top.
+
+* Thu Feb 20 2003 Alexander Larsson <alexl@redhat.com> 2.0.11-6
+- New NPTL patch:
+- Added skipthreads optimization to top
+- Don't read threads in 'w'
+
+* Thu Feb 20 2003 Alexander Larsson <alexl@redhat.com> 2.0.11-5
+- Update the NPTL patch since the kernel /proc was fixed
+- For kernels >= 2.4.20-2.50
+
+* Mon Feb 17 2003 Alexander Larsson <alexl@redhat.com> 2.0.11-4
+- Update nptl patch to new /proc layout.
+
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com> 2.0.11-3
+- rebuilt
+
+* Wed Jan 22 2003 Alexander Larsson <alexl@redhat.com> 2.0.11-2
+- Created nptl patch after discussion with ingo and arjan
+
+* Tue Jan 21 2003 Alexander Larsson <alexl@redhat.com> 2.0.11-1
+- Update to 2.0.11
+
+* Mon Dec 16 2002 Elliot Lee <sopwith@redhat.com> 2.0.10-4
+- Fix %%install in changelog
+
+* Tue Nov 19 2002 Jakub Jelinek <jakub@redhat.com> 2.0.10-3
+- Fix for Hammer
+
+* Wed Oct 23 2002 Alexander Larsson <alexl@redhat.com> 2.0.10-2
+- Remove uninstalled files in %%install. Add pmap to %%files
+
+* Tue Oct 8 2002 Alexander Larsson <alexl@redhat.com> 2.0.10-1
+- Update to 2.0.10
+- Removed applied patches.
+
+* Mon Aug 12 2002 Alexander Larsson <alexl@redhat.com> 2.0.7-25
+- Add patch to protect against idle ticks going backwards. Fixes #71237
+
+* Thu Aug 8 2002 Alexander Larsson <alexl@redhat.com> 2.0.7-24
+- Fix saving of sort, fixes #32757
+- Fix printing size, fixes #48224
+- Fix float decimal point input #58163
+
+* Thu Aug 8 2002 Alexander Larsson <alexl@redhat.com> 2.0.7-23
+- Fix unsigned/signed bug. Closes #60998.
+- Update threadbadhack to correctly propagate process time to the main thread.
+
+* Wed Aug 7 2002 Alexander Larsson <alexl@redhat.com> 2.0.7-22
+- Don't strip binaries
+
+* Fri Jul 12 2002 Alexander Larsson <alexl@redhat.com> 2.0.7-21
+- Remove the X11 subpackage
+
+* Mon Jul 1 2002 Alexander Larsson <alexl@redhat.com> 2.0.7-19
+- Added patch that fixes #35174
+
+* Wed Jun 26 2002 Alexander Larsson <alexl@redhat.com> 2.0.7-18
+- New thread badhack patch. Fixes a segfault.
+
+* Mon Jun 24 2002 Alexander Larsson <alexl@redhat.com> 2.0.7-16
+- New thread badhack. Now enabled by default.
+
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Thu Jun 20 2002 Alexander Larsson <alexl@redhat.com> 2.0.7-14
+- Added badhack to support hiding threads
+
+* Thu May 23 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Mon Apr 15 2002 Bill Nottingham <notting@redhat.com> 2.0.7-12
+- add ldconfig in postun section
+
+* Mon Aug 27 2001 Trond Eivind Glomsrod <teg@redhat.com> 2.0.7-11
+- Add ncurses-devel as a build dependency (#49562)
+
+* Sat Jul 21 2001 Tim Powers <timp@redhat.com>
+- removed applnk entry, one of the things that's cluttering our menus
+
+* Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>
+- Bump release + rebuild.
+
+* Thu Apr 5 2001 Jakub Jelinek <jakub@redhat.com>
+- fix AIX style user defined formats (#34833)
+
+* Thu Mar 22 2001 Bill Nottingham <notting@redhat.com>
+- add a '-e' to sysctl to ignore errors (#31852)
+
+* Mon Mar 5 2001 Preston Brown <pbrown@redhat.com>
+- bigger buffer for reading /proc/stat fixes segfault (#27840)
+
+* Thu Feb 1 2001 Preston Brown <pbrown@redhat.com>
+- make sysctl return a value when errors occur (#18820).
+- support big UIDs (#22683)
+
+* Mon Jan 22 2001 Helge Deller <hdeller@redhat.com>
+- work-around for negative CPU output (Bug #18380)
+
+* Thu Aug 17 2000 Than Ngo <than@redhat.com>
+- fix failing in RPM post script (Bug #16226)
+
+* Wed Jul 26 2000 Michael K. Johnson <johnsonm@redhat.com>
+- Added Jakub's locale patch
+
+* Fri Jul 14 2000 Michael K. Johnson <johnsonm@redhat.com>
+- procps-2.0.7
+- integrated all patches except for signames patch, which is broken
+ and unnecessary
+- See NEWS for changes between 2.0.6 and 2.0.7
+- Added patch to correctly install desktop file. Oops.
+
+* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
+- automatic rebuild
+
+* Tue Jul 03 2000 Preston Brown <pbrown@redhat.com>
+- larger buffers for reading /proc/stat
+
+* Tue Jun 13 2000 Preston Brown <pbrown@redhat.com>
+- FHS paths
+
+* Tue May 30 2000 Preston Brown <pbrown@redhat.com>
+- add smp, signal name patches from VA Linux. Thanks guys.
+
+* Mon May 22 2000 Harald Hoyer <harald@redhat.com>
+- added sysctl.conf (5) man page
+
+* Wed May 10 2000 Bill Nottingham <notting@redhat.com>
+- fix PAGE_SIZE mismatch on ia64
+
+* Sun May 7 2000 Bill Nottingham <notting@redhat.com>
+- rebuild with different optimizations for ia64
+
+* Fri Mar 24 2000 Bernhard Rosenkraenzer <bero@redhat.com>
+- rebuild with current ncurses
+
+* Tue Mar 7 2000 Bill Nottingham <notting@redhat.com>
+- fix end-of-file behavior in sysctl
+
+* Mon Feb 07 2000 Preston Brown <pbrown@redhat.com>
+- wmconfig -> desktop
+
+* Mon Feb 7 2000 Jakub Jelinek <jakub@redhat.com>
+- don't try to load System.map (and spit error messages if it does not
+ exist) if ps or top are not going to use it, both to speed things up
+ and remove the ugly messages when they don't make sense.
+- in top, print the possible error messages using standard top SHOWMESSAGE
+ (because it will be now printed out when already in terminal mode).
+
+* Thu Feb 3 2000 Matt Wilson <msw@redhat.com>
+- added patch to prevent divide by zero on UltraSparc
+- gzip man pages
+++ /dev/null
-From 8e8a824533643de4a4a221358a8c5ae7d4e9e474 Mon Sep 17 00:00:00 2001
-From: Ameya Palande <ameya.palande@nokia.com>
-Date: Wed, 28 Jul 2010 14:41:24 +0300
-Subject: [PATCH] unknown hz value fix
-
-Fixes linux version detection. This relied on a side-effect of the elf loader
-and previously hoped that constructors would be called in a certain order.
-That behavior was undefined and hence unreliable. For newer kernels, an elf
-note is now checked to extract HZ tick count.
-
-Original author: <david.sugar@canonical.com>
-Backported to meego by: Ameya Palande <ameya.palande@nokia.com>
----
- proc/sysinfo.c | 1 +
- proc/version.c | 5 ++---
- proc/version.h | 1 +
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/proc/sysinfo.c b/proc/sysinfo.c
-index 0ad7fba..793829f 100644
---- a/proc/sysinfo.c
-+++ b/proc/sysinfo.c
-@@ -212,6 +212,7 @@ static int check_for_privs(void){
- static void init_libproc(void) __attribute__((constructor));
- static void init_libproc(void){
- have_privs = check_for_privs();
-+ init_Linux_version(); // make sure we have version before continuing...
- // ought to count CPUs in /proc/stat instead of relying
- // on glibc, which foolishly tries to parse /proc/cpuinfo
- //
-diff --git a/proc/version.c b/proc/version.c
-index 391b9bb..2049e15 100644
---- a/proc/version.c
-+++ b/proc/version.c
-@@ -35,11 +35,10 @@ void display_version(void) {
-
- int linux_version_code;
-
--static void init_Linux_version(void) __attribute__((constructor));
--static void init_Linux_version(void) {
-+void init_Linux_version(void) {
- static struct utsname uts;
- int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */
--
-+
- if (uname(&uts) == -1) /* failure implies impending death */
- exit(1);
- if (sscanf(uts.release, "%d.%d.%d", &x, &y, &z) < 3)
-diff --git a/proc/version.h b/proc/version.h
-index 492d251..28c9b49 100644
---- a/proc/version.h
-+++ b/proc/version.h
-@@ -14,6 +14,7 @@
-
- EXTERN_C_BEGIN
-
-+extern void init_Linux_version(void); /* initialize linux version */
- extern void display_version(void); /* display suite version */
- extern const char procps_version[]; /* global buf for suite version */
- extern const char procps_number_version[]; /* global buf for suite number version */
---
-1.7.0.4
-
projects / external / procps.git / commitdiff