ackup file permission leak in kate

Package-Manager: portage-2.0.51.22-r1

5 files changed, 240 insertions, 19 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index e3dfd1822aeb..ed84f6075404 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.255 2005/07/14 07:40:02 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.256 2005/07/18 16:25:54 carlo Exp $
+
+*kdelibs-3.3.2-r10 (18 Jul 2005)
+
+  18 Jul 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/post-3.3.2-kdelibs-kate.diff, +kdelibs-3.3.2-r10.ebuild:
+  backup file permission leak in kate, #98735
 
   14 Jul 2005; Hardave Riar <hardave@gentoo.org> kdelibs-3.4.1-r1.ebuild:
   Keyworded ~mips
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 1961881d20a2..cee00346cf09 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,28 +1,31 @@
-MD5 5e3d1258287aece21687445ad7749f49 ChangeLog 41277
+MD5 3e2e72f881b6bd72528922777d0b0b35 kdelibs-3.4.1-r1.ebuild 3367
+MD5 a22f453221b250479669277a770541f5 kdelibs-3.3.2-r9.ebuild 4238
+MD5 55bab3d2397e49ba4427536c499592a1 kdelibs-3.3.2-r10.ebuild 4325
 MD5 32fa38e337bdc93fc7fef176e76c18d6 kdelibs-3.2.3-r7.ebuild 3565
 MD5 02f2da44089df832481a6066c2a71fb3 kdelibs-3.4.1-r2.ebuild 3358
 MD5 5f037b266d49d92331b2b449e8b10fab kdelibs-3.2.3-r9.ebuild 3830
-MD5 a22f453221b250479669277a770541f5 kdelibs-3.3.2-r9.ebuild 4238
-MD5 35642afad936bc4714ea938c1152c7ee kdelibs-3.4.0-r2.ebuild 3471
-MD5 3e2e72f881b6bd72528922777d0b0b35 kdelibs-3.4.1-r1.ebuild 3367
+MD5 5ddc74a659d413e4df654e7b422932e7 ChangeLog 41471
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r2 68
-MD5 02c4482bb15fc1a504621c2627a4deee files/digest-kdelibs-3.2.3-r7 529
-MD5 99b6a0719a376a17b6edea6555e3e5ae files/digest-kdelibs-3.2.3-r9 601
+MD5 35642afad936bc4714ea938c1152c7ee kdelibs-3.4.0-r2.ebuild 3471
+MD5 25ab050b323a8efb2049fd770f50058b files/kdelibs-3.3.2-anchor-fix.patch 5947
 MD5 b291a4a134cac9072ad1140a78eee9ce files/kdelibs-3.4.1-kntlm.patch 1323
+MD5 b93484486086ff60f9633f48ed311877 files/post-3.2.3-kdelibs-kimgio.diff 39789
 MD5 4d3faaf48564cde79aac52957f7e6278 files/kdelibs-3.4.1-ktoolbar-crash.patch 2215
-MD5 e8b51d92930950619b2139c22d4e1407 files/digest-kdelibs-3.3.2-r9 517
-MD5 2f2e57269ffc653aa3c0884c9492fb16 files/digest-kdelibs-3.4.0-r2 148
-MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r1 68
+MD5 998641088387e630d4ab9e9013caa539 files/kdelibs-3.4.0-imagemap.patch 546
 MD5 a5d3cb18c9572d8ca3dd06cbe5d226f1 files/kde3-dcopidlng.patch 681
-MD5 25ab050b323a8efb2049fd770f50058b files/kdelibs-3.3.2-anchor-fix.patch 5947
-MD5 d3df6d042148fd884422822aaf4ffbab files/kdelibs-3.3.2-aspell-dir.patch 467
-MD5 40783b984dcb127c8852246f7eb0a1e8 files/kdelibs-3.3.2-ppc64.patch 957
+MD5 119cc73926dceafff9107b5f916277ee files/post-3.2.3-kdelibs-htmlframes.patch 15435
 MD5 296419fbb169c4d87ace85d1e1645652 files/kdelibs-3.4.0-form-freeze.patch 660
