Compare commits

...

No commits in common. "c8" and "c9s" have entirely different histories.
c8 ... c9s

12 changed files with 41 additions and 70 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/ncompress-4.2.4.4.tar.gz
/ncompress-4.2.4.4.tar.gz

View File

@ -1 +0,0 @@
5f43cc6cfe5f70a8a58fdcf0fc40f4ab2168ee2f SOURCES/ncompress-4.2.4.4.tar.gz

View File

@ -1,55 +0,0 @@
From 14d486afed1a1c5ef5ad14f92e52537e6aa68aad Mon Sep 17 00:00:00 2001
From: Ondrej Dubaj <odubaj@redhat.com>
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

View File

@ -1,9 +1,8 @@
Summary: Fast compression and decompression utilities
Name: ncompress
Version: 4.2.4.4
Release: 13%{?dist}
Release: 21%{?dist}
License: Public Domain
Group: Applications/File
URL: http://ncompress.sourceforge.net/
Source: http://prdownloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
@ -38,11 +37,8 @@ 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: make
BuildRequires: gcc
BuildRequires: glibc-devel
%description
@ -55,6 +51,7 @@ compressed files.
Install ncompress if you need compression/decompression utilities
which are compatible with the original UNIX compress utility.
%prep
%setup -q
@ -78,11 +75,12 @@ 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}"
%install
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
@ -91,15 +89,43 @@ ln -sf compress $RPM_BUILD_ROOT/%{_bindir}/uncompress
install -p -m644 compress.1 $RPM_BUILD_ROOT%{_mandir}/man1
ln -sf compress.1 $RPM_BUILD_ROOT%{_mandir}/man1/uncompress.1
%files
%{_bindir}/compress
%{_bindir}/uncompress
%{_mandir}/man1/*
%doc LZW.INFO README
%changelog
* Wed May 06 2020 Ondrej Dubaj <odubaj@redhat.com> - 4.2.4.4-13
- Fixed exit code return when error is ignored (#1830869)
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.2.4.4-21
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.2.4.4-20
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.4.4-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.4.4-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.4.4-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.4.4-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.4.4-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 20 2018 Pavel Raiskup <praiskup@redhat.com> - 4.2.4.4-14
- fix FTBFS (missing gcc), rhbz#1604928
- cleanup rpmlint issues
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.4.4-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sat Feb 24 2018 Florian Weimer <fweimer@redhat.com> - 4.2.4.4-12
- Use LDFLAGS from redhat-rpm-config
@ -207,7 +233,7 @@ ln -sf compress.1 $RPM_BUILD_ROOT%{_mandir}/man1/uncompress.1
* Fri Mar 18 2005 Peter Vrabec <pvrabec@redhat.com>
- rebuilt
* Thu Feb 08 2005 Peter Vrabec <pvrabec@redhat.com>
* Thu Feb 10 2005 Peter Vrabec <pvrabec@redhat.com>
- rebuilt
* Tue Oct 05 2004 Than Ngo <than@redhat.com> 4.2.4-40
@ -279,7 +305,7 @@ ln -sf compress.1 $RPM_BUILD_ROOT%{_mandir}/man1/uncompress.1
- update URL
- use %%{_mandir}
* Wed May 5 2000 Bill Nottingham <notting@redhat.com>
* Fri May 5 2000 Bill Nottingham <notting@redhat.com>
- fix "build" for ia64
* Mon Feb 7 2000 Bill Nottingham <notting@redhat.com>
@ -298,7 +324,7 @@ ln -sf compress.1 $RPM_BUILD_ROOT%{_mandir}/man1/uncompress.1
* Mon Apr 27 1998 Prospector System <bugs@redhat.com>
- translations modified for de, fr, tr
* Wed Oct 21 1997 Cristian Gafton <gafton@redhat.com>
* Wed Oct 22 1997 Cristian Gafton <gafton@redhat.com>
- fixed the spec file
* Mon Jun 02 1997 Erik Troan <ewt@redhat.com>

1
sources Normal file
View File

@ -0,0 +1 @@
4be215caacf3d082bfe24cfdbaba538e ncompress-4.2.4.4.tar.gz