Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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.15-r1.ebuild tk-8.5_alpha6-r1.ebuild tk-8.4.14.ebuild tk-8.4.14-r1.ebuild
Date: Sun, 16 Sep 2007 02:31:28
Message-Id: E1IWjnh-0007T7-S0@stork.gentoo.org
1 matsuu 07/09/16 02:23:57
2
3 Modified: ChangeLog
4 Added: tk-8.4.15-r1.ebuild tk-8.5_alpha6-r1.ebuild
5 Removed: tk-8.4.14.ebuild tk-8.4.14-r1.ebuild
6 Log:
7 Fixed CVE-2007-4851, bug #192539.
8 (Portage version: 2.1.2.12)
9
10 Revision Changes Path
11 1.90 dev-lang/tk/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.90&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.90&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/ChangeLog?r1=1.89&r2=1.90
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v
20 retrieving revision 1.89
21 retrieving revision 1.90
22 diff -u -r1.89 -r1.90
23 --- ChangeLog 21 Aug 2007 19:10:34 -0000 1.89
24 +++ ChangeLog 16 Sep 2007 02:23:57 -0000 1.90
25 @@ -1,6 +1,16 @@
26 # ChangeLog for dev-lang/tk
27 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.89 2007/08/21 19:10:34 angelos Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.90 2007/09/16 02:23:57 matsuu Exp $
30 +
31 +*tk-8.5_alpha6-r1 (16 Sep 2007)
32 +*tk-8.4.15-r1 (16 Sep 2007)
33 +
34 + 16 Sep 2007; MATSUU Takuto <matsuu@g.o>
35 + -files/tk-8.3.5-tclm4-soname.patch, +files/tk-CVE-2007-4851.patch,
36 + -tk-8.4.14.ebuild, -tk-8.4.14-r1.ebuild, +tk-8.4.15-r1.ebuild,
37 + +tk-8.5_alpha6-r1.ebuild:
38 + Fixed CVE-2007-4851, bug #192539.
39 + Removed old versions.
40
41 21 Aug 2007; Christoph Mende <angelos@g.o> tk-8.4.15.ebuild:
42 Stable on amd64 wrt bug #178320
43
44
45
46 1.1 dev-lang/tk/tk-8.4.15-r1.ebuild
47
48 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/tk-8.4.15-r1.ebuild?rev=1.1&view=markup
49 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/tk-8.4.15-r1.ebuild?rev=1.1&content-type=text/plain
50
51 Index: tk-8.4.15-r1.ebuild
52 ===================================================================
53 # Copyright 1999-2007 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 # $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.15-r1.ebuild,v 1.1 2007/09/16 02:23:57 matsuu Exp $
56
57 WANT_AUTOCONF=latest
58 WANT_AUTOMAKE=latest
59
60 inherit autotools eutils multilib toolchain-funcs
61
62 DESCRIPTION="Tk Widget Set"
63 HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
64 SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
65
66 LICENSE="BSD"
67 SLOT="0"
68 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
69 IUSE="debug threads"
70
71 RDEPEND="x11-libs/libX11
72 ~dev-lang/tcl-${PV}"
73 DEPEND="${RDEPEND}
74 x11-libs/libXt
75 x11-proto/xproto"
76
77 S=${WORKDIR}/${PN}${PV}
78
79 pkg_setup() {
80 if use threads ; then
81 ewarn ""
82 ewarn "PLEASE NOTE: You are compiling ${P} with"
83 ewarn "threading enabled."
84 ewarn "Threading is not supported by all applications"
85 ewarn "that compile against tcl. You use threading at"
86 ewarn "your own discretion."
87 ewarn ""
88 epause 5
89 fi
90 }
91
92 src_unpack() {
93 unpack ${A}
94 cd "${S}"
95 epatch "${FILESDIR}"/remove-control-v-8.4.9.diff
96 epatch "${FILESDIR}"/${PN}-8.4.9-man.patch
97 epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
98
99 # Bug 125971
100 epatch "${FILESDIR}"/${P}-tclm4-soname.patch
101
102 # Bug 192539
103 epatch "${FILESDIR}"/${PN}-CVE-2007-4851.patch
104
105 local d
106 for d in */configure ; do
107 cd "${S}"/${d%%/*}
108 EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \
109 epatch "${FILESDIR}"/tk-configure-LANG.patch
110 done
111
112 cd "${S}"/unix
113 eautoreconf
114 }
115
116 src_compile() {
117 tc-export CC
118 cd "${S}"/unix
119
120 local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
121
122 econf \
123 --with-tcl=/usr/${mylibdir} \
124 $(use_enable threads) \
125 $(use_enable debug symbols) || die
126
127 emake || die
128 }
129
130 src_install() {
131 #short version number
132 local v1
133 v1=${PV%.*}
134
135 cd "${S}"/unix
136 make DESTDIR="${D}" install || die
137
138 # fix the tkConfig.sh to eliminate refs to the build directory
139 local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
140 sed -i \
141 -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
142 -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
143 -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
144 -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
145 -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
146 -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
147 "${D}"/usr/${mylibdir}/tkConfig.sh || die
148
149 # install private headers
150 insinto /usr/${mylibdir}/tk${v1}/include/unix
151 doins "${S}"/unix/*.h || die
152 insinto /usr/${mylibdir}/tk${v1}/include/generic
153 doins "${S}"/generic/*.h || die
154 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
155 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
156 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
157
158 # install symlink for libraries
159 #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
160 if use debug ; then
161 dosym libtk${v1}g.so /usr/${mylibdir}/libtk${v1}.so
162 dosym libtkstub${v1}g.a /usr/${mylibdir}/libtkstub${v1}.a
163 dosym ../tk${v1}g/pkgIndex.tcl /usr/${mylibdir}/tk${v1}/pkgIndex.tcl
164 fi
165 dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
166 dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
167
168 dosym wish${v1} /usr/bin/wish
169
170 cd "${S}"
171 dodoc ChangeLog README changes license.terms
172 }
173
174
175
176 1.1 dev-lang/tk/tk-8.5_alpha6-r1.ebuild
177
178 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/tk-8.5_alpha6-r1.ebuild?rev=1.1&view=markup
179 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/tk/tk-8.5_alpha6-r1.ebuild?rev=1.1&content-type=text/plain
180
181 Index: tk-8.5_alpha6-r1.ebuild
182 ===================================================================
183 # Copyright 1999-2007 Gentoo Foundation
184 # Distributed under the terms of the GNU General Public License v2
185 # $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5_alpha6-r1.ebuild,v 1.1 2007/09/16 02:23:57 matsuu Exp $
186
187 WANT_AUTOCONF=latest
188 WANT_AUTOMAKE=latest
189
190 inherit autotools eutils multilib toolchain-funcs
191
192 MY_P="${PN}${PV/_alpha/a}"
193 DESCRIPTION="Tk Widget Set"
194 HOMEPAGE="http://www.tcl.tk/"
195 SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
196
197 LICENSE="BSD"
198 SLOT="0"
199 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
200 IUSE="debug threads"
201
202 RDEPEND="x11-libs/libX11
203 ~dev-lang/tcl-${PV}"
204 DEPEND="${RDEPEND}
205 x11-libs/libXt
206 x11-proto/xproto"
207
208 S="${WORKDIR}/${MY_P}"
209
210 pkg_setup() {
211 if use threads ; then
212 ewarn ""
213 ewarn "PLEASE NOTE: You are compiling ${P} with"
214 ewarn "threading enabled."
215 ewarn "Threading is not supported by all applications"
216 ewarn "that compile against tcl. You use threading at"
217 ewarn "your own discretion."
218 ewarn ""
219 epause 5
220 fi
221 }
222
223 src_unpack() {
224 unpack ${A}
225 cd "${S}"
226 epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
227
228 # Bug 125971
229 epatch "${FILESDIR}"/${P}-tclm4-soname.patch
230
231 # Bug 192539
232 epatch "${FILESDIR}"/${PN}-CVE-2007-4851.patch
233
234 cd "${S}"/unix
235 eautoreconf
236 }
237
238 src_compile() {
239 tc-export CC
240 cd "${S}"/unix
241
242 local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
243
244 econf \
245 --with-tcl=/usr/${mylibdir} \
246 $(use_enable threads) \
247 $(use_enable debug symbols) || die
248
249 emake || die
250 }
251
252 src_install() {
253 #short version number
254 local v1
255 v1=${PV%_*}
256
257 cd "${S}"/unix
258 S= emake DESTDIR="${D}" install || die
259
260 # fix the tkConfig.sh to eliminate refs to the build directory
261 local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
262 sed -i \
263 -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
264 -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
265 -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
266 -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
267 -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
268 -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
269 "${D}"/usr/${mylibdir}/tkConfig.sh || die
270
271 # install private headers
272 insinto /usr/${mylibdir}/tk${v1}/include/unix
273 doins "${S}"/unix/*.h || die
274 insinto /usr/${mylibdir}/tk${v1}/include/generic
275 doins "${S}"/generic/*.h || die
276 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
277 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
278 rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
279
280 # install symlink for libraries
281 #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
282 dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
283 dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
284
285 dosym wish${v1} /usr/bin/wish
286
287 cd "${S}"
288 dodoc ChangeLog* README changes
289 }
290
291
292
293 --
294 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups