Fix information disclosure (bug 133814), respect CFLAGS, install desktop entry.

(Portage version: 2.0.54-r2)

5 files changed, 75 insertions, 12 deletions

diff --git a/net-misc/kphone/ChangeLog b/net-misc/kphone/ChangeLog
index a5f3fbf0f95c..16930a00aa41 100644
--- a/net-misc/kphone/ChangeLog
+++ b/net-misc/kphone/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/kphone
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kphone/ChangeLog,v 1.37 2006/04/03 22:22:50 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kphone/ChangeLog,v 1.38 2006/05/20 18:56:28 carlo Exp $
+
+*kphone-4.2-r1 (20 May 2006)
+
+  20 May 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/kphone-4.2-CVE-2006-2442.diff, +kphone-4.2-r1.ebuild:
+  Fix information disclosure (bug 133814), respect CFLAGS, install desktop entry.
 
   03 Apr 2006; Gustavo Zacarias <gustavoz@gentoo.org> kphone-4.2.ebuild:
   Back to sparc & ppc stable
diff --git a/net-misc/kphone/Manifest b/net-misc/kphone/Manifest
index f2ed94f955bb..f212cae7ab0d 100644
--- a/net-misc/kphone/Manifest
+++ b/net-misc/kphone/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fb42a41f24ff6235b49c64c0c6369dad ChangeLog 4855
+MD5 310d07467d25924cba559e06d26e576a ChangeLog 5080
 MD5 2ac98b4c3bd182f4d422edead25c56d9 files/digest-kphone-4.1.0 64
 MD5 c96af639b76079a8a65e634df2154fb8 files/digest-kphone-4.1.1 64
 MD5 021fac998cd116c8390408634abaf994 files/digest-kphone-4.2 62
+MD5 021fac998cd116c8390408634abaf994 files/digest-kphone-4.2-r1 62
 MD5 13744936b73f480a658795a553dd7efe files/kphone-4.1.0-Makefiles.patch 461
 MD5 ce59ccd7de9e3fb78d4ab5bb40b0d283 files/kphone-4.1.1-gcc34.patch 456
+MD5 9cfd15f592300e5711b7c39acd5d8b8e files/kphone-4.2-CVE-2006-2442.diff 574
 MD5 aa1742f0c810c439d129b6e2d08a2f42 files/kphone-4.2-gcc4.diff 960
 MD5 79a9d63d5116f9fd85489f5b0464cfdb kphone-4.1.0.ebuild 933
 MD5 34e862915786f759ee014aa4aab3d0b9 kphone-4.1.1.ebuild 1031
+MD5 b16f7f7a8e25370ff2a586ecfce47781 kphone-4.2-r1.ebuild 1249
 MD5 af646ec7a417940c2b44ccb081ba0ae5 kphone-4.2.ebuild 1041
 MD5 70f06600556327dcfbc31fa03f610042 metadata.xml 155
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEMaBTKRy60XGEcJIRAgRaAJ4lG0A5EfBW3c067WxIZHKJ4STTjgCgg5IW
-I2BOJeN++lh4GnZj4L/XN3Q=
-=0aAJ
------END PGP SIGNATURE-----
diff --git a/net-misc/kphone/files/digest-kphone-4.2-r1 b/net-misc/kphone/files/digest-kphone-4.2-r1
new file mode 100644
index 000000000000..3610863f6734
--- /dev/null
+++ b/net-misc/kphone/files/digest-kphone-4.2-r1
@@ -0,0 +1 @@
+MD5 632abebc16d4f40bf03d191892e00e22 kphone-4.2.tar.gz 287320
diff --git a/net-misc/kphone/files/kphone-4.2-CVE-2006-2442.diff b/net-misc/kphone/files/kphone-4.2-CVE-2006-2442.diff
new file mode 100644
index 000000000000..b2f42eaad7f5
--- /dev/null
+++ b/net-misc/kphone/files/kphone-4.2-CVE-2006-2442.diff
@@ -0,0 +1,20 @@
+--- kphone.cpp.orig	2005-06-21 13:14:49.000000000 +0200
++++ kphone/kphone/kphone.cpp	2006-02-04 22:49:19.000000000 +0100
+@@ -1,5 +1,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++
+ #include <qtimer.h>
+ #include <qsettings.h>
+ #include <qmenubar.h>
+@@ -32,6 +35,8 @@
+ 		userPrefix = "_" + prefix + "_";
+ 	}
+ 	QSettings settings;
++	
++	umask(077);
+ 	Sip::setLocalAddress( settings.readEntry(
+ 		"/kphone/dissipate_addr", Sip::getLocalAddress() ) );
+ 	QString socketStr = settings.readEntry( "/kphone/General/SocketMode", "UDP" );
diff --git a/net-misc/kphone/kphone-4.2-r1.ebuild b/net-misc/kphone/kphone-4.2-r1.ebuild
new file mode 100644
index 000000000000..5e23ec06751b
--- /dev/null
+++ b/net-misc/kphone/kphone-4.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kphone/kphone-4.2-r1.ebuild,v 1.1 2006/05/20 18:56:28 carlo Exp $
+
+inherit qt3 eutils
+
+DESCRIPTION="A SIP user agent for Linux, with which you can initiate VoIP connections over the Internet."
+HOMEPAGE="http://sourceforge.net/projects/kphone"
+SRC_URI="http://www.wirlab.net/kphone/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="alsa debug jack"
+
+S=${WORKDIR}/${PN}
+
+DEPEND="=x11-libs/qt-3*
+	dev-libs/openssl
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )"
+
+# TODO: support for Secure RTP, needs libSRTP in portage
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/kphone-4.2-gcc4.diff
+	epatch ${FILESDIR}/kphone-4.2-CVE-2006-2442.diff
+	sed -i -e "s:\$CFLAGS -O3:\$CFLAGS $CFLAGS:" ${S}/configure
+}
+
+src_compile() {
+	local myconf="$(use_enable alsa) $(use_enable jack)
+	              $(use_enable debug) --disable-srtp"
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc CHANGES README
+	make_desktop_entry "kphone" KPhone "/usr/share/apps/kphone/icons/large-kphone.png" "Telephony;Qt"
+}