From: | "Mike Frysinger (vapier)" <vapier@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in media-libs/imlib2: ChangeLog imlib2-1.4.1.000-r1.ebuild imlib2-1.4.0-r1.ebuild |
Date: | Sat, 31 May 2008 05:47:18 |
Message-Id: | E1K2Jvs-0004q4-Qs@stork.gentoo.org |
1 | vapier 08/05/31 05:47:12 |
2 | |
3 | Modified: ChangeLog |
4 | Added: imlib2-1.4.1.000-r1.ebuild imlib2-1.4.0-r1.ebuild |
5 | Log: |
6 | Add fixes from upstream for CVE-2008-2426 #223965. |
7 | (Portage version: 2.2_pre5.spank.spunk) |
8 | |
9 | Revision Changes Path |
10 | 1.64 media-libs/imlib2/ChangeLog |
11 | |
12 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/imlib2/ChangeLog?rev=1.64&view=markup |
13 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/imlib2/ChangeLog?rev=1.64&content-type=text/plain |
14 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/imlib2/ChangeLog?r1=1.63&r2=1.64 |
15 | |
16 | Index: ChangeLog |
17 | =================================================================== |
18 | RCS file: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v |
19 | retrieving revision 1.63 |
20 | retrieving revision 1.64 |
21 | diff -u -r1.63 -r1.64 |
22 | --- ChangeLog 19 Apr 2008 21:05:30 -0000 1.63 |
23 | +++ ChangeLog 31 May 2008 05:47:12 -0000 1.64 |
24 | @@ -1,6 +1,14 @@ |
25 | # ChangeLog for media-libs/imlib2 |
26 | # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 | -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.63 2008/04/19 21:05:30 vapier Exp $ |
28 | +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.64 2008/05/31 05:47:12 vapier Exp $ |
29 | + |
30 | +*imlib2-1.4.1.000-r1 (31 May 2008) |
31 | +*imlib2-1.4.0-r1 (31 May 2008) |
32 | + |
33 | + 31 May 2008; Mike Frysinger <vapier@g.o> |
34 | + +files/imlib2-1.4.0-CVE-2008-2426.patch, +imlib2-1.4.0-r1.ebuild, |
35 | + +imlib2-1.4.1.000-r1.ebuild: |
36 | + Add fixes from upstream for CVE-2008-2426 #223965. |
37 | |
38 | *imlib2-1.4.1.000 (19 Apr 2008) |
39 | |
40 | |
41 | |
42 | |
43 | 1.1 media-libs/imlib2/imlib2-1.4.1.000-r1.ebuild |
44 | |
45 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/imlib2/imlib2-1.4.1.000-r1.ebuild?rev=1.1&view=markup |
46 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/imlib2/imlib2-1.4.1.000-r1.ebuild?rev=1.1&content-type=text/plain |
47 | |
48 | Index: imlib2-1.4.1.000-r1.ebuild |
49 | =================================================================== |
50 | # Copyright 1999-2008 Gentoo Foundation |
51 | # Distributed under the terms of the GNU General Public License v2 |
52 | # $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.1.000-r1.ebuild,v 1.1 2008/05/31 05:47:12 vapier Exp $ |
53 | |
54 | inherit enlightenment toolchain-funcs |
55 | |
56 | MY_P=${P/_/-} |
57 | DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm" |
58 | HOMEPAGE="http://www.enlightenment.org/" |
59 | SRC_URI="http://download.enlightenment.org/snapshots/2008-01-25/${P}.tar.bz2" |
60 | |
61 | KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
62 | IUSE="X bzip2 gif jpeg mmx mp3 png tiff zlib" |
63 | |
64 | DEPEND="=media-libs/freetype-2* |
65 | bzip2? ( app-arch/bzip2 ) |
66 | zlib? ( sys-libs/zlib ) |
67 | gif? ( >=media-libs/giflib-4.1.0 ) |
68 | png? ( >=media-libs/libpng-1.2.1 ) |
69 | jpeg? ( media-libs/jpeg ) |
70 | tiff? ( >=media-libs/tiff-3.5.5 ) |
71 | X? ( x11-libs/libXext x11-proto/xextproto ) |
72 | mp3? ( media-libs/libid3tag )" |
73 | |
74 | src_unpack() { |
75 | enlightenment_src_unpack |
76 | cd "${S}" |
77 | epatch "${FILESDIR}"/${PN}-1.4.0-CVE-2008-2426.patch #223965 |
78 | } |
79 | |
80 | src_compile() { |
81 | # imlib2 has diff configure options for x86/amd64 mmx |
82 | local myconf="" |
83 | if [[ $(tc-arch) == "amd64" ]] ; then |
84 | myconf="$(use_enable mmx amd64) --disable-mmx" |
85 | else |
86 | myconf="--disable-amd64 $(use_enable mmx)" |
87 | fi |
88 | |
89 | [[ $(gcc-major-version) -ge 4 ]] && myconf="${myconf} --enable-visibility-hiding" |
90 | |
91 | export MY_ECONF=" |
92 | $(use_with X x) \ |
93 | $(use_with jpeg) \ |
94 | $(use_with png) \ |
95 | $(use_with tiff) \ |
96 | $(use_with gif) \ |
97 | $(use_with zlib) \ |
98 | $(use_with bzip2) \ |
99 | $(use_with mp3 id3) \ |
100 | ${myconf} \ |
101 | " |
102 | enlightenment_src_compile |
103 | } |
104 | |
105 | |
106 | |
107 | 1.1 media-libs/imlib2/imlib2-1.4.0-r1.ebuild |
108 | |
109 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/imlib2/imlib2-1.4.0-r1.ebuild?rev=1.1&view=markup |
110 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/imlib2/imlib2-1.4.0-r1.ebuild?rev=1.1&content-type=text/plain |
111 | |
112 | Index: imlib2-1.4.0-r1.ebuild |
113 | =================================================================== |
114 | # Copyright 1999-2008 Gentoo Foundation |
115 | # Distributed under the terms of the GNU General Public License v2 |
116 | # $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.0-r1.ebuild,v 1.1 2008/05/31 05:47:12 vapier Exp $ |
117 | |
118 | EKEY_STATE="release" |
119 | inherit enlightenment toolchain-funcs |
120 | |
121 | MY_P=${P/_/-} |
122 | DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm" |
123 | HOMEPAGE="http://www.enlightenment.org/" |
124 | |
125 | KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
126 | IUSE="X bzip2 gif jpeg mmx mp3 png tiff zlib" |
127 | |
128 | DEPEND="=media-libs/freetype-2* |
129 | bzip2? ( app-arch/bzip2 ) |
130 | zlib? ( sys-libs/zlib ) |
131 | gif? ( >=media-libs/giflib-4.1.0 ) |
132 | png? ( >=media-libs/libpng-1.2.1 ) |
133 | jpeg? ( media-libs/jpeg ) |
134 | tiff? ( >=media-libs/tiff-3.5.5 ) |
135 | X? ( x11-libs/libXext x11-proto/xextproto ) |
136 | mp3? ( media-libs/libid3tag )" |
137 | |
138 | src_unpack() { |
139 | enlightenment_src_unpack |
140 | cd "${S}" |
141 | epatch "${FILESDIR}"/${P}-CVE-2008-2426.patch #223965 |
142 | } |
143 | |
144 | src_compile() { |
145 | # imlib2 has diff configure options for x86/amd64 mmx |
146 | local mymmx="" |
147 | if [[ $(tc-arch) == "amd64" ]] ; then |
148 | mymmx="$(use_enable mmx amd64) --disable-mmx" |
149 | else |
150 | mymmx="--disable-amd64 $(use_enable mmx)" |
151 | fi |
152 | |
153 | export MY_ECONF=" |
154 | $(use_with X x) \ |
155 | $(use_with jpeg) \ |
156 | $(use_with png) \ |
157 | $(use_with tiff) \ |
158 | $(use_with gif) \ |
159 | $(use_with zlib) \ |
160 | $(use_with bzip2) \ |
161 | $(use_with mp3 id3) \ |
162 | ${mymmx} \ |
163 | " |
164 | enlightenment_src_compile |
165 | } |
166 | |
167 | |
168 | |
169 | -- |
170 | gentoo-commits@l.g.o mailing list |