Skip to content

Commit

Permalink
Merge pull request #988 from microsoft/mamalisz/libwebp
Browse files Browse the repository at this point in the history
Update libwebp to 1.0.3, fixing CVEs. (#987)
  • Loading branch information
jslobodzian authored May 26, 2021
2 parents a8dccd4 + 95211d5 commit e092e4a
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 33 deletions.
4 changes: 2 additions & 2 deletions SPECS/libwebp/libwebp.signatures.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"libwebp-1.0.0.tar.gz": "c5c5ebf979543ac1f3348df8f6245262abd787a147b9632c880d92bfc38dbbeb"
"libwebp-1.0.3.tar.gz": "082d114bcb18a0e2aafc3148d43367c39304f86bf18ba0b2e766447e111a4a91"
}
}
}
64 changes: 35 additions & 29 deletions SPECS/libwebp/libwebp.spec
Original file line number Diff line number Diff line change
@@ -1,54 +1,53 @@
Summary: Library to encode and decode webP format images
Name: libwebp
Version: 1.0.0
Release: 4%{?dist}
Version: 1.0.3
Release: 1%{?dist}
License: BSD
URL: https://webmproject.org/
Group: System Environment/Libraries
Vendor: Microsoft Corporation
Distribution: Mariner
Group: System Environment/Libraries
URL: https://webmproject.org/
#Source0: https://github.com/webmproject/%{name}/archive/v%{version}.tar.gz
Source0: %{name}-%{version}.tar.gz

BuildRequires: libjpeg-turbo-devel
BuildRequires: libtiff-devel
BuildRequires: libpng-devel
Requires: libjpeg-turbo
Requires: libtiff
Requires: libpng
BuildRequires: libjpeg-turbo-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
Requires: libjpeg-turbo
Requires: libpng
Requires: libtiff

%description
The libwebp package contains a library and support programs to encode and decode images in WebP format.

%package devel
Summary: Header and development files
Requires: %{name} = %{version}-%{release}
%description devel
%package devel
Summary: Header and development files
Requires: %{name} = %{version}-%{release}
%description devel
It contains the libraries and header files to create applications

%prep
%setup -q

%build
./autogen.sh

./configure \
--prefix=%{_prefix} \
--enable-libwebpmux \
--enable-libwebpdemux \
--enable-libwebpdecoder \
--enable-libwebpextras \
--enable-swap-16bit-csp \
--disable-static
--prefix=%{_prefix} \
--enable-libwebpmux \
--enable-libwebpdemux \
--enable-libwebpdecoder \
--enable-libwebpextras \
--enable-swap-16bit-csp \
--disable-static
make %{?_smp_mflags}

%install
make DESTDIR=%{buildroot} install
find %{buildroot} -name '*.la' -delete
find %{buildroot} -type f -name '*.la' -delete -print

%post
/sbin/ldconfig

%postun
/sbin/ldconfig
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
Expand All @@ -64,16 +63,23 @@ find %{buildroot} -name '*.la' -delete
%{_libdir}/pkgconfig/*.pc

%changelog
* Sat May 09 00:21:21 PST 2020 Nick Samson <[email protected]> - 1.0.0-4
- Added %%license line automatically
* Tue May 25 2021 Mateusz Malisz <[email protected]> - 1.0.3-1
- Update to version 1.0.3

* Sat May 09 2020 Nick Samson <[email protected]> 1.0.0-4
- Added %%license line automatically

* Mon Apr 13 2020 Jon Slobodzian <[email protected]> 1.0.0-3
- Verified license. Removed sha1. Fixed Source0 URL comment. Fixed formatting. URL to https.

* Tue Sep 03 2019 Mateusz Malisz <[email protected]> 1.0.0-2
- Initial CBL-Mariner import from Photon (license: Apache2).

* Wed Sep 12 2018 Keerthana K <[email protected]> 1.0.0-1
- Update to version 1.0.0

* Thu Apr 06 2017 Kumar Kaushik <[email protected]> 0.6.0-1
- Upgrading version to 0.6.0

* Wed Jul 27 2016 Divya Thaluru <[email protected]> 0.5.1-1
- Initial version
4 changes: 2 additions & 2 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3045,8 +3045,8 @@
"type": "other",
"other": {
"name": "libwebp",
"version": "1.0.0",
"downloadUrl": "https://github.com/webmproject/libwebp/archive/v1.0.0.tar.gz"
"version": "1.0.3",
"downloadUrl": "https://github.com/webmproject/libwebp/archive/v1.0.3.tar.gz"
}
}
},
Expand Down

0 comments on commit e092e4a

Please sign in to comment.