Security fix for fast-lock cache, CVE-2008-2142, bug 221197.

Package-Manager: portage-2.1.5_rc10

5 files changed, 310 insertions, 10 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 662bebfd473f..6b565fbd71cf 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.244 2008/05/11 21:24:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.245 2008/05/13 00:10:42 ulm Exp $
+
+*emacs-22.2-r2 (12 May 2008)
+*emacs-21.4-r17 (12 May 2008)
+
+  12 May 2008; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-22.2-fast-lock.patch, -emacs-21.4-r16.ebuild,
+  +emacs-21.4-r17.ebuild, +emacs-22.2-r2.ebuild:
+  Security fix for fast-lock cache, CVE-2008-2142, bug 221197.
 
 *emacs-21.4-r16 (11 May 2008)
 *emacs-18.59-r5 (11 May 2008)
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 617ec25ecbac..2e4f05ffa4a8 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,13 +9,14 @@ AUX emacs-22.1-hack-local-variables.patch 561 RMD160 248f09898369161dcd0e3148c7f
 AUX emacs-22.1-oldxmenu-qa.patch 448 RMD160 ac5b0e57569f0963862ded46953be899fb637590 SHA1 10887f5e0ccebde6715307fdc59faa8f826dd597 SHA256 3039fa8eedc22c638e706123bd1affb0f736a53bf0ebc68566678ead92a4c590
 AUX emacs-22.1-s390x-non-multilib.patch 1097 RMD160 01f05e7f917cc7b0e7f8d5c06935a967a9bed8bd SHA1 8783e82d5d53b1993f00481577201511a4fed375 SHA256 2cf2c4722cee9567be5b570a47d32f9322b125cbcd214161d3f956605b03eecc
 AUX emacs-22.1-vcdiff-tmp-race.patch 831 RMD160 0ffb7c22f28982a0f199a177a5e21a6a62b5ef46 SHA1 9200da3d3825747ded3cba4c9e1c0a514131e9ae SHA256 a220e676cde0e84fb136328915a747cce1b0807c21373cfda7c93063997d616d
+AUX emacs-22.2-fast-lock.patch 1474 RMD160 a85b27612673d3cdea50d35a25fd8f1172425cb2 SHA1 468d15d844cacaf905f5aca9c5ea63f0017a0162 SHA256 72419329a28850e5e92e517a7634a38a106afbb743c21167411bbb755c82f4c2
 AUX emacs-22.2-heimdal-gentoo.patch 1906 RMD160 004cd91c637df470e5960854b943d2cce5b628af SHA1 6460fca37eed80fd0b7539ec0982dcd180fe2281 SHA256 7cd1a4358a26aa832461e5a16b6d8a1ea95b58dd19578ee2361f91afc4e3bc7f
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd
 DIST emacs-18.59-patches-1.tar.bz2 16613 RMD160 274fc8cf91d1ebd847bac79d77aa7540803a2b07 SHA1 5eeb76e3517c0db6d4d664a01d667b0e824b6b09 SHA256 92b72201b3c152360a09a5d7dadbac4debb131751c4fb4dfda49d6430e6e0680
 DIST emacs-18.59-patches-2.tar.bz2 17872 RMD160 bb79f013611768afe79d69c18ce84bae009d04d5 SHA1 ef86046c19aeba889c7c3fd35c83afa76ee8b84b SHA256 d1c7975068b773733fb142e07b86dbf2952a7ff75fe6fa79638d9eee6929b7a4
 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
 DIST emacs-21.4-patches-2.tar.bz2 9984 RMD160 fd1a5e24740a9ce230b0898864abea2ef4451db2 SHA1 4042d587210dba95514c18054de4a98ce8d4c231 SHA256 2980bf428e97e34def633ce4c6bf383dbaf09aeb57eea318398144a067c7fa34
-DIST emacs-21.4-patches-3.tar.bz2 11704 RMD160 32c2c008c1ad7647acf8296f8c21d8c0539df14c SHA1 432b568688b16991f1e3d289c95238c55ea7f863 SHA256 89de48385fbdf4096e9904351d9d637cae89317eb94fad96ad4597901bb0a499
+DIST emacs-21.4-patches-5.tar.bz2 12425 RMD160 522aff90dc0b1876ad9a4082aac07053f992e0f0 SHA1 57162cd4f5a02c455d973ede94204e38b88a280a SHA256 c836e88c707310a9b2da13543c25f3895f19ad3f30f634a234fa0789570d9d00
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
 DIST emacs-22.1.tar.gz 38172226 RMD160 da5360871db8b1d473ff7f0b0937ee6c278c0b19 SHA1 327664173eabe5db49d4e7e4a4b1794577af902e SHA256 1ec43bef7127e572f92d7c3a846951cf8e263e27445c62c867035f94681c3ed0
 DIST emacs-22.2.tar.gz 38694318 RMD160 ec2da7cd7065cbd76773e544da1d1495f33d6ea1 SHA1 7a371332cb8400d44e8eb31f19e432bbc93523a0 SHA256 216839e1fb38ca4f2ed0a07689fb47ee80d90845f34e0a56fe781d6aa462e367
