Hello community, here is the log from the commit of package procps for openSUSE:Factory checked in at 2012-11-02 17:40:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/procps (Old) and /work/SRC/openSUSE:Factory/.procps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "procps", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/procps/procps.changes 2012-07-09 13:30:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.procps.new/procps.changes 2012-11-02 17:40:50.000000000 +0100 @@ -1,0 +2,23 @@ +Tue Oct 30 14:34:52 UTC 2012 - [email protected] + +- Update to procps-ng-3.3.5 + * Stop SIGFPE on vmstat at times + * Added debian patch for kfreebsd bug, Debian #674785 + * Bump the soname + +------------------------------------------------------------------- +Tue Oct 30 12:35:12 UTC 2012 - [email protected] + +- Update to procps-ng-3.3.4 + * Removed ps -aux bogus message + * w get -i option to display IP addresses + * watch 8bit fixes Debian #675069 + * Fixed FTBFS for non-linux Debian #677055 + * pkill -u <uid> doesn't need space Debian #676239 + * top enables intra-column horizontal scrolling + * top can display a task's environment + * top can display major/minor pg fault deltas, Debian #84992 + * top provides additional control over column widths + * top offers user controlled left/right justification + +------------------------------------------------------------------- Old: ---- procps-v3.3.3-bnc634071_procstat2.diff procps-v3.3.3-large_pcpu.patch procps-v3.3.3-petabytes.patch procps-v3.3.3-stealtime.patch procps-v3.3.3-top.1.diff procps-v3.3.3-w-notruncate.diff procps-v3.3.3-w-simply-work.diff procps-v3.3.3-watch.patch procps-v3.3.3-xen.dif procps-v3.3.3.tar.bz2 New: ---- procps-v3.3.4-bnc634071_procstat2.diff procps-v3.3.4-large_pcpu.patch procps-v3.3.4-petabytes.patch procps-v3.3.4-stealtime.patch procps-v3.3.4-top.1.diff procps-v3.3.4-w-notruncate.diff procps-v3.3.4-w-simply-work.diff procps-v3.3.4-watch.patch procps-v3.3.4-xen.dif procps-v3.3.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procps.spec ++++++ --- /var/tmp/diff_new_pack.iO2IJv/_old 2012-11-02 17:40:52.000000000 +0100 +++ /var/tmp/diff_new_pack.iO2IJv/_new 2012-11-02 17:40:52.000000000 +0100 @@ -17,15 +17,18 @@ %bcond_with bin2usr +%define somajor 1 +%define libname libprocps%{somajor} Name: procps BuildRequires: automake BuildRequires: libselinux-devel BuildRequires: libtool BuildRequires: ncurses-devel +BuildRequires: pkg-config Url: https://gitorious.org/procps PreReq: %fillup_prereq %insserv_prereq -Version: 3.3.3 +Version: 3.3.5 Release: 0 Summary: The ps utilities for /proc License: GPL-2.0+ ; LGPL-2.1+ @@ -38,26 +41,26 @@ Source3: systat.xinetd Source4: sysctl.conf Source5: sysctl.conf.s390 -Patch0: procps-v3.3.3-watch.patch +Patch0: procps-v3.3.4-watch.patch Patch1: procps-v3.3.3-ia64.diff -Patch2: procps-v3.3.3-stealtime.patch -Patch3: procps-v3.3.3-w-notruncate.diff -Patch4: procps-v3.3.3-w-simply-work.diff -Patch5: procps-v3.3.3-top.1.diff +Patch2: procps-v3.3.4-stealtime.patch +Patch3: procps-v3.3.4-w-notruncate.diff +Patch4: procps-v3.3.4-w-simply-work.diff +Patch5: procps-v3.3.4-top.1.diff Patch6: procps-v3.3.3-buffersize.diff Patch7: procps-v3.3.3-readeof.patch Patch8: procps-v3.3.3-slab.patch Patch9: procps-v3.3.3-selinux.patch Patch10: procps-v3.3.3-accuracy.dif -Patch11: procps-v3.3.3-xen.dif +Patch11: procps-v3.3.4-xen.dif Patch12: procps-v3.3.3-fdleak.dif Patch13: procps-v3.3.3-columns.dif Patch14: procps-v3.3.3-integer-overflow.patch -Patch15: procps-v3.3.3-bnc634071_procstat2.diff +Patch15: procps-v3.3.4-bnc634071_procstat2.diff Patch16: procps-v3.3.3-bnc634840.patch Patch17: procps-v3.3.3-read-sysctls-also-from-boot-sysctl.conf-kernelversion.diff -Patch18: procps-v3.3.3-petabytes.patch -Patch19: procps-v3.3.3-large_pcpu.patch +Patch18: procps-v3.3.4-petabytes.patch +Patch19: procps-v3.3.4-large_pcpu.patch Patch20: procps-v3.3.3-tinfo.dif Patch21: procps-v3.3.3-pwdx.patch Patch22: procps-v3.3.3-chroot.diff @@ -85,17 +88,18 @@ Summary: Include Files and Libraries mandatory for Development License: GPL-2.0+ ; LGPL-2.1+ Group: Development/Libraries/C and C++ +Requires: %{libname} = %{version} %description devel This package contains all necessary include files and libraries needed to develop applications that require these. -%package -n libprocps0 +%package -n %{libname} Summary: The props library License: LGPL-2.1+ Group: System/Libraries -%description -n libprocps0 +%description -n %{libname} The props library can be used to read informations out from /proc the process information pseudo-file system, @@ -129,10 +133,11 @@ %build sh po/update-potfiles test -s .tarball-version || echo %{version} > .tarball-version -autoreconf -fi +./autogen.sh export NCURSESW_CFLAGS="$(ncursesw5-config --cflags)" export NCURSESW_LIBS="$(ncursesw5-config --libs)" -%global optflags %{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -pipe +export LFS_CFLAGS="$(getconf LFS_CFLAGS)" +%global optflags %{optflags} -D_GNU_SOURCE $LFS_CFLAGS -DCPU_ZEROTICS -DUSE_X_COLHDR -pipe %configure \ --disable-static \ --disable-nls \ @@ -224,9 +229,9 @@ %postun %insserv_cleanup -%post -n libprocps0 -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig -%postun -n libprocps0 -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig %files %defattr (-,root,root,755) @@ -302,9 +307,9 @@ %{_libdir}/libprocps.so %{_libdir}/pkgconfig/libprocps.pc -%files -n libprocps0 +%files -n %{libname} %defattr (-,root,root,755) -%{_libdir}/libprocps.so.0 -%{_libdir}/libprocps.so.0.0.1 +%{_libdir}/libprocps.so.1 +%{_libdir}/libprocps.so.1.0.0 %changelog ++++++ boot.sysctl ++++++ --- /var/tmp/diff_new_pack.iO2IJv/_old 2012-11-02 17:40:52.000000000 +0100 +++ /var/tmp/diff_new_pack.iO2IJv/_new 2012-11-02 17:40:52.000000000 +0100 @@ -22,11 +22,11 @@ rc_reset case "$1" in - start) + start) echo -n "Applying sysctl settings" /sbin/sysctl -e -q --system rc_status -v -r - if [ -s /etc/sysconfig/sysctl -a -x /lib/aaa_base/convert_sysctl ]; then + if test -s /etc/sysconfig/sysctl -a -x /lib/aaa_base/convert_sysctl ; then echo -n " Warning: applying settings from obsolete /etc/sysconfig/sysctl" /lib/aaa_base/convert_sysctl --stdout | sysctl -e -q -f - rc_status -v -r ++++++ procps-v3.3.3-bnc634071_procstat2.diff -> procps-v3.3.4-bnc634071_procstat2.diff ++++++ --- /work/SRC/openSUSE:Factory/procps/procps-v3.3.3-bnc634071_procstat2.diff 2012-06-07 15:39:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.procps.new/procps-v3.3.4-bnc634071_procstat2.diff 2012-11-02 17:40:50.000000000 +0100 @@ -112,8 +112,8 @@ EXTERN_C_END #endif /* SYSINFO_H */ --- top/top.c -+++ top/top.c 2012-06-04 10:08:23.264009898 +0000 -@@ -354,7 +354,7 @@ static void bye_bye (const char *str) { ++++ top/top.c 2012-10-30 11:16:32.138345792 +0000 +@@ -370,7 +370,7 @@ static void bye_bye (const char *str) { , LINUX_VERSION_PATCH(linux_version_code) , procps_version , (unsigned)Hertz, (unsigned)sizeof(Hertz), (unsigned)sizeof(Hertz) * 8 @@ -122,19 +122,32 @@ , (unsigned)sizeof(HST_t), Page_size / (unsigned)sizeof(HST_t), HHist_siz , (unsigned)sizeof(proc_t), (unsigned)sizeof(p->cmd), (unsigned)sizeof(proc_t*) , (long)Frames_libflags -@@ -1764,7 +1764,7 @@ static void zap_fieldstab (void) { - always: - Fieldstab[P_CPN].head = "P "; - Fieldstab[P_CPN].fmts = "%1d "; +@@ -1896,7 +1896,7 @@ static void zap_fieldstab (void) { + /*** hotplug_acclimated ***/ + + Fieldstab[P_CPN].width = 1; - if (1 < (digits = (unsigned)snprintf(buf, sizeof(buf), "%u", (unsigned)smp_num_cpus))) { + if (1 < (digits = (unsigned)snprintf(buf, sizeof(buf), "%u", (unsigned)smp_num_cpus()))) { if (5 < digits) error_exit(N_txt(FAIL_widecpu_txt)); - snprintf(fmts_cpu, sizeof(fmts_cpu), "%%%ud ", digits); - Fieldstab[P_CPN].head = " P " + 5 - digits; -@@ -1773,9 +1773,9 @@ always: - + Fieldstab[P_CPN].width = digits; + } +@@ -1904,9 +1904,9 @@ static void zap_fieldstab (void) { + #ifdef PERCENTBOOST + Cpu_pmax = 99.9; + Fieldstab[P_CPU].width = 5; +- if (Rc.mode_irixps && smp_num_cpus > 1 && !Thread_mode) { +- Cpu_pmax = 100.0 * smp_num_cpus; +- if (smp_num_cpus > 10) { ++ if (Rc.mode_irixps && smp_num_cpus() > 1 && !Thread_mode) { ++ Cpu_pmax = 100.0 * smp_num_cpus(); ++ if (smp_num_cpus() > 10) { + if (Cpu_pmax > 99999.0) Cpu_pmax = 99999.0; + } else { + if (Cpu_pmax > 999.9) Cpu_pmax = 999.9; +@@ -1915,9 +1915,9 @@ static void zap_fieldstab (void) { + #else Cpu_pmax = 99.9; - Fieldstab[P_CPU].fmts = " %#4.1f "; + Fieldstab[P_CPU].width = 4; - if (Rc.mode_irixps && smp_num_cpus > 1 && !Thread_mode) { - Cpu_pmax = 100.0 * smp_num_cpus; - if (smp_num_cpus > 10) { @@ -142,9 +155,9 @@ + Cpu_pmax = 100.0 * smp_num_cpus(); + if (smp_num_cpus() > 10) { if (Cpu_pmax > 99999.0) Cpu_pmax = 99999.0; - Fieldstab[P_CPU].fmts = "%5.0f "; } else { -@@ -1841,7 +1841,7 @@ static CPU_t *cpus_refresh (CPU_t *cpus) + if (Cpu_pmax > 999.9) Cpu_pmax = 999.9; +@@ -1997,7 +1997,7 @@ static CPU_t *cpus_refresh (CPU_t *cpus) we'll force it to be treated as 'idle' so as not to present misleading percentages. */ cpus[Cpu_faux_tot].edge = @@ -153,7 +166,7 @@ #endif // now value each separate cpu's tics, maybe for (i = 0; i < Cpu_faux_tot && i < Screen_rows; i++) { -@@ -1946,7 +1946,7 @@ static void procs_hlp (proc_t *this) { +@@ -2102,7 +2102,7 @@ static void procs_hlp (proc_t *this) { oldtimev.tv_usec = timev.tv_usec; // if in Solaris mode, adjust our scaling for all cpus @@ -162,7 +175,7 @@ #ifdef OFF_HST_HASH maxt_sav = Frame_maxtask; #endif -@@ -2088,8 +2088,7 @@ static void sysinfo_refresh (int forced) +@@ -2255,8 +2255,7 @@ static void sysinfo_refresh (int forced) #ifndef PRETEND4CPUS /*** hotplug_acclimated ***/ if (300 <= cur_secs - cpu_secs) { @@ -172,7 +185,7 @@ cpu_secs = cur_secs; } #endif -@@ -2116,10 +2115,10 @@ static void before (char *me) { +@@ -2285,10 +2284,10 @@ static void before (char *me) { initialize_nls(); // establish cpu particulars ++++++ procps-v3.3.3-large_pcpu.patch -> procps-v3.3.4-large_pcpu.patch ++++++ --- /work/SRC/openSUSE:Factory/procps/procps-v3.3.3-large_pcpu.patch 2012-06-07 15:39:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.procps.new/procps-v3.3.4-large_pcpu.patch 2012-11-02 17:40:50.000000000 +0100 @@ -1,14 +1,40 @@ --- top/top.c -+++ top/top.c 2012-06-04 10:36:26.252009786 +0000 -@@ -1777,7 +1777,10 @@ always: - Fieldstab[P_CPU].fmts = " %#4.1f "; ++++ top/top.c 2012-10-30 11:34:42.634844811 +0000 +@@ -1910,8 +1910,15 @@ static void zap_fieldstab (void) { + Fieldstab[P_CPU].width = 5; if (Rc.mode_irixps && smp_num_cpus() > 1 && !Thread_mode) { Cpu_pmax = 100.0 * smp_num_cpus(); - if (smp_num_cpus() > 10) { -+ if (smp_num_cpus() > 100) { -+ if (Cpu_pmax > 999999.0) Cpu_pmax = 999999.0; -+ Fieldstab[P_CPU].fmts = "%6.0f "; ++ if (smp_num_cpus() > 1000) { ++ if (Cpu_pmax > 9999999.0) Cpu_pmax = 9999999.0; ++ Fieldstab[P_CPU].width = 8; ++ } else if (smp_num_cpus() > 100) { ++ if (Cpu_pmax > 999999.0) Cpu_pmax = 999999.0; ++ Fieldstab[P_CPU].width = 7; + } else if (smp_num_cpus() > 10) { if (Cpu_pmax > 99999.0) Cpu_pmax = 99999.0; - Fieldstab[P_CPU].fmts = "%5.0f "; ++ Fieldstab[P_CPU].width = 6; } else { + if (Cpu_pmax > 999.9) Cpu_pmax = 999.9; + } +@@ -1921,12 +1928,18 @@ static void zap_fieldstab (void) { + Fieldstab[P_CPU].width = 4; + if (Rc.mode_irixps && smp_num_cpus() > 1 && !Thread_mode) { + Cpu_pmax = 100.0 * smp_num_cpus(); +- if (smp_num_cpus() > 10) { ++ if (smp_num_cpus() > 1000) { ++ if (Cpu_pmax > 9999999.0) Cpu_pmax = 9999999.0; ++ Fieldstab[P_CPU].width = 7; ++ } else if (smp_num_cpus() > 100) { ++ if (Cpu_pmax > 999999.0) Cpu_pmax = 999999.0; ++ Fieldstab[P_CPU].width = 6; ++ } else if (smp_num_cpus() > 10) { + if (Cpu_pmax > 99999.0) Cpu_pmax = 99999.0; ++ Fieldstab[P_CPU].width = 5; + } else { + if (Cpu_pmax > 999.9) Cpu_pmax = 999.9; + } +- Fieldstab[P_CPU].width = 5; + } + #endif + ++++++ procps-v3.3.3-petabytes.patch -> procps-v3.3.4-petabytes.patch ++++++ --- /work/SRC/openSUSE:Factory/procps/procps-v3.3.3-petabytes.patch 2012-06-07 15:39:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.procps.new/procps-v3.3.4-petabytes.patch 2012-11-02 17:40:50.000000000 +0100 @@ -1,17 +1,21 @@ --- top/top.c -+++ top/top.c 2012-06-04 10:32:22.760334019 +0000 -@@ -1060,15 +1060,17 @@ static int get_int (const char *prompt) ++++ top/top.c 2012-10-30 11:24:24.226345149 +0000 +@@ -1283,15 +1283,19 @@ end_justifies: * SK_Kb (1) it's kilobytes * SK_Mb (2) it's megabytes * SK_Gb (3) it's gigabytes - * SK_Tb (4) it's terabytes */ + * SK_Tb (4) it's terabytes -+ * SK_Pb (5) it's petabytes -+ * SK_Eb (6) it's exabytes */ - static const char *scale_num (unsigned long num, const int width, const int type) { ++ * SK_Pb (5) it's petabytes ++ * SK_Eb (6) it's exabytes ++ */ + static const char *scale_unum (unsigned long num, int type, int width, int justr) { // kilobytes, megabytes, gigabytes, terabytes, duh! - static double scale[] = { 1024.0, 1024.0*1024, 1024.0*1024*1024, 1024.0*1024*1024*1024, 0 }; - // kilo, mega, giga, tera, none +- static double scale[] = { 1024.0, 1024.0*1024, 1024.0*1024*1024, 1024.0*1024*1024*1024, 0 }; +- // kilo, mega, giga, tera, none ++ static double scale[] = { 1024.0, 1024.0*1024, 1024.0*1024*1024, 1024.0*1024*1024*1024, ++ 1024.0*1024*1024*1024*1024, 1024.0*1024*1024*1024*1024*1024, 0 }; ++ // kilo, mega, giga, tera, peta, exa, none #ifdef CASEUP_SUFIX - static char nextup[] = { 'K', 'M', 'G', 'T', 0 }; + static char nextup[] = { 'K', 'M', 'G', 'T', 'P', 'E', 0 }; @@ -22,11 +26,11 @@ static char buf[SMLBUFSIZ]; double *dp; --- top/top.h -+++ top/top.h 2012-06-04 10:32:43.952010338 +0000 -@@ -177,7 +177,7 @@ enum pflag { - /* The scaling 'type' used with scale_num() -- this is how ++++ top/top.h 2012-10-30 11:23:33.570344292 +0000 +@@ -186,7 +186,7 @@ enum pflag { + /* The scaling 'type' used with scale_unum() -- this is how the passed number is interpreted should scaling be necessary */ - enum scale_num { + enum scale_unum { - SK_no, SK_Kb, SK_Mb, SK_Gb, SK_Tb + SK_no, SK_Kb, SK_Mb, SK_Gb, SK_Tb, SK_Pb, SK_Eb }; ++++++ procps-v3.3.3-stealtime.patch -> procps-v3.3.4-stealtime.patch ++++++ --- /work/SRC/openSUSE:Factory/procps/procps-v3.3.3-stealtime.patch 2012-06-07 15:39:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.procps.new/procps-v3.3.4-stealtime.patch 2012-11-02 17:40:50.000000000 +0100 @@ -22,7 +22,7 @@ + _("st")); } - static unsigned long unitConvert(unsigned int size) + static unsigned long unitConvert(unsigned long size) @@ -230,7 +232,7 @@ static unsigned long unitConvert(unsigne static void new_format(void) { ++++++ procps-v3.3.3-top.1.diff -> procps-v3.3.4-top.1.diff ++++++ --- /work/SRC/openSUSE:Factory/procps/procps-v3.3.3-top.1.diff 2012-06-07 15:39:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.procps.new/procps-v3.3.4-top.1.diff 2012-11-02 17:40:50.000000000 +0100 @@ -1,5 +1,5 @@ --- top/top.1 -+++ top/top.1 2012-06-01 14:25:06.216010097 +0000 ++++ top/top.1 2012-10-30 11:10:06.558844692 +0000 @@ -23,7 +23,7 @@ .. \# Setup //////////////////////////////////////////////////////////////// @@ -9,7 +9,7 @@ . .ll +(\n[half_xtra] + \n[half_xtra]) . -@@ -46,15 +46,15 @@ +@@ -46,18 +46,18 @@ .ds F \fIOff\fR .ds O \fIOn\fR . @@ -21,6 +21,9 @@ -.ds CG \'current\' window/field group +.ds CG 'current' window/field group .ds CI interactive command + \# - Note: our 'Command Line' used in 2 places + .ds CL \-\fBhv\fR|\-\fBbcHiSs\fR \-\fBd\fR delay \-\fBn\fR limit \ + \-\fBu\fR|\fBU\fR user \-\fBp\fR pid[,pid] \-\fBw\fR [cols] \fR .ds CO command\-line option .ds CT command toggle -.ds CW \'current\' window @@ -28,7 +31,7 @@ .ds FG field group .ds FM full\-screen mode .ds KA arrow key -@@ -818,7 +818,7 @@ Use either of these keys if you have a l +@@ -854,7 +854,7 @@ Use either of these keys if you have a l to see current status, .TP 7 @@ -37,7 +40,7 @@ There are two help levels available. The first will provide a reminder of all the basic \*(CIs. If \*(We is\fI secured\fR, that screen will be abbreviated. -@@ -827,7 +827,7 @@ Typing 'h' or '?' on that help screen wi +@@ -863,7 +863,7 @@ Typing 'h' or '?' on that help screen wi those \*(CIs applicable to \*(AM. .TP 7 @@ -46,7 +49,7 @@ Removes restrictions on which tasks are shown. This command will reverse any 'i' (idle tasks) and 'n' (max tasks) commands that might be active. -@@ -843,13 +843,13 @@ vertical and horizontal scrolling. +@@ -879,13 +879,13 @@ vertical and horizontal scrolling. When operating in \*(AM this command has a broader meaning. .TP 7 @@ -62,7 +65,7 @@ This command will influence use of the 'bold' terminfo capability and alters\fB both\fR the \*(SA and \*(TA for the \*(CW. While it is intended primarily for use with dumb terminals, it can be -@@ -861,7 +861,7 @@ Thus, unless the 'x' and/or 'y' toggles +@@ -897,7 +897,7 @@ Thus, unless the 'x' and/or 'y' toggles there will be no visual confirmation that they are even on. .TP 7 @@ -71,7 +74,7 @@ You will be prompted to enter the delay time, in seconds, between display updates. -@@ -875,26 +875,26 @@ If at any time you wish to know the curr +@@ -911,26 +911,26 @@ If at any time you wish to know the curr help and view the system summary on the second line. .TP 7 @@ -102,7 +105,7 @@ You will be prompted for a PID and then the signal to send. The default signal, as reflected in the prompt, is SIGTERM. However, you can send any signal, via number or name. -@@ -905,24 +905,24 @@ depending on your progress: +@@ -941,24 +941,24 @@ depending on your progress: 2) at the signal prompt, type 0 .TP 7 @@ -126,12 +129,21 @@ restart later in exactly that same state. .TP 7 --\ \ \'\fBZ\fR\' :\fIChange-Color-Mapping -+\ \ '\fBZ\fR' :\fIChange-Color-Mapping +-\ \ \'\fBX\fR\' :\fIExtra-Fixed-Width \fR ++\ \ '\fBX\fR' :\fIExtra-Fixed-Width \fR + Some fields are fixed width and not scalable. + As such, they are subject to truncation which would be indicated + by a '+' in the last position. +@@ -988,7 +988,7 @@ these fields are never decreased by \*(W + To narrow them you must specify a smaller number or restore the defaults. + + .TP 7 +-\ \ \'\fBZ\fR\' :\fIChange-Color-Mapping \fR ++\ \ '\fBZ\fR' :\fIChange-Color-Mapping \fR This key will take you to a separate screen where you can change the colors for the \*(CW, or for all windows. For details regarding this \*(CI \*(Xt 4d. COLOR Mapping. -@@ -943,12 +943,12 @@ These commands always impact just the \* +@@ -1009,12 +1009,12 @@ These commands always impact just the \* \*(CWs and \*(FGs. .TP 7 @@ -146,7 +158,7 @@ This command affects from 2 to many \*(SA lines, depending on the state of the '1' toggle and whether or not \*(We is running under true SMP. -@@ -956,7 +956,7 @@ This portion of the \*(SA is also influe +@@ -1022,7 +1022,7 @@ This portion of the \*(SA is also influe as reflected in the total label which shows either 'Tasks' or 'Threads'. .TP 7 @@ -155,7 +167,7 @@ This command affects how the 't' command's Cpu States portion is shown. Although this toggle exists primarily to serve massively-parallel SMP machines, it is not restricted to solely SMP environments. -@@ -967,7 +967,7 @@ Otherwise, each \*(Pu is displayed separ +@@ -1033,7 +1033,7 @@ Otherwise, each \*(Pu is displayed separ up to available screen height. .TP 7 @@ -164,8 +176,25 @@ This command affects the two \*(SA lines dealing with physical and virtual memory. -@@ -992,12 +992,12 @@ The following commands will also be infl - global 'B' (bold enable) toggle. +@@ -1056,14 +1056,14 @@ The \*(TA \*(CIs are\fB never available\ + .B APPEARANCE\fR of \*(TW + .PD 0 + .TP 7 +-\ \ \'\fBJ\fR\' :\fIJustify-Numeric-Columns\fR toggle \fR ++\ \ '\fBJ\fR' :\fIJustify-Numeric-Columns\fR toggle \fR + Alternates between right-justified (the default) and + left-justified numeric data. + If the numeric data completely fills the available column, this + \*(CT may impact the column header only. + + .TP 7 +-\ \ \'\fBj\fR\' :\fIJustify-Character-Columns\fR toggle \fR ++\ \ '\fBj\fR' :\fIJustify-Character-Columns\fR toggle \fR + Alternates between left-justified (the default) and + right-justified character data. + If the character data completely fills the available column, this +@@ -1076,12 +1076,12 @@ global 'B' (bold enable) toggle. + .RS -2 .TP 7 -\ \ \'\fBb\fR\' :\fIBold/Reverse\fR toggle \fR @@ -179,7 +208,7 @@ Changes highlighting for the current sort field. If you forget which field is being sorted this command can serve as a quick visual reminder, providing the sort field is being displayed. -@@ -1006,7 +1006,7 @@ The sort field might\fI not\fR be visibl +@@ -1090,7 +1090,7 @@ The sort field might\fI not\fR be visibl 2) the 'f' \*(CI turned it \*F .TP 7 @@ -188,7 +217,7 @@ Changes highlighting for "running" tasks. For additional insight into this task state, \*(Xt 3a. DESCRIPTIONS of Fields, the 'S' field (Process Status). -@@ -1015,7 +1015,7 @@ Use of this provision provides important +@@ -1099,7 +1099,7 @@ Use of this provision provides important The only costs will be a few additional tty escape sequences. .TP 7 @@ -197,7 +226,7 @@ Switches the \*(CW between your last used color scheme and the older form of black-on-white or white-on-black. This command will alter\fB both\fR the \*(SA and \*(TA but does not affect -@@ -1026,20 +1026,20 @@ the state of the 'x', 'y' or 'b' toggles +@@ -1110,20 +1110,20 @@ the state of the 'x', 'y' or 'b' toggles .B CONTENT\fR of \*(TW .PD 0 .TP 7 @@ -221,7 +250,7 @@ When 'Cumulative mode' is \*O, each process is listed with the \*(Pu time that it and its dead children have used. -@@ -1055,7 +1055,7 @@ If you wish to know in advance whether o +@@ -1139,7 +1139,7 @@ If you wish to know in advance whether o effect, simply ask for help and view the window summary on the second line. .TP 7 @@ -230,7 +259,7 @@ You will be prompted for the\fB uid\fR or\fB name\fR of the user to display. The '-u' option matches on \fB effective\fR user whereas the '-U' option matches on\fB any\fR user (real, effective, saved, or filesystem). -@@ -1068,7 +1068,7 @@ Later, if you wish to monitor all tasks +@@ -1152,7 +1152,7 @@ Later, if you wish to monitor all tasks command but just press <Enter> at the prompt. .TP 7 @@ -239,7 +268,7 @@ In this mode, processes are reordered according to their parents and the layout of the COMMAND column resembles that of a tree. In forest view mode it is still possible to toggle between program -@@ -1084,7 +1084,7 @@ mode in the \*(CW. +@@ -1168,7 +1168,7 @@ mode in the \*(CW. .B SIZE\fR of \*(TW .PD 0 .TP 7 @@ -248,7 +277,7 @@ Displays all tasks or just active tasks. When this toggle is \*F, tasks that have not used any \*(PU since the last update will not be displayed. -@@ -1096,7 +1096,7 @@ If this command is applied to the last \ +@@ -1180,7 +1180,7 @@ If this command is applied to the last \ affect the window's size, as all prior \*(TDs will have already been painted. .TP 7 @@ -257,7 +286,7 @@ You will be prompted to enter the number of tasks to display. The lessor of your number and available screen rows will be used. -@@ -1134,12 +1134,12 @@ The sort field might\fI not\fR be visibl +@@ -1218,12 +1218,12 @@ The sort field might\fI not\fR be visibl 2) the 'f' \*(CI turned it \*F .TP 7 @@ -272,7 +301,7 @@ Moves the sort column to the right unless the current sort field is the last field being displayed. -@@ -1150,14 +1150,14 @@ the current sort field is visible. +@@ -1234,14 +1234,14 @@ the current sort field is visible. .in .TP 7 @@ -289,7 +318,7 @@ Using this \*(CI you can alternate between high-to-low and low-to-high sorts. .PP -@@ -1236,7 +1236,7 @@ know what window is the \*(CW. +@@ -1320,7 +1320,7 @@ know what window is the \*(CW. .SS 5b. COMMANDS for Windows .\" ---------------------------------------------------------------------- .TP 7 @@ -298,7 +327,7 @@ The '-' key turns the \*(CW's \*(TD \*O and \*F. When \*O, that \*(TA will show a minimum of the columns header you've established with the 'f' \*(CI. -@@ -1250,7 +1250,7 @@ If all 4 \*(TDs are currently visible, t +@@ -1334,7 +1334,7 @@ If all 4 \*(TDs are currently visible, t as the only display element. .TP 7 @@ -307,7 +336,7 @@ The '=' key forces the \*(CW's \*(TD to be visible. It also reverses any 'i' (idle tasks), 'n' (max tasks) and 'u'/'U' (user filter) commands that might be active. -@@ -1265,7 +1265,7 @@ except for the 'i' (idle tasks), 'n' (ma +@@ -1349,7 +1349,7 @@ except for the 'i' (idle tasks), 'n' (ma and scrolling \*(CIs. .TP 7 @@ -316,7 +345,7 @@ This command will switch between \*(FM and \*(AM. The first time you issue this command, all four \*(TDs will be shown. -@@ -1273,7 +1273,7 @@ Thereafter when you switch modes, you wi +@@ -1357,7 +1357,7 @@ Thereafter when you switch modes, you wi chosen to make visible. .TP 7 @@ -325,7 +354,7 @@ This will change the \*(CW, which in turn changes the window to which commands are directed. These keys act in a circular fashion so you can reach any desired \*(CW -@@ -1284,7 +1284,7 @@ whenever the \*(CW name loses its emphas +@@ -1368,7 +1368,7 @@ whenever the \*(CW name loses its emphas the \*(TD is \*F and many commands will be restricted. .TP 7 @@ -334,7 +363,7 @@ You will be prompted to enter a number between 1 and 4 designating the \*(FG which should be made the \*(CW. -@@ -1293,7 +1293,7 @@ In \*(AM, it is simply a less convenient +@@ -1377,7 +1377,7 @@ In \*(AM, it is simply a less convenient commands. .TP 7 @@ -343,7 +372,7 @@ You will be prompted for a new name to be applied to the \*(CW. It does not require that the window name be visible (the 'l' toggle to be \*O). -@@ -1301,8 +1301,8 @@ It does not require that the window name +@@ -1385,8 +1385,8 @@ It does not require that the window name .IP "*" 3 The \*(CIs shown with an \*(AK have use beyond \*(AM. .Bd -literal -compact @@ -354,7 +383,7 @@ \ and fields management .Ed -@@ -1388,7 +1388,7 @@ available in \*(AM if the \*(CW's \*(TD +@@ -1485,7 +1485,7 @@ available in \*(AM if the \*(CW's \*(TD You can use these \*(CIs to locate a task row containing a particular value. .TP 4 @@ -363,7 +392,7 @@ You will be prompted for the case-sensitive string to locate starting from the current window coordinates. There are no restrictions on search string content. -@@ -1401,7 +1401,7 @@ Keying <Enter> with no input will effect +@@ -1498,7 +1498,7 @@ Keying <Enter> with no input will effect a new search string is entered. .TP 4 ++++++ procps-v3.3.3-w-notruncate.diff -> procps-v3.3.4-w-notruncate.diff ++++++ --- /work/SRC/openSUSE:Factory/procps/procps-v3.3.3-w-notruncate.diff 2012-06-07 15:39:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.procps.new/procps-v3.3.4-w-notruncate.diff 2012-11-02 17:40:50.000000000 +0100 @@ -1,15 +1,15 @@ --- w.c -+++ w.c 2012-06-01 14:11:59.508510289 +0000 -@@ -239,7 +239,7 @@ static const proc_t *getproc(const utmp_ ++++ w.c 2012-10-30 10:58:51.547461515 +0000 +@@ -360,7 +360,7 @@ static const proc_t *getproc(const utmp_ } static void showinfo(utmp_t * u, int formtype, int maxcmd, int from, -- const int userlen, const int fromlen) -+ int userlen, int fromlen) +- const int userlen, const int fromlen, const int ip_addresses) ++ int userlen, int fromlen, const int ip_addresses) { unsigned long long jcpu; int ut_pid_found; -@@ -269,7 +269,13 @@ static void showinfo(utmp_t * u, int for +@@ -390,7 +390,13 @@ static void showinfo(utmp_t * u, int for strncpy(uname, u->ut_user, UT_NAMESIZE); if (formtype) { @@ -22,17 +22,17 @@ + } + printf("%-*.*s%-*.*s", userlen + 1, userlen, uname, utlnlen + 1, utlnlen, u->ut_line); if (from) - print_host(u->ut_host, UT_HOSTSIZE, fromlen); + print_from(u, ip_addresses, fromlen); print_logintime(u->ut_time, stdout); -@@ -319,6 +325,7 @@ static void __attribute__ ((__noreturn__ +@@ -440,6 +446,7 @@ static void __attribute__ ((__noreturn__ fputs(_(" -h, --no-header do not print header\n" " -u, --no-current ignore current process username\n" " -s, --short short format\n" + " -n, --no-truncat non truncated listing (large)\n" " -f, --from show remote hostname field\n" - " -o, --old-style old style output\n"), out); - fputs(USAGE_SEPARATOR, out); -@@ -347,6 +354,7 @@ int main(int argc, char **argv) + " -o, --old-style old style output\n" + " -i, --ip-addr display IP address instead of hostname (if possible)\n"), out); +@@ -476,6 +483,7 @@ int main(int argc, char **argv) {"no-header", no_argument, NULL, 'h'}, {"no-current", no_argument, NULL, 'u'}, {"sort", no_argument, NULL, 's'}, @@ -40,16 +40,16 @@ {"from", no_argument, NULL, 'f'}, {"old-style", no_argument, NULL, 'o'}, {"help", no_argument, NULL, HELP_OPTION}, -@@ -365,7 +373,7 @@ int main(int argc, char **argv) +@@ -494,7 +502,7 @@ int main(int argc, char **argv) #endif while ((ch = -- getopt_long(argc, argv, "husfoV", longopts, NULL)) != -1) -+ getopt_long(argc, argv, "husnfoV", longopts, NULL)) != -1) +- getopt_long(argc, argv, "husfoVi", longopts, NULL)) != -1) ++ getopt_long(argc, argv, "husnfoVi", longopts, NULL)) != -1) switch (ch) { case 'h': header = 0; -@@ -376,6 +384,10 @@ int main(int argc, char **argv) +@@ -505,6 +513,10 @@ int main(int argc, char **argv) case 's': longform = 0; break; ++++++ procps-v3.3.3-w-simply-work.diff -> procps-v3.3.4-w-simply-work.diff ++++++ --- /work/SRC/openSUSE:Factory/procps/procps-v3.3.3-w-simply-work.diff 2012-06-07 15:39:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.procps.new/procps-v3.3.4-w-simply-work.diff 2012-11-02 17:40:50.000000000 +0100 @@ -1,9 +1,9 @@ --- w.c -+++ w.c 2012-06-01 14:18:26.088580533 +0000 -@@ -435,9 +435,19 @@ int main(int argc, char **argv) ++++ w.c 2012-10-30 11:05:00.182344798 +0000 +@@ -569,8 +569,19 @@ int main(int argc, char **argv) maxcmd = atoi(p); else - maxcmd = 80; + maxcmd = MAX_CMD_WIDTH; +#if 0 + /* + * I have no idea why it shouldn't be allowed to see the result @@ -13,11 +13,10 @@ + */ if (maxcmd < 71) xerrx(EXIT_FAILURE, _("%d column window is too narrow"), maxcmd); -- +#else + if (maxcmd < 71) + xwarnx(_("%d column window could be to too narrow"), maxcmd); +#endif - maxcmd -= 21 + userlen + (from ? fromlen : 0) + (longform ? 20 : 0); - if (maxcmd < 3) - xwarnx(_("warning: screen width %d suboptimal"), win.ws_col); + if (MAX_CMD_WIDTH < maxcmd) { + xwarnx(_("%d column width exceeds command buffer size, truncating to %d"), + maxcmd, MAX_CMD_WIDTH); ++++++ procps-v3.3.3-watch.patch -> procps-v3.3.4-watch.patch ++++++ --- /work/SRC/openSUSE:Factory/procps/procps-v3.3.3-watch.patch 2012-06-07 15:39:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.procps.new/procps-v3.3.4-watch.patch 2012-11-02 17:40:50.000000000 +0100 @@ -1,60 +1,3 @@ ---- watch.c -+++ watch.c 2012-06-04 15:13:19.484011000 +0200 -@@ -53,6 +53,7 @@ - #include <unistd.h> - #ifdef WITH_WATCH8BIT - # include <wchar.h> -+# include <wctype.h> - # include <ncursesw/ncurses.h> - #else - # include <ncurses.h> -@@ -296,7 +297,11 @@ wint_t my_getwc(FILE * s) - } - #endif /* WITH_WATCH8BIT */ - -+#ifdef WITH_WATCH8BIT -+void output_header(wchar_t *restrict wcommand, int wcommand_columns, int wcommand_characters, double interval) -+#else - void output_header(char *restrict command, double interval) -+#endif /* WITH_WATCH8BIT */ - { - time_t t = time(NULL); - char *ts = ctime(&t); -@@ -434,8 +439,8 @@ int run_command(char *restrict command, - c = carry; - carry = WEOF; - } -- } while (c != WEOF && !isprint(c) -- && c < 12 -+ } while (c != WEOF && !iswprint(c) -+ && c < 128 - && wcwidth(c) == 0 - && c != L'\n' - && c != L'\t' -@@ -718,7 +723,11 @@ int main(int argc, char *argv[]) - } - - if (show_title) -+#ifdef WITH_WATCH8BIT -+ output_header(wcommand, wcommand_columns, wcommand_characters, interval); -+#else - output_header(command, interval); -+#endif /* WITH_WATCH8BIT */ - - if (run_command(command, command_argv)) - break; ---- skill.c -+++ skill.c 2012-06-04 13:28:45.700010498 +0000 -@@ -98,7 +98,8 @@ static void hurt_proc(int tty, int uid, - fprintf(stderr, "%-8s %-8s %5d %-16.16s ? ", - (char *)dn_buf, user_from_uid(uid), pid, cmd); - fflush (stdout); -- getline(&buf, &len, stdin); -+ if (getline(&buf, &len, stdin) == -1) -+ return; - if (rpmatch(buf) < 1) { - free(buf); - return; --- configure.ac +++ configure.ac 2012-06-04 13:33:19.308509976 +0000 @@ -125,7 +125,7 @@ AC_CHECK_FUNCS([\ ++++++ procps-v3.3.3-xen.dif -> procps-v3.3.4-xen.dif ++++++ --- /work/SRC/openSUSE:Factory/procps/procps-v3.3.3-xen.dif 2012-06-07 15:39:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.procps.new/procps-v3.3.4-xen.dif 2012-11-02 17:40:50.000000000 +0100 @@ -9,15 +9,7 @@ sleep_half = (sleep_time / 2); new_header(); -@@ -261,6 +261,7 @@ static void new_format(void) - dstl = *cpu_zzz; - Div = duse + dsys + didl + diow + dstl; - divo2 = Div / 2UL; -+ if (Div == 0) Div++; - printf(format, - running, blocked, - unitConvert(kb_swap_used), unitConvert(kb_main_free), -@@ -305,16 +306,17 @@ static void new_format(void) +@@ -305,12 +306,12 @@ static void new_format(void) /* idle can run backwards for a moment -- kernel "feature" */ if (debt) { @@ -35,8 +27,3 @@ } Div = duse + dsys + didl + diow + dstl; - divo2 = Div / 2UL; -+ if (Div == 0) continue; - printf(format, - running, - blocked, ++++++ procps-v3.3.3.tar.bz2 -> procps-v3.3.5.tar.bz2 ++++++ ++++ 4889 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
