patch for #114234

(Portage version: 2.0.51.22-r3)

5 files changed, 220 insertions, 28 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 1fb466124bd7..e380d7d14e39 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.110 2005/12/12 06:01:31 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.111 2005/12/21 10:00:18 taviso Exp $
+
+*openmotif-2.2.3-r8 (21 Dec 2005)
+
+  21 Dec 2005; Tavis Ormandy <taviso@gentoo.org>
+  +files/openmotif-2.2.3-CVE-2005-3964.patch, +openmotif-2.2.3-r8.ebuild:
+  patch for #114234
 
   12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   openmotif-2.2.3-r7.ebuild:
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 77386c6278cf..f801a36639ae 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,36 +1,39 @@
-MD5 565952a9753c9d1e318667a928427a02 ChangeLog 16565
-MD5 b38be118160b49f6b0f9e31d26f01594 files/CAN-2005-0605.patch 1118
-MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r13 79
-MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r9 79
+MD5 899ae6215f03b05f8cc6291eaf02eb00 openmotif-2.2.3-r8.ebuild 3964
+MD5 820298e14c2fe7aa9d83621eb59a75ad openmotif-2.2.3-r3.ebuild 3239
+MD5 0b8526ea0e8fb64a6dafc6108efae24d openmotif-2.2.3-r7.ebuild 3919
+MD5 bdd6eae7af3ae0ed5996309333f4c9f2 openmotif-2.1.30-r13.ebuild 5165
+MD5 489fb15ce20166fbbdbc35d7cf161858 ChangeLog 16744
+MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+MD5 cbb60554d94564b84d4960afdbcc2500 openmotif-2.1.30-r9.ebuild 3939
+MD5 ee3a092a933a6393bf14d5d7e6231934 files/openmotif-2.1.30-xpm2.diff 47085
 MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r3 68
 MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r7 68
-MD5 76aa44266e6ebef00c664b2f24822ce9 files/openmotif-2.1.30-CAN-2004-0687-0688.patch.bz2 3274
-MD5 5c49a886f108baeda96fc41f32647cf6 files/openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2 12300
-MD5 6e392c40eacd6da7718bc94d55914d32 files/openmotif-2.1.30-CAN-2004-0914.patch.bz2 11702
-MD5 62870f12ebc148c6319223ec659c290f files/openmotif-2.1.30-CAN-2004-0914_sec8.patch 471
+MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r8 68
 MD5 61fb956ff4bc34bc503cdb2226fd037b files/openmotif-2.1.30-darwin-netbsd.diff 16799
-MD5 ed2738dd3cbdc87b0800fe9710092d18 files/openmotif-2.1.30-imake-ansi.patch 6554
-MD5 28350d5dab901ef8cd0dc92e578e3f45 files/openmotif-2.1.30-imake-tmpdir.patch 1083
-MD5 f586e24ce0a2b3eeea25a82c8ec1d3c4 files/openmotif-2.1.30-uil-bad_grammar_fix.diff 832
-MD5 8aaa33844cae66b12fcdce6b58bfe6df files/openmotif-2.1.30-xpm.diff 13134
-MD5 ee3a092a933a6393bf14d5d7e6231934 files/openmotif-2.1.30-xpm2.diff 47085
+MD5 339b1b38271b9dfdd8c476429b55787e files/openmotif-2.2.3-pixel_length.patch 450
+MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r9 79
+MD5 6e392c40eacd6da7718bc94d55914d32 files/openmotif-2.1.30-CAN-2004-0914.patch.bz2 11702
 MD5 e408518ff6768e58a409938c473d23ce files/openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2 3362
-MD5 a6ffd504c7b34b3c24a2e9f45e864bbe files/openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986
-MD5 81bc342197a88eb207901ec3ea8927c7 files/openmotif-2.2.3-CAN-2004-0914.patch.bz2 11770
-MD5 db318d4fb05541d70e7e451d46987bd1 files/openmotif-2.2.3-CAN-2004-0914_sec8.patch 491
-MD5 aaf04376f7011a2f68b7961100f611fb files/openmotif-2.2.3-Mwm.defaults 536
+MD5 8aaa33844cae66b12fcdce6b58bfe6df files/openmotif-2.1.30-xpm.diff 13134
 MD5 5f3081ba56f381a6c667c4677258d1c0 files/openmotif-2.2.3-XmResizeHashTable.patch 183
