diff --git a/backport-0001-CVE-2023-4863.patch b/backport-0001-CVE-2023-4863.patch deleted file mode 100644 index 3886b0e4345c0e95f405e8ce14e2298772e91c5c..0000000000000000000000000000000000000000 --- a/backport-0001-CVE-2023-4863.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 95ea5226c870449522240ccff26f0b006037c520 Mon Sep 17 00:00:00 2001 -From: Vincent Rabaud -Date: Mon, 11 Sep 2023 16:06:08 +0200 -Subject: [PATCH] Fix invalid incremental decoding check. - -The first condition is only necessary if we have not read enough -(enough being defined by src_last, not src_end which is the end -of the image). -The second condition now fits the comment below: "if not -incremental, and we are past the end of buffer". - -BUG=oss-fuzz:62136 - -Change-Id: I0700f67c62db8e1c02c2e429a069a71e606a5e4f ---- - -diff --git a/src/dec/vp8l_dec.c b/src/dec/vp8l_dec.c -index 5ab34f5..809b1aa 100644 ---- a/src/dec/vp8l_dec.c -+++ b/src/dec/vp8l_dec.c -@@ -1233,9 +1233,20 @@ - } - - br->eos_ = VP8LIsEndOfStream(br); -- if (dec->incremental_ && br->eos_ && src < src_end) { -+ // In incremental decoding: -+ // br->eos_ && src < src_last: if 'br' reached the end of the buffer and -+ // 'src_last' has not been reached yet, there is not enough data. 'dec' has to -+ // be reset until there is more data. -+ // !br->eos_ && src < src_last: this cannot happen as either the buffer is -+ // fully read, either enough has been read to reach 'src_last'. -+ // src >= src_last: 'src_last' is reached, all is fine. 'src' can actually go -+ // beyond 'src_last' in case the image is cropped and an LZ77 goes further. -+ // The buffer might have been enough or there is some left. 'br->eos_' does -+ // not matter. -+ assert(!dec->incremental_ || (br->eos_ && src < src_last) || src >= src_last); -+ if (dec->incremental_ && br->eos_ && src < src_last) { - RestoreState(dec); -- } else if (!br->eos_) { -+ } else if ((dec->incremental_ && src >= src_last) || !br->eos_) { - // Process the remaining rows corresponding to last row-block. - if (process_func != NULL) { - process_func(dec, row > last_row ? last_row : row); diff --git a/libwebp-1.3.2.tar.gz b/libwebp-1.4.0.tar.gz similarity index 63% rename from libwebp-1.3.2.tar.gz rename to libwebp-1.4.0.tar.gz index 1d747e9f02746b03352f6ebd71220d49e7c665e4..7034c045c63d761223da35f814be823c905756bc 100644 Binary files a/libwebp-1.3.2.tar.gz and b/libwebp-1.4.0.tar.gz differ diff --git a/libwebp.spec b/libwebp.spec index b96f1863a85cbe88fb7cbbe5470e0fa88bf6426b..e89e0005c308ea621063fb48adf5a2dc2d6d7ab7 100644 --- a/libwebp.spec +++ b/libwebp.spec @@ -1,13 +1,12 @@ Name: libwebp -Version: 1.3.2 -Release: 3 -URL: https://www.webmproject.org +Version: 1.4.0 +Release: 1 +URL: https://code.google.com/speed/webp/ Summary: Library and tools for the WebP graphics format -License: BSD -Source0: http://downloads.webmproject.org/releases/webp/%{name}-%{version}.tar.gz +License: BSD-3-Clause +Source0: https://storage.googleapis.com/downloads.webmproject.org/releases/webp/%{name}-%{version}.tar.gz Patch6000: libwebp-freeglut.patch -Patch6001: backport-0001-CVE-2023-4863.patch BuildRequires: libjpeg-devel libpng-devel giflib-devel libtiff-devel BuildRequires: java-devel jpackage-utils swig freeglut-devel @@ -83,20 +82,16 @@ jar cvf ../libwebp.jar com/google/webp/*.class install -d %{buildroot}/%{_libdir}/%{name}-java cp swig/*.jar swig/*.so %{buildroot}/%{_libdir}/%{name}-java/ %delete_la -%ldconfig_scriptlets %files tools -%defattr(-,root,root) %{_bindir}/* %files -n %{name} -%defattr(-,root,root) %doc README.md AUTHORS %license COPYING %{_libdir}/*.so.* %files devel -%defattr(-,root,root) %{_libdir}/%{name}*.so %{_libdir}/libsharpyuv.so %{_includedir}/* @@ -104,15 +99,16 @@ cp swig/*.jar swig/*.so %{buildroot}/%{_libdir}/%{name}-java/ %{_libdir}/pkgconfig/* %files java -%defattr(-,root,root) %{_libdir}/%{name}-java/ %files help -%defattr(-,root,root) %doc NEWS PATENTS %{_mandir}/man*/* %changelog +* Mon Aug 26 2024 Funda Wang - 1.4.0-1 +- update to 1.4.0 + * Thu Feb 22 2024 luofng - 1.3.2-3 - Type: enhencement - CVE:NA diff --git a/libwebp.yaml b/libwebp.yaml index 3cba8a0fd0ae2c66fb2d88da969c135187fa193f..3031bce0100f2da389135f55729d1e2fa983001a 100644 --- a/libwebp.yaml +++ b/libwebp.yaml @@ -1,5 +1,4 @@ version_control: github src_repo: webmproject/libwebp tag_prefix: ^v -seperator: "." - +separator: "."