Hello community, here is the log from the commit of package procps for openSUSE:Factory checked in at 2017-07-12 19:30:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/procps (Old) and /work/SRC/openSUSE:Factory/.procps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "procps" Wed Jul 12 19:30:11 2017 rev:105 rq:508477 version:3.3.12 Changes: -------- --- /work/SRC/openSUSE:Factory/procps/procps.changes 2017-07-04 11:53:01.618689313 +0200 +++ /work/SRC/openSUSE:Factory/.procps.new/procps.changes 2017-07-12 19:30:14.169210096 +0200 @@ -1,0 +2,8 @@ +Thu Jul 6 09:13:36 UTC 2017 - [email protected] + +- Add patch procps-ng-3.3.12-sysctl-iobuf.patch to increase I/O + buffer for reading and writing values below /proc/sys (bsc#1039941) +- Add patch procps-ng-3.3.12-stable_secret.patch to avoid messages + on unset /proc/sys/net/ipv6/conf/*/stable_secret due EIO + +------------------------------------------------------------------- New: ---- procps-ng-3.3.12-stable_secret.patch procps-ng-3.3.12-sysctl-iobuf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procps.spec ++++++ --- /var/tmp/diff_new_pack.9xSnMU/_old 2017-07-12 19:30:16.272913275 +0200 +++ /var/tmp/diff_new_pack.9xSnMU/_new 2017-07-12 19:30:16.272913275 +0200 @@ -26,7 +26,7 @@ Summary: The ps utilities for /proc #Alternate: https://gitlab.com/procps-ng/procps/repository/archive.tar.bz2?ref=v3.3.12 #Also: http://gitorious.org/procps/ -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0+ and LGPL-2.1+ Group: System/Monitoring Url: http://sf.net/projects/procps-ng/ Source: http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-3.3.12.tar.xz @@ -61,6 +61,10 @@ Patch33: procps-ng-3.3.11-pmap4suse.patch # PATCH-FIX-UPSTREAM -- Allow content lines below /proc/sys longer than 1024 characters Patch34: procps-ng-3.3.12-sysctl-a.patch +# PATCH-ENHANCE-SUSE -- Increase buffer on reading/writing /proc/sys values +Patch35: procps-ng-3.3.12-sysctl-iobuf.patch +# PATCH-FIX-SUSE -- Ignore EIO on reading unset value of e.g. /proc/sys/net/ipv6/conf/all/stable_secret +Patch36: procps-ng-3.3.12-stable_secret.patch BuildRequires: automake BuildRequires: dejagnu BuildRequires: libselinux-devel @@ -104,7 +108,7 @@ %package devel Summary: Include Files and Libraries mandatory for Development -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0+ and LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: %{libname} = %{version} @@ -147,6 +151,8 @@ %patch32 %patch33 %patch34 +%patch35 +%patch36 %build # ++++++ procps-ng-3.3.12-stable_secret.patch ++++++ --- sysctl.c | 6 ++++++ 1 file changed, 6 insertions(+) --- sysctl.c +++ sysctl.c 2017-07-06 09:23:55.635379302 +0000 @@ -239,6 +239,9 @@ static int ReadSetting(const char *restr xwarnx(_("permission denied on key '%s'"), outname); rc = -1; break; + case EIO: /* Ignore stable_secret below /proc/sys/net/ipv6/conf */ + rc = -1; + break; default: xwarn(_("reading key \"%s\""), outname); rc = -1; @@ -288,6 +291,9 @@ static int ReadSetting(const char *restr rc = DisplayAll(tmpname); goto out; } + case EIO: /* Ignore stable_secret below /proc/sys/net/ipv6/conf */ + rc = -1; + break; default: xwarnx(_("reading key \"%s\""), outname); rc = -1; ++++++ procps-ng-3.3.12-sysctl-a.patch ++++++ --- /var/tmp/diff_new_pack.9xSnMU/_old 2017-07-12 19:30:16.352901989 +0200 +++ /var/tmp/diff_new_pack.9xSnMU/_new 2017-07-12 19:30:16.352901989 +0200 @@ -9,14 +9,12 @@ Signed-off-by: Werner Fink <[email protected]> --- - sysctl.c | 42 ++++++++++++++++++++++++------------------ + sysctl.c | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) -diff --git sysctl.c sysctl.c -index c3072a1..29f31af 100644 --- sysctl.c -+++ sysctl.c -@@ -209,8 +209,13 @@ static int ReadSetting(const char *restrict const name) ++++ sysctl.c 2017-07-06 08:11:02.011136954 +0000 +@@ -211,8 +211,13 @@ static int ReadSetting(const char *restr } if (pattern && !pattern_match(outname, pattern)) { @@ -32,7 +30,7 @@ } fp = fopen(tmpname, "r"); -@@ -239,24 +244,25 @@ static int ReadSetting(const char *restrict const name) +@@ -241,24 +246,25 @@ static int ReadSetting(const char *restr * /sbin/sysctl -a | egrep -6 dev.cdrom.info */ do { @@ -74,6 +72,3 @@ } } while (fgets(inbuf, sizeof inbuf - 1, fp)); } else { --- -2.12.0 - ++++++ procps-ng-3.3.12-sysctl-iobuf.patch ++++++ --- sysctl.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- sysctl.c +++ sysctl.c 2017-07-06 09:35:09.128849737 +0000 @@ -160,6 +160,8 @@ static char *StripLeadingAndTrailingSpac /* * Read a sysctl setting */ +#define IOBUFSIZ (128<<10) +static char *iobuf; static int ReadSetting(const char *restrict const name) { int rc = 0; @@ -222,6 +224,9 @@ static int ReadSetting(const char *restr fp = fopen(tmpname, "r"); + if (iobuf) + setvbuf(fp, iobuf, _IOFBF, IOBUFSIZ); + if (!fp) { switch (errno) { case ENOENT: @@ -432,6 +437,9 @@ static int WriteSetting(const char *sett fp = fopen(tmpname, "w"); + if (iobuf) + setvbuf(fp, iobuf, _IOFBF, IOBUFSIZ); + if (!fp) { switch (errno) { case ENOENT: @@ -806,6 +814,8 @@ int main(int argc, char *argv[]) argc -= optind; argv += optind; + iobuf = (char*)malloc(IOBUFSIZ); /* Allow to fail */ + if (DisplayAllOpt) return DisplayAll(PROC_PATH);