+MD5 b38be118160b49f6b0f9e31d26f01594 files/CAN-2005-0605.patch 1118
+MD5 7284e10e14cac30429821b824dd2f722 files/site.def 2062
+MD5 ed2738dd3cbdc87b0800fe9710092d18 files/openmotif-2.1.30-imake-ansi.patch 6554
 MD5 d5f7bbd57d8951fec70fac481f00a83e files/openmotif-2.2.3-automake.patch 275
-MD5 644560d15450d90e787bf12ac8e77638 files/openmotif-2.2.3-char_not_supported.patch 1014
-MD5 216193f922fae0747195fd851696b580 files/openmotif-2.2.3-mwm-configdir.patch 1549
+MD5 76aa44266e6ebef00c664b2f24822ce9 files/openmotif-2.1.30-CAN-2004-0687-0688.patch.bz2 3274
+MD5 307acb8e70d5d1bba7e8035dd043bfbd files/openmotif-2.2.3-CVE-2005-3964.patch 1139
+MD5 f586e24ce0a2b3eeea25a82c8ec1d3c4 files/openmotif-2.1.30-uil-bad_grammar_fix.diff 832
 MD5 ae018b1d050619b521ce52cf1a822ef9 files/openmotif-2.2.3-no_demos.patch 3803
-MD5 339b1b38271b9dfdd8c476429b55787e files/openmotif-2.2.3-pixel_length.patch 450
+MD5 a6ffd504c7b34b3c24a2e9f45e864bbe files/openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986
 MD5 f89741373660d1834cb1063c06dda8fd files/openmotif-2.2.3-popup_timeout.patch 359
-MD5 214cd8f46dc88caf500e6307658abfbf files/openmotif-2.2.3-utf8.patch 2979
-MD5 7284e10e14cac30429821b824dd2f722 files/site.def 2062
+MD5 62870f12ebc148c6319223ec659c290f files/openmotif-2.1.30-CAN-2004-0914_sec8.patch 471
+MD5 644560d15450d90e787bf12ac8e77638 files/openmotif-2.2.3-char_not_supported.patch 1014
+MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r13 79
+MD5 28350d5dab901ef8cd0dc92e578e3f45 files/openmotif-2.1.30-imake-tmpdir.patch 1083
+MD5 5c49a886f108baeda96fc41f32647cf6 files/openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2 12300
 MD5 7284e10e14cac30429821b824dd2f722 files/site.def.1 2062
-MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-MD5 bdd6eae7af3ae0ed5996309333f4c9f2 openmotif-2.1.30-r13.ebuild 5165
-MD5 cbb60554d94564b84d4960afdbcc2500 openmotif-2.1.30-r9.ebuild 3939
-MD5 820298e14c2fe7aa9d83621eb59a75ad openmotif-2.2.3-r3.ebuild 3239
-MD5 0b8526ea0e8fb64a6dafc6108efae24d openmotif-2.2.3-r7.ebuild 3919
+MD5 81bc342197a88eb207901ec3ea8927c7 files/openmotif-2.2.3-CAN-2004-0914.patch.bz2 11770
+MD5 aaf04376f7011a2f68b7961100f611fb files/openmotif-2.2.3-Mwm.defaults 536
+MD5 db318d4fb05541d70e7e451d46987bd1 files/openmotif-2.2.3-CAN-2004-0914_sec8.patch 491
+MD5 214cd8f46dc88caf500e6307658abfbf files/openmotif-2.2.3-utf8.patch 2979
+MD5 216193f922fae0747195fd851696b580 files/openmotif-2.2.3-mwm-configdir.patch 1549
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r8 b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r8
new file mode 100644
index 000000000000..a6451299c75a
--- /dev/null
+++ b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r8
@@ -0,0 +1 @@
+MD5 94c96a0f94ee0d5e41d3dba2188b263d openMotif-2.2.3.tar.gz 5149785
diff --git a/x11-libs/openmotif/files/openmotif-2.2.3-CVE-2005-3964.patch b/x11-libs/openmotif/files/openmotif-2.2.3-CVE-2005-3964.patch
new file mode 100644
index 000000000000..2069eb4fad78
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.2.3-CVE-2005-3964.patch
@@ -0,0 +1,29 @@
+--- openMotif-2.2.3/clients/uil/UilDiags.c	2002-01-10 21:55:42.000000000 +0100
++++ openMotif-2.2.3/clients/uil/UilDiags.c	2005-12-12 22:09:48.000000000 +0100
+@@ -293,12 +293,12 @@ void	diag_issue_diagnostic
+     va_start(ap, l_start_column);
+ 
+ #ifndef NO_MESSAGE_CATALOG
+-    vsprintf( msg_buffer, 
++    vsnprintf( msg_buffer, 132, 
+ 	      catgets(uil_catd, UIL_SET1, msg_cat_table[ message_number ],
+ 		      diag_rz_msg_table[ message_number ].ac_text), 
+ 	     ap );
+ #else
+-    vsprintf( msg_buffer, 
++    vsnprintf( msg_buffer, 132,
+ 	      diag_rz_msg_table[ message_number ].ac_text, 
+ 	      ap );
+ #endif
+diff -rupN openMotif-2.2.3/clients/uil/UilSrcSrc.c openMotif-2.2.3-rc4/clients/uil/UilSrcSrc.c
+--- openMotif-2.2.3/clients/uil/UilSrcSrc.c	2002-01-10 21:55:47.000000000 +0100
++++ openMotif-2.2.3/clients/uil/UilSrcSrc.c	2005-12-12 22:10:46.000000000 +0100
+@@ -631,7 +631,7 @@ open_source_file( XmConst char          
+ 
+     /* place the file name in the expanded_name buffer */
+ 
+-    strcpy(buffer, c_file_name);
++    strncpy(buffer, c_file_name, 256);
+ 
+ /*    Determine if this is the main file or an include file.  */
+ 
diff --git a/x11-libs/openmotif/openmotif-2.2.3-r8.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r8.ebuild
new file mode 100644
index 000000000000..8ccea1985259
--- /dev/null
+++ b/x11-libs/openmotif/openmotif-2.2.3-r8.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r8.ebuild,v 1.1 2005/12/21 10:00:19 taviso Exp $
+
+inherit eutils libtool flag-o-matic multilib
+
+MY_P=${P/m/M}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Open Motif"
+HOMEPAGE="http://www.motifzone.org/"
+SRC_URI="ftp://ftp.motifzone.net/om${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="MOTIF"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/libc
+	|| ( ( x11-libs/libXmu
+			x11-libs/libXaw
+			x11-libs/libXp
+		)
+		virtual/x11
+	)
+	>=x11-libs/motif-config-0.9"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	!ppc-macos? ( =sys-devel/automake-1.4* )
+	=sys-devel/autoconf-2.5*
+	|| ( ( x11-proto/printproto
+			x11-proto/xextproto
+			x11-misc/xbitmaps
+		)
+		virtual/x11
+	)"
+
+PROVIDE="virtual/motif"
+SLOT="2.2"
+
+pkg_setup() {
+	# multilib includes don't work right in this package...
+	[ -n "${ABI}" ] && append-flags "-I/usr/include/gentoo-multilib/${ABI}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# various patches
+	epatch ${FILESDIR}/${P}-mwm-configdir.patch
+	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch.bz2
+	epatch ${FILESDIR}/${P}-CAN-2004-0914-newer.patch.bz2
+	epatch ${FILESDIR}/${P}-CAN-2004-0914_sec8.patch
+	epatch ${FILESDIR}/${P}-char_not_supported.patch
+	epatch ${FILESDIR}/${P}-pixel_length.patch
+	epatch ${FILESDIR}/${P}-popup_timeout.patch
+	epatch ${FILESDIR}/${P}-XmResizeHashTable.patch
+	epatch ${FILESDIR}/${P}-utf8.patch
+	epatch ${FILESDIR}/${P}-no_demos.patch
+	epatch ${FILESDIR}/${P}-CVE-2005-3964.patch
+	use ppc-macos && epatch ${FILESDIR}/${P}-automake.patch
+	epatch ${FILESDIR}/CAN-2005-0605.patch
+
+	# autotool stuff
+	export WANT_AUTOCONF=2.5
+
+	# Patched Makefile.am to work with version 1.6 on ppc-macos.
+	# Untested elsewhere
+	use ppc-macos || export WANT_AUTOMAKE=1.4
+
+	libtoolize --force --copy
+	aclocal || die
+	AUTOMAKE_OPTS="--foreign"
+	# For some reason ppc-macos complains about missing depcomp and compile
+	# files
+	use ppc-macos && AUTOMAKE_OPTS="-a -c -f ${AUTOMAKE_OPTS}"
+	automake ${AUTOMAKE_OPTS} || die
+	autoconf || die
+}
+
+
+src_compile() {
+	# get around some LANG problems in make (#15119)
+	unset LANG
+
+	# bug #80421
+	filter-flags -ftracer
+
+	econf --with-x || die "configuration failed"
+
+	emake -j1 || die "make failed, if you have lesstif installed removed it, compile openmotif and recompile lesstif"
+}
+
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	# cleanups
+	rm -fR ${D}/usr/$(get_libdir)/X11
+	rm -fR ${D}/usr/$(get_libdir)/X11/bindings
+	rm -fR ${D}/usr/include/X11/
+
+	list="/usr/share/man/man1/mwm.1 /usr/share/man/man4/mwmrc.4"
+	for f in $list; do
+		dosed 's:/usr/lib/X11/\(.*system\\&\.mwmrc\):/etc/X11/mwm/\1:g' "$f"
+		dosed 's:/usr/lib/X11/app-defaults:/etc/X11/app-defaults:g' "$f"
+	done
+
+
+	einfo "Fixing binaries"
+	dodir /usr/$(get_libdir)/openmotif-2.2
+	for file in `ls ${D}/usr/bin`
+	do
+		mv ${D}/usr/bin/${file} ${D}/usr/$(get_libdir)/openmotif-2.2/${file}
+	done
+
+	einfo "Fixing libraries"
+	mv ${D}/usr/$(get_libdir)/* ${D}/usr/$(get_libdir)/openmotif-2.2/
+
+	einfo "Fixing includes"
+	dodir /usr/include/openmotif-2.2/
+	mv ${D}/usr/include/* ${D}/usr/include/openmotif-2.2
+
+	einfo "Fixing man pages"
+	mans="1 3 4 5"
+	for man in $mans; do
+		dodir /usr/share/man/man${man}
+		for file in `ls ${D}/usr/share/man/man${man}`
+		do
+			file=${file/.${man}/}
+			mv ${D}/usr/share/man/man$man/${file}.${man} ${D}/usr/share/man/man${man}/${file}-openmotif-2.2.${man}
+		done
+	done
+
+
+	# install docs
+	dodoc COPYRIGHT.MOTIF LICENSE
+	dodoc README RELEASE RELNOTES
+	dodoc BUGREPORT TODO
+
+	# profile stuff
+	dodir /etc/env.d
+	echo "LDPATH=/usr/lib/openmotif-2.2" > ${D}/etc/env.d/15openmotif-2.2
+	dodir /usr/$(get_libdir)/motif
+	echo "PROFILE=openmotif-2.2" > ${D}/usr/$(get_libdir)/motif/openmotif-2.2
+}
+
+pkg_postinst() {
+	/usr/bin/motif-config -s
+}
+
+pkg_postrm() {
+	/usr/bin/motif-config -s
+}