Update lambda2/libcroco to 0.6.12-6

lambci · Oct 30, 2020 · 632f7b5 · 632f7b5
1 parent 0e55fe8
commit 632f7b5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/amazon-linux-2/build/specs/lambda2/libcroco.spec b/amazon-linux-2/build/specs/lambda2/libcroco.spec
@@ -1,12 +1,14 @@
 Name:             libcroco
 Summary:          A CSS2 parsing library
-Version:          0.6.11
-Release: 1%{?dist}.0.2
+Version:          0.6.12
+Release:          6%{?dist}
 License:          LGPLv2
 Group:            System Environment/Libraries
 Source:           http://download.gnome.org/sources/libcroco/0.6/%{name}-%{version}.tar.xz
-#Fedora specific patch
-Patch0:    libcroco-0.6.1-multilib.patch
+#Fedora-specific patch
+Patch0:           libcroco-0.6.1-multilib.patch
+# https://gitlab.gnome.org/GNOME/libcroco/-/merge_requests/5
+Patch1:           CVE-2020-12825.patch
 
 BuildRequires:    pkgconfig
 BuildRequires:    glib2-devel
@@ -20,6 +22,7 @@ CSS2 parsing and manipulation library for GNOME
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
+%patch1 -p1 -b .CVE-2020-12825
 
 %build
 %configure --disable-static
@@ -41,9 +44,21 @@ make %{?_smp_mflags} CFLAGS="$CFLAGS -fno-strict-aliasing"
 %exclude %{_bindir}/croco-0.6-config
 
 %changelog
-* Wed May 15 2019 Michael Hart <[email protected]>
+* Thu Oct 29 2020 Michael Hart <[email protected]>
 - recompiled for AWS Lambda (Amazon Linux 2) with prefix /opt
 
+* Mon Aug 03 2020 Michael Catanzaro <[email protected]> - 0.6.12-6
+- Rebuild with 7.9-z target
+  Related: #1835951
+
+* Mon Aug 03 2020 Michael Catanzaro <[email protected]> - 0.6.12-5
+- Fix CVE-2020-12825
+  Resolves: #1835951
+
+* Thu Apr 06 2017 Richard Hughes <[email protected]> - 0.6.12-4
+- Update to 0.6.12
+- Resolves: #1569991
+
 * Thu Dec 17 2015 Kalev Lember <[email protected]> - 0.6.11-1
 - Update to 0.6.11
 - Resolves: #1386999

diff --git a/amazon-linux-2/packages.txt b/amazon-linux-2/packages.txt
@@ -322,7 +322,7 @@ libcap-ng.x86_64                   0.7.5-4.lambda2.0.4                   lambda2
 libcap-ng-python.x86_64            0.7.5-4.lambda2.0.4                   lambda2
 libcap-ng-utils.x86_64             0.7.5-4.lambda2.0.4                   lambda2
 libcilkrts.x86_64                  7.3.1-9.lambda2                       lambda2
-libcroco.x86_64                    0.6.11-1.lambda2.0.2                  lambda2
+libcroco.x86_64                    0.6.12-6.lambda2                      lambda2
 libcrypt.x86_64                    2.26-35.lambda2                       lambda2
 libcrypt-nss.x86_64                2.26-35.lambda2                       lambda2
 libcurl.x86_64                     7.61.1-12.lambda2.0.2                 lambda2