From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1IoKJU-0007FS-K3 for garchives@archives.gentoo.org; Sat, 03 Nov 2007 14:49:29 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.14.1/8.14.0) with SMTP id lA3EnN1U009522; Sat, 3 Nov 2007 14:49:23 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by robin.gentoo.org (8.14.1/8.14.0) with ESMTP id lA3EnMfT009516 for ; Sat, 3 Nov 2007 14:49:23 GMT Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 9E15C64FFE for ; Sat, 3 Nov 2007 14:49:22 +0000 (UTC) Received: from ulm by stork.gentoo.org with local (Exim 4.60) (envelope-from ) id 1IoKJN-0006Mf-IZ for gentoo-commits@lists.gentoo.org; Sat, 03 Nov 2007 14:49:21 +0000 From: "Ulrich Mueller (ulm)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ulm@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-editors/emacs: ChangeLog emacs-22.1-r2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog emacs-22.1-r2.ebuild X-VCS-Directories: app-editors/emacs X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: Sender: Ulrich Mueller Date: Sat, 03 Nov 2007 14:49:21 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@gentoo.org X-Archives-Salt: 698a31a6-8831-4ba6-ad88-b786f9c56261 X-Archives-Hash: b44dd650d95fbc1ca16c253fd6b46284 ulm 07/11/03 14:49:21 Modified: ChangeLog Added: emacs-22.1-r2.ebuild Log: Security fix for function hack-local-variables, CVE-2007-5795, bug #197958. (Portage version: 2.1.3.16) Revision Changes Path 1.198 app-editors/emacs/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.198&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.198&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.197&r2=1.198 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- ChangeLog 2 Nov 2007 09:37:33 -0000 1.197 +++ ChangeLog 3 Nov 2007 14:49:20 -0000 1.198 @@ -1,6 +1,12 @@ # ChangeLog for app-editors/emacs # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.197 2007/11/02 09:37:33 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.198 2007/11/03 14:49:20 ulm Exp $ + +*emacs-22.1-r2 (03 Nov 2007) + + 03 Nov 2007; Ulrich Mueller + +files/emacs-22.1-hack-local-variables.patch, +emacs-22.1-r2.ebuild: + Security fix for function hack-local-variables, CVE-2007-5795, bug #197958. 02 Nov 2007; Ulrich Mueller emacs-22.1-r1.ebuild: Partial sync of emacs and emacs-cvs ebuilds. 1.1 app-editors/emacs/emacs-22.1-r2.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-22.1-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-22.1-r2.ebuild?rev=1.1&content-type=text/plain Index: emacs-22.1-r2.ebuild =================================================================== # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r2.ebuild,v 1.1 2007/11/03 14:49:21 ulm Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="latest" inherit autotools elisp-common eutils flag-o-matic DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" HOMEPAGE="http://www.gnu.org/software/emacs/" SRC_URI="mirror://gnu/emacs/${P}.tar.gz" LICENSE="GPL-2 FDL-1.2 BSD" SLOT="22" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" IUSE="alsa gif gtk gzip-el hesiod jpeg motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm" RESTRICT="strip" X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps" RDEPEND="!=app-admin/eselect-emacs-0.7-r1 sys-libs/zlib hesiod? ( net-dns/hesiod ) spell? ( || ( app-text/ispell app-text/aspell ) ) alsa? ( media-sound/alsa-headers ) X? ( $X_DEPEND x11-misc/emacs-desktop gif? ( media-libs/giflib ) jpeg? ( media-libs/jpeg ) tiff? ( media-libs/tiff ) png? ( media-libs/libpng ) xpm? ( x11-libs/libXpm ) gtk? ( =x11-libs/gtk+-2* ) !gtk? ( Xaw3d? ( x11-libs/Xaw3d ) !Xaw3d? ( motif? ( virtual/motif ) ) ) )" DEPEND="${RDEPEND} gzip-el? ( app-arch/gzip )" # FULL_VERSION keeps the full version number, which is needed in order to # determine some path information correctly for copy/move operations later on FULL_VERSION="${PV}" src_unpack() { unpack ${A} cd "${S}" sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \ -e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \ "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings" if ! use gzip-el; then # Emacs' build system automatically detects the gzip binary and # compresses el files. We don't want that so confuse it with a # wrong binary name sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \ || die "unable to sed configure.in" fi epatch "${FILESDIR}/${P}-Xaw3d-headers.patch" epatch "${FILESDIR}/${P}-freebsd-sparc.patch" epatch "${FILESDIR}/${P}-oldxmenu-qa.patch" epatch "${FILESDIR}/${P}-backup-buffer.patch" epatch "${FILESDIR}/${P}-hack-local-variables.patch" # ALSA is detected and used even if not requested by the USE=alsa flag. # So remove the automagic check use alsa || epatch "${FILESDIR}/${P}-disable_alsa_detection.patch" eautoreconf } src_compile() { export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 ALLOWED_FLAGS="" strip-flags unset LDFLAGS replace-flags -O[3-9] -O2 sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die local myconf if use alsa && ! use sound; then echo einfo "Although sound USE flag is disabled you chose to have alsa," einfo "so sound is switched on anyway." echo myconf="${myconf} --with-sound" else myconf="${myconf} $(use_with sound)" fi if use X; then myconf="${myconf} --with-x" myconf="${myconf} $(use_with toolkit-scroll-bars)" myconf="${myconf} $(use_with jpeg) $(use_with tiff)" myconf="${myconf} $(use_with gif) $(use_with png)" myconf="${myconf} $(use_with xpm)" # GTK+ is the default toolkit if USE=gtk is chosen with other # possibilities. Emacs upstream thinks this should be standard # policy on all distributions if use gtk; then echo einfo "Configuring to build with GTK support, disabling all other toolkits" echo myconf="${myconf} --with-x-toolkit=gtk" elif use Xaw3d; then einfo "Configuring to build with Xaw3d(athena) support" myconf="${myconf} --with-x-toolkit=athena" myconf="${myconf} --without-gtk" elif use motif; then einfo "Configuring to build with motif toolkit support" myconf="${myconf} --with-x-toolkit=motif" myconf="${myconf} --without-gtk" else einfo "Configuring to build with no toolkit" myconf="${myconf} --with-x-toolkit=no" myconf="${myconf} --without-gtk" fi else myconf="${myconf} --without-x" fi myconf="${myconf} $(use_with hesiod)" econf \ --program-suffix=-emacs-${SLOT} \ --infodir=/usr/share/info/emacs-${SLOT} \ --without-carbon \ ${myconf} || die "econf emacs failed" emake CC="$(tc-getCC)" || die "emake failed" einfo "Recompiling patched lisp files..." (cd lisp; emake recompile) || die "emake recompile failed" (cd src; emake versionclean) emake CC="$(tc-getCC)" || die "emake failed" } src_install () { emake install DESTDIR="${D}" || die "make install failed" rm "${D}"/usr/bin/emacs-${FULL_VERSION}-emacs-${SLOT} \ || die "removing duplicate emacs executable failed" mv "${D}"/usr/bin/emacs-emacs-${SLOT} "${D}"/usr/bin/emacs-${SLOT} \ || die "moving Emacs executable failed" # move info documentation to the correct place einfo "Fixing info documentation ..." for i in "${D}"/usr/share/info/emacs-${SLOT}/*; do mv ${i} ${i}.info || die "mv info failed" done # move man pages to the correct place einfo "Fixing manpages ..." for m in "${D}"/usr/share/man/man1/* ; do mv ${m} ${m%.1}-emacs-${SLOT}.1 || die "mv man failed" done # avoid collision between slots, see bug #169033 e.g. rm "${D}"/usr/share/emacs/site-lisp/subdirs.el rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores keepdir /var/lib/games/emacs/ if use source; then insinto /usr/share/emacs/${FULL_VERSION}/src # This is not meant to install all the source -- just the # C source you might find via find-function doins src/*.[ch] sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<-EOF ;;; ${PN}-${SLOT} site-lisp configuration (if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) X (setq find-function-C-source-directory X "/usr/share/emacs/${FULL_VERSION}/src")) EOF elisp-site-file-install 00${PN}-${SLOT}-gentoo.el fi dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed" } emacs-infodir-rebuild() { # Depending on the Portage version, the Info dir file is compressed # or removed. It is only rebuilt by Portage if our directory is in # INFOPATH, which is not guaranteed. So we rebuild it ourselves. local infodir=/usr/share/info/emacs-${SLOT} f einfo "Regenerating Info directory index in ${infodir} ..." rm -f "${ROOT}"${infodir}/dir{,.*} for f in "${ROOT}"${infodir}/*.info*; do [[ ${f##*/} == *[0-9].info* ]] \ || install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null done echo } pkg_postinst() { test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el || cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el local f for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do test -e ${f} || touch ${f} done elisp-site-regen emacs-infodir-rebuild if [[ $(readlink "${ROOT}"/usr/bin/emacs) == emacs.emacs-${SLOT}* ]]; then # transition from pre-eselect revision eselect emacs set emacs-${SLOT} else eselect emacs update --if-unset fi if use X; then elog "You need to install some fonts for Emacs. Under monolithic" elog "XFree86/Xorg you typically had such fonts installed by default." elog "With modular Xorg, you will have to perform this step yourself." elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's" elog "machine would satisfy basic Emacs requirements under X11." fi echo elog "You can set the version to be started by /usr/bin/emacs through" elog "the Emacs eselect module, which also redirects man and info pages." elog "Therefore, several Emacs versions can be installed at the same time." elog "\"man emacs.eselect\" for details." } pkg_postrm() { elisp-site-regen emacs-infodir-rebuild eselect emacs update --if-unset } -- gentoo-commits@gentoo.org mailing list