@@ -23,15 +24,16 @@ DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SH
 EBUILD emacs-18.59-r4.ebuild 2491 RMD160 b384466f01c7f4df87a50c4f6ffa209be64fc60e SHA1 d1680b107812f2950e767b7982e3a3545e2820bd SHA256 bb4d86f19d22cda3efc60987f74dc348173b9f493e6565abd0f4e2bdf4ef13c1
 EBUILD emacs-18.59-r5.ebuild 2491 RMD160 67930a5bdc3dbf106f62e75847552d65f11c2d02 SHA1 b9c8547d7ff8fc47adc0f62dd6d286cf7612a9aa SHA256 d076fbd0c152efc96212ed9e45bc5055791014a1e676ac5551b0a8c85d892d20
 EBUILD emacs-21.4-r15.ebuild 5610 RMD160 fe29223f7e215bbb6dd583e380203d46bad2763b SHA1 97d2512d1b128a2a38d95047dd2712c3bf941d33 SHA256 bbf623f7d8793ceb4c665078e411f915bc3ccacf1501f78542acf9d9bd5fac3c
-EBUILD emacs-21.4-r16.ebuild 5621 RMD160 570fc82a0a6280aae765b83a1cde4b1b71667eb6 SHA1 e612071b2e1cdaa9c1d1188333e60518725598f2 SHA256 89f57ff8b98c01de4469baf94909f2eea77873fc7dbf0e55663ef6eeb23f134b
+EBUILD emacs-21.4-r17.ebuild 5624 RMD160 e0e8ddb1e964860e0caf4939b79b2f1d4ba435b3 SHA1 36e3d2908312f3f33592f7d2d148dab0791d289d SHA256 402875cad4cb23aaf977902f2d238fa526b1304051f735c0b2d5fd35b81bac4c
 EBUILD emacs-22.1-r4.ebuild 8112 RMD160 43b5252e54649807630f0989b6ba6c1e71892230 SHA1 f9de872a9e14b6f62fb44b816473943abbf57d5f SHA256 8a33993a7bed688a69d74a752ea14322b0ae57cebb9a624cdaf1f5e77ca7007a
 EBUILD emacs-22.2-r1.ebuild 8005 RMD160 7dd0ec2ddfa323483d23fe4e99b9bda6a4834f04 SHA1 54bbaa8572d336dd7eb70ba26a17392dbffcb7f2 SHA256 8c8cca5b3f5319d964f7afd25adbc71beb5a563abb5fad8b28e5472493b85543
-MISC ChangeLog 36344 RMD160 20a1b2914231159781020d1cd7b710e57b6c474e SHA1 8485b356f18482982a20fa23006191fd9e17d618 SHA256 f4de3a003e4f0eea13234e00644a8f1fcd92a80f49cb138fe4fdf4cfd2842d08
+EBUILD emacs-22.2-r2.ebuild 8218 RMD160 2b48a4c525ec56960433dea6439286f1fca8ce5f SHA1 7c300222fe6c1e5eb81a348202a1dce2a3d4e254 SHA256 2f418154f8d24f54cc1f301b36380f2775a88852705a3fe55dd1f7801abc7d93
+MISC ChangeLog 36625 RMD160 4986c53b46dcf698b128bd5166ba19a764eeab38 SHA1 56e522e0c60b81d5b172af30e60278bc31ac3777 SHA256 ea539be4ae5fc49b39ef31e3bdabe4a7bd1e7f814d3a783c0f79eb0e32bd5c5f
 MISC metadata.xml 1213 RMD160 7df0bb43f41ecf811a37b60ee3cbefc7f798e840 SHA1 e545b177be5578569de6410bfea01cffe6003611 SHA256 1e71985b81478302fb03a9af91293f7dfad07aa7b31c4cc226170b45d573ce13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkgojhMACgkQOeoy/oIi7uxmHgCgmKeq5QEiOkTdkz9feiu4fMqj
-tEoAoLJo+JRzE+vbaE8+sXtD+AJgH59S
-=/SF0
+iEYEARECAAYFAkgo3K0ACgkQOeoy/oIi7uyH0wCfZV9bjgJA1bdS0bH38J6XIB2k
+SoYAoKS8LMmeuvgAPgxlHnZNLxnciha3
+=+z41
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r16.ebuild b/app-editors/emacs/emacs-21.4-r17.ebuild
index 1e84ae526863..0489f2f8b67e 100644
--- a/app-editors/emacs/emacs-21.4-r16.ebuild
+++ b/app-editors/emacs/emacs-21.4-r17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r16.ebuild,v 1.2 2008/05/12 18:35:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r17.ebuild,v 1.1 2008/05/13 00:10:42 ulm Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -9,7 +9,7 @@ inherit flag-o-matic eutils toolchain-funcs autotools
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
-	mirror://gentoo/${P}-patches-3.tar.bz2
+	mirror://gentoo/${P}-patches-5.tar.bz2
 	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
 
 LICENSE="GPL-2 FDL-1.1 BSD"
