Hello community, here is the log from the commit of package procps for openSUSE:Factory checked in at 2015-06-03 08:16:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/procps (Old) and /work/SRC/openSUSE:Factory/.procps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "procps" Changes: -------- --- /work/SRC/openSUSE:Factory/procps/procps.changes 2015-03-29 20:14:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.procps.new/procps.changes 2015-06-03 08:16:49.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jun 2 06:43:46 UTC 2015 - [email protected] + +- Reintroduce the corrected patch procps-ng-3.3.9-w-notruncate.diff + to have a working --no-truncat option back for `w' (boo#932950) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procps.spec ++++++ --- /var/tmp/diff_new_pack.r4tHs2/_old 2015-06-03 08:16:50.000000000 +0200 +++ /var/tmp/diff_new_pack.r4tHs2/_new 2015-06-03 08:16:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package procps # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -123,7 +123,7 @@ %setup -q -n %{name}-ng-%{version} %patch0 %patch1 -%patch3 +%patch3 -b .trcate %patch4 %patch5 %patch7 ++++++ procps-ng-3.3.9-w-notruncate.diff ++++++ --- /var/tmp/diff_new_pack.r4tHs2/_old 2015-06-03 08:16:50.000000000 +0200 +++ /var/tmp/diff_new_pack.r4tHs2/_new 2015-06-03 08:16:50.000000000 +0200 @@ -1,6 +1,34 @@ +--- + w.c | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + --- w.c -+++ w.c 2014-05-15 13:26:57.162238550 +0000 -@@ -451,6 +451,7 @@ static void __attribute__ ((__noreturn__ ++++ w.c 2015-06-02 06:35:25.221520280 +0000 +@@ -365,7 +365,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, const int ip_addresses) ++ int userlen, int fromlen, const int ip_addresses) + { + unsigned long long jcpu; + int ut_pid_found; +@@ -395,7 +395,13 @@ static void showinfo(utmp_t * u, int for + strncpy(uname, u->ut_user, UT_NAMESIZE); + + if (formtype) { +- printf("%-*.*s%-9.8s", userlen + 1, userlen, uname, u->ut_line); ++ int utlnlen = 8; ++ if (formtype > 1) { ++ userlen = strnlen(uname, UT_NAMESIZE); ++ fromlen = strnlen(u->ut_host, UT_HOSTSIZE); ++ utlnlen = strnlen(u->ut_line, UT_LINESIZE); ++ } ++ printf("%-*.*s%-*.*s", userlen + 1, userlen, uname, utlnlen + 1, utlnlen, u->ut_line); + if (from) + print_from(u, ip_addresses, fromlen); + print_logintime(u->ut_time, stdout); +@@ -445,6 +451,7 @@ static void __attribute__ ((__noreturn__ fputs(_(" -h, --no-header do not print header\n"),out); fputs(_(" -u, --no-current ignore current process username\n"),out); fputs(_(" -s, --short short format\n"),out); @@ -8,7 +36,7 @@ fputs(_(" -f, --from show remote hostname field\n"),out); fputs(_(" -o, --old-style old style output\n"),out); fputs(_(" -i, --ip-addr display IP address instead of hostname (if possible)\n"), out); -@@ -487,6 +488,7 @@ int main(int argc, char **argv) +@@ -481,6 +488,7 @@ int main(int argc, char **argv) {"no-header", no_argument, NULL, 'h'}, {"no-current", no_argument, NULL, 'u'}, {"short", no_argument, NULL, 's'}, @@ -16,3 +44,23 @@ {"from", no_argument, NULL, 'f'}, {"old-style", no_argument, NULL, 'o'}, {"ip-addr", no_argument, NULL, 'i'}, +@@ -502,7 +510,7 @@ int main(int argc, char **argv) + #endif + + while ((ch = +- getopt_long(argc, argv, "husfoVi", longopts, NULL)) != -1) ++ getopt_long(argc, argv, "husnfoVi", longopts, NULL)) != -1) + switch (ch) { + case 'h': + header = 0; +@@ -513,6 +521,10 @@ int main(int argc, char **argv) + case 's': + longform = 0; + break; ++ case 'n': ++ longform = 2; ++ header = 0; ++ break; + case 'f': + from = !from; + break;
