Browse code
BUG [CVE-2018-6942] package : freetype2 branch :1.0
This change is to include the patch in macro in spec file, which was missed as part of commit 7068d6f2430ff666e8527253516e62790c45eac2
Change-Id: I236943d7e4dc6f0784f8a626ae5883b324f8f2ad
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5253
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George
Tapas Kundu authored on 2018/06/13 03:09:35Showing 2 changed files
| ... | ... |
@@ -1,21 +1,3 @@ |
| 1 |
-diff --git a/ChangeLog b/ChangeLog |
|
| 2 |
-index 15ef4ae..fff4a41 100644 |
|
| 3 |
-+++ b/ChangeLog |
|
| 4 |
-@@ -1,5 +1,13 @@ |
|
| 5 |
- 2018-01-27 Werner Lemberg <wl@gnu.org> |
|
| 6 |
- |
|
| 7 |
-+ * src/truetype/ttinterp.c (Ins_GETVARIATION): Avoid NULL reference. |
|
| 8 |
-+ |
|
| 9 |
-+ Reported as |
|
| 10 |
-+ |
|
| 11 |
-+ https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5736 |
|
| 12 |
-+ |
|
| 13 |
-+2018-01-27 Werner Lemberg <wl@gnu.org> |
|
| 14 |
-+ |
|
| 15 |
- * src/truetype/ttgxvar.c (tt_set_mm_blend): Minor. |
|
| 16 |
- |
|
| 17 |
- 2018-01-27 Werner Lemberg <wl@gnu.org> |
|
| 18 | 1 |
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c |
| 19 | 2 |
index d855aaa..551f14a 100644 |
| 20 | 3 |
--- a/src/truetype/ttinterp.c |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: software font engine. |
| 2 | 2 |
Name: freetype2 |
| 3 | 3 |
Version: 2.7.1 |
| 4 |
-Release: 5%{?dist}
|
|
| 4 |
+Release: 6%{?dist}
|
|
| 5 | 5 |
License: BSD/GPL |
| 6 | 6 |
URL: http://www.freetype.org/ |
| 7 | 7 |
Group: System Environment/Libraries |
| ... | ... |
@@ -32,6 +32,7 @@ It contains the libraries and header files to create applications |
| 32 | 32 |
%patch1 -p1 |
| 33 | 33 |
%patch2 -p1 |
| 34 | 34 |
%patch3 -p1 |
| 35 |
+%patch4 -p1 |
|
| 35 | 36 |
|
| 36 | 37 |
%build |
| 37 | 38 |
./configure \ |
| ... | ... |
@@ -66,6 +67,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
| 66 | 66 |
%{_libdir}/pkgconfig/*.pc
|
| 67 | 67 |
|
| 68 | 68 |
%changelog |
| 69 |
+* Tue Jun 12 2018 Tapas Kundu <tkundu@vmware.com> 2.7.1-6 |
|
| 70 |
+- Added the patch macro for CVE-2018-6942 |
|
| 69 | 71 |
* Sat Jun 09 2018 Tapas Kundu <tkundu@vmware.com> 2.7.1-5 |
| 70 | 72 |
- CVE-2018-6942 |
| 71 | 73 |
* Fri Nov 03 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.7.1-4 |