@@ -49,7 +49,7 @@ src_unpack() {
 		-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"
 
-	# install emacsclient.1 man page (#165466)
+	# install emacsclient.1 man page (bug 165466)
 	sed -i -e "s/for page in emacs/& emacsclient/" Makefile.in || die
 
 	# This will need to be updated for X-Compilation
diff --git a/app-editors/emacs/emacs-22.2-r2.ebuild b/app-editors/emacs/emacs-22.2-r2.ebuild
new file mode 100644
index 000000000000..ecd716e5f5dd
--- /dev/null
+++ b/app-editors/emacs/emacs-22.2-r2.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.2-r2.ebuild,v 1.1 2008/05/13 00:10:42 ulm Exp $
+
+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-3 FDL-1.2 BSD"
+SLOT="22"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
+RESTRICT="strip"
+
+RDEPEND="!<app-editors/emacs-cvs-22.1
+	sys-libs/ncurses
+	>=app-admin/eselect-emacs-1.2
+	net-libs/liblockfile
+	hesiod? ( net-dns/hesiod )
+	kerberos? ( virtual/krb5 )
+	spell? ( || ( app-text/ispell app-text/aspell ) )
+	alsa? ( media-libs/alsa-lib )
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-misc/xbitmaps
+		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}
+	alsa? ( dev-util/pkgconfig )
+	X? ( gtk? ( dev-util/pkgconfig ) )
+	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}"
+
+	epatch "${FILESDIR}/emacs-22.1-Xaw3d-headers.patch"
+	epatch "${FILESDIR}/emacs-22.1-freebsd-sparc.patch"
+	# fix vcdiff insecure temporary file creation (bug 216880)
+	epatch "${FILESDIR}/emacs-22.1-vcdiff-tmp-race.patch"
+	# support compilation with Heimdal (bug 215558)
+	epatch "${FILESDIR}/${P}-heimdal-gentoo.patch"
+	# fix fast-lock cache security problem (bug 221197)
+	epatch "${FILESDIR}/${P}-fast-lock.patch"
+
+	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 alsa; then
+		# ALSA is detected even if not requested by its USE flag.
+		# Suppress it by supplying pkg-config with a wrong library name.
+		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+	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
+
+	eautoreconf
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	ALLOWED_FLAGS=""
+	strip-flags
+	#unset LDFLAGS
+	if use hppa; then # bug #193703
+		replace-flags -O[2-9] -O
+	else
+		replace-flags -O[3-9] -O2
+	fi
+	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
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			myconf="${myconf} --with-x-toolkit=gtk"
+		elif use Xaw3d; then
+			einfo "Configuring to build with Xaw3d (Athena) toolkit"
+			myconf="${myconf} --with-x-toolkit=athena"
+			myconf="${myconf} --without-gtk"
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			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)"
+	myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
+
+	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 () {
+	local i m
+
+	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 /usr/share/emacs/site-lisp
+	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//' >10${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 10${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
+	rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty
+	echo
+}
+
+pkg_postinst() {
+	[ -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
+		[ -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 ifunset
+	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 ifunset
+}
diff --git a/app-editors/emacs/files/emacs-22.2-fast-lock.patch b/app-editors/emacs/files/emacs-22.2-fast-lock.patch
new file mode 100644
index 000000000000..e1c00a5cb305
--- /dev/null
+++ b/app-editors/emacs/files/emacs-22.2-fast-lock.patch
@@ -0,0 +1,31 @@
+--- emacs-22.2-orig/lisp/obsolete/fast-lock.el	2008-01-10 13:15:40.000000000 +0100
++++ emacs-22.2/lisp/obsolete/fast-lock.el	2008-05-12 21:25:57.000000000 +0200
+@@ -286,7 +286,7 @@
+ 				      (integer :tag "size")))))
+   :group 'fast-lock)
+ 
+-(defcustom fast-lock-cache-directories '("." "~/.emacs-flc")
++(defcustom fast-lock-cache-directories '("~/.emacs-flc")
+ ; - `internal', keep each file's Font Lock cache file in the same file.
+ ; - `external', keep each file's Font Lock cache file in the same directory.
+   "*Directories in which Font Lock cache files are saved and read.
+@@ -304,13 +304,18 @@
+  ((\"^/your/true/home/directory/\" . \".\") \"~/.emacs-flc\")
+ 
+ would cause a file's current directory to be used if the file is under your
+-home directory hierarchy, or otherwise the absolute directory `~/.emacs-flc'."
++home directory hierarchy, or otherwise the absolute directory `~/.emacs-flc'.
++For security reasons, it is not advisable to use the file's current directory
++to avoid the possibility of using the cache of another user."
+   :type '(repeat (radio (directory :tag "directory")
+ 			(cons :tag "Matching"
+ 			      (regexp :tag "regexp")
+ 			      (directory :tag "directory"))))
+   :group 'fast-lock)
+ 
++;;;###autoload
++(put 'fast-lock-cache-directories 'risky-local-variable t)
++
+ (defcustom fast-lock-save-events '(kill-buffer kill-emacs)
+   "*Events under which caches will be saved.
+ Valid events are `save-buffer', `kill-buffer' and `kill-emacs'.