add security patch

5 files changed, 188 insertions, 3 deletions

diff --git a/x11-terms/multi-gnome-terminal/ChangeLog b/x11-terms/multi-gnome-terminal/ChangeLog
index 3db8eea59fc9..2c4a10265cd2 100644
--- a/x11-terms/multi-gnome-terminal/ChangeLog
+++ b/x11-terms/multi-gnome-terminal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/multi-gnome-terminal
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/ChangeLog,v 1.22 2004/09/03 07:31:38 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/ChangeLog,v 1.23 2004/09/03 16:48:52 foser Exp $
+
+*multi-gnome-terminal-1.6.2-r1 (03 Sep 2004)
+
+  03 Sep 2004; foser <foser@gentoo.org> multi-gnome-terminal-1.6.2-r1.ebuild :
+  Add patch disabling the logging of keystrokes (#62322)
 
   03 Sep 2004; Luca Barbato <lu_zero@gentoo.org>
   +files/multi-gnome-terminal-1.6.2-gcc-3.4.patch,
diff --git a/x11-terms/multi-gnome-terminal/Manifest b/x11-terms/multi-gnome-terminal/Manifest
index 60378ea08191..d6a1a2f91fac 100644
--- a/x11-terms/multi-gnome-terminal/Manifest
+++ b/x11-terms/multi-gnome-terminal/Manifest
@@ -1,5 +1,8 @@
-MD5 bcd044a238be925dab48f5e5747d7302 ChangeLog 3364
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 9d9773bbcb5390c9e700e7ee5375db79 multi-gnome-terminal-1.6.2.ebuild 1930
+MD5 f119ce5dcb1be1d4365d8afb27339520 multi-gnome-terminal-1.6.2-r1.ebuild 2012
+MD5 d417bd77d840c26a367c4d0e15ed9cad ChangeLog 3545
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 d2af4e1acb1bc5842cf1b8b11cb80a3e files/digest-multi-gnome-terminal-1.6.2 80
+MD5 d2af4e1acb1bc5842cf1b8b11cb80a3e files/digest-multi-gnome-terminal-1.6.2-r1 80
+MD5 763affd4473fc41fbbfa967a23a9cbf0 files/multi-gnome-terminal-1.6.2-remove_debug.patch 2559
 MD5 a799552d002f0a012c2001e045e42a2c files/multi-gnome-terminal-1.6.2-gcc-3.4.patch 1250
diff --git a/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.6.2-r1 b/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.6.2-r1
new file mode 100644
index 000000000000..2f595b780a56
--- /dev/null
+++ b/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.6.2-r1
@@ -0,0 +1 @@
+MD5 52b65d2326efc4273716383b0196e95f multi-gnome-terminal-1.6.2.tar.bz2 1616529
diff --git a/x11-terms/multi-gnome-terminal/files/multi-gnome-terminal-1.6.2-remove_debug.patch b/x11-terms/multi-gnome-terminal/files/multi-gnome-terminal-1.6.2-remove_debug.patch
new file mode 100644
index 000000000000..774168a237f9
--- /dev/null
+++ b/x11-terms/multi-gnome-terminal/files/multi-gnome-terminal-1.6.2-remove_debug.patch
@@ -0,0 +1,93 @@
+diff -urN multi-gnome-terminal-1.6.2/gnome-terminal/enhanced_gui.c multi-gnome-terminal-1.6.2-CVS/gnome-terminal/enhanced_gui.c
+--- multi-gnome-terminal-1.6.2/gnome-terminal/enhanced_gui.c	2002-10-13 09:18:04.000000000 -0400
++++ multi-gnome-terminal-1.6.2-CVS/gnome-terminal/enhanced_gui.c	2004-04-01 06:20:18.000000000 -0500
+@@ -5531,7 +5531,7 @@
+     }
+ }
+ #define EVENT_STATE_MASK (GDK_SHIFT_MASK | GDK_MOD1_MASK | GDK_CONTROL_MASK)
+-#define kkd(x) x
++#define kkd(x) 
+ /* ========================================================== */
+ /* Function to handle keybindings */
+ gint snooper_func(GtkWidget* widget, GdkEventKey *event, gpointer data)
+diff -urN multi-gnome-terminal-1.6.2/gnome-terminal/zvtterm.c multi-gnome-terminal-1.6.2-CVS/gnome-terminal/zvtterm.c
+--- multi-gnome-terminal-1.6.2/gnome-terminal/zvtterm.c	2002-09-10 08:17:29.000000000 -0400
++++ multi-gnome-terminal-1.6.2-CVS/gnome-terminal/zvtterm.c	2004-04-01 06:20:18.000000000 -0500
+@@ -4504,9 +4504,12 @@
+ static void
+ zvt_term_readdata (gpointer data, gint fd, GdkInputCondition condition)
+ {
++  int select_retval;
++  struct timeval tv;
++  fd_set rfds;
+   gboolean update;
+-  gchar buffer[4096];
+-  gint count, saveerrno;
++  gchar buffer[32768];
++  gint count, total_count, saveerrno;
+   struct _vtx *vx;
+   ZvtTerm *term;
+   int screen;
+@@ -4535,23 +4538,46 @@
+   vt_cursor_state (term, 0);
+   vt_match_highlight(term->vx, 0);
+ #endif
+-  while ( (saveerrno == EAGAIN) && (count = read (fd, buffer, 4096)) > 0)  {
+-    
+-#if 0
+-    int i =0;
+-    while(i<count)
+-      {
+-	if (buffer[i]==27)
+-	  printf("<Esc> ");
+-	else
+-	  printf("(%d,%c) ", buffer[i], buffer[i]);
+-	i++;
+-      }
+-    printf("\n count=%d\n", count);
+-#endif
+-    
++
++
++  select_retval=1;
++  total_count=0;
++  count=1;
++
++  while ( (count>0) && (select_retval==1) && (total_count<32768) )
++  {
++	  count=0;
++	  int maxread=32768-total_count;
++	  if (maxread>4096)
++		  maxread=4096;
++
++	  count = read (fd, &buffer[total_count], maxread);
++	  saveerrno=errno;
++	  if (count == -1)
++	  {
++		  perror("read()");
++		  break;
++	  }
++	  if (count>0)
++		  total_count+=count;
++
++	  FD_ZERO(&rfds);
++	  FD_SET(fd, &rfds);
++	  tv.tv_sec = 0;
++	  tv.tv_usec = 10000;
++	  select_retval = select(fd+1, &rfds, NULL, NULL, &tv);
++	  if (select_retval == -1)
++	  {
++	      perror("select()");
++	      break;
++	  }
++  }
++  
++  if (total_count) {
++   
++  count=total_count;
++
+     update = TRUE;
+-    saveerrno = errno;
+ #ifdef MGT_NEW_DATA_PROCESSING 
+     in_data = g_malloc0(sizeof (struct in_data_t));
+     in_data->term = term;
diff --git a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2-r1.ebuild b/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..80312b72373d
--- /dev/null
+++ b/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2-r1.ebuild,v 1.1 2004/09/03 16:48:52 foser Exp $
+
+IUSE="nls"
+
+inherit libtool eutils
+
+DESCRIPTION="Extended version of the Gnome Terminal."
+SRC_URI="mirror://sourceforge/multignometerm/${P}.tar.bz2"
+HOMEPAGE="http://multignometerm.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
+
+DEPEND="=x11-libs/gtk+-1*
+	>=gnome-base/gnome-libs-1.4.1.7
+	>=media-libs/gdk-pixbuf-0.11.0-r1
+	=gnome-base/libglade-0*
+	>=app-text/scrollkeeper-0.3.10-r1
+	=gnome-base/orbit-0*"
+
+RDEPEND="nls? ( sys-devel/gettext )"
+
+src_unpack() {
+
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-gcc-3.4.patch"
+	# Fix loggin keystrokes (#62322)
+	epatch ${FILESDIR}/${P}-remove_debug.patch
+
+}
+
+src_compile() {
+
+	elibtoolize
+
+	local myconf=""
+	use nls || myconf="--disable-nls"
+
+	./configure --host=${CHOST} \
+		    --prefix=/usr \
+		    --mandir=/usr/share/man \
+		    --infodir=/usr/share/info \
+		    --sysconfdir=/etc \
+		    ${myconf} || die
+
+	emake || die "Compilation failed"
+}
+
+src_install() {
+
+	cp  ${S}/omf-install/Makefile ${S}/omf-install/Makefile.orig
+	sed -e "s:scrollkeeper-update.*::g" \
+	    ${S}/omf-install/Makefile.orig > ${S}/omf-install/Makefile
+
+	# Remove the NO_XALF nonsense from the .desktop file
+	cp ${S}/gnome-terminal/multi-gnome-terminal.desktop \
+	   ${S}/gnome-terminal/mgt.desktop.old
+	sed -e "s:NO_XALF ::" \
+	    ${S}/gnome-terminal/mgt.desktop.old > \
+		${S}/gnome-terminal/multi-gnome-terminal.desktop
+
+	make DESTDIR=${D} install || die "Installation failed"
+
+	dosym mgt/multignometerm.png /usr/share/pixmaps/multignometerm.png
+
+	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README
+}
+
+pkg_postinst() {
+
+	echo ">>> Updating Scrollkeeper database..."
+	scrollkeeper-update &>/dev/null
+}
+
+pkg_postrm() {
+
+	echo ">>> Updating Scrollkeeper database..."
+	scrollkeeper-update &>/dev/null
+}
+