Add ncompress package and remove conflicting file from gzip (#957)

This commit is contained in:
Thomas Crain 2021-05-19 16:23:00 -07:00 коммит произвёл GitHub
Родитель be148421e7
Коммит 7510ea05f9
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
10 изменённых файлов: 110 добавлений и 23 удалений

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Просмотреть файл

@ -156,6 +156,7 @@
"moby-engine",
"moby-runc",
"msgpack",
"ncompress",
"nlohmann-json",
"nmap",
"ntopng",

Просмотреть файл

@ -1,14 +1,13 @@
Summary: Programs for compressing and decompressing files
Name: gzip
Version: 1.9
Release: 5%{?dist}
Release: 6%{?dist}
License: GPLv3+
URL: http://www.gnu.org/software/gzip
Group: Applications/File
Vendor: Microsoft Corporation
Distribution: Mariner
Source0: http://ftp.gnu.org/gnu/gzip/%{name}-%{version}.tar.xz
Group: Applications/File
URL: https://www.gnu.org/software/gzip
Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
%if %{with_check}
BuildRequires: less
%endif
@ -16,8 +15,10 @@ BuildRequires: less
%description
The Gzip package contains programs for compressing and
decompressing files.
%prep
%setup -q
%build
#make some fixes required by glibc-2.28:
sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c
@ -25,11 +26,16 @@ echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h
%configure --disable-silent-rules
make %{?_smp_mflags}
%install
make DESTDIR=%{buildroot} install
install -vdm 755 %{buildroot}%{_bindir}
rm -rf %{buildroot}%{_infodir}
# In most distros, the "uncompress" name is shipped as part of ncompress
# This an alias to gunzip
rm -f %{buildroot}%{_bindir}/uncompress
%check
make %{?_smp_mflags} check
@ -40,21 +46,35 @@ make %{?_smp_mflags} check
%{_mandir}/*/*
%changelog
* Tue Oct 20 2020 Andrew Phelps <anphel@microsoft.com> 1.9-5
* Mon May 17 2021 Thomas Crain <thcrain@microsoft.com> - 1.9-6
- Stop packaging 'uncompress' binary alias
- Lint spec
- Update URLs to secure variants
- License verified
* Tue Oct 20 2020 Andrew Phelps <anphel@microsoft.com> - 1.9-5
- Fix check test
* Sat May 09 00:21:13 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.9-4
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 1.9-4
- Added %%license line automatically
* Fri Mar 03 2020 Jon Slobodzian <joslobo@microsoft.com> 1.9-3
* Fri Mar 03 2020 Jon Slobodzian <joslobo@microsoft.com> - 1.9-3
- Fixed reference URL. Verified license.
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 1.9-2
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> - 1.9-2
- Initial CBL-Mariner import from Photon (license: Apache2).
* Wed Sep 12 2018 Anish Swaminathan <anishs@vmware.com> 1.9-1
* Wed Sep 12 2018 Anish Swaminathan <anishs@vmware.com> - 1.9-1
- Update to version 1.9
* Sat Sep 08 2018 Alexey Makhalov <amakhalov@vmware.com> 1.8-2
* Sat Sep 08 2018 Alexey Makhalov <amakhalov@vmware.com> - 1.8-2
- Fix compilation issue against glibc-2.28
* Fri Mar 24 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.8-1
* Fri Mar 24 2017 Dheeraj Shetty <dheerajs@vmware.com> - 1.8-1
- Upgrading to version 1.8
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.6-2
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> - 1.6-2
- GA - Bump release of all rpms
* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 1.6-1
- Initial build. First version
* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> - 1.6-1
- Initial build. First version

Просмотреть файл

@ -0,0 +1,5 @@
{
"Signatures": {
"ncompress-5.0.tar.gz": "96ec931d06ab827fccad377839bfb91955274568392ddecf809e443443aead46"
}
}

Просмотреть файл

@ -0,0 +1,51 @@
Summary: A fast, simple LZW file compressor
Name: ncompress
Version: 5.0
Release: 1%{?dist}
License: Unlicense
Vendor: Microsoft Corporation
Distribution: Mariner
URL: https://github.com/vapier/ncompress
#Source0: https://github.com/vapier/%{name}/archive/v%{version}.tar.gz
Source0: %{name}-%{version}.tar.gz
BuildRequires: gcc
BuildRequires: glibc-devel
BuildRequires: make
%description
This is (N)compress. It is an improved version of compress 4.1.
Compress is a fast, simple LZW file compressor. Compress does not have the highest compression rate,
but it is one of the fastest programs to compress data. Compress is the defacto standard in the UNIX
community for compressing files. (N)compress 4.2 introduced a special, fast compression hash algorithm.
This algorithm uses more memory than the old hash table. If you don't want the faster hash table algorithm
et 'Memory free for compress' below 800000. Starting with compress 3.0, the output format changed in a
backwards incompatible way. This is not a big deal as compress 3.0 was first released in Jan 1985, while
the first release of compress was available less than a year prior. There shouldn't be any need to produce
files that only older versions of compress would accept. Newer versions of compress are still able to
handle the output of older versions though -- i.e. compress 3.0+ is able to decompress files produced
by compress 2.0 and older.
%prep
%autosetup
%build
%make_build
%install
make PREFIX=%{_prefix} DESTDIR=%{buildroot} install_core
# %%check
# As of v5.0, this package does not have a test section
%files
%defattr(-,root,root)
%license UNLICENSE LZW.INFO
%{_bindir}/compress
%{_bindir}/uncompress
%{_mandir}/man1/*
%changelog
* Mon May 17 2021 Thomas Crain <thcrain@microsoft.com> - 5.0-1
- Original version for CBL-Mariner

Просмотреть файл

@ -1786,7 +1786,7 @@
"other": {
"name": "gzip",
"version": "1.9",
"downloadUrl": "http://ftp.gnu.org/gnu/gzip/gzip-1.9.tar.xz"
"downloadUrl": "https://ftp.gnu.org/gnu/gzip/gzip-1.9.tar.xz"
}
}
},
@ -3740,6 +3740,16 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "ncompress",
"version": "5.0",
"downloadUrl": "https://github.com/vapier/ncompress/archive/v5.0.tar.gz"
}
}
},
{
"component": {
"type": "other",

Просмотреть файл

@ -60,7 +60,7 @@ gawk-4.2.1-4.cm1.aarch64.rpm
findutils-4.6.0-7.cm1.aarch64.rpm
findutils-lang-4.6.0-7.cm1.aarch64.rpm
gettext-0.21-1.cm1.aarch64.rpm
gzip-1.9-5.cm1.aarch64.rpm
gzip-1.9-6.cm1.aarch64.rpm
make-4.2.1-5.cm1.aarch64.rpm
mariner-release-1.0-16.cm1.noarch.rpm
patch-2.7.6-7.cm1.aarch64.rpm

Просмотреть файл

@ -60,7 +60,7 @@ gawk-4.2.1-4.cm1.x86_64.rpm
findutils-4.6.0-7.cm1.x86_64.rpm
findutils-lang-4.6.0-7.cm1.x86_64.rpm
gettext-0.21-1.cm1.x86_64.rpm
gzip-1.9-5.cm1.x86_64.rpm
gzip-1.9-6.cm1.x86_64.rpm
make-4.2.1-5.cm1.x86_64.rpm
mariner-release-1.0-16.cm1.noarch.rpm
patch-2.7.6-7.cm1.x86_64.rpm

Просмотреть файл

@ -142,8 +142,8 @@ gtest-debuginfo-1.8.1-5.cm1.aarch64.rpm
gtest-devel-1.8.1-5.cm1.aarch64.rpm
gtest-static-1.8.1-5.cm1.aarch64.rpm
gtk-doc-1.29-6.cm1.noarch.rpm
gzip-1.9-5.cm1.aarch64.rpm
gzip-debuginfo-1.9-5.cm1.aarch64.rpm
gzip-1.9-6.cm1.aarch64.rpm
gzip-debuginfo-1.9-6.cm1.aarch64.rpm
integritysetup-2.3.3-2.cm1.aarch64.rpm
intltool-0.51.0-7.cm1.noarch.rpm
itstool-2.0.6-3.cm1.noarch.rpm

Просмотреть файл

@ -142,8 +142,8 @@ gtest-debuginfo-1.8.1-5.cm1.x86_64.rpm
gtest-devel-1.8.1-5.cm1.x86_64.rpm
gtest-static-1.8.1-5.cm1.x86_64.rpm
gtk-doc-1.29-6.cm1.noarch.rpm
gzip-1.9-5.cm1.x86_64.rpm
gzip-debuginfo-1.9-5.cm1.x86_64.rpm
gzip-1.9-6.cm1.x86_64.rpm
gzip-debuginfo-1.9-6.cm1.x86_64.rpm
integritysetup-2.3.3-2.cm1.x86_64.rpm
intltool-0.51.0-7.cm1.noarch.rpm
itstool-2.0.6-3.cm1.noarch.rpm