diff options
author | Hans de Graaff <graaff@gentoo.org> | 2008-04-11 14:13:42 +0000 |
---|---|---|
committer | Hans de Graaff <graaff@gentoo.org> | 2008-04-11 14:13:42 +0000 |
commit | 27d40fb6f6849f21732b64e8ac512dde0f1badc9 (patch) | |
tree | e892eee1522bebe7cc4f1f1bcf4eec3f6d986043 /app-editors | |
parent | * stabilization (diff) | |
download | historical-27d40fb6f6849f21732b64e8ac512dde0f1badc9.tar.gz historical-27d40fb6f6849f21732b64e8ac512dde0f1badc9.tar.bz2 historical-27d40fb6f6849f21732b64e8ac512dde0f1badc9.zip |
Fix #216880
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/xemacs/ChangeLog | 8 | ||||
-rw-r--r-- | app-editors/xemacs/Manifest | 10 | ||||
-rw-r--r-- | app-editors/xemacs/files/xemacs-21.4.21-vcdiff.patch | 19 | ||||
-rw-r--r-- | app-editors/xemacs/xemacs-21.4.21-r1.ebuild | 236 |
4 files changed, 268 insertions, 5 deletions
diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog index 66384f74a776..2a420ad51a8a 100644 --- a/app-editors/xemacs/ChangeLog +++ b/app-editors/xemacs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-editors/xemacs # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.108 2008/04/09 06:29:28 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.109 2008/04/11 14:13:41 graaff Exp $ + +*xemacs-21.4.21-r1 (11 Apr 2008) + + 11 Apr 2008; Hans de Graaff <graaff@gentoo.org> + +files/xemacs-21.4.21-vcdiff.patch, +xemacs-21.4.21-r1.ebuild: + Fix security bug #216880. 09 Apr 2008; Hans de Graaff <graaff@gentoo.org> -files/xemacs-21.4.20-linuxplay.patch, -files/font-lock-keywords.patch, diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest index 83f91bf39451..ee6dd7cb77c9 100644 --- a/app-editors/xemacs/Manifest +++ b/app-editors/xemacs/Manifest @@ -4,16 +4,18 @@ Hash: SHA1 AUX README.Gentoo 1426 RMD160 2aee174f6eaa410ac036ad316fb860be340b17a7 SHA1 0f10e8c6907e6f4c33e284ef37ffee9f6467c84c SHA256 9fa4fa31fc4deb0742dd220c8a1cf41af2bb4f4651e4f995589389afcc9f5f92 AUX xemacs-21.4.19-db.patch 3157 RMD160 354d4b70dce5313ecd8732336b2562f66153c351 SHA1 f83a0870a07a10ec5f177c0e0292607463ff095a SHA256 c0c0cf18ccd01ee0e34e913c4f275977f4f61aa7343fef9fdff1f3ba84096022 AUX xemacs-21.4.19-texi.patch 1107 RMD160 2cedf0e0dfe50fdb2eb578fd7605629ea28a6f61 SHA1 4858d4297fc9c4a2db2b53b718618a23441b48c9 SHA256 9f7af4de522d03c9e78076c4801db775ce919d30b27f4f84c8b055d17f476ae5 +AUX xemacs-21.4.21-vcdiff.patch 476 RMD160 1298334c8d309f9054d98ec98bdda6dba494b653 SHA1 63bedf52451d64907f410b6a6534d82371a42e3e SHA256 adf0bb95ef289187027203f28fb0055be817c6b54211912bc33c16a9ff9cfb2c AUX xemacs.desktop 1080 RMD160 9ddca2747abcc4e7a8bb305740942f62daa73ba6 SHA1 6a3a88ea334b510951a15efb126c4fb71a3b8c38 SHA256 a97f2b5f1b85fde16eaf6b00cd3889a0c2777a0e2c1d7d3d2814f752a976b060 DIST NeXT_XEmacs.tar.gz 39571 RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 SHA1 619912734b1a1fae5115941b904d41beb4765b47 SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7 DIST xemacs-21.4.21.tar.gz 8333619 RMD160 6dd212dd926cd7a8cb5ac905fb41ef787065bef5 SHA1 fe9216148ae90c9f4c8b904a987319026676c535 SHA256 7594721cc5fa66cfabfb18446e51970eebae517f024856a7d6e6e0a79adbfcb0 +EBUILD xemacs-21.4.21-r1.ebuild 6554 RMD160 94eb55e36728d10fa849b6a5b121b61bce81b2aa SHA1 dd570d6d29799e2f0621969cb3dee489663e8024 SHA256 c6ada30f3a67df80cf5bbc5363ad09a4bd4c7e61cb952d83bfa680ef932aed81 EBUILD xemacs-21.4.21.ebuild 6469 RMD160 0c685427b77a567a930bb9565a3fbe929baf4c65 SHA1 f3bf2857b17ca3225f97f6804c2263b75c5a311c SHA256 0b3fd6de3433dc0e011f9e9bf3b4a5ba5e12450246ca4ffebaa6fee7268b3541 -MISC ChangeLog 19091 RMD160 7671bb1c750bea1702fde068c06ef219fdf0703e SHA1 33e4192a782f0603ef4de82aad1231b32f9cbf5b SHA256 12cd48a7798d809f2b7de2485c415862fc76a9574dfc290b024f4ca6cbe12b68 +MISC ChangeLog 19269 RMD160 36b8a4c89ede0a36d58e7fc59de97d03f1dd3d84 SHA1 f29f50adbd7310bb494e3b7afd3307d0770cc00d SHA256 a81659f864cc43511fc7821072121051edebe67031404ffb0c439b37af1e3936 MISC metadata.xml 365 RMD160 21028f8736b367db1d2cf1d46baedc881ded15da SHA1 a9900a09ce68ac0ae674b5913d033c7afaa85272 SHA256 cbe62b1685c4809f53fc7b8243f0662f6a57bcfe7fd49ac7138f970a3f94f6ea -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFH/GJTQUozDL2JlH4RAloDAJ0Z/d2MT2iM27LF97TzbS/mWsmj0gCfW+1V -PE5G8sDCcWzqu+UsBjSLuEE= -=KYTt +iD8DBQFH/3IiQUozDL2JlH4RAgWyAJ9Fpn7pgaz4ujeKKE07mK3HbGhe2ACeNbuM +MFPvdmsfsQ6lmfcVUNm6Fc0= +=mElH -----END PGP SIGNATURE----- diff --git a/app-editors/xemacs/files/xemacs-21.4.21-vcdiff.patch b/app-editors/xemacs/files/xemacs-21.4.21-vcdiff.patch new file mode 100644 index 000000000000..105eb549eb6d --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.4.21-vcdiff.patch @@ -0,0 +1,19 @@ +--- lib-src/vcdiff.~1~ 1996-12-18 23:42:33.000000000 +0100 ++++ lib-src/vcdiff 2008-04-09 08:20:36.000000000 +0200 +@@ -79,14 +79,14 @@ + case $f in + s.* | */s.*) + if +- rev1=/tmp/geta$$ ++ rev1=`mktemp /tmp/geta.XXXXXXXX` + get -s -p -k $sid1 "$f" > $rev1 && + case $sid2 in + '') + workfile=`expr " /$f" : '.*/s.\(.*\)'` + ;; + *) +- rev2=/tmp/getb$$ ++ rev2=`mktemp /tmp/getb.XXXXXXXX` + get -s -p -k $sid2 "$f" > $rev2 + workfile=$rev2 + esac diff --git a/app-editors/xemacs/xemacs-21.4.21-r1.ebuild b/app-editors/xemacs/xemacs-21.4.21-r1.ebuild new file mode 100644 index 000000000000..82ec94fec093 --- /dev/null +++ b/app-editors/xemacs/xemacs-21.4.21-r1.ebuild @@ -0,0 +1,236 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.21-r1.ebuild,v 1.1 2008/04/11 14:13:41 graaff Exp $ + +# Note: xemacs currently does not work with a hardened profile. If you +# want to use xemacs on a hardened profile then compile with the +# -nopie flag in CFLAGS or help fix bug #75028. + +export WANT_AUTOCONF="2.1" +inherit autotools eutils + +DESCRIPTION="highly customizable open source text editor and application development system" +HOMEPAGE="http://www.xemacs.org/" +SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz + http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="eolconv esd gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb" + +X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps" + +DEPEND="virtual/libc + !virtual/xemacs + berkdb? ( sys-libs/db ) + gdbm? ( >=sys-libs/gdbm-1.8.3 ) + >=sys-libs/zlib-1.1.4 + >=dev-libs/openssl-0.9.6 + >=media-libs/audiofile-0.2.3 + gpm? ( >=sys-libs/gpm-1.19.6 ) + postgres? ( >=dev-db/postgresql-7.2 ) + ldap? ( net-nds/openldap ) + esd? ( media-sound/esound ) + nas? ( media-libs/nas ) + X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) + dnd? ( x11-libs/dnd ) + motif? ( >=x11-libs/openmotif-2.1.30 ) + athena? ( x11-libs/libXaw ) + Xaw3d? ( x11-libs/Xaw3d ) + neXt? ( x11-libs/neXtaw ) + xface? ( media-libs/compface ) + tiff? ( media-libs/tiff ) + png? ( =media-libs/libpng-1.2* ) + jpeg? ( media-libs/jpeg ) + canna? ( app-i18n/canna ) + !amd64? ( freewnn? ( app-i18n/freewnn ) ) + >=sys-libs/ncurses-5.2 + >=app-admin/eselect-emacs-0.7-r1" + +PDEPEND="app-xemacs/xemacs-base + mule? ( app-xemacs/mule-base )" + +PROVIDE="virtual/xemacs" + +src_unpack() { + unpack ${P}.tar.gz + use neXt && unpack NeXT_XEmacs.tar.gz + + cd "${S}" + epatch "${FILESDIR}"/xemacs-21.4.19-texi.patch + + # see bug 58350, 102540 and 143580 + epatch "${FILESDIR}"/xemacs-21.4.19-db.patch + + # Security bug #216880 + epatch "${FILESDIR}"/xemacs-21.4.21-vcdiff.patch + + # Run autoconf. XEmacs tries to be smart by providing a stub + # configure.ac file for autoconf 2.59 but this throws our + # autotools eclass so it must be removed first. + rm "${S}"/configure.ac + eautoconf + + use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ +} + +src_compile() { + local myconf="" + + if use X; then + + myconf="${myconf} --with-widgets=athena" + myconf="${myconf} --with-dialogs=athena" + myconf="${myconf} --with-menubars=lucid" + myconf="${myconf} --with-scrollbars=lucid" + if use motif ; then + myconf="--with-widgets=motif" + myconf="${myconf} --with-dialogs=motif" + myconf="${myconf} --with-scrollbars=motif" + myconf="${myconf} --with-menubars=lucid" + fi + if use athena ; then + myconf="--with-scrollbars=athena" + fi + + if use Xaw3d; then + myconf="${myconf} --with-athena=3d" + elif use neXt; then + myconf="${myconf} --with-athena=next" + else + myconf="${myconf} --with-athena=xaw" + fi + + use dnd && myconf="${myconf} --with-dragndrop --with-offix" + + myconf="${myconf} $(use_with tiff ) $(use_with png )" + myconf="${myconf} $(use_with jpeg ) $(use_with xface )" + else + myconf="${myconf} + --without-x + --without-xpm + --without-dragndrop + --with-gif=no" + fi + + if use mule ; then + myconf="${myconf} --with-mule" + + if use xim ; then + if use motif ; then + myconf="${myconf} --with-xim=motif" + else + myconf="${myconf} --with-xim=xlib" + fi + else + myconf="${myconf} --with-xim=no" + fi + + myconf="${myconf} $(use_with canna ) $(use_with freewnn wnn )" + fi + + # This determines the type of sounds we are playing + local soundconf="native" + + # This determines how these sounds should be played + use nas && soundconf="${soundconf},nas" + use esd && soundconf="${soundconf},esd" + + myconf="${myconf} --with-sound=${soundconf}" + + if use gdbm || use berkdb ; then + use gdbm && mydb="gdbm" + + use berkdb && mydb="${mydb},berkdb" + + myconf="${myconf} --with-database=${mydb}" + else + myconf="${myconf} --without-database" + fi + + # fixes #21264, this should be fixed in 21.4.21 and has been fixed + # in 21.5 for sure. Now that 21.4.21 is out there is no real + # evidence that this indeed got fixed, so keep these exceptions + # for now. + use alpha && myconf="${myconf} --with-system-malloc" + use ppc64 && myconf="${myconf} --with-system-malloc" + use ia64 && myconf="${myconf} --with-system-malloc" + + # Enabling modules will cause segfaults outside the XEmacs build directory + use ia64 && myconf="${myconf} --without-modules" + + einfo "${myconf}" + + # Don't use econf because it uses options which this configure + # script does not understand (like --host). + ./configure ${myconf} ${EXTRA_ECONF} \ + $(use_with gif ) \ + $(use_with gpm ) \ + $(use_with postgres postgresql ) \ + $(use_with ldap ) \ + $(use_with eolconv file-coding ) \ + $(use_with pop ) \ + --prefix=/usr \ + --with-ncurses \ + --with-msw=no \ + --mail-locking=flock \ + --with-site-lisp=yes \ + --with-site-modules=yes \ + || die "The configure script failed to run properly" + + emake || die "emake failed" +} + +src_install() { + emake prefix="${D}"/usr \ + mandir="${D}"/usr/share/man/man1 \ + infodir="${D}"/usr/share/info \ + install gzip-el || die "emake install failed" + + # Rename some applications installed in bin so that it is clear + # which application installed them and so that conflicting + # packages (emacs) can't clobber the actual applications. + # Addresses bug #62991. + for i in b2m ctags etags rcs-checkin ; do + mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed" + done + + # rename man pages + for i in ctags etags; do + mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed" + done + + # install base packages directories + dodir /usr/lib/xemacs/xemacs-packages/ + dodir /usr/lib/xemacs/site-packages/ + dodir /usr/lib/xemacs/site-modules/ + dodir /usr/lib/xemacs/site-lisp/ + + if use mule; + then + dodir /usr/lib/xemacs/mule-packages + fi + + # remove extraneous info files + cd "${D}"/usr/share/info + rm -f dir info.info texinfo* termcap* standards* + + cd "${S}" + dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README* + dodoc "${FILESDIR}"/README.Gentoo + + insinto /usr/share/pixmaps + newins "${S}"/etc/${PN}-icon.xpm ${PN}.xpm + + insinto /usr/share/applications + doins "${FILESDIR}"/${PN}.desktop +} + +pkg_postinst() { + eselect emacs update --if-unset +} + +pkg_postrm() { + eselect emacs update --if-unset +} |