Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package procps for openSUSE:Factory checked in at 2021-02-16 22:36:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/procps (Old) and /work/SRC/openSUSE:Factory/.procps.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "procps" Tue Feb 16 22:36:06 2021 rev:119 rq:871141 version:3.3.17 Changes: -------- --- /work/SRC/openSUSE:Factory/procps/procps.changes 2021-02-07 15:18:13.821688738 +0100 +++ /work/SRC/openSUSE:Factory/.procps.new.28504/procps.changes 2021-02-16 22:41:27.850036831 +0100 @@ -1,0 +2,57 @@ +Thu Feb 11 08:46:36 UTC 2021 - Dr. Werner Fink <wer...@suse.de> + +- Add /usr/share/man/uk dir to file list for lang sub package + +------------------------------------------------------------------- +Wed Feb 10 17:32:06 UTC 2021 - Antoine Belvire <antoine.belv...@opensuse.org> + +- Fix directory for Ukrainian man pages translations. +- Move localized man pages to lang package. +- Remove obsolete conditionals. +- Remove obsolete --enable-oomem option. +- Run spec-cleaner. + +------------------------------------------------------------------- +Wed Feb 10 10:09:35 UTC 2021 - Dr. Werner Fink <wer...@suse.de> + +- Update to procps-ng-3.3.17 + * library: Incremented to 8:3:0 + (no removals or additions, internal changes only) + * all: properly handle utf8 cmdline translations issue #176 + * kill: Pass int to signalled process merge #32 + * pgrep: Pass int to signalled process merge #32 + * pgrep: Check sanity of SG_ARG_MAX issue #152 + * pgrep: Add older than selection merge #79 + * pidof: Quiet mode merge #83 + * pidof: show worker threads Redhat #1803640 + * ps.1: Mention stime alias issue #164 + * ps: check also match on truncated 16 char comm names + * ps: Add exe output option Redhat #1399206 + * ps: A lot more sorting available merge #99 + * pwait: New command waits for a process merge #97 + * sysctl: Match systemd directory order Debian #950788 + * sysctl: Document directory order Debian #951550 + * top: ensure config file backward compatibility Debian #951335 + * top: add command line 'e' for symmetry with 'E' issue #165 + * top: add '4' toggle for two abreast cpu display issue #172 + * top: add '!' toggle for combining multiple cpus + * top: fix potential SEGV involving -p switch merge #114 + * vmstat: Wide mode gives wider proc columns merge #48 + * watch: Add environment variable for interval merge #62 + * watch: Add no linewrap option issue #182 + * watch: Support more colors merge #106,#109 + * free,uptime,slabtop: complain about extra ops issue #181 +- Remove now obsolete upstream patches + * procps-check-sanity-of-SC_ARG_MAX.patch + * procps-ng-3e1c00d0.patch +- Port patches + * procps-ng-3.3.10-integer-overflow.patch + * procps-ng-3.3.10-large_pcpu.patch + * procps-ng-3.3.8-accuracy.dif + * procps-ng-3.3.8-bnc634840.patch + * procps-ng-3.3.8-petabytes.patch + * procps-ng-3.3.8-tinfo.dif + * procps-ng-3.3.9-w-notruncate.diff + * procps-v3.3.3-read-sysctls-also-from-boot-sysctl.conf-kernelversion.diff + +------------------------------------------------------------------- Old: ---- procps-check-sanity-of-SC_ARG_MAX.patch procps-ng-3.3.16.tar.xz procps-ng-3e1c00d0.patch New: ---- procps-ng-3.3.17.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procps.spec ++++++ --- /var/tmp/diff_new_pack.zSjvS1/_old 2021-02-16 22:41:28.722037876 +0100 +++ /var/tmp/diff_new_pack.zSjvS1/_new 2021-02-16 22:41:28.726037881 +0100 @@ -26,15 +26,14 @@ %bcond_without pidof %bcond_without nls Name: procps -Version: 3.3.16 +Version: 3.3.17 Release: 0 Summary: The ps utilities for /proc -#Alternate: https://gitlab.com/procps-ng/procps/repository/archive.tar.bz2?ref=v%{version} -#Also: http://gitorious.org/procps/ License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Monitoring -URL: http://sf.net/projects/procps-ng/ +URL: https://sf.net/projects/procps-ng/ Source: http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-%{version}.tar.xz +#Alternate: https://gitlab.com/procps-ng/procps/repository/archive.tar.bz2?ref=v%{version} Source1: procps-rpmlintrc Patch0: procps-ng-3.3.9-watch.patch Patch1: procps-v3.3.3-ia64.diff @@ -61,10 +60,6 @@ Patch32: procps-ng-3.3.10-errno.patch # PATCH-FEATURE-SUSE -- Let upstream pmap behave simialr to old suse pmap Patch33: procps-ng-3.3.11-pmap4suse.patch -# PATCH-FIX-UPSTREAM -- "ps -C" does not allow anymore an argument longer than 15 characters -Patch34: procps-ng-3e1c00d0.patch -Patch35: procps-check-sanity-of-SC_ARG_MAX.patch - BuildRequires: automake BuildRequires: dejagnu BuildRequires: diffutils @@ -74,24 +69,13 @@ BuildRequires: pkgconfig BuildRequires: screen BuildRequires: xz +BuildRequires: pkgconfig(libsystemd) Provides: ps = %{version}-%{release} Obsoletes: ps < %{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %ifarch ia64 x86_64 ppc64 ppc %{sparc} BuildRequires: libnuma-devel %endif -%if 0%{?suse_version} >= 1230 -BuildRequires: pkgconfig(libsystemd) -%endif -%if 0%{?suse_version} < 1230 -Requires(post): %fillup_prereq -Requires(post): %insserv_prereq -Requires(postun): %insserv_prereq -%endif - -%if %{with nls} %lang_package -%endif %description The procps package contains a set of system utilities that provide @@ -133,7 +117,7 @@ the process information pseudo-file system. %prep -%setup -q -n %{name}-ng-%{version} +%setup -q %patch0 %patch1 %patch3 -b .trcate @@ -143,10 +127,10 @@ %patch11 %patch12 %patch13 -b .column -%patch14 +%patch14 -b .ovrflw %patch15 %patch16 -%patch17 +%patch17 -b .sysctl %patch18 %patch19 %patch20 @@ -155,13 +139,8 @@ %patch31 -p1 %patch32 %patch33 -b .pmap4us -%patch34 -p1 -%patch35 -p1 %build -# -# -# test -s .tarball-version || echo %{version} > .tarball-version #./autogen.sh autoreconf -fiv @@ -183,7 +162,6 @@ --enable-watch8bit \ --enable-shared \ --enable-skill \ - --enable-oomem \ --enable-w-from \ --enable-sigwinch \ --enable-wide-percent \ @@ -191,14 +169,10 @@ --enable-w-from \ --enable-libselinux \ --with-pic=yes \ -%if 0%{?suse_version} > 1230 --with-systemd \ -%else - --without-systemd \ -%endif --with-gnu-ld \ --disable-modern-top -make %{?_smp_mflags} +%make_build LD_LIBRARY_PATH=$PWD/proc/.libs \ ./pmap $$ || { @@ -282,9 +256,9 @@ ln -s /bin/pkill %{buildroot}%{_bindir}/pkill ln -s /sbin/sysctl %{buildroot}%{_sbindir}/sysctl %endif -%if %{with nls} -%find_lang procps-ng -%endif + +%find_lang procps-ng --with-man --all-name +echo '%%dir %%{_mandir}/uk' >> procps-ng.lang %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig @@ -364,6 +338,7 @@ %{_bindir}/pidof %endif %{_bindir}/pmap +%{_bindir}/pwait %{_bindir}/pwdx %{_bindir}/skill %{_bindir}/slabtop @@ -373,26 +348,27 @@ %{_bindir}/vmstat %{_bindir}/w %{_bindir}/watch -%{_mandir}/man1/free.1%{ext_man} -%{_mandir}/man1/pgrep.1%{ext_man} +%{_mandir}/man1/free.1%{?ext_man} +%{_mandir}/man1/pgrep.1%{?ext_man} %if %{with pidof} -%{_mandir}/man1/pidof.1%{ext_man} +%{_mandir}/man1/pidof.1%{?ext_man} %endif -%{_mandir}/man1/pkill.1%{ext_man} -%{_mandir}/man1/pmap.1%{ext_man} -%{_mandir}/man1/procps.1%{ext_man} -%{_mandir}/man1/ps.1%{ext_man} -%{_mandir}/man1/pwdx.1%{ext_man} -%{_mandir}/man1/skill.1%{ext_man} -%{_mandir}/man1/slabtop.1%{ext_man} -%{_mandir}/man1/snice.1%{ext_man} -%{_mandir}/man1/tload.1%{ext_man} -%{_mandir}/man1/top.1%{ext_man} -%{_mandir}/man1/w.1%{ext_man} -%{_mandir}/man1/watch.1%{ext_man} -%{_mandir}/man5/sysctl.conf.5%{ext_man} -%{_mandir}/man8/vmstat.8%{ext_man} -%{_mandir}/man8/sysctl.8%{ext_man} +%{_mandir}/man1/pkill.1%{?ext_man} +%{_mandir}/man1/pmap.1%{?ext_man} +%{_mandir}/man1/procps.1%{?ext_man} +%{_mandir}/man1/ps.1%{?ext_man} +%{_mandir}/man1/pwait.1%{?ext_man} +%{_mandir}/man1/pwdx.1%{?ext_man} +%{_mandir}/man1/skill.1%{?ext_man} +%{_mandir}/man1/slabtop.1%{?ext_man} +%{_mandir}/man1/snice.1%{?ext_man} +%{_mandir}/man1/tload.1%{?ext_man} +%{_mandir}/man1/top.1%{?ext_man} +%{_mandir}/man1/w.1%{?ext_man} +%{_mandir}/man1/watch.1%{?ext_man} +%{_mandir}/man5/sysctl.conf.5%{?ext_man} +%{_mandir}/man8/vmstat.8%{?ext_man} +%{_mandir}/man8/sysctl.8%{?ext_man} %files devel %defattr (-,root,root,755) @@ -412,16 +388,14 @@ %{_includedir}/proc/whattime.h %{_libdir}/libprocps.so %{_libdir}/pkgconfig/libprocps.pc -%{_mandir}/man3/openproc.3%{ext_man} -%{_mandir}/man3/readproc.3%{ext_man} -%{_mandir}/man3/readproctab.3%{ext_man} +%{_mandir}/man3/openproc.3%{?ext_man} +%{_mandir}/man3/readproc.3%{?ext_man} +%{_mandir}/man3/readproctab.3%{?ext_man} %files -n %{libname} %defattr (-,root,root,755) %{_libdir}/libprocps.so.%{somajor}* -%if %{with nls} %files lang -f procps-ng.lang -%endif %changelog ++++++ procps-ng-3.3.10-integer-overflow.patch ++++++ --- /var/tmp/diff_new_pack.zSjvS1/_old 2021-02-16 22:41:28.778037944 +0100 +++ /var/tmp/diff_new_pack.zSjvS1/_new 2021-02-16 22:41:28.778037944 +0100 @@ -4,7 +4,7 @@ 2 files changed, 20 insertions(+), 4 deletions(-) --- free.c -+++ free.c 2018-04-04 11:29:36.599107898 +0000 ++++ free.c 2021-02-10 09:58:35.409695062 +0000 @@ -134,7 +134,7 @@ static const char *scale_size(unsigned l if (args.exponent > 1) { /* In desired scale. */ @@ -14,7 +14,7 @@ ); return buf; } -@@ -379,15 +379,28 @@ int main(int argc, char **argv) +@@ -381,15 +381,28 @@ int main(int argc, char **argv) * to print the high info, even if it is zero. */ if (flags & FREE_LOHI) { @@ -31,22 +31,22 @@ + else + kb_high_used = 0; + - printf("%-7s", _("Low:")); - printf(" %11s", scale_size(kb_low_total, flags, args)); + printf("%-9s", _("Low:")); + printf("%11s", scale_size(kb_low_total, flags, args)); - printf(" %11s", scale_size(kb_low_total - kb_low_free, flags, args)); + printf(" %11s", scale_size(kb_low_used, flags, args)); printf(" %11s", scale_size(kb_low_free, flags, args)); printf("\n"); - printf("%-7s", _("High:")); - printf(" %11s", scale_size(kb_high_total, flags, args)); + printf("%-9s", _("High:")); + printf("%11s", scale_size(kb_high_total, flags, args)); - printf(" %11s", scale_size(kb_high_total - kb_high_free, flags, args)); + printf(" %11s", scale_size(kb_high_used, flags, args)); printf(" %11s", scale_size(kb_high_free, flags, args)); printf("\n"); } --- proc/sysinfo.c -+++ proc/sysinfo.c 2018-04-04 11:17:32.480409601 +0000 ++++ proc/sysinfo.c 2021-02-10 10:00:35.227385913 +0000 @@ -783,7 +783,10 @@ nextline: kb_main_cached = kb_page_cache + kb_slab_reclaimable; if ((ev=getenv("PS_FULL_CACHE"))) ++++++ procps-ng-3.3.10-large_pcpu.patch ++++++ --- /var/tmp/diff_new_pack.zSjvS1/_old 2021-02-16 22:41:28.794037963 +0100 +++ /var/tmp/diff_new_pack.zSjvS1/_new 2021-02-16 22:41:28.794037963 +0100 @@ -4,7 +4,7 @@ --- top/top.c +++ top/top.c 2018-04-04 12:09:16.087193018 +0000 -@@ -2379,7 +2379,11 @@ static void zap_fieldstab (void) { +@@ -2404,7 +2404,11 @@ static void zap_fieldstab (void) { Cpu_pmax = 99.9; if (Rc.mode_irixps && smp_num_cpus > 1 && !Thread_mode) { Cpu_pmax = 100.0 * smp_num_cpus; ++++++ procps-ng-3.3.16.tar.xz -> procps-ng-3.3.17.tar.xz ++++++ ++++ 185924 lines of diff (skipped) ++++++ procps-ng-3.3.8-accuracy.dif ++++++ --- /var/tmp/diff_new_pack.zSjvS1/_old 2021-02-16 22:41:29.338038615 +0100 +++ /var/tmp/diff_new_pack.zSjvS1/_new 2021-02-16 22:41:29.338038615 +0100 @@ -6,7 +6,7 @@ --- ps/common.h +++ ps/common.h 2018-04-04 11:14:33.915688098 +0000 -@@ -302,6 +302,7 @@ extern int running_only; +@@ -303,6 +303,7 @@ extern int running_only; extern int screen_cols; extern int screen_rows; extern time_t seconds_since_boot; ++++++ procps-ng-3.3.8-bnc634840.patch ++++++ --- /var/tmp/diff_new_pack.zSjvS1/_old 2021-02-16 22:41:29.346038624 +0100 +++ /var/tmp/diff_new_pack.zSjvS1/_new 2021-02-16 22:41:29.350038629 +0100 @@ -12,7 +12,7 @@ --- top/top.c +++ top/top.c 2018-04-04 11:33:59.278280201 +0000 -@@ -3663,7 +3663,13 @@ static void before (char *me) { +@@ -3691,7 +3691,13 @@ static void before (char *me) { sa.sa_flags = 0; for (i = SIGRTMAX; i; i--) { switch (i) { ++++++ procps-ng-3.3.8-petabytes.patch ++++++ --- /var/tmp/diff_new_pack.zSjvS1/_old 2021-02-16 22:41:29.362038644 +0100 +++ /var/tmp/diff_new_pack.zSjvS1/_new 2021-02-16 22:41:29.362038644 +0100 @@ -4,7 +4,7 @@ --- top/top.c +++ top/top.c 2018-04-04 11:49:56.472660056 +0000 -@@ -1607,9 +1607,9 @@ static inline const char *make_str_utf8 +@@ -1626,9 +1626,9 @@ static inline const char *make_str_utf8 static const char *scale_mem (int target, unsigned long num, int width, int justr) { // SK_Kb SK_Mb SK_Gb SK_Tb SK_Pb SK_Eb #ifdef BOOST_MEMORY @@ -16,7 +16,7 @@ #endif static char buf[SMLBUFSIZ]; float scaled_num; -@@ -1621,7 +1621,7 @@ static const char *scale_mem (int target +@@ -1640,7 +1640,7 @@ static const char *scale_mem (int target goto end_justifies; scaled_num = num; ++++++ procps-ng-3.3.8-tinfo.dif ++++++ --- /var/tmp/diff_new_pack.zSjvS1/_old 2021-02-16 22:41:29.378038663 +0100 +++ /var/tmp/diff_new_pack.zSjvS1/_new 2021-02-16 22:41:29.378038663 +0100 @@ -5,7 +5,7 @@ --- Makefile.am +++ Makefile.am 2018-04-04 12:28:14.937957527 +0000 -@@ -164,7 +164,7 @@ else +@@ -171,7 +171,7 @@ else slabtop_LDADD = $(LDADD) @NCURSES_LIBS@ endif @@ -16,7 +16,7 @@ if BUILD_SKILL --- configure.ac +++ configure.ac 2018-04-04 12:29:23.364676155 +0000 -@@ -169,8 +169,16 @@ else +@@ -194,8 +194,16 @@ else else WATCH_NCURSES_LIBS="$NCURSES_LIBS" fi ++++++ procps-ng-3.3.9-w-notruncate.diff ++++++ --- /var/tmp/diff_new_pack.zSjvS1/_old 2021-02-16 22:41:29.390038677 +0100 +++ /var/tmp/diff_new_pack.zSjvS1/_new 2021-02-16 22:41:29.390038677 +0100 @@ -4,8 +4,8 @@ 2 files changed, 18 insertions(+), 3 deletions(-) --- w.1 -+++ w.1 2018-06-05 07:04:14.040265663 +0000 -@@ -36,6 +36,9 @@ and a "w \-u". ++++ w.1 2021-02-10 09:47:10.894888530 +0000 +@@ -40,6 +40,9 @@ and a \fB\-s\fR, \fB\-\-short\fR Use the short format. Don't print the login time, JCPU or PCPU times. .TP @@ -16,8 +16,8 @@ Toggle printing the .B from --- w.c -+++ w.c 2018-06-05 07:04:14.040265663 +0000 -@@ -379,7 +379,7 @@ static const proc_t *getproc(const utmp_ ++++ w.c 2021-02-10 09:51:09.750284453 +0000 +@@ -394,7 +394,7 @@ static const proc_t *getproc(const utmp_ } static void showinfo(utmp_t * u, int formtype, int maxcmd, int from, @@ -26,7 +26,7 @@ { unsigned long long jcpu; int ut_pid_found; -@@ -409,7 +409,13 @@ static void showinfo(utmp_t * u, int for +@@ -424,7 +424,13 @@ static void showinfo(utmp_t * u, int for strncpy(uname, u->ut_user, UT_NAMESIZE); if (formtype) { @@ -40,8 +40,8 @@ + 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); -@@ -459,6 +465,7 @@ static void __attribute__ ((__noreturn__ + #ifdef HAVE_UTMPX_H +@@ -478,6 +484,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); @@ -49,7 +49,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); -@@ -495,6 +502,7 @@ int main(int argc, char **argv) +@@ -514,6 +521,7 @@ int main(int argc, char **argv) {"no-header", no_argument, NULL, 'h'}, {"no-current", no_argument, NULL, 'u'}, {"short", no_argument, NULL, 's'}, @@ -57,7 +57,7 @@ {"from", no_argument, NULL, 'f'}, {"old-style", no_argument, NULL, 'o'}, {"ip-addr", no_argument, NULL, 'i'}, -@@ -516,7 +524,7 @@ int main(int argc, char **argv) +@@ -535,7 +543,7 @@ int main(int argc, char **argv) #endif while ((ch = @@ -66,7 +66,7 @@ switch (ch) { case 'h': header = 0; -@@ -527,6 +535,10 @@ int main(int argc, char **argv) +@@ -546,6 +554,10 @@ int main(int argc, char **argv) case 's': longform = 0; break; ++++++ procps-v3.3.3-read-sysctls-also-from-boot-sysctl.conf-kernelversion.diff ++++++ --- /var/tmp/diff_new_pack.zSjvS1/_old 2021-02-16 22:41:29.426038720 +0100 +++ /var/tmp/diff_new_pack.zSjvS1/_new 2021-02-16 22:41:29.426038720 +0100 @@ -4,18 +4,18 @@ 2 files changed, 14 insertions(+) --- sysctl.8 -+++ sysctl.8 2018-04-04 11:38:10.173667994 +0000 ++++ sysctl.8 2021-02-10 10:05:27.781748090 +0000 @@ -81,6 +81,8 @@ directories in the following list in giv Once a file of a given filename is loaded, any file of the same name in subsequent directories is ignored. .br +/boot/sysctl.conf-<kernelversion> +.br - /run/sysctl.d/*.conf - .br /etc/sysctl.d/*.conf + .br + /run/sysctl.d/*.conf --- sysctl.c -+++ sysctl.c 2018-04-04 11:36:32.515463365 +0000 ++++ sysctl.c 2021-02-10 10:04:25.290952318 +0000 @@ -39,6 +39,7 @@ #include <string.h> #include <sys/stat.h> @@ -30,8 +30,8 @@ unsigned di, i; + struct utsname uts; const char *dirs[] = { - "/run/sysctl.d", "/etc/sysctl.d", + "/run/sysctl.d", @@ -685,6 +687,16 @@ static int PreloadSystem(void) } qsort(cfgs, ncfgs, sizeof(struct cfg *), sortpairs);
