KVoctrain temp file vulnerability, #102151

(Portage version: 2.0.51.22-r2)

11 files changed, 178 insertions, 11 deletions

diff --git a/kde-base/kdeedu/ChangeLog b/kde-base/kdeedu/ChangeLog
index 3ce883a4964b..ebfbcbb265e4 100644
--- a/kde-base/kdeedu/ChangeLog
+++ b/kde-base/kdeedu/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for kde-base/kdeedu
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.138 2005/07/30 14:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.139 2005/08/14 23:33:39 carlo Exp $
+
+*kdeedu-3.4.2-r2 (14 Aug 2005)
+*kdeedu-3.4.1-r11 (14 Aug 2005)
+*kdeedu-3.4.1-r1 (14 Aug 2005)
+*kdeedu-3.3.2-r2 (14 Aug 2005)
+
+  14 Aug 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/post-3.4.2-kdeedu.diff, +kdeedu-3.3.2-r2.ebuild,
+  +kdeedu-3.4.1-r1.ebuild, +kdeedu-3.4.1-r11.ebuild,
+  +kdeedu-3.4.2-r2.ebuild:
+  KVoctrain temp file vulnerability, #102151
 
   30 Jul 2005; Dan Armak <danarmak@gentoo.org> kdeedu-3.4.2.ebuild:
   Removed ~mips keyword, because kdelibs-3.4.2 doesn't have it. The mips team
diff --git a/kde-base/kdeedu/Manifest b/kde-base/kdeedu/Manifest
index 3d63960236a7..30afd1f335b8 100644
--- a/kde-base/kdeedu/Manifest
+++ b/kde-base/kdeedu/Manifest
@@ -1,16 +1,25 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 df29909ad2d7b0655d54a7c2dc22c59a kdeedu-3.2.3.ebuild 371
-MD5 1d60b1487202f1902008238e59f9518d kdeedu-3.4.1-r10.ebuild 492
-MD5 95e4444d6ab7da50cb7e52c681b9de36 ChangeLog 16511
-MD5 0a4c5b2e6bf26b17b618e2bdcb51a5b9 kdeedu-3.4.1.ebuild 380
+MD5 6ff7a4db095bb782a651b7856754ec08 kdeedu-3.3.2.ebuild 485
+MD5 cafd45a53b22e2a6a9bdf27e14312ca9 kdeedu-3.4.1-r1.ebuild 430
+MD5 3a11edab05d1dbe10691cc92fa303777 kdeedu-3.3.2-r2.ebuild 770
 MD5 cb126b5f74362daf4ecc8786f8b9f0e1 kdeedu-3.4.2.ebuild 381
+MD5 1d60b1487202f1902008238e59f9518d kdeedu-3.4.1-r10.ebuild 492
+MD5 df29909ad2d7b0655d54a7c2dc22c59a kdeedu-3.2.3.ebuild 371
+MD5 705fa63eb3109cc9c372c29d33071af0 kdeedu-3.4.2-r2.ebuild 543
 MD5 8070d6e5cc1db3ec0736ca4a1f98764f kdeedu-3.3.2-r1.ebuild 720
-MD5 6ff7a4db095bb782a651b7856754ec08 kdeedu-3.3.2.ebuild 485
+MD5 0a4c5b2e6bf26b17b618e2bdcb51a5b9 kdeedu-3.4.1.ebuild 380
+MD5 8af3592b1315ba837e625c9bec7f36f8 ChangeLog 16870
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 e7cd9b62dca74069886026f2b18a1aa1 kdeedu-3.4.2-r1.ebuild 497
-MD5 0a69a5cb72c99f0ecc6f31877d6a228d files/digest-kdeedu-3.4.2 67
+MD5 9c833fa77a3bacd1906088c37adff38c kdeedu-3.4.1-r11.ebuild 539
 MD5 8c7a533efeec6ea8c10027674472c7dd files/digest-kdeedu-3.3.2-r1 133
-MD5 130e2ed23a0a0e8e00482b72450a525b files/digest-kdeedu-3.4.1 67
-MD5 217724099165841cf8d84c4449344b2b files/digest-kdeedu-3.3.2 67
-MD5 ccd5af76582fc3fd522ecdd655355d38 files/digest-kdeedu-3.2.3 67
+MD5 8c7a533efeec6ea8c10027674472c7dd files/digest-kdeedu-3.3.2-r2 133
+MD5 130e2ed23a0a0e8e00482b72450a525b files/digest-kdeedu-3.4.1-r1 67
 MD5 0a69a5cb72c99f0ecc6f31877d6a228d files/digest-kdeedu-3.4.2-r1 67
