added patch for security purposes to 3.3.0 and 3.4.0 (#135020)(#113683). updated the gcc34 patch for 3.3.0.

Package-Manager: portage-2.1-r2

10 files changed, 140 insertions, 5 deletions

diff --git a/dev-util/motor/ChangeLog b/dev-util/motor/ChangeLog
index 3368a43553e8..a759f78db006 100644
--- a/dev-util/motor/ChangeLog
+++ b/dev-util/motor/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/motor
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/motor/ChangeLog,v 1.7 2005/04/24 13:04:02 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/motor/ChangeLog,v 1.8 2006/08/22 10:14:17 liquidx Exp $
+
+*motor-3.4.0-r1 (22 Aug 2006)
+*motor-3.3.0-r1 (22 Aug 2006)
+
+  22 Aug 2006; Alastair Tse <liquidx@gentoo.org>
+  +files/motor-3.2.2-security.patch, +files/motor-3.3.0-gcc34-2.patch,
+  -motor-3.2.4.1.ebuild, motor-3.3.0.ebuild, +motor-3.3.0-r1.ebuild,
+  +motor-3.4.0-r1.ebuild:
+  added patch for security purposes to 3.3.0 and 3.4.0 (#135020)(#113683).
+  updated the gcc34 patch for 3.3.0.
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> motor-3.3.0.ebuild:
   Stable on ppc.
diff --git a/dev-util/motor/files/digest-motor-3.3.0 b/dev-util/motor/files/digest-motor-3.3.0
index bc090d5fbca1..4b24e5ae6ca4 100644
--- a/dev-util/motor/files/digest-motor-3.3.0
+++ b/dev-util/motor/files/digest-motor-3.3.0
@@ -1 +1,3 @@
 MD5 6134029dd297cad87f168874447010b1 motor-3.3.0.tar.bz2 468384
+RMD160 51f25989ca8f0ea89b851e55a6a5490a0dd31830 motor-3.3.0.tar.bz2 468384
+SHA256 4d4d6f751476b5aad848f78f41644f081151481f63a73d55e146caa1325e83c5 motor-3.3.0.tar.bz2 468384
diff --git a/dev-util/motor/files/digest-motor-3.3.0-r1 b/dev-util/motor/files/digest-motor-3.3.0-r1
new file mode 100644
index 000000000000..4b24e5ae6ca4
--- /dev/null
+++ b/dev-util/motor/files/digest-motor-3.3.0-r1
@@ -0,0 +1,3 @@
+MD5 6134029dd297cad87f168874447010b1 motor-3.3.0.tar.bz2 468384
+RMD160 51f25989ca8f0ea89b851e55a6a5490a0dd31830 motor-3.3.0.tar.bz2 468384
+SHA256 4d4d6f751476b5aad848f78f41644f081151481f63a73d55e146caa1325e83c5 motor-3.3.0.tar.bz2 468384
diff --git a/dev-util/motor/files/digest-motor-3.4.0 b/dev-util/motor/files/digest-motor-3.4.0
index 86697dd83f56..3dbcdee6dcec 100644
--- a/dev-util/motor/files/digest-motor-3.4.0
+++ b/dev-util/motor/files/digest-motor-3.4.0
@@ -1 +1,3 @@
 MD5 0fcf7ce0386b269e8bdbb7a86e9bee19 motor-3.4.0.tar.bz2 468265
+RMD160 bf5dd07744fa1a8868612f32f96776bd915b0063 motor-3.4.0.tar.bz2 468265
+SHA256 d876ca4567cb691b17c7a8cde1c5a23a9349bdbe70b587804a7b58f21c1d2f42 motor-3.4.0.tar.bz2 468265
diff --git a/dev-util/motor/files/digest-motor-3.4.0-r1 b/dev-util/motor/files/digest-motor-3.4.0-r1
new file mode 100644
index 000000000000..3dbcdee6dcec
--- /dev/null
+++ b/dev-util/motor/files/digest-motor-3.4.0-r1
@@ -0,0 +1,3 @@
+MD5 0fcf7ce0386b269e8bdbb7a86e9bee19 motor-3.4.0.tar.bz2 468265
+RMD160 bf5dd07744fa1a8868612f32f96776bd915b0063 motor-3.4.0.tar.bz2 468265
+SHA256 d876ca4567cb691b17c7a8cde1c5a23a9349bdbe70b587804a7b58f21c1d2f42 motor-3.4.0.tar.bz2 468265
diff --git a/dev-util/motor/files/motor-3.2.2-security.patch b/dev-util/motor/files/motor-3.2.2-security.patch
new file mode 100644
index 000000000000..188fc54cedc1
--- /dev/null
+++ b/dev-util/motor/files/motor-3.2.2-security.patch
@@ -0,0 +1,11 @@
+--- motor-3.4.0.orig/kkstrtext/kkstrtext.h
++++ motor-3.4.0/kkstrtext/kkstrtext.h
+@@ -87,7 +87,7 @@
+     { \
+ 	va_list vgs__ap; char vgs__buf[1024]; \
+ 	va_start(vgs__ap, fmt); \
+-	vsprintf(vgs__buf, fmt, vgs__ap); c = vgs__buf; \
++	vsnprintf(vgs__buf, 1024, fmt, vgs__ap); c = vgs__buf; \
+ 	va_end(vgs__ap); \
+     }
+ 
diff --git a/dev-util/motor/files/motor-3.3.0-gcc34-2.patch b/dev-util/motor/files/motor-3.3.0-gcc34-2.patch
new file mode 100644
index 000000000000..1541d2da199c
--- /dev/null
+++ b/dev-util/motor/files/motor-3.3.0-gcc34-2.patch
@@ -0,0 +1,30 @@
+diff -urN ../tmp-orig/motor-3.2.4.1/parser/src/parser.c ./parser/src/parser.c
+--- ../tmp-orig/motor-3.2.4.1/parser/src/parser.c	2001-11-02 08:44:15.000000000 +0100
++++ ./parser/src/parser.c	2004-07-21 13:49:04.909656822 +0200
+@@ -313,7 +313,6 @@
+ 		buf = mmap(0, *size, PROT_READ, MAP_SHARED, f, 0);
+ 		if (buf == MAP_FAILED) buf = NULL;
+ 		break;
+-	    default:
+ 	}
+     }
+     close(f);
+@@ -333,7 +332,6 @@
+ 	    // munmap
+ 	    munmap(text, size);
+ 	    break;
+-	default:
+     }
+ }
+ 
+--- ../tmp-orig/motor-3.2.4.1/src/ui/ncurses/uitagbrowser.cc	2002-12-11 09:03:11.000000000 +0100
++++ ./src/ui/ncurses/uitagbrowser.cc	2004-07-21 14:08:05.463971935 +0200
+@@ -78,7 +78,7 @@
+     cm.setwindow(textwindow(w.x1, w.y1, w.x1+20, 0, uiconf.getcolor(cp_menufr)));
+ 
+     for(motortagbrowser::viewscope scope = motortagbrowser::File;
+-    scope != motortagbrowser::viewscope_size; (int) scope += 1) {
++    scope != motortagbrowser::viewscope_size; scope = (motortagbrowser::viewscope) ( scope + 1 ) ) {
+ 	cm.additem(0, scope, (string) " " + getscopename(scope));
+ 	if(scope == tagbrowser.getscope())
+ 	    cm.setpos(cm.getcount()-1);
diff --git a/dev-util/motor/motor-3.3.0-r1.ebuild b/dev-util/motor/motor-3.3.0-r1.ebuild
new file mode 100644
index 000000000000..ca2b585de579
--- /dev/null
+++ b/dev-util/motor/motor-3.3.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/motor/motor-3.3.0-r1.ebuild,v 1.1 2006/08/22 10:14:18 liquidx Exp $
+
+inherit eutils
+
+DESCRIPTION="text mode based programming environment for Linux"
+HOMEPAGE="http://thekonst.net/en/motor"
+SRC_URI="http://thekonst.net/download/motor-3.3.0.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~ppc x86"
+IUSE="nls"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc34-2.patch"
+	epatch "${FILESDIR}/motor-3.2.2-security.patch"
+}
+
+src_compile() {
+	econf `use_enable nls` || die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+
+	dodoc AUTHORS COPYING README TODO FAQ ChangeLog
+	docinto tutorial
+	dohtml -r tutorial/*
+}
diff --git a/dev-util/motor/motor-3.3.0.ebuild b/dev-util/motor/motor-3.3.0.ebuild
index 3c2a826c1ccf..f81fd953319b 100644
--- a/dev-util/motor/motor-3.3.0.ebuild
+++ b/dev-util/motor/motor-3.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/motor/motor-3.3.0.ebuild,v 1.5 2005/07/10 01:12:36 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/motor/motor-3.3.0.ebuild,v 1.6 2006/08/22 10:14:18 liquidx Exp $
 
 inherit eutils
 
@@ -18,7 +18,8 @@ DEPEND=">=sys-libs/ncurses-5.2
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}; epatch ${FILESDIR}/${P}-gcc34.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc34-2.patch"
 }
 
 src_compile() {
diff --git a/dev-util/motor/motor-3.4.0-r1.ebuild b/dev-util/motor/motor-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..db89e434c8df
--- /dev/null
+++ b/dev-util/motor/motor-3.4.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/motor/motor-3.4.0-r1.ebuild,v 1.1 2006/08/22 10:14:18 liquidx Exp $
+
+inherit eutils
+
+DESCRIPTION="text mode based programming environment for Linux"
+HOMEPAGE="http://thekonst.net/en/motor"
+SRC_URI="http://thekonst.net/download/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+IUSE="nls"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/motor-3.2.2-security.patch"
+}
+
+src_compile() {
+	econf `use_enable nls` || die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+
+	dodoc AUTHORS COPYING README TODO FAQ ChangeLog
+	docinto tutorial
+	dohtml -r tutorial/*
+}