Gentoo Archives: gentoo-commits

From: "Matsuu Takuto (matsuu)" <matsuu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/tk: ChangeLog tk-8.4.17.ebuild tk-8.4.15-r2.ebuild tk-8.5.0-r2.ebuild tk-8.5.0.ebuild tk-8.5.0-r1.ebuild tk-8.4.16.ebuild
Date: Mon, 04 Feb 2008 16:28:06
Message-Id: E1JM4At-0002Oi-Fb@stork.gentoo.org
1 matsuu 08/02/04 16:28:03
2
3 Modified: ChangeLog
4 Added: tk-8.4.17.ebuild tk-8.4.15-r2.ebuild
5 tk-8.5.0-r2.ebuild
6 Removed: tk-8.5.0.ebuild tk-8.5.0-r1.ebuild tk-8.4.16.ebuild
7 Log:
8 Version bump and fixed CVE-2006-4484, bug #208464.
9 (Portage version: 2.1.3.19)
10
11 Revision Changes Path
12 1.102 dev-lang/tk/ChangeLog
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.102&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.102&content-type=text/plain
16 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/ChangeLog?r1=1.101&r2=1.102
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v
21 retrieving revision 1.101
22 retrieving revision 1.102
23 diff -u -r1.101 -r1.102
24 --- ChangeLog 30 Dec 2007 03:35:09 -0000 1.101
25 +++ ChangeLog 4 Feb 2008 16:28:02 -0000 1.102
26 @@ -1,6 +1,17 @@
27 # ChangeLog for dev-lang/tk
28 -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.101 2007/12/30 03:35:09 matsuu Exp $
30 +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
31 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.102 2008/02/04 16:28:02 matsuu Exp $
32 +
33 +*tk-8.5.0-r2 (04 Feb 2008)
34 +*tk-8.4.17 (04 Feb 2008)
35 +*tk-8.4.15-r2 (04 Feb 2008)
36 +
37 + 04 Feb 2008; MATSUU Takuto <matsuu@g.o>
38 + +files/tk-CVE-2006-4484.patch, +tk-8.4.15-r2.ebuild, -tk-8.4.16.ebuild,
39 + +tk-8.4.17.ebuild, -tk-8.5.0.ebuild, -tk-8.5.0-r1.ebuild,
40 + +tk-8.5.0-r2.ebuild:
41 + Version bumped.
42 + Fixed CVE-2006-4484, bug #208464.
43
44 *tk-8.5.0-r1 (30 Dec 2007)
45
46
47
48
49 1.1 dev-lang/tk/tk-8.4.17.ebuild
50
51 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/tk-8.4.17.ebuild?rev=1.1&view=markup
52 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/tk-8.4.17.ebuild?rev=1.1&content-type=text/plain
53
54 Index: tk-8.4.17.ebuild
55 ===================================================================
56 # Copyright 1999-2008 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 # $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.17.ebuild,v 1.1 2008/02/04 16:28:02 matsuu Exp $
59
60 WANT_AUTOCONF=latest
61 WANT_AUTOMAKE=latest
62
63 inherit autotools eutils multilib toolchain-funcs
64
65 DESCRIPTION="Tk Widget Set"
66 HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
67 SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
68
69 LICENSE="BSD"
70 SLOT="0"
71 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
72 IUSE="debug threads"
73
74 RDEPEND="x11-libs/libX11
75 ~dev-lang/tcl-${PV}"
76 DEPEND="${RDEPEND}
77 x11-libs/libXt
78 x11-proto/xproto"
79
80 S=${WORKDIR}/${PN}${PV}
81
82 pkg_setup() {
83 if use threads ; then
84 ewarn ""
85 ewarn "PLEASE NOTE: You are compiling ${P} with"
86 ewarn "threading enabled."
87 ewarn "Threading is not supported by all applications"
88 ewarn "that compile against tcl. You use threading at"
89 ewarn "your own discretion."
90 ewarn ""
91 epause 5
92 fi
93 }
94
95 src_unpack() {
96 unpack ${A}
97 cd "${S}"
98 epatch "${FILESDIR}"/remove-control-v-8.4.9.diff
99 epatch "${FILESDIR}"/${PN}-8.4.9-man.patch
100 epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
101
102 # Bug 125971
103 epatch "${FILESDIR}"/${PN}-8.4.15-tclm4-soname.patch
104
105 # Bug 208464
106 epatch "${FILESDIR}"/${PN}-CVE-2006-4484.patch
107
108 local d
109 for d in */configure ; do
110 cd "${S}"/${d%%/*}
111 EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \
112 epatch "${FILESDIR}"/tk-configure-LANG.patch
113 done
114
115 cd "${S}"/unix
116 eautoreconf
117 }
118
119 src_compile() {
120 tc-export CC
121 cd "${S}"/unix
122
123 local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
124
125 econf \
126 --with-tcl=/usr/${mylibdir} \
127 $(use_enable threads) \
128 $(use_enable debug symbols) || die
129
130 emake || die
131 }
132
133 src_install() {
134 #short version number
135 local v1
136 v1=${PV%.*}
137
138 cd "${S}"/unix
139 make DESTDIR="${D}" install || die
140
141 # fix the tkConfig.sh to eliminate refs to the build directory
142 local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
143 sed -i \
144 -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
145 -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
146 -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
147 -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
148 -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
149 -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
150 "${D}"/usr/${mylibdir}/tkConfig.sh || die
151
152 # install private headers
153 insinto /usr/${mylibdir}/tk${v1}/include/unix
154 doins "${S}"/unix/*.h || die
155 insinto /usr/${mylibdir}/tk${v1}/include/generic
156 doins "${S}"/generic/*.h || die
157 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
158 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
159 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
160
161 # install symlink for libraries
162 #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
163 if use debug ; then
164 dosym libtk${v1}g.so /usr/${mylibdir}/libtk${v1}.so
165 dosym libtkstub${v1}g.a /usr/${mylibdir}/libtkstub${v1}.a
166 dosym ../tk${v1}g/pkgIndex.tcl /usr/${mylibdir}/tk${v1}/pkgIndex.tcl
167 fi
168 dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
169 dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
170
171 dosym wish${v1} /usr/bin/wish
172
173 cd "${S}"
174 dodoc ChangeLog README changes license.terms
175 }
176
177
178
179 1.1 dev-lang/tk/tk-8.4.15-r2.ebuild
180
181 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/tk-8.4.15-r2.ebuild?rev=1.1&view=markup
182 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/tk-8.4.15-r2.ebuild?rev=1.1&content-type=text/plain
183
184 Index: tk-8.4.15-r2.ebuild
185 ===================================================================
186 # Copyright 1999-2008 Gentoo Foundation
187 # Distributed under the terms of the GNU General Public License v2
188 # $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.15-r2.ebuild,v 1.1 2008/02/04 16:28:02 matsuu Exp $
189
190 WANT_AUTOCONF=latest
191 WANT_AUTOMAKE=latest
192
193 inherit autotools eutils multilib toolchain-funcs
194
195 DESCRIPTION="Tk Widget Set"
196 HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
197 SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
198
199 LICENSE="BSD"
200 SLOT="0"
201 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
202 IUSE="debug threads"
203
204 RDEPEND="x11-libs/libX11
205 ~dev-lang/tcl-${PV}"
206 DEPEND="${RDEPEND}
207 x11-libs/libXt
208 x11-proto/xproto"
209
210 S=${WORKDIR}/${PN}${PV}
211
212 pkg_setup() {
213 if use threads ; then
214 ewarn ""
215 ewarn "PLEASE NOTE: You are compiling ${P} with"
216 ewarn "threading enabled."
217 ewarn "Threading is not supported by all applications"
218 ewarn "that compile against tcl. You use threading at"
219 ewarn "your own discretion."
220 ewarn ""
221 epause 5
222 fi
223 }
224
225 src_unpack() {
226 unpack ${A}
227 cd "${S}"
228 epatch "${FILESDIR}"/remove-control-v-8.4.9.diff
229 epatch "${FILESDIR}"/${PN}-8.4.9-man.patch
230 epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
231
232 # Bug 125971
233 epatch "${FILESDIR}"/${P}-tclm4-soname.patch
234
235 # Bug 192539
236 epatch "${FILESDIR}"/${PN}-CVE-2007-4851.patch
237
238 # Bug 208464
239 epatch "${FILESDIR}"/${PN}-CVE-2006-4484.patch
240
241 local d
242 for d in */configure ; do
243 cd "${S}"/${d%%/*}
244 EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \
245 epatch "${FILESDIR}"/tk-configure-LANG.patch
246 done
247
248 cd "${S}"/unix
249 eautoreconf
250 }
251
252 src_compile() {
253 tc-export CC
254 cd "${S}"/unix
255
256 local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
257
258 econf \
259 --with-tcl=/usr/${mylibdir} \
260 $(use_enable threads) \
261 $(use_enable debug symbols) || die
262
263 emake || die
264 }
265
266 src_install() {
267 #short version number
268 local v1
269 v1=${PV%.*}
270
271 cd "${S}"/unix
272 make DESTDIR="${D}" install || die
273
274 # fix the tkConfig.sh to eliminate refs to the build directory
275 local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
276 sed -i \
277 -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
278 -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
279 -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
280 -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
281 -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
282 -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
283 "${D}"/usr/${mylibdir}/tkConfig.sh || die
284
285 # install private headers
286 insinto /usr/${mylibdir}/tk${v1}/include/unix
287 doins "${S}"/unix/*.h || die
288 insinto /usr/${mylibdir}/tk${v1}/include/generic
289 doins "${S}"/generic/*.h || die
290 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
291 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
292 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
293
294 # install symlink for libraries
295 #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
296 if use debug ; then
297 dosym libtk${v1}g.so /usr/${mylibdir}/libtk${v1}.so
298 dosym libtkstub${v1}g.a /usr/${mylibdir}/libtkstub${v1}.a
299 dosym ../tk${v1}g/pkgIndex.tcl /usr/${mylibdir}/tk${v1}/pkgIndex.tcl
300 fi
301 dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
302 dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
303
304 dosym wish${v1} /usr/bin/wish
305
306 cd "${S}"
307 dodoc ChangeLog README changes license.terms
308 }
309
310
311
312 1.1 dev-lang/tk/tk-8.5.0-r2.ebuild
313
314 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/tk-8.5.0-r2.ebuild?rev=1.1&view=markup
315 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/tk-8.5.0-r2.ebuild?rev=1.1&content-type=text/plain
316
317 Index: tk-8.5.0-r2.ebuild
318 ===================================================================
319 # Copyright 1999-2008 Gentoo Foundation
320 # Distributed under the terms of the GNU General Public License v2
321 # $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.0-r2.ebuild,v 1.1 2008/02/04 16:28:02 matsuu Exp $
322
323 WANT_AUTOCONF=latest
324 WANT_AUTOMAKE=latest
325
326 inherit autotools eutils multilib toolchain-funcs
327
328 MY_P="${PN}${PV/_beta/b}"
329 DESCRIPTION="Tk Widget Set"
330 HOMEPAGE="http://www.tcl.tk/"
331 SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
332
333 LICENSE="BSD"
334 SLOT="0"
335 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
336 IUSE="debug threads truetype"
337
338 RDEPEND="x11-libs/libX11
339 ~dev-lang/tcl-${PV}"
340 DEPEND="${RDEPEND}
341 truetype? ( x11-libs/libXft )
342 x11-libs/libXt
343 x11-proto/xproto"
344
345 S="${WORKDIR}/${MY_P}"
346
347 pkg_setup() {
348 if use threads ; then
349 ewarn ""
350 ewarn "PLEASE NOTE: You are compiling ${P} with"
351 ewarn "threading enabled."
352 ewarn "Threading is not supported by all applications"
353 ewarn "that compile against tcl. You use threading at"
354 ewarn "your own discretion."
355 ewarn ""
356 epause 5
357 fi
358 }
359
360 src_unpack() {
361 unpack ${A}
362 cd "${S}"
363 epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
364
365 # Bug 125971
366 epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
367
368 # Bug 208464
369 epatch "${FILESDIR}"/${PN}-CVE-2006-4484.patch
370
371 cd "${S}"/unix
372 eautoreconf
373 }
374
375 src_compile() {
376 tc-export CC
377 cd "${S}"/unix
378
379 local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
380
381 econf \
382 --with-tcl=/usr/${mylibdir} \
383 $(use_enable threads) \
384 $(use_enable truetype xft) \
385 $(use_enable debug symbols) || die
386
387 emake || die
388 }
389
390 src_install() {
391 #short version number
392 local v1
393 v1=${PV%.*}
394
395 cd "${S}"/unix
396 S= emake DESTDIR="${D}" install || die
397
398 # fix the tkConfig.sh to eliminate refs to the build directory
399 local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
400 sed -i \
401 -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
402 -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
403 -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
404 -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
405 -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
406 -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
407 "${D}"/usr/${mylibdir}/tkConfig.sh || die
408
409 # install private headers
410 insinto /usr/${mylibdir}/tk${v1}/include/unix
411 doins "${S}"/unix/*.h || die
412 insinto /usr/${mylibdir}/tk${v1}/include/generic
413 doins "${S}"/generic/*.h || die
414 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
415 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
416 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
417
418 # install symlink for libraries
419 #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
420 dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
421 dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
422
423 dosym wish${v1} /usr/bin/wish
424
425 cd "${S}"
426 dodoc ChangeLog* README changes
427 }
428
429
430
431 --
432 gentoo-commits@l.g.o mailing list