diff --git a/SOURCES/ncompress-4.2.4.4-exit-code-ignored.patch b/SOURCES/ncompress-4.2.4.4-exit-code-ignored.patch new file mode 100644 index 0000000..2fffb02 --- /dev/null +++ b/SOURCES/ncompress-4.2.4.4-exit-code-ignored.patch @@ -0,0 +1,55 @@ +From 14d486afed1a1c5ef5ad14f92e52537e6aa68aad Mon Sep 17 00:00:00 2001 +From: Ondrej Dubaj +Date: Wed, 6 May 2020 13:23:42 +0200 +Subject: [PATCH] Do not set exit_code when an error is ignored + +--- + compress42.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/compress42.c b/compress42.c +index 834c2f2..3dd3d19 100644 +--- a/compress42.c ++++ b/compress42.c +@@ -1193,7 +1193,6 @@ comprexx(fileptr) + { + fprintf(stderr, "\nunlink error (ignored) "); + perror(ofname); +- exit_code = 1; + } + + remove_ofname = 0; +@@ -1241,7 +1240,6 @@ comprexx(fileptr) + { + fprintf(stderr, "\nutime error (ignored) "); + perror(ofname); +- exit_code = 1; + } + + #ifndef AMIGA +@@ -1249,14 +1247,12 @@ comprexx(fileptr) + { + fprintf(stderr, "\nchmod error (ignored) "); + perror(ofname); +- exit_code = 1; + } + #ifndef DOS + if (chown(ofname, infstat.st_uid, infstat.st_gid)) /* Copy ownership */ + { + fprintf(stderr, "\nchown error (ignored) "); + perror(ofname); +- exit_code = 1; + } + #endif + #endif +@@ -1266,7 +1262,6 @@ comprexx(fileptr) + { + fprintf(stderr, "\nunlink error (ignored) "); + perror(ifname); +- exit_code = 1; + } + } + } +-- +2.24.1 + diff --git a/SPECS/ncompress.spec b/SPECS/ncompress.spec index af360ac..3010586 100644 --- a/SPECS/ncompress.spec +++ b/SPECS/ncompress.spec @@ -1,7 +1,7 @@ Summary: Fast compression and decompression utilities Name: ncompress Version: 4.2.4.4 -Release: 12%{?dist} +Release: 13%{?dist} License: Public Domain Group: Applications/File URL: http://ncompress.sourceforge.net/ @@ -38,6 +38,11 @@ Patch5: ncompress-4.2.4.4-memmove.patch # ~> downstream Patch6: ncompress-4.2.4.4-silence-gcc.patch +# do not set exit_code when an error is ignored +# ~> #1830869 +# ~> upstream (pkubat) +Patch7: ncompress-4.2.4.4-exit-code-ignored.patch + BuildRequires: glibc-devel %description @@ -73,6 +78,7 @@ sed "s/\$(ARCH_FLAGS)/$ARCH_FLAGS/" Makefile.def > Makefile %patch4 -p1 -b .endians %patch5 -p1 -b .memmove %patch6 -p1 -b .silence-gcc +%patch7 -p1 -b .exit-code-ignored %build make CFLAGS="%{optflags} %{?nc_endian} %{?nc_align} %{build_ldflags}" @@ -92,6 +98,9 @@ ln -sf compress.1 $RPM_BUILD_ROOT%{_mandir}/man1/uncompress.1 %doc LZW.INFO README %changelog +* Wed May 06 2020 Ondrej Dubaj - 4.2.4.4-13 +- Fixed exit code return when error is ignored (#1830869) + * Sat Feb 24 2018 Florian Weimer - 4.2.4.4-12 - Use LDFLAGS from redhat-rpm-config