Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/emacs-cvs: ChangeLog emacs-cvs-22.1.50-r1.ebuild emacs-cvs-23.0.50.ebuild emacs-cvs-23.0.0-r7.ebuild emacs-cvs-22.1.50_p20070829-r1.ebuild emacs-cvs-22.1.50_p20070829.ebuild
Date: Sat, 06 Oct 2007 17:46:50
Message-Id: E1IeDaU-0000qK-7D@stork.gentoo.org
1 ulm 07/10/06 17:37:14
2
3 Modified: ChangeLog emacs-cvs-22.1.50-r1.ebuild
4 emacs-cvs-23.0.50.ebuild emacs-cvs-23.0.0-r7.ebuild
5 Added: emacs-cvs-22.1.50_p20070829-r1.ebuild
6 Removed: emacs-cvs-22.1.50_p20070829.ebuild
7 Log:
8 Fix tramp-make-tramp-temp-file vulnerability, bug #194713.
9 (Portage version: 2.1.3.12)
10
11 Revision Changes Path
12 1.157 app-editors/emacs-cvs/ChangeLog
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.157&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.157&content-type=text/plain
16 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?r1=1.156&r2=1.157
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v
21 retrieving revision 1.156
22 retrieving revision 1.157
23 diff -u -r1.156 -r1.157
24 --- ChangeLog 19 Sep 2007 07:04:10 -0000 1.156
25 +++ ChangeLog 6 Oct 2007 17:37:13 -0000 1.157
26 @@ -1,6 +1,15 @@
27 # ChangeLog for app-editors/emacs-cvs
28 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.156 2007/09/19 07:04:10 ulm Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.157 2007/10/06 17:37:13 ulm Exp $
31 +
32 +*emacs-cvs-22.1.50_p20070829-r1 (06 Oct 2007)
33 +
34 + 06 Oct 2007; Ulrich Mueller <ulm@g.o>
35 + +files/emacs-cvs-make-tramp-temp-file.patch, emacs-cvs-22.1.50-r1.ebuild,
36 + -emacs-cvs-22.1.50_p20070829.ebuild,
37 + +emacs-cvs-22.1.50_p20070829-r1.ebuild, emacs-cvs-23.0.0-r7.ebuild,
38 + emacs-cvs-23.0.50.ebuild:
39 + Fix tramp-make-tramp-temp-file vulnerability, bug #194713. Quote ${ROOT}.
40
41 18 Sep 2007; Ulrich Mueller <ulm@g.o> emacs-cvs-22.1.50-r1.ebuild,
42 emacs-cvs-22.1.50_p20070829.ebuild, emacs-cvs-23.0.0-r7.ebuild,
43
44
45
46 1.4 app-editors/emacs-cvs/emacs-cvs-22.1.50-r1.ebuild
47
48 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r1.ebuild?rev=1.4&view=markup
49 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r1.ebuild?rev=1.4&content-type=text/plain
50 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r1.ebuild?r1=1.3&r2=1.4
51
52 Index: emacs-cvs-22.1.50-r1.ebuild
53 ===================================================================
54 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r1.ebuild,v
55 retrieving revision 1.3
56 retrieving revision 1.4
57 diff -u -r1.3 -r1.4
58 --- emacs-cvs-22.1.50-r1.ebuild 18 Sep 2007 22:36:40 -0000 1.3
59 +++ emacs-cvs-22.1.50-r1.ebuild 6 Oct 2007 17:37:13 -0000 1.4
60 @@ -1,6 +1,6 @@
61 # Copyright 1999-2007 Gentoo Foundation
62 # Distributed under the terms of the GNU General Public License v2
63 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r1.ebuild,v 1.3 2007/09/18 22:36:40 ulm Exp $
64 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r1.ebuild,v 1.4 2007/10/06 17:37:13 ulm Exp $
65
66 ECVS_AUTH="pserver"
67 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
68 @@ -205,20 +205,20 @@
69
70 local infodir=/usr/share/info/${EMACS_SUFFIX} f
71 einfo "Regenerating Info directory index in ${infodir} ..."
72 - rm -f ${ROOT}${infodir}/dir{,.*}
73 - for f in ${ROOT}${infodir}/*.info*; do
74 + rm -f "${ROOT}"${infodir}/dir{,.*}
75 + for f in "${ROOT}"${infodir}/*.info*; do
76 [[ ${f##*/} == *[0-9].info* ]] \
77 - || install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null
78 + || install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null
79 done
80 echo
81 }
82
83 pkg_postinst() {
84 - test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
85 - cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
86 + test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ||
87 + cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
88
89 local f
90 - for f in ${ROOT}/var/lib/games/emacs/{snake,tetris}-scores; do
91 + for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
92 test -e ${f} || touch ${f}
93 done
94
95
96
97
98 1.7 app-editors/emacs-cvs/emacs-cvs-23.0.50.ebuild
99
100 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50.ebuild?rev=1.7&view=markup
101 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50.ebuild?rev=1.7&content-type=text/plain
102 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50.ebuild?r1=1.6&r2=1.7
103
104 Index: emacs-cvs-23.0.50.ebuild
105 ===================================================================
106 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50.ebuild,v
107 retrieving revision 1.6
108 retrieving revision 1.7
109 diff -u -r1.6 -r1.7
110 --- emacs-cvs-23.0.50.ebuild 18 Sep 2007 22:36:40 -0000 1.6
111 +++ emacs-cvs-23.0.50.ebuild 6 Oct 2007 17:37:13 -0000 1.7
112 @@ -1,6 +1,6 @@
113 # Copyright 1999-2007 Gentoo Foundation
114 # Distributed under the terms of the GNU General Public License v2
115 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50.ebuild,v 1.6 2007/09/18 22:36:40 ulm Exp $
116 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50.ebuild,v 1.7 2007/10/06 17:37:13 ulm Exp $
117
118 ECVS_AUTH="pserver"
119 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
120 @@ -207,20 +207,20 @@
121
122 local infodir=/usr/share/info/${EMACS_SUFFIX} f
123 einfo "Regenerating Info directory index in ${infodir} ..."
124 - rm -f ${ROOT}${infodir}/dir{,.*}
125 - for f in ${ROOT}${infodir}/*.info*; do
126 + rm -f "${ROOT}"${infodir}/dir{,.*}
127 + for f in "${ROOT}"${infodir}/*.info*; do
128 [[ ${f##*/} == *[0-9].info* ]] \
129 - || install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null
130 + || install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null
131 done
132 echo
133 }
134
135 pkg_postinst() {
136 - test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
137 - cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
138 + test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ||
139 + cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
140
141 local f
142 - for f in ${ROOT}/var/lib/games/emacs/{snake,tetris}-scores; do
143 + for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
144 test -e ${f} || touch ${f}
145 done
146
147
148
149
150 1.5 app-editors/emacs-cvs/emacs-cvs-23.0.0-r7.ebuild
151
152 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r7.ebuild?rev=1.5&view=markup
153 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r7.ebuild?rev=1.5&content-type=text/plain
154 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r7.ebuild?r1=1.4&r2=1.5
155
156 Index: emacs-cvs-23.0.0-r7.ebuild
157 ===================================================================
158 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r7.ebuild,v
159 retrieving revision 1.4
160 retrieving revision 1.5
161 diff -u -r1.4 -r1.5
162 --- emacs-cvs-23.0.0-r7.ebuild 18 Sep 2007 22:36:40 -0000 1.4
163 +++ emacs-cvs-23.0.0-r7.ebuild 6 Oct 2007 17:37:13 -0000 1.5
164 @@ -1,6 +1,6 @@
165 # Copyright 1999-2007 Gentoo Foundation
166 # Distributed under the terms of the GNU General Public License v2
167 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r7.ebuild,v 1.4 2007/09/18 22:36:40 ulm Exp $
168 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r7.ebuild,v 1.5 2007/10/06 17:37:13 ulm Exp $
169
170 ECVS_AUTH="pserver"
171 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
172 @@ -210,20 +210,20 @@
173
174 local infodir=/usr/share/info/${EMACS_SUFFIX} f
175 einfo "Regenerating Info directory index in ${infodir} ..."
176 - rm -f ${ROOT}${infodir}/dir{,.*}
177 - for f in ${ROOT}${infodir}/*.info*; do
178 + rm -f "${ROOT}"${infodir}/dir{,.*}
179 + for f in "${ROOT}"${infodir}/*.info*; do
180 [[ ${f##*/} == *[0-9].info* ]] \
181 - || install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null
182 + || install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null
183 done
184 echo
185 }
186
187 pkg_postinst() {
188 - test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
189 - cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
190 + test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ||
191 + cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
192
193 local f
194 - for f in ${ROOT}/var/lib/games/emacs/{snake,tetris}-scores; do
195 + for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
196 test -e ${f} || touch ${f}
197 done
198
199
200
201
202 1.1 app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild
203
204 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild?rev=1.1&view=markup
205 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild?rev=1.1&content-type=text/plain
206
207 Index: emacs-cvs-22.1.50_p20070829-r1.ebuild
208 ===================================================================
209 # Copyright 1999-2007 Gentoo Foundation
210 # Distributed under the terms of the GNU General Public License v2
211 # $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild,v 1.1 2007/10/06 17:37:13 ulm Exp $
212
213 WANT_AUTOCONF="2.5"
214 WANT_AUTOMAKE="latest"
215
216 inherit autotools elisp-common eutils flag-o-matic
217
218 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
219 HOMEPAGE="http://www.gnu.org/software/emacs/"
220 SRC_URI="mirror://gentoo/${P}.tar.bz2"
221
222 LICENSE="GPL-3 FDL-1.2 BSD"
223 SLOT="22"
224 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
225 IUSE="alsa gif gpm gtk gzip-el hesiod jpeg motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xpm"
226 RESTRICT="strip"
227
228 X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
229
230 RDEPEND="sys-libs/ncurses
231 >=app-admin/eselect-emacs-0.7-r1
232 sys-libs/zlib
233 hesiod? ( net-dns/hesiod )
234 spell? ( || ( app-text/ispell app-text/aspell ) )
235 alsa? ( media-sound/alsa-headers )
236 gpm? ( sys-libs/gpm )
237 X? (
238 $X_DEPEND
239 x11-misc/emacs-desktop
240 gif? ( media-libs/giflib )
241 jpeg? ( media-libs/jpeg )
242 tiff? ( media-libs/tiff )
243 png? ( media-libs/libpng )
244 svg? ( >=gnome-base/librsvg-2.0 )
245 xpm? ( x11-libs/libXpm )
246 gtk? ( =x11-libs/gtk+-2* )
247 !gtk? (
248 Xaw3d? ( x11-libs/Xaw3d )
249 !Xaw3d? (
250 motif? ( virtual/motif )
251 )
252 )
253 )"
254
255 DEPEND="${RDEPEND}
256 gzip-el? ( app-arch/gzip )"
257
258 PROVIDE="virtual/editor"
259
260 # FULL_VERSION keeps the full version number, which is needed in order to
261 # determine some path information correctly for copy/move operations later on
262 FULL_VERSION="${PV%%_*}"
263 EMACS_SUFFIX="emacs-${SLOT}-cvs"
264
265 src_unpack() {
266 unpack ${A}
267 cd "${S}"
268
269 sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
270 -e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
271 "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
272 if ! use gzip-el; then
273 # Emacs' build system automatically detects the gzip binary and
274 # compresses el files. We don't want that so confuse it with a
275 # wrong binary name
276 sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
277 || die "unable to sed configure.in"
278 fi
279
280 epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
281 epatch "${FILESDIR}/${PN}-make-tramp-temp-file.patch"
282 # ALSA is detected and used even if not requested by the USE=alsa flag.
283 # So remove the automagic check
284 use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch"
285
286 eautoreconf
287 }
288
289 src_compile() {
290 export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
291 ALLOWED_FLAGS=""
292 strip-flags
293 unset LDFLAGS
294 replace-flags -O[3-9] -O2
295
296 local myconf
297
298 if use alsa && ! use sound; then
299 echo
300 einfo "Although sound USE flag is disabled you chose to have alsa,"
301 einfo "so sound is switched on anyway."
302 echo
303 myconf="${myconf} --with-sound"
304 else
305 myconf="${myconf} $(use_with sound)"
306 fi
307
308 if use X; then
309 myconf="${myconf} --with-x"
310 myconf="${myconf} $(use_with toolkit-scroll-bars)"
311 myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
312 myconf="${myconf} $(use_with gif) $(use_with png)"
313 myconf="${myconf} $(use_with xpm) $(use_with svg rsvg)"
314
315 # GTK+ is the default toolkit if USE=gtk is chosen with other
316 # possibilities. Emacs upstream thinks this should be standard
317 # policy on all distributions
318 if use gtk; then
319 echo
320 einfo "Configuring to build with GTK support, disabling all other toolkits"
321 echo
322 myconf="${myconf} --with-x-toolkit=gtk"
323 elif use Xaw3d; then
324 einfo "Configuring to build with Xaw3d(athena) support"
325 myconf="${myconf} --with-x-toolkit=athena"
326 myconf="${myconf} --without-gtk"
327 elif use motif; then
328 einfo "Configuring to build with motif toolkit support"
329 myconf="${myconf} --with-x-toolkit=motif"
330 myconf="${myconf} --without-gtk"
331 else
332 einfo "Configuring to build with no toolkit"
333 myconf="${myconf} --with-x-toolkit=no"
334 myconf="${myconf} --without-gtk"
335 fi
336 else
337 myconf="${myconf} --without-x"
338 fi
339
340 myconf="${myconf} $(use_with hesiod)"
341 myconf="${myconf} $(use_with gpm)"
342
343 econf \
344 --program-suffix=-${EMACS_SUFFIX} \
345 --infodir=/usr/share/info/${EMACS_SUFFIX} \
346 --without-carbon \
347 ${myconf} || die "econf emacs failed"
348
349 emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
350 }
351
352 src_install () {
353 emake install DESTDIR="${D}" || die "make install failed"
354
355 rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
356 || die "removing duplicate emacs executable failed"
357 mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
358 || die "moving Emacs executable failed"
359
360 # move info documentation to the correct place
361 einfo "Fixing info documentation ..."
362 for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
363 mv ${i} ${i}.info || die "mv info failed"
364 done
365
366 # move man pages to the correct place
367 einfo "Fixing manpages ..."
368 for m in "${D}"/usr/share/man/man1/* ; do
369 mv ${m} ${m%.1}-${EMACS_SUFFIX}.1 || die "mv man failed"
370 done
371
372 # avoid collision between slots, see bug #169033 e.g.
373 rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
374 rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
375 keepdir /var/lib/games/emacs/
376
377 if use source; then
378 insinto /usr/share/emacs/${FULL_VERSION}/src
379 # This is not meant to install all the source -- just the
380 # C source you might find via find-function
381 doins src/*.[ch]
382 sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<-EOF
383 (if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
384 X (setq find-function-C-source-directory
385 X "/usr/share/emacs/${FULL_VERSION}/src"))
386 EOF
387 elisp-site-file-install 00${PN}-${SLOT}-gentoo.el
388 fi
389
390 dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed"
391 }
392
393 emacs-infodir-rebuild() {
394 # Depending on the Portage version, the Info dir file is compressed
395 # or removed. It is only rebuilt by Portage if our directory is in
396 # INFOPATH, which is not guaranteed. So we rebuild it ourselves.
397
398 local infodir=/usr/share/info/${EMACS_SUFFIX} f
399 einfo "Regenerating Info directory index in ${infodir} ..."
400 rm -f "${ROOT}"${infodir}/dir{,.*}
401 for f in "${ROOT}"${infodir}/*.info*; do
402 [[ ${f##*/} == *[0-9].info* ]] \
403 || install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null
404 done
405 echo
406 }
407
408 pkg_postinst() {
409 test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ||
410 cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
411
412 local f
413 for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
414 test -e ${f} || touch ${f}
415 done
416
417 elisp-site-regen
418 emacs-infodir-rebuild
419 eselect emacs update --if-unset
420
421 if use X; then
422 elog "You need to install some fonts for Emacs. Under monolithic"
423 elog "XFree86/Xorg you typically had such fonts installed by default."
424 elog "With modular Xorg, you will have to perform this step yourself."
425 elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
426 elog "machine would satisfy basic Emacs requirements under X11."
427 fi
428
429 echo
430 elog "You can set the version to be started by /usr/bin/emacs through"
431 elog "the Emacs eselect module. Man and info pages are automatically"
432 elog "redirected, so you are to test emacs-cvs along with the stable"
433 elog "release. \"man emacs.eselect\" for details."
434 }
435
436 pkg_postrm() {
437 elisp-site-regen
438 emacs-infodir-rebuild
439 eselect emacs update --if-unset
440 }
441
442
443
444 --
445 gentoo-commits@g.o mailing list