+MD5 0a69a5cb72c99f0ecc6f31877d6a228d files/digest-kdeedu-3.4.2-r2 67
+MD5 0e82c5810df3b04370188ba13cc50203 files/post-3.4.2-kdeedu.diff 1876
+MD5 ccd5af76582fc3fd522ecdd655355d38 files/digest-kdeedu-3.2.3 67
+MD5 217724099165841cf8d84c4449344b2b files/digest-kdeedu-3.3.2 67
+MD5 130e2ed23a0a0e8e00482b72450a525b files/digest-kdeedu-3.4.1 67
+MD5 0a69a5cb72c99f0ecc6f31877d6a228d files/digest-kdeedu-3.4.2 67
 MD5 130e2ed23a0a0e8e00482b72450a525b files/digest-kdeedu-3.4.1-r10 67
+MD5 130e2ed23a0a0e8e00482b72450a525b files/digest-kdeedu-3.4.1-r11 67
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.3.2-r2 b/kde-base/kdeedu/files/digest-kdeedu-3.3.2-r2
new file mode 100644
index 000000000000..0f4c0506d9ad
--- /dev/null
+++ b/kde-base/kdeedu/files/digest-kdeedu-3.3.2-r2
@@ -0,0 +1,2 @@
+MD5 2ea54bb7aee669582eb0877d3c6f0b3d kdeedu-3.3.2.tar.bz2 22069753
+MD5 d8c1e43263124b4ef17cbf1b368a4f9f kstars-3_3.diff.tar.gz 13701
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.4.1-r1 b/kde-base/kdeedu/files/digest-kdeedu-3.4.1-r1
new file mode 100644
index 000000000000..2d593459a047
--- /dev/null
+++ b/kde-base/kdeedu/files/digest-kdeedu-3.4.1-r1
@@ -0,0 +1 @@
+MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.4.1-r11 b/kde-base/kdeedu/files/digest-kdeedu-3.4.1-r11
new file mode 100644
index 000000000000..2d593459a047
--- /dev/null
+++ b/kde-base/kdeedu/files/digest-kdeedu-3.4.1-r11
@@ -0,0 +1 @@
+MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.4.2-r2 b/kde-base/kdeedu/files/digest-kdeedu-3.4.2-r2
new file mode 100644
index 000000000000..733395bad924
--- /dev/null
+++ b/kde-base/kdeedu/files/digest-kdeedu-3.4.2-r2
@@ -0,0 +1 @@
+MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/kdeedu/files/post-3.4.2-kdeedu.diff b/kde-base/kdeedu/files/post-3.4.2-kdeedu.diff
new file mode 100644
index 000000000000..1d75c63bac18
--- /dev/null
+++ b/kde-base/kdeedu/files/post-3.4.2-kdeedu.diff
@@ -0,0 +1,63 @@
+Index: kvoctrain/kvoctrain/langen2kvtml
+===================================================================
+--- kvoctrain/kvoctrain/langen2kvtml	(revision 443975)
++++ kvoctrain/kvoctrain/langen2kvtml	(working copy)
+@@ -89,6 +89,9 @@
+ 
+ require "flush.pl";
+ use Getopt::Long;
++use File::Temp qw(tempdir);
++my $tmpdir = tempdir(TEMPDIR => 1, CLEANUP => 1 );
++
+ $/="\r\n";	# we work with dos files
+ 
+ #
+@@ -165,10 +168,6 @@
+     $country="GB";
+ }
+ 
+-# All logging information goes into this file
+-$logfile = "/tmp/langen2kvtml.log";
+-open(LOG, ">$logfile") || die "Cannot create $logfile: $!";
+-
+ &printflush(STDOUT,"Waiting for generating files ...\n");
+ $tmp1=$#ARGV+1;
+ &printflush(STDOUT,"... $tmp1 files given via command line ...\n");
+@@ -178,13 +177,11 @@
+     if ($proxy) {
+         &printflush(STDOUT,"... using proxy service $proxy ...\n");
+     }
+-    `lwp-request $proxy http://www.vokabeln.de/files/Voc-$country.zip >/tmp/Voc-$country.zip`;
+-    # unzip -u update only!
+-    # unzip -o overwrite!
+-    `unzip -u /tmp/Voc-$country.zip >/tmp/unzip.log`;
++    `lwp-request $proxy http://www.vokabeln.de/files/Voc-$country.zip >$tmpdir/Voc-$country.zip`;
+     &printflush(STDOUT,"... updating Voc-$country.zip ...\n");
+     $/="\n";	# we work with a unix file
+-    open(ZIP,"</tmp/unzip.log");
++    # unzip -u update only!
++    open(ZIP,"unzip -u $tmpdir/Voc-$country.zip |");
+     while(<ZIP>) {
+ 	chomp;
+ 	if( /voc/ ) {
+@@ -194,20 +191,16 @@
+ 	}
+     }
+     close(ZIP);
+-    unlink("/tmp/unzip.log");
+     $/="\r\n";	# we work with a dos file
+ }
+ 
+ for my $file (@res, @ARGV) {
+     $vocfile = $file;
+-    &printflush(LOG,"... generating \"$kvtfile\"...\n");
+     $lang		= "";		# initially unset
+     $filestage	= 0;		# file stage
+     &process_vocfile($vocfile);
+ }
+ print STDERR "...\tAll Complete.\n";
+-&printflush(LOG,"\nAll Complete.\n");
+-close(LOG);
+ 
+ exit;
+ 
diff --git a/kde-base/kdeedu/kdeedu-3.3.2-r2.ebuild b/kde-base/kdeedu/kdeedu-3.3.2-r2.ebuild
new file mode 100644
index 000000000000..a290c8ead1c2
--- /dev/null
+++ b/kde-base/kdeedu/kdeedu-3.3.2-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.3.2-r2.ebuild,v 1.1 2005/08/14 23:33:39 carlo Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE educational apps"
+SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${PV}.tar.bz2
+	http://dev.gentoo.org/~carlo/patches/kstars-3_3.diff.tar.gz"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE=""
+
+src_unpack() {
+	#kde_src_unpack
+	# Workaround problem on JFS filesystems, see bug 62510
+	bzip2 -dc ${DISTDIR}/${PN}-${PV}.tar.bz2 | tar xf -
+	unpack kstars-3_3.diff.tar.gz
+	cd ${S}
+	epatch ${WORKDIR}/kstars-3_3.diff
+	epatch ${FILESDIR}/post-3.4.2-kdeedu.diff
+	make -f admin/Makefile.common || die
+}
diff --git a/kde-base/kdeedu/kdeedu-3.4.1-r1.ebuild b/kde-base/kdeedu/kdeedu-3.4.1-r1.ebuild
new file mode 100644
index 000000000000..82953dfd9513
--- /dev/null
+++ b/kde-base/kdeedu/kdeedu-3.4.1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.4.1-r1.ebuild,v 1.1 2005/08/14 23:33:39 carlo Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE educational apps"
+
+KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~sparc x86 ~hppa"
+IUSE=""
+
+DEPEND=""
+
+PATCHES="${FILESDIR}/post-3.4.2-kdeedu.diff"
+
+myconf="--disable-kig-python-scripting"
diff --git a/kde-base/kdeedu/kdeedu-3.4.1-r11.ebuild b/kde-base/kdeedu/kdeedu-3.4.1-r11.ebuild
new file mode 100644
index 000000000000..3562d6396bde
--- /dev/null
+++ b/kde-base/kdeedu/kdeedu-3.4.1-r11.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.4.1-r11.ebuild,v 1.1 2005/08/14 23:33:39 carlo Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE educational apps"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="kig-scripting"
+
+DEPEND="kig-scripting? ( >=dev-libs/boost-1.32 )"
+
+PATCHES="${FILESDIR}/post-3.4.2-kdeedu.diff"
+
+
+src_compile() {
+	myconf="$(use_enable kig-scripting kig-python-scripting)"
+
+	kde_src_compile
+}
diff --git a/kde-base/kdeedu/kdeedu-3.4.2-r2.ebuild b/kde-base/kdeedu/kdeedu-3.4.2-r2.ebuild
new file mode 100644
index 000000000000..aeb08bf3e17a
--- /dev/null
+++ b/kde-base/kdeedu/kdeedu-3.4.2-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.4.2-r2.ebuild,v 1.1 2005/08/14 23:33:39 carlo Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE educational apps"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="kig-scripting"
+
+DEPEND="kig-scripting? ( >=dev-libs/boost-1.32 )"
+
+PATCHES="${FILESDIR}/post-3.4.2-kdeedu.diff"
+
+src_compile() {
+	local myconf="$(use_enable kig-scripting kig-python-scripting)"
+
+	kde_src_compile
+}