Merge pull request !3 from syyhao/dev218
This commit is contained in:
openeuler-ci-bot 2020-02-19 10:47:52 +08:00 committed by Gitee
commit 18ab0b9636

View File

@ -1,6 +1,6 @@
Name: tar Name: tar
Version: 1.30 Version: 1.30
Release: 10 Release: 11
Epoch: 2 Epoch: 2
Summary: An organized and systematic method of controlling a large amount of data Summary: An organized and systematic method of controlling a large amount of data
License: GPLv3+ License: GPLv3+
@ -11,7 +11,6 @@ Source1: https://ftp.gnu.org/gnu/tar/tar-%{version}.tar.xz.sig
BuildRequires: autoconf automake texinfo gettext libacl-devel attr acl policycoreutils BuildRequires: autoconf automake texinfo gettext libacl-devel attr acl policycoreutils
Provides: bundled(gnulib) /bin/tar /bin/gtar Provides: bundled(gnulib) /bin/tar /bin/gtar
#patch0001~0008 come from fedora
Patch0001: tar-1.28-loneZeroWarning.patch Patch0001: tar-1.28-loneZeroWarning.patch
Patch0002: tar-1.28-vfatTruncate.patch Patch0002: tar-1.28-vfatTruncate.patch
Patch0003: tar-1.29-wildcards.patch Patch0003: tar-1.29-wildcards.patch
@ -21,28 +20,28 @@ Patch0006: tar-1.28-sparse-inf-loops.patch
Patch0007: tar-1.30-tests-difflink.patch Patch0007: tar-1.30-tests-difflink.patch
Patch0008: tar-1.30-tests-dirrem.patch Patch0008: tar-1.30-tests-dirrem.patch
Patch6000: Rewrite-struct-tm-formatting.patch Patch0009: Rewrite-struct-tm-formatting.patch
Patch6001: maint-avoid-warnings-from-upcoming-GCC8.patch Patch0010: maint-avoid-warnings-from-upcoming-GCC8.patch
Patch6002: maint-avoid-Wstringop-truncation-warnings-upcoming-G.patch Patch0011: maint-avoid-Wstringop-truncation-warnings-upcoming-G.patch
Patch6003: maint-avoid-Wstringop-truncation-warnings-from-upcom.patch Patch0012: maint-avoid-Wstringop-truncation-warnings-from-upcom.patch
Patch6004: one-top-level-avoid-a-heap-buffer-overflow.patch Patch0013: one-top-level-avoid-a-heap-buffer-overflow.patch
Patch6005: Avoid-some-resource-leaks.patch Patch0014: Avoid-some-resource-leaks.patch
Patch6006: Report-race-on-systems-without-O_DIRECTORY.patch Patch0015: Report-race-on-systems-without-O_DIRECTORY.patch
Patch6007: Fix-double-free-introduced-by-577dc345.patch Patch0016: Fix-double-free-introduced-by-577dc345.patch
Patch6008: Fix-improper-memory-access.patch Patch0017: Fix-improper-memory-access.patch
Patch6009: Fix-buffer-overflow.patch Patch0018: Fix-buffer-overflow.patch
Patch6010: Reject-pax-options-starting-with-equals-sign.patch Patch0019: Reject-pax-options-starting-with-equals-sign.patch
Patch6011: Fix-error-handling-when-reading-incremental-snapshot.patch Patch0020: Fix-error-handling-when-reading-incremental-snapshot.patch
Patch6012: Fix-semantics-of-K-used-together-with-explicit-membe.patch Patch0021: Fix-semantics-of-K-used-together-with-explicit-membe.patch
Patch6013: Bugfix.patch Patch0022: Bugfix.patch
Patch6014: Disallow-modifications-to-the-global-pax-extended-he.patch Patch0023: Disallow-modifications-to-the-global-pax-extended-he.patch
Patch6015: Work-over-a-bug-in-gnulib-error.patch Patch0024: Work-over-a-bug-in-gnulib-error.patch
Patch6016: Remove-erroneous-abort-call.patch Patch0025: Remove-erroneous-abort-call.patch
Patch6017: Fix-iconv-usage.patch Patch0026: Fix-iconv-usage.patch
Patch6018: Fix-compilation-without-iconv.patch Patch0027: Fix-compilation-without-iconv.patch
Patch6019: Fix-build-on-AIX.patch Patch0028: Fix-build-on-AIX.patch
Patch6020: Fix-possible-NULL-dereference-savannah-bug-55369.patch Patch0029: Fix-possible-NULL-dereference-savannah-bug-55369.patch
Patch6021: Fix-CVE-2018-20482.patch Patch0030: Fix-CVE-2018-20482.patch
%description %description
GNU Tar provides the ability to create tar archives, as well as various other GNU Tar provides the ability to create tar archives, as well as various other
@ -59,12 +58,11 @@ BuildArch: noarch
Help document for tar. Help document for tar.
%prep %prep
export FORCE_UNSAFE_CONFIGURE=1
%autosetup -n tar-%{version} -p1 %autosetup -n tar-%{version} -p1
autoreconf -v autoreconf -v
%build %build
export FORCE_UNSAFE_CONFIGURE=1
%configure --without-selinux --with-lzma="xz --format=lzma" \ %configure --without-selinux --with-lzma="xz --format=lzma" \
DEFAULT_RMT_DIR=%{_sysconfdir} RSH=/usr/bin/ssh DEFAULT_RMT_DIR=%{_sysconfdir} RSH=/usr/bin/ssh
%make_build %make_build
@ -83,7 +81,7 @@ rm -f %{buildroot}%{_mandir}/man8/rmt.8*
%check %check
#make check make check
%pre %pre
@ -102,6 +100,9 @@ rm -f %{buildroot}%{_mandir}/man8/rmt.8*
%{_infodir}/tar.info* %{_infodir}/tar.info*
%changelog %changelog
* Tue Feb 18 2020 openEuler Buildteam <buildteam@openeuler.org> - 2:1.30-11
- Enable check
* Wed Jan 22 2020 openEuler Buildteam <buildteam@openeuler.org> - 2:1.30-10 * Wed Jan 22 2020 openEuler Buildteam <buildteam@openeuler.org> - 2:1.30-10
- set FORCE_UNSAFE_CONFIGURE to 1 - set FORCE_UNSAFE_CONFIGURE to 1