- updated to 1.31 (fixes CVE-2018-20482)

[packages/tar.git] / tar.spec

diff --git a/tar.spec b/tar.spec
index 825f823678f414528d580eaaed320386277a6ef7..0c3970a8eedc50d234dc731b19c4e3b2cd1901ef 100644 (file)
--- a/tar.spec
+++ b/tar.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
 %bcond_with    tests   # perform make check
-#
+
 Summary:       A GNU file archiving program
 Summary(de.UTF-8):     GNU-Magnetband-Archivierprogramm (tar)
 Summary(es.UTF-8):     GNU Tape Archiver (tar)
@@ -10,27 +10,23 @@ Summary(pl.UTF-8):  Program do archiwizacji (GNU)
 Summary(pt_BR.UTF-8):  GNU Tape Archiver (tar)
 Summary(tr.UTF-8):     Yaygın kullanılan yedekleyici
 Name:          tar
-Version:       1.23
-Release:       4
+Version:       1.31
+Release:       1
 Epoch:         1
 License:       GPL v3+
 Group:         Applications/Archiving
-Source0:       http://ftp.gnu.org/gnu/tar/%{name}-%{version}.tar.bz2
-# Source0-md5: 41e2ca4b924ec7860e51b43ad06cdb7e
+Source0:       https://ftp.gnu.org/gnu/tar/%{name}-%{version}.tar.bz2
+# Source0-md5: 77afa35b696c8d760331fa0e12c2fac9
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 4e4b1655fe42c27a4eb5d7bcd82e74ac
-Patch0:                %{name}-man-debian.patch
-Patch1:                %{name}-man.patch
-Patch2:                %{name}-info.patch
-Patch3:                %{name}-pl.po-update.patch
-Patch4:                %{name}-zero-block.patch
-Patch5:                am-nosilentrules.patch
-Patch6:                %{name}-fortifysourcessigabrt.patch
+Patch0:                %{name}-info.patch
+Patch1:                %{name}-zero-block.patch
 URL:           http://www.gnu.org/software/tar/tar.html
-BuildRequires: autoconf >= 2.60
-BuildRequires: automake >= 1:1.9
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1:1.11
 BuildRequires: bison
-BuildRequires: gettext-devel >= 0.16
+BuildRequires: gettext-tools >= 0.16
+BuildRequires: help2man
 BuildRequires: sed >= 4.0
 BuildRequires: texinfo
 Conflicts:     amanda-client < 2.5.2
@@ -142,13 +138,8 @@ z pakietu dump.
 
 %prep
 %setup -q
-%patch0 -p2
+%patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %{__rm} po/stamp-po
 
@@ -158,7 +149,8 @@ z pakietu dump.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+       --disable-silent-rules
 
 %{__make}
 
@@ -173,8 +165,10 @@ install -d $RPM_BUILD_ROOT{/usr/bin,%{_mandir}/man1}
 
 ln -sf %{_bindir}/tar $RPM_BUILD_ROOT/usr/bin/gtar
 
+help2man ./src/tar -o tar.1
 install tar.1 $RPM_BUILD_ROOT%{_mandir}/man1
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.tar-non-english-man-pages
 
 %find_lang %{name}
 
@@ -190,21 +184,22 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README NEWS
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) /usr/bin/*
+%attr(755,root,root) %{_bindir}/tar
+%attr(755,root,root) /usr/bin/gtar
 %{_infodir}/tar.info*
-%{_mandir}/man1/*
-%lang(de) %{_mandir}/de/man1/*
-%lang(es) %{_mandir}/es/man1/*
-%lang(fi) %{_mandir}/fi/man1/*
-%lang(fr) %{_mandir}/fr/man1/*
-%lang(hu) %{_mandir}/hu/man1/*
-%lang(id) %{_mandir}/id/man1/*
-%lang(it) %{_mandir}/it/man1/*
-%lang(ja) %{_mandir}/ja/man1/*
-%lang(nl) %{_mandir}/nl/man1/*
-%lang(pl) %{_mandir}/pl/man1/*
+%{_mandir}/man1/tar.1*
+%lang(de) %{_mandir}/de/man1/tar.1*
+%lang(es) %{_mandir}/es/man1/tar.1*
+%lang(fi) %{_mandir}/fi/man1/tar.1*
+%lang(fr) %{_mandir}/fr/man1/tar.1*
+%lang(hu) %{_mandir}/hu/man1/tar.1*
+%lang(id) %{_mandir}/id/man1/tar.1*
+%lang(it) %{_mandir}/it/man1/tar.1*
+%lang(ja) %{_mandir}/ja/man1/tar.1*
+%lang(nl) %{_mandir}/nl/man1/tar.1*
+%lang(pl) %{_mandir}/pl/man1/tar.1*
 
 %files rmt
 %defattr(644,root,root,755)
-%attr(755,root,root) /sbin/*
+%attr(755,root,root) /sbin/rmt
+%{_mandir}/man8/rmt.8*