Skip to content

Commit 8c7d987

Browse files
dmcilvaneyanphel31
authored andcommitted
libtar: Fixup spec formatting, remove .la files, remove explicit provides (#3698)
* Fixup libtar spec formatting, .la files, provides * Add comment so we can track CVE fixes
1 parent 020d6f9 commit 8c7d987

File tree

1 file changed

+26
-18
lines changed

1 file changed

+26
-18
lines changed

SPECS/libtar/libtar.spec

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: C library for manipulating tar files
22
Name: libtar
33
Version: 1.2.20
4-
Release: 9%{?dist}
4+
Release: 10%{?dist}
55
License: BSD
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
@@ -15,11 +15,14 @@ Patch0: libtar-gen-debuginfo.patch
1515
Patch1: libtar-CVE-2013-4420.patch
1616
# CVE patches + other fixes from Redhat
1717
Patch2: libtar-1.2.11-mem-deref.patch
18+
# CVE-2021-33643
19+
# CVE-2021-33644
1820
Patch3: libtar-1.2.20-CVE-2021-33643-CVE-2021-33644.patch
21+
# CVE-2021-33645
22+
# CVE-2021-33646
1923
Patch4: libtar-1.2.20-CVE-2021-33645-CVE-2021-33646.patch
2024
Patch5: libtar-1.2.20-fix-resource-leaks.patch
2125
Patch6: libtar-1.2.20-static-analysis.patch
22-
Provides: libtar.so.0()(64bit)
2326

2427
%description
2528
libtar is a library for manipulating tar files from within C programs.
@@ -30,7 +33,7 @@ Group: Development/Libraries
3033
Requires: libtar = %{version}-%{release}
3134

3235
%description devel
33-
The litar-devel package contains libraries and header files for
36+
The libtar-devel package contains libraries and header files for
3437
developing applications that use libtar.
3538

3639
%prep
@@ -45,6 +48,7 @@ make %{?_smp_mflags}
4548
%install
4649
make DESTDIR=%{buildroot} install
4750
chmod +x %{buildroot}/%{_libdir}/libtar.so.*
51+
find %{buildroot} -type f -name "*.la" -delete -print
4852

4953
#%check
5054
#Commented out %check due to no test existence
@@ -63,33 +67,37 @@ chmod +x %{buildroot}/%{_libdir}/libtar.so.*
6367
%{_includedir}/*
6468
%{_mandir}/man3/*
6569
%{_libdir}/libtar.so
66-
%{_libdir}/libtar.la
6770

6871
%changelog
72+
* Tue Sep 06 2022 Daniel McIlvaney <[email protected]> - 1.2.20-10
73+
- Remove undesirable .la files
74+
- Rely on generators to provide libtar.so.0()(64bit)
75+
- Add CVE comments to correctly track CVE status
76+
6977
* Mon Sep 05 2022 Daniel McIlvaney <[email protected]> - 1.2.20-9
7078
- Add various CVE and correctness patches from Fedora 37
7179
- Fixes CVE-2021-33643, CVE-2021-33644, CVE-2021-33645, CVE-2021-33646
7280

7381
* Sat May 09 2020 Nick Samson <[email protected]> - 1.2.20-8
7482
- Added %%license line automatically
7583

76-
* Thu Apr 23 2020 Nick Samson <[email protected]> 1.2.20-7
77-
- Updated Source0, URL, removed sha1 line. License verified.
84+
* Thu Apr 23 2020 Nick Samson <[email protected]> 1.2.20-7
85+
- Updated Source0, URL, removed sha1 line. License verified.
7886

79-
* Tue Sep 03 2019 Mateusz Malisz <[email protected]> 1.2.20-6
80-
- Initial CBL-Mariner import from Photon (license: Apache2).
87+
* Tue Sep 03 2019 Mateusz Malisz <[email protected]> 1.2.20-6
88+
- Initial CBL-Mariner import from Photon (license: Apache2).
8189

82-
* Thu Nov 02 2017 Xiaolin Li <[email protected]> 1.2.20-5
83-
- Fix CVE-2013-4420
90+
* Thu Nov 02 2017 Xiaolin Li <[email protected]> 1.2.20-5
91+
- Fix CVE-2013-4420
8492

85-
* Thu Jun 29 2017 Chang Lee <[email protected]> 1.2.20-4
86-
- Removed %check due to no test existence.
93+
* Thu Jun 29 2017 Chang Lee <[email protected]> 1.2.20-4
94+
- Removed %check due to no test existence.
8795

88-
* Tue Apr 25 2017 Priyesh Padmavilasom <[email protected]> 1.2.20-3
89-
- Ensure non empty debuginfo
96+
* Tue Apr 25 2017 Priyesh Padmavilasom <[email protected]> 1.2.20-3
97+
- Ensure non empty debuginfo
9098

91-
* Fri Mar 10 2017 Xiaolin Li <[email protected]> 1.2.20-2
92-
- Provides libtar.so.0()(64bit).
99+
* Fri Mar 10 2017 Xiaolin Li <[email protected]> 1.2.20-2
100+
- Provides libtar.so.0()(64bit).
93101

94-
* Fri Mar 03 2017 Xiaolin Li <[email protected]> 1.2.20-1
95-
- Initial packaging for Photon
102+
* Fri Mar 03 2017 Xiaolin Li <[email protected]> 1.2.20-1
103+
- Initial packaging for Photon

0 commit comments

Comments
 (0)