Fix temacs segmentation fault when dumping with kernel 2.6.25, bug 221281.

Package-Manager: portage-2.1.5_rc10

4 files changed, 309 insertions, 2 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 3fe3aee9c2f1..662bebfd473f 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.243 2008/05/06 20:37:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.244 2008/05/11 21:24:04 ulm Exp $
+
+*emacs-21.4-r16 (11 May 2008)
+*emacs-18.59-r5 (11 May 2008)
+
+  11 May 2008; Ulrich Mueller <ulm@gentoo.org> +emacs-18.59-r5.ebuild,
+  +emacs-21.4-r16.ebuild:
+  Fix temacs segmentation fault when dumping with kernel 2.6.25, bug 221281.
+  Patch backported from Emacs 22.
 
   06 May 2008; Jeroen Roovers <jer@gentoo.org> emacs-22.2-r1.ebuild:
   Stable for HPPA (bug #220535).
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 18e6e883249f..0bd54b7f6d1a 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX emacs-22.1-Xaw3d-headers.patch 4736 RMD160 d94da74ae2e8db00b5b98f35f3bbf11a1f38a188 SHA1 dd4eafe26a313334cc2c51f14b9ee7669428d02a SHA256 80228568be71952150c75adf562208913dcb15e51743480749729f9dc58816ea
 AUX emacs-22.1-backup-buffer.patch 481 RMD160 9ef0dfc7cb6a23eea18881dfa1d6d3a9b5873982 SHA1 0302df9678f2cc59c89da8bf47130810e08bfbbf SHA256 84b740a49cf201cd4e5f7384adeb3eff6b1a2c8af6b6b6d1fe849e32d50e0e8b
 AUX emacs-22.1-format-int.patch 3078 RMD160 525a4fbac24e2d97c6267655c36c06438f941a87 SHA1 397220a5b57f25a0271c1a4cc45c10f25d5f6703 SHA256 4632460b86af84ee0a826fa1dd228dcc9e763cfde9a8615e8c03655241e2a8fd
@@ -9,15 +12,26 @@ AUX emacs-22.1-vcdiff-tmp-race.patch 831 RMD160 0ffb7c22f28982a0f199a177a5e21a6a
 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.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
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 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 5614 RMD160 d78129d5c5a4c86b3086219c9c7329f5fa26efee SHA1 8653940c69ccb5c31760091f0eb229087a114ac1 SHA256 2e7078418d3ca020ed83d9595c1acde58d1f3bd085202f4a06293b4bb9b0cd08
+EBUILD emacs-21.4-r16.ebuild 5625 RMD160 2919c06a835f6b56c4f98997e15e5abf2c013f15 SHA1 968c4d753905bdde09d3cf053cbfeca638636c69 SHA256 77c3e72376e158b969bc69ee444125638439537bac174cd16aface5dc73c36e3
 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 36074 RMD160 e754615c5899dc07367fce281048b17cd9ef646b SHA1 47b209fc2700953dd9bd815a5c231523c02beba9 SHA256 34014a79c9294940c966d0e455a1a93c2bb838cd71dac5d81dcc8664cc1643fc
+MISC ChangeLog 36344 RMD160 20a1b2914231159781020d1cd7b710e57b6c474e SHA1 8485b356f18482982a20fa23006191fd9e17d618 SHA256 f4de3a003e4f0eea13234e00644a8f1fcd92a80f49cb138fe4fdf4cfd2842d08
 MISC metadata.xml 1213 RMD160 7df0bb43f41ecf811a37b60ee3cbefc7f798e840 SHA1 e545b177be5578569de6410bfea01cffe6003611 SHA256 1e71985b81478302fb03a9af91293f7dfad07aa7b31c4cc226170b45d573ce13
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEUEARECAAYFAkgnZB4ACgkQOeoy/oIi7uzTzACXT0msHo7hne2mUXt3KoSXW+87
+bACdGRALRk5ZJ5n6hlNw+pE60dNclnU=
+=tGD2
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-18.59-r5.ebuild b/app-editors/emacs/emacs-18.59-r5.ebuild
new file mode 100644
index 000000000000..10a81d1e3b25
--- /dev/null
+++ b/app-editors/emacs/emacs-18.59-r5.ebuild
@@ -0,0 +1,92 @@
+# 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-18.59-r5.ebuild,v 1.1 2008/05/11 21:24:04 ulm Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="The extensible self-documenting text editor"
+HOMEPAGE="http://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/old-gnu/emacs/${P}.tar.gz
+	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
+	mirror://gentoo/${P}-patches-2.tar.bz2"
+
+LICENSE="GPL-1 BSD"
+SLOT="18"
+KEYWORDS="~x86"
+IUSE="X"
+
+RDEPEND="sys-libs/ncurses
+	>=app-admin/eselect-emacs-1.2
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}"
+
+MY_BASEDIR="/usr/share/emacs/${PV}"
+MY_LOCKDIR="/var/lib/emacs/lock"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}/${P}-linux22x-elf-glibc21.diff"
+	EPATCH_SUFFIX=patch epatch
+}
+
+src_compile() {
+	# Do not use the sandbox, or the dumped Emacs will be twice as large
+	SANDBOX_ON=0
+
+	# autoconf? What's autoconf? We are living in 1992. ;-)
+	local arch
+	case ${ARCH} in
+		x86)   arch=intel386 ;;
+		*)	   die "Architecture ${ARCH} not supported" ;;
+	esac
+	local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
+	use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
+	sed -e "${cmd}" src/config.h-dist >src/config.h
+
+	cat <<-END >src/paths.h
+		#define PATH_LOADSEARCH "${MY_BASEDIR}/lisp"
+		#define PATH_EXEC "${MY_BASEDIR}/etc"
+		#define PATH_LOCK "${MY_LOCKDIR}/"
+		#define PATH_SUPERLOCK "${MY_LOCKDIR}/!!!SuperLock!!!"
+	END
+
+	# -O3 and -finline-functions cause segmentation faults at run time.
+	filter-flags -finline-functions
+	replace-flags -O[3-9] -O2
+	strip-flags
+
+	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" || die
+}
+
+src_install() {
+	local i
+
+	dodir ${MY_BASEDIR}
+	dodir /usr/share/man/man1
+	make install LIBDIR="${D}${MY_BASEDIR}" BINDIR="${D}/usr/bin" \
+		MANDIR="${D}/usr/share/man/man1" || die
+	chmod -R go-w "${D}${MY_BASEDIR}"
+	rmdir "${D}${MY_BASEDIR}/lock"
+
+	dodir ${MY_LOCKDIR%/*}
+	diropts -m0777
+	keepdir ${MY_LOCKDIR}
+
+	for i in emacsclient etags ctags; do
+		mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die "mv ${i} failed"
+	done
+	mv "${D}"/usr/bin/emacs{,-${SLOT}} || die "mv emacs failed"
+	mv "${D}"/usr/share/man/man1/emacs{,-emacs-${SLOT}}.1 || die
+	dosym ../emacs/${PV}/info /usr/share/info/emacs-${SLOT}
+
+	dodoc README PROBLEMS
+}
+
+pkg_postinst() {
+	eselect emacs update ifunset
+}
+
+pkg_postrm() {
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-21.4-r16.ebuild b/app-editors/emacs/emacs-21.4-r16.ebuild
new file mode 100644
index 000000000000..b57cb44fe701
--- /dev/null
+++ b/app-editors/emacs/emacs-21.4-r16.ebuild
@@ -0,0 +1,193 @@
+# 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.1 2008/05/11 21:24:04 ulm Exp $
+
+WANT_AUTOCONF="2.1"
+
+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
+	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
+
+LICENSE="GPL-2 FDL-1.1 BSD"
+SLOT="21"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X Xaw3d leim motif nls sendmail"
+
+RDEPEND="sys-libs/ncurses
+	X? (
+		x11-libs/libXext
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXmu
+		x11-libs/libXpm
+		x11-misc/emacs-desktop
+		>=media-libs/giflib-4.1.0.1b
+		>=media-libs/jpeg-6b-r2
+		>=media-libs/tiff-3.5.5-r3
+		>=media-libs/libpng-1.2.1
+		Xaw3d? ( x11-libs/Xaw3d )
+		!Xaw3d? ( motif? ( virtual/motif ) )
+	)
+	sendmail? ( virtual/mta )
+	>=app-admin/eselect-emacs-1.2"
+
+DEPEND="${RDEPEND}
+	X? ( x11-misc/xbitmaps )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_SUFFIX=patch epatch
+
+	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"
+
+	# install emacsclient.1 man page (#165466)
+	sed -i -e "s/for page in emacs/& emacsclient/" Makefile.in || die
+
+	# This will need to be updated for X-Compilation
+	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
+		"${S}/src/s/gnu-linux.h" || die
+
+	eautoconf
+}
+
+src_compile() {
+	export SANDBOX_ON=0
+
+	# -fstack-protector gets internal compiler error at xterm.c (bug 33265)
+	filter-flags -fstack-protector
+
+	# emacs doesn't handle LDFLAGS properly (bug #77430 and bug #65002)
+	unset LDFLAGS
+
+	# ever since GCC 3.2
+	replace-flags -O[3-9] -O2
+
+	# -march is known to cause signal 6 on some environment
+	filter-flags "-march=*"
+
+	local myconf
+	use nls || myconf="${myconf} --disable-nls"
+	if use X ; then
+		myconf="${myconf}
+			--with-x
+			--with-xpm
+			--with-jpeg
+			--with-tiff
+			--with-gif
+			--with-png"
+		if use Xaw3d ; then
+			einfo "Configuring to build with Xaw3d (Athena) toolkit"
+			myconf="${myconf} --with-x-toolkit=athena"
+		elif use motif ; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf="${myconf} --with-x-toolkit=motif"
+		else
+			# do not build emacs with any toolkit, bug 35300
+			einfo "Configuring to build with no toolkit"
+			myconf="${myconf} --with-x-toolkit=no"
+		fi
+	else
+		myconf="${myconf} --without-x"
+	fi
+	econf ${myconf} || die "econf 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 "die emake failed"
+}
+
+src_install() {
+	local i m
+
+	einstall || die "einstall failed"
+	for i in "${D}"/usr/bin/* ; do
+		mv "${i}" "${i}-emacs-${SLOT}" || die "mv ${i} failed"
+	done
+	mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die "mv emacs failed"
+	rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT}
+
+	einfo "Fixing info documentation..."
+	mkdir "${T}/emacs-${SLOT}"
+	mv "${D}/usr/share/info/dir" "${T}"
+	for i in "${D}"/usr/share/info/*
+	do
+		mv "${i}" "${T}/emacs-${SLOT}/${i##*/}.info"
+	done
+	mv "${T}/emacs-${SLOT}" "${D}/usr/share/info"
+	mv "${T}/dir" "${D}/usr/share/info/emacs-${SLOT}"
+
+	einfo "Fixing manpages..."
+	for m in "${D}"/usr/share/man/man1/* ; do
+		mv "${m}" "${m%.1}-emacs-${SLOT}.1" || die "mv ${m} failed"
+	done
+
+	# avoid collision between slots
+	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
+
+	einfo "Fixing permissions..."
+	find "${D}" -perm 664 |xargs chmod -f 644 2>/dev/null
+	find "${D}" -type d |xargs chmod -f 755 2>/dev/null
+
+	keepdir /usr/share/emacs/${PV}/leim
+	keepdir /usr/share/emacs/site-lisp
+
+	dodoc BUGS ChangeLog README
+}
+
+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() {
+	test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ||
+		cp "${ROOT}"/usr/share/emacs{/${PV},}/site-lisp/subdirs.el
+
+	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 sendmail && ! has_version "virtual/mta"; then
+		elog "You disabled sendmail support for Emacs. If you later install"
+		elog "a MTA then you will need to recompile Emacs. See Bug #11104."
+	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
+}
+
+pkg_postrm() {
+	emacs-infodir-rebuild
+	eselect emacs update ifunset
+}