diff --git a/cpio-2.13-revert-CVE-2015-1197-fix.patch b/0002-cpio-2.13-revert-CVE-2015-1197-fix.patch similarity index 100% rename from cpio-2.13-revert-CVE-2015-1197-fix.patch rename to 0002-cpio-2.13-revert-CVE-2015-1197-fix.patch diff --git a/cpio.spec b/cpio.spec index a64644e49ad8c8ad499404753aac1e6317ef29d3..7567830c7518fbe34a8aaf737b05b304b3366748 100644 --- a/cpio.spec +++ b/cpio.spec @@ -1,24 +1,28 @@ -%define anolis_release 3 -Summary: A GNU archiving program -Name: cpio -Version: 2.13 -Release: %{anolis_release}%{?dist} -License: GPLv3+ -URL: http://www.gnu.org/software/cpio/ -Source: ftp://ftp.gnu.org/gnu/cpio/cpio-%{version}.tar.bz2 - -# help2man generated manual page distributed only in RHEL/Fedora -Source1: cpio.1 -Patch1: 0001-solve-the-first-defined-here-error.patch -Patch2: cpio-2.13-revert-CVE-2015-1197-fix.patch - -# We use SVR4 portable format as default. - -Provides: bundled(gnulib) -Provides: bundled(paxutils) -Provides: /bin/cpio -BuildRequires: gcc -BuildRequires: texinfo, autoconf, automake, gettext, gettext-devel, rmt +%define anolis_release 4 +Summary: A GNU archiving program +Name: cpio +Version: 2.13 +Release: %{anolis_release}%{?dist} +License: GPLv3+ +URL: http://www.gnu.org/software/cpio/ +Source: ftp://ftp.gnu.org/gnu/cpio/cpio-%{version}.tar.bz2 + +Source1: cpio.1 +Patch1: 0001-solve-the-first-defined-here-error.patch +# Revert fix for CVE-2015-1197 (#1797163) +# https://lists.gnu.org/archive/html/bug-cpio/2019-11/msg00016.html +Patch2: 0002-cpio-2.13-revert-CVE-2015-1197-fix.patch + +Provides: bundled(gnulib) +Provides: bundled(paxutils) +Provides: /bin/cpio +BuildRequires: gcc +BuildRequires: texinfo +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gettext +BuildRequires: gettext-devel +BuildRequires: rmt %description GNU cpio copies files into or out of a cpio or tar archive. Archives @@ -63,6 +67,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_mandir}/man1/*.1* install -c -p -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_mandir}/man1 +%generate_compatibility_deps + + %find_lang %{name} %check @@ -75,9 +82,12 @@ make check || { %files -f %{name}.lang +%dir %{abidir} %{!?_licensedir:%global license %%doc} %license COPYING %{_bindir}/* +%{abidir}/*-option.list + %{_mandir}/man*/* %{_infodir}/*.info* @@ -85,6 +95,9 @@ make check || { %doc AUTHORS ChangeLog NEWS README THANKS TODO %changelog +* Tue Dec 12 2022 chen_yu_ao - 2.13-4 +- optimise spec file format and comments, add abi files + * Tue Oct 18 2022 Chunmei Xu - 2.13-3 - revert fix for CVE-2015-1197 as it causes shutdown issues