From a0c14c7d1ffa82849b3a5c1b07639903846f4748 Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Mon, 17 Jun 2013 18:56:54 +0200 Subject: [PATCH 1/4] Enabling skill and snice (#974752) --- procps-ng.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/procps-ng.spec b/procps-ng.spec index 3ceab9f..f1be8ec 100644 --- a/procps-ng.spec +++ b/procps-ng.spec @@ -3,7 +3,7 @@ Summary: System and process monitoring utilities Name: procps-ng Version: 3.3.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://sourceforge.net/projects/procps-ng/ @@ -88,7 +88,8 @@ autoreconf --verbose --force --install --disable-static \ --disable-w-from \ --disable-kill \ - --disable-rpath + --disable-rpath \ + --enable-skill make CFLAGS="%{optflags}" @@ -131,6 +132,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/sysctl.d %{_includedir}/proc %changelog +* Mon Jun 17 2013 Jaromir Capik - 3.3.7-4 +- Enabling skill and snice (#974752) + * Tue Apr 16 2013 Jaromir Capik - 3.3.7-3 - Avoid segfaults when reading zero bytes - file2str (#951391) From a404c9e4c0b2a4383e5b9702ef9fa4c8316c73ed Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Tue, 25 Jun 2013 19:53:50 +0200 Subject: [PATCH 2/4] Enabling UTF-8 in watch --- procps-ng.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/procps-ng.spec b/procps-ng.spec index f1be8ec..c02e53e 100644 --- a/procps-ng.spec +++ b/procps-ng.spec @@ -3,7 +3,7 @@ Summary: System and process monitoring utilities Name: procps-ng Version: 3.3.7 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://sourceforge.net/projects/procps-ng/ @@ -89,6 +89,7 @@ autoreconf --verbose --force --install --disable-w-from \ --disable-kill \ --disable-rpath \ + --enable-watch8bit \ --enable-skill @@ -132,6 +133,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/sysctl.d %{_includedir}/proc %changelog +* Tue Jun 25 2013 Jaromir Capik - 3.3.7-5 +- Enabling UTF-8 in watch + * Mon Jun 17 2013 Jaromir Capik - 3.3.7-4 - Enabling skill and snice (#974752) From c0b21bcd1de1995d470d396a08cb26093fd4f8f1 Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Wed, 26 Jun 2013 12:58:39 +0200 Subject: [PATCH 3/4] Disabling tests - unsuitable for running on buildsystems --- procps-ng.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/procps-ng.spec b/procps-ng.spec index c02e53e..c382637 100644 --- a/procps-ng.spec +++ b/procps-ng.spec @@ -1,4 +1,5 @@ -%global tests_enabled 1 +# testsuite is unsuitable for running on buildsystems +%global tests_enabled 0 Summary: System and process monitoring utilities Name: procps-ng @@ -135,6 +136,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/sysctl.d %changelog * Tue Jun 25 2013 Jaromir Capik - 3.3.7-5 - Enabling UTF-8 in watch +- Disabling tests - unsuitable for running on buildsystems * Mon Jun 17 2013 Jaromir Capik - 3.3.7-4 - Enabling skill and snice (#974752) From 2fda39079bf0ca5cc9be631ac2fbb52de9283d7b Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Wed, 26 Jun 2013 18:30:26 +0200 Subject: [PATCH 4/4] Avoiding "write error" messages when piping to grep (#976199) --- ...exit-support-fix-fileutils-for-EPIPE.patch | 42 +++++++++++++++++++ procps-ng.spec | 7 +++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 0002-library-for-atexit-support-fix-fileutils-for-EPIPE.patch diff --git a/0002-library-for-atexit-support-fix-fileutils-for-EPIPE.patch b/0002-library-for-atexit-support-fix-fileutils-for-EPIPE.patch new file mode 100644 index 0000000..da8de50 --- /dev/null +++ b/0002-library-for-atexit-support-fix-fileutils-for-EPIPE.patch @@ -0,0 +1,42 @@ +From b1f06bdcc9e02f7dbaf1161ad6231c45ea3f9d88 Mon Sep 17 00:00:00 2001 +From: Jim Warner +Date: Tue, 25 Jun 2013 00:00:00 -0500 +Subject: [PATCH 2/2] library: for atexit() support, fix fileutils for EPIPE + +When fileutils with stream error checking was borrowed +from GNU lib, an omission was also propagated where an +errno of EPIPE wouldn't be preserved in close_stream() +making a test for EPIPE in close_stdout() meaningless. + +This patch corrects such oversight so that an errno of +EPIPE no longer produces 'write error' at program end. + +( gnulib provides for optionally ignoring EPIPE, but ) +( if a program chooses to ignore it, then their code ) +( appears to suffer from this close_stream oversight ) + +Reference(s): +. original fileutilis addition +commit c7cf98b0e03780f78abe5275c6fb282f71a2369f +. bugzilla report +https://bugzilla.redhat.com/show_bug.cgi?id=976199 +--- + lib/fileutils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/fileutils.c b/lib/fileutils.c +index a9ef2ff..1ade3d8 100644 +--- a/lib/fileutils.c ++++ b/lib/fileutils.c +@@ -24,7 +24,7 @@ int close_stream(FILE * stream) + const int prev_fail = (ferror(stream) != 0); + const int fclose_fail = (fclose(stream) != 0); + if (prev_fail || (fclose_fail && (some_pending || errno != EBADF))) { +- if (!fclose_fail) ++ if (!fclose_fail && errno != EPIPE) + errno = 0; + return EOF; + } +-- +1.8.1.2 + diff --git a/procps-ng.spec b/procps-ng.spec index c382637..51d1e95 100644 --- a/procps-ng.spec +++ b/procps-ng.spec @@ -4,7 +4,7 @@ Summary: System and process monitoring utilities Name: procps-ng Version: 3.3.7 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ and LGPLv2+ Group: Applications/System URL: https://sourceforge.net/projects/procps-ng/ @@ -13,6 +13,7 @@ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz Patch0: procps-ng-3.3.7-testsuite-reverting-bogus-commit-unix-exp.patch Patch1: procps-ng-3.3.7-segv-file2str-read-zero-bytes.patch +Patch2: 0002-library-for-atexit-support-fix-fileutils-for-EPIPE.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -70,6 +71,7 @@ System and process monitoring utilities development headers %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build # The following stuff is needed for git archives only @@ -134,6 +136,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/sysctl.d %{_includedir}/proc %changelog +* Wed Jun 26 2013 Jaromir Capik - 3.3.7-6 +- Avoiding "write error" messages when piping to grep (#976199) + * Tue Jun 25 2013 Jaromir Capik - 3.3.7-5 - Enabling UTF-8 in watch - Disabling tests - unsuitable for running on buildsystems