1 |
commit: 94e12aeabfce23de76fc295e93d980498c46d042 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 11 19:19:59 2020 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 11 19:19:59 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94e12aea |
7 |
|
8 |
dev-libs/libcroco: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.12 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
dev-libs/libcroco/Manifest | 1 - |
14 |
dev-libs/libcroco/files/0.6.12-CVE-2017-7960.patch | 40 --------------- |
15 |
dev-libs/libcroco/files/0.6.12-CVE-2017-7961.patch | 42 --------------- |
16 |
dev-libs/libcroco/libcroco-0.6.12-r1.ebuild | 60 ---------------------- |
17 |
4 files changed, 143 deletions(-) |
18 |
|
19 |
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest |
20 |
index 2329c260cf2..647d3f20e22 100644 |
21 |
--- a/dev-libs/libcroco/Manifest |
22 |
+++ b/dev-libs/libcroco/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST libcroco-0.6.12.tar.xz 482028 BLAKE2B d43b73ba21f600ec6d549b867a58db956e081ca8b0787db577062e36487d23cd99b384ca3269421d26aff9825725b262fd6a3e48be73448fe984548ab3eb080b SHA512 af9a171d5ccded255b57f170576e67155f12fa0f61ab3e379e907975f77afc37e82e22772c6019b2897cffc15b2425faf3ccfda92b1a45b23eda2519debabeb6 |
25 |
DIST libcroco-0.6.13.tar.xz 487840 BLAKE2B 511212f1849343d55104cc6d17662cacd524bae098bab12d6db58df41710c8dca2c5beb7a37e42feac6d856934a07feb3d11c55dc74ba055e21066f2bdefb260 SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4 |
26 |
|
27 |
diff --git a/dev-libs/libcroco/files/0.6.12-CVE-2017-7960.patch b/dev-libs/libcroco/files/0.6.12-CVE-2017-7960.patch |
28 |
deleted file mode 100644 |
29 |
index 50095d50b89..00000000000 |
30 |
--- a/dev-libs/libcroco/files/0.6.12-CVE-2017-7960.patch |
31 |
+++ /dev/null |
32 |
@@ -1,40 +0,0 @@ |
33 |
-From 898e3a8c8c0314d2e6b106809a8e3e93cf9d4394 Mon Sep 17 00:00:00 2001 |
34 |
-From: Ignacio Casal Quinteiro |
35 |
-Date: Sun, 16 Apr 2017 13:13:43 +0200 |
36 |
-Subject: [PATCH 1/3] input: check end of input before reading a byte |
37 |
- |
38 |
-When reading bytes we weren't check that the index wasn't |
39 |
-out of bound and this could produce an invalid read which |
40 |
-could deal to a security bug. |
41 |
---- |
42 |
-leio: Snipped cosmetic chunks |
43 |
- |
44 |
-diff --git a/src/cr-input.c b/src/cr-input.c |
45 |
-index 49000b1..3b63a88 100644 |
46 |
---- a/src/cr-input.c |
47 |
-+++ b/src/cr-input.c |
48 |
-@@ -404,6 +404,8 @@ cr_input_get_nb_bytes_left (CRInput const * a_this) |
49 |
- enum CRStatus |
50 |
- cr_input_read_byte (CRInput * a_this, guchar * a_byte) |
51 |
- { |
52 |
-+ gulong nb_bytes_left = 0; |
53 |
-+ |
54 |
- g_return_val_if_fail (a_this && PRIVATE (a_this) |
55 |
- && a_byte, CR_BAD_PARAM_ERROR); |
56 |
- |
57 |
-@@ -413,6 +415,12 @@ cr_input_read_byte (CRInput * a_this, guchar * a_byte) |
58 |
- if (PRIVATE (a_this)->end_of_input == TRUE) |
59 |
- return CR_END_OF_INPUT_ERROR; |
60 |
- |
61 |
-+ nb_bytes_left = cr_input_get_nb_bytes_left (a_this); |
62 |
-+ |
63 |
-+ if (nb_bytes_left < 1) { |
64 |
-+ return CR_END_OF_INPUT_ERROR; |
65 |
-+ } |
66 |
-+ |
67 |
- *a_byte = PRIVATE (a_this)->in_buf[PRIVATE (a_this)->next_byte_index]; |
68 |
- |
69 |
- if (PRIVATE (a_this)->nb_bytes - |
70 |
--- |
71 |
-2.10.1 |
72 |
- |
73 |
|
74 |
diff --git a/dev-libs/libcroco/files/0.6.12-CVE-2017-7961.patch b/dev-libs/libcroco/files/0.6.12-CVE-2017-7961.patch |
75 |
deleted file mode 100644 |
76 |
index 65a08f4ebab..00000000000 |
77 |
--- a/dev-libs/libcroco/files/0.6.12-CVE-2017-7961.patch |
78 |
+++ /dev/null |
79 |
@@ -1,42 +0,0 @@ |
80 |
-From 9ad72875e9f08e4c519ef63d44cdbd94aa9504f7 Mon Sep 17 00:00:00 2001 |
81 |
-From: Ignacio Casal Quinteiro <qignacio@××××××.com> |
82 |
-Date: Sun, 16 Apr 2017 13:56:09 +0200 |
83 |
-Subject: [PATCH 3/3] tknzr: support only max long rgb values |
84 |
- |
85 |
-This fixes a possible out of bound when reading rgbs which |
86 |
-are longer than the support MAXLONG |
87 |
---- |
88 |
- src/cr-tknzr.c | 10 ++++++++++ |
89 |
- 1 file changed, 10 insertions(+) |
90 |
- |
91 |
-diff --git a/src/cr-tknzr.c b/src/cr-tknzr.c |
92 |
-index 1a7cfeb..1548c35 100644 |
93 |
---- a/src/cr-tknzr.c |
94 |
-+++ b/src/cr-tknzr.c |
95 |
-@@ -1279,6 +1279,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) |
96 |
- status = cr_tknzr_parse_num (a_this, &num); |
97 |
- ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); |
98 |
- |
99 |
-+ if (num->val > G_MAXLONG) { |
100 |
-+ status = CR_PARSING_ERROR; |
101 |
-+ goto error; |
102 |
-+ } |
103 |
-+ |
104 |
- red = num->val; |
105 |
- cr_num_destroy (num); |
106 |
- num = NULL; |
107 |
-@@ -1298,6 +1303,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) |
108 |
- status = cr_tknzr_parse_num (a_this, &num); |
109 |
- ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); |
110 |
- |
111 |
-+ if (num->val > G_MAXLONG) { |
112 |
-+ status = CR_PARSING_ERROR; |
113 |
-+ goto error; |
114 |
-+ } |
115 |
-+ |
116 |
- PEEK_BYTE (a_this, 1, &next_bytes[0]); |
117 |
- if (next_bytes[0] == '%') { |
118 |
- SKIP_CHARS (a_this, 1); |
119 |
--- |
120 |
-2.10.1 |
121 |
- |
122 |
|
123 |
diff --git a/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild b/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild |
124 |
deleted file mode 100644 |
125 |
index 9cea2f4ac75..00000000000 |
126 |
--- a/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild |
127 |
+++ /dev/null |
128 |
@@ -1,60 +0,0 @@ |
129 |
-# Copyright 1999-2019 Gentoo Authors |
130 |
-# Distributed under the terms of the GNU General Public License v2 |
131 |
- |
132 |
-EAPI=6 |
133 |
-GNOME2_LA_PUNT="yes" |
134 |
- |
135 |
-inherit gnome2 multilib-minimal |
136 |
- |
137 |
-DESCRIPTION="Generic Cascading Style Sheet (CSS) parsing and manipulation toolkit" |
138 |
-HOMEPAGE="https://git.gnome.org/browse/libcroco/" |
139 |
- |
140 |
-LICENSE="LGPL-2" |
141 |
-SLOT="0.6" |
142 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
143 |
-IUSE="test" |
144 |
-RESTRICT="!test? ( test )" |
145 |
- |
146 |
-RDEPEND=" |
147 |
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] |
148 |
- >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] |
149 |
-" |
150 |
-DEPEND="${RDEPEND} |
151 |
- dev-util/gtk-doc-am |
152 |
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
153 |
-" |
154 |
- |
155 |
-PATCHES=( |
156 |
- "${FILESDIR}"/${PV}-CVE-2017-7960.patch |
157 |
- "${FILESDIR}"/${PV}-CVE-2017-7961.patch |
158 |
-) |
159 |
- |
160 |
-src_prepare() { |
161 |
- if ! use test; then |
162 |
- # don't waste time building tests |
163 |
- sed 's/^\(SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ |
164 |
- || die "sed failed" |
165 |
- fi |
166 |
- |
167 |
- gnome2_src_prepare |
168 |
-} |
169 |
- |
170 |
-multilib_src_configure() { |
171 |
- ECONF_SOURCE=${S} \ |
172 |
- gnome2_src_configure \ |
173 |
- --disable-static \ |
174 |
- $([[ ${CHOST} == *-darwin* ]] && echo --disable-Bsymbolic) |
175 |
- |
176 |
- if multilib_is_native_abi; then |
177 |
- ln -s "${S}"/docs/reference/html docs/reference/html || die |
178 |
- fi |
179 |
-} |
180 |
- |
181 |
-multilib_src_install() { |
182 |
- gnome2_src_install |
183 |
-} |
184 |
- |
185 |
-multilib_src_install_all() { |
186 |
- DOCS="AUTHORS ChangeLog HACKING NEWS README TODO" |
187 |
- einstalldocs |
188 |
-} |