-MD5 998641088387e630d4ab9e9013caa539 files/kdelibs-3.4.0-imagemap.patch 546
+MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989
+MD5 5e9c627e4e9e367ce88ed62a0a9ac162 files/post-3.2.3-kdelibs-khtml.diff 2411
 MD5 581be8df4ecfd3cf649bb36b6f57e35a files/kdelibs-3.4.1-configure.patch 4558
-MD5 119cc73926dceafff9107b5f916277ee files/post-3.2.3-kdelibs-htmlframes.patch 15435
+MD5 e8b51d92930950619b2139c22d4e1407 files/digest-kdelibs-3.3.2-r10 517
+MD5 40783b984dcb127c8852246f7eb0a1e8 files/kdelibs-3.3.2-ppc64.patch 957
+MD5 d3df6d042148fd884422822aaf4ffbab files/kdelibs-3.3.2-aspell-dir.patch 467
+MD5 138c3252883171d55ec24ed0318950fd files/post-3.3.2-kdelibs-kate.diff 2212
 MD5 b174d4e6ed2d0fd78fa43a40654f9ea4 files/post-3.2.3-kdelibs-idn.patch 2337
-MD5 5e9c627e4e9e367ce88ed62a0a9ac162 files/post-3.2.3-kdelibs-khtml.diff 2411
-MD5 b93484486086ff60f9633f48ed311877 files/post-3.2.3-kdelibs-kimgio.diff 39789
-MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989
+MD5 02c4482bb15fc1a504621c2627a4deee files/digest-kdelibs-3.2.3-r7 529
+MD5 99b6a0719a376a17b6edea6555e3e5ae files/digest-kdelibs-3.2.3-r9 601
+MD5 e8b51d92930950619b2139c22d4e1407 files/digest-kdelibs-3.3.2-r9 517
+MD5 2f2e57269ffc653aa3c0884c9492fb16 files/digest-kdelibs-3.4.0-r2 148
+MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r1 68
+MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r2 68
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.3.2-r10 b/kde-base/kdelibs/files/digest-kdelibs-3.3.2-r10
new file mode 100644
index 000000000000..c50a640d5a54
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.3.2-r10
@@ -0,0 +1,7 @@
+MD5 0473fb4c6c2cd2bc0f267cfa201f3fd8 kdelibs-3.3.2.tar.bz2 15623180
+MD5 7309e259ae1f29be08bbb70e580da3fb post-3.3.2-kdelibs-dcop.patch 1903
+MD5 b92182b7734e4ff145a08d9755448ec7 post-3.3.2-kdelibs-idn-2.patch 4212
+MD5 acc1153e58b45f92b43747dbc6693e41 post-3.3.2-kdelibs-kimgio-fixed.diff 53212
+MD5 d3658e90acec6ff140463ed2fd0e7736 post-3.3.2-kdelibs-kio.diff 1640
+MD5 d2e513a039ba44becf5728b983b78fc4 post-3.3.2-kdelibs-htmlframes2.patch 1202
+MD5 fe67157b26a8cdf5bcfa1898cdf3b154 post-3.3.2-kdelibs-kioslave.patch 663
diff --git a/kde-base/kdelibs/files/post-3.3.2-kdelibs-kate.diff b/kde-base/kdelibs/files/post-3.3.2-kdelibs-kate.diff
new file mode 100644
index 000000000000..8977df8f1c9f
--- /dev/null
+++ b/kde-base/kdelibs/files/post-3.3.2-kdelibs-kate.diff
@@ -0,0 +1,58 @@
+Index: kate/part/katedocument.cpp
+===================================================================
+--- kate/part/katedocument.cpp	(revision 433695)
++++ kate/part/katedocument.cpp	(revision 433696)
+@@ -47,7 +47,9 @@
+ 
+ #include <kio/job.h>
+ #include <kio/netaccess.h>
++#include <kio/kfileitem.h>
+ 
++
+ #include <kparts/event.h>
+ 
+ #include <klocale.h>
+@@ -2619,14 +2621,38 @@
+ 
+ bool KateDocument::save()
+ {
+-  // FIXME reorder for efficiency, prompt user in case of failure
+   bool l ( url().isLocalFile() );
+-  if ( ( ( l && config()->backupFlags() & KateDocumentConfig::LocalFiles ) ||
+-         ( ! l && config()->backupFlags() & KateDocumentConfig::RemoteFiles ) )
+-       && isModified() ) {
++
++  if ( ( l && config()->backupFlags() & KateDocumentConfig::LocalFiles )
++       || ( ! l && config()->backupFlags() & KateDocumentConfig::RemoteFiles ) )
++  {
+     KURL u( url().directory(false) + config()->backupPrefix() + url().fileName() + config()->backupSuffix() );
+-    if ( ! KIO::NetAccess::upload( url().path(), u, kapp->mainWidget() ) )
++
++    kdDebug () << "backup src file name: " << url() << endl;
++    kdDebug () << "backup dst file name: " << u << endl;
++
++    // get the right permissions, start with safe default
++    mode_t  perms = 0600;
++    KIO::UDSEntry fentry;
++    if (KIO::NetAccess::stat (url(), fentry, kapp->mainWidget()))
++    {
++      kdDebug () << "stating succesfull: " << url() << endl;
++      KFileItem item (fentry, url());
++      perms = item.permissions();
++    }
++
++    // first del existing file if any, than copy over the file we have
++    // failure if a: the existing file could not be deleted, b: the file could not be copied
++    if ( (!KIO::NetAccess::exists( u, false, kapp->mainWidget() ) || KIO::NetAccess::del( u, kapp->mainWidget() ))
++          && KIO::NetAccess::file_copy( url(), u, perms, true, false, kapp->mainWidget() ) )
++    {
++      kdDebug(13020)<<"backing up successfull ("<<url().prettyURL()<<" -> "<<u.prettyURL()<<")"<<endl;
++    }
++    else
++    {
+       kdDebug(13020)<<"backing up failed ("<<url().prettyURL()<<" -> "<<u.prettyURL()<<")"<<endl;
++      // FIXME: notify user for real ;)
++    }
+   }
+ 
+   return KParts::ReadWritePart::save();
diff --git a/kde-base/kdelibs/kdelibs-3.3.2-r10.ebuild b/kde-base/kdelibs/kdelibs-3.3.2-r10.ebuild
new file mode 100644
index 000000000000..e95e8147b2bd
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.3.2-r10.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.3.2-r10.ebuild,v 1.1 2005/07/18 16:25:54 carlo Exp $
+
+inherit kde eutils flag-o-matic
+set-kdedir 3.3
+
+DESCRIPTION="KDE libraries needed by all kde programs"
+HOMEPAGE="http://www.kde.org/"
+SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
+	mirror://kde/security_patches/post-3.3.2-kdelibs-dcop.patch
+	mirror://kde/security_patches/post-3.3.2-kdelibs-idn-2.patch
+	mirror://kde/security_patches/post-3.3.2-kdelibs-kimgio-fixed.diff
+	mirror://kde/security_patches/post-3.3.2-kdelibs-kio.diff
+	mirror://kde/security_patches/post-3.3.2-kdelibs-htmlframes2.patch
+	mirror://kde/security_patches/post-3.3.2-kdelibs-kioslave.patch"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+IUSE="alsa arts cups doc ipv6 kerberos ldap spell ssl tiff"
+
+# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
+# so we recreate the entire DEPEND from scratch.
+RDEPEND="arts? ( ~kde-base/arts-1.3.2 )
+	>=x11-libs/qt-3.3.3
+	app-arch/bzip2
+	>=dev-libs/libxslt-1.1.4
+	>=dev-libs/libxml2-2.6.6
+	>=dev-libs/libpcre-4.2
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	alsa? ( media-libs/alsa-lib virtual/alsa )
+	cups? ( >=net-print/cups-1.1.19 )
+	ldap? ( >=net-nds/openldap-2.1.26 )
+	tiff? ( media-libs/tiff )
+	spell? ( || ( app-text/aspell
+		      app-text/ispell ) )
+	kerberos? ( virtual/krb5 )
+	virtual/fam
+	virtual/ghostscript
+	media-libs/libart_lgpl
+	net-dns/libidn
+	sys-devel/gettext"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58
+	>=sys-devel/automake-1.8
+	doc? ( app-doc/doxygen )
+	!kde-misc/kgamma"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	# This is an ugly hack: it makes base_src_unpack do nothing, but still lets us enjoy
+	# the other things kde_src_unpack does.
+	kde_src_unpack nounpack
+
+	cd $S/kio/kio && patch -p0 <${DISTDIR}/post-3.3.2-kdelibs-kio.diff
+	cd $S
+	epatch ${DISTDIR}/post-3.3.2-kdelibs-htmlframes2.patch
+	epatch ${DISTDIR}/post-3.3.2-kdelibs-kioslave.patch
+
+	# see bug #67748. Patch applied in kdelibs 3.4.x.
+	epatch ${FILESDIR}/${P}-aspell-dir.patch
+
+	# see bug #77127. Patch applied in kdelibs 3.3.3.
+	epatch ${FILESDIR}/${P}-anchor-fix.patch
+
+	# see bug #81652.
+	epatch ${FILESDIR}/kde3-dcopidlng.patch
+
+	# see bug #63529.
+	epatch ${FILESDIR}/${P}-ppc64.patch
+
+	# see bug #83814.
+	epatch ${DISTDIR}/post-3.3.2-kdelibs-dcop.patch
+
+	# see bug #81110.
+	epatch ${DISTDIR}/post-3.3.2-kdelibs-idn-2.patch
+
+	# kimgio input validation errors, see bug #88862
+	cd ${S}/kimgio && patch -p0 < "${DISTDIR}/post-3.3.2-kdelibs-kimgio-fixed.diff"
+	cd ${S}
+
+	# see bug #98735.
+	epatch ${FILESDIR}/post-3.3.2-kdelibs-kate.diff
+
+
+	
+}
+
+src_compile() {
+	kde_src_compile myconf
+
+	myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
+	myconf="$myconf $(use_with alsa) $(use_enable cups) $(use_with arts)"
+
+	use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
+	use ssl		&& myconf="$myconf --with-ssl-dir=/usr"	|| myconf="$myconf --without-ssl"
+
+	use kerberos || myconf="$myconf --with-gssapi=no"
+
+	use x86 && myconf="$myconf --enable-fast-malloc=full"
+	use ppc64 && append-flags -mminimal-toc
+
+	kde_src_compile configure make
+
+	use doc && make apidox
+}
+
+src_install() {
+	kde_src_install
+	dohtml *.html
+
+	if use doc ; then
+		einfo "Copying API documentation..."
+		dodir ${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs
+		cp -r ${S}/apidocs/* ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
+	else
+		rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
+	fi
+
+	# needed to fix lib64 issues on amd64, see bug #45669
+	use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64
+	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
+	if [ "${SYMLINK_LIB}" = "yes" ]; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
+	fi
+
+	if ! use arts ; then
+
+		dodir /etc/env.d
+
+		echo "PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
+LDPATH=${PREFIX}/lib
+CONFIG_PROTECT=\"${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown\"" > ${D}/etc/env.d/47kdepaths-3.3.1 # number goes down with version upgrade
+
+	fi
+}
+
+pkg_postinst() {
+	if use doc ; then
+		rm $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
+		ln -sf $KDEDIR/share/doc/HTML/en/common \
+			$KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
+	fi
+}