upstream patch and cleaned out old versions

(Portage version: 2.1.2.7)

11 files changed, 32 insertions, 236 deletions

diff --git a/net-im/twinkle/ChangeLog b/net-im/twinkle/ChangeLog
index d9e2312b3766..03e4ad8ee136 100644
--- a/net-im/twinkle/ChangeLog
+++ b/net-im/twinkle/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/twinkle
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.29 2007/05/19 23:56:23 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.30 2007/06/18 10:52:08 dragonheart Exp $
+
+*twinkle-1.0.1-r1 (18 Jun 2007)
+
+  18 Jun 2007; Daniel Black <dragonheart@gentoo.org>
+  -files/twinkle-0.9-dtmf.patch, -files/twinkle-0.9-invite4xx.patch,
+  -files/twinkle-0.9-memman.patch, +files/twinkle-1.0.1-icmp.patch,
+  -twinkle-0.9-r2.ebuild, -twinkle-1.0.ebuild, -twinkle-1.0.1.ebuild,
+  +twinkle-1.0.1-r1.ebuild:
+  upstream patch and cleaned out old versions
 
 *twinkle-1.0.1 (19 May 2007)
 
diff --git a/net-im/twinkle/files/digest-twinkle-0.9-r2 b/net-im/twinkle/files/digest-twinkle-0.9-r2
deleted file mode 100644
index 0f87aa58bd88..000000000000
--- a/net-im/twinkle/files/digest-twinkle-0.9-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 74ef85e9f4570cec10bd23d301f5549e twinkle-0.9.tar.gz 1012524
-RMD160 f6b8b70a9630687cf7f100c9dde888289d97f082 twinkle-0.9.tar.gz 1012524
-SHA256 22f536aaf6a7aa6870c31d03190b206509cfc8b6147c3af7080d6dbfa5a992b6 twinkle-0.9.tar.gz 1012524
diff --git a/net-im/twinkle/files/digest-twinkle-1.0 b/net-im/twinkle/files/digest-twinkle-1.0
deleted file mode 100644
index 6d8d29a59905..000000000000
--- a/net-im/twinkle/files/digest-twinkle-1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3180475a8eade9918bc1299dcbfe1fcc twinkle-1.0.tar.gz 1172116
-RMD160 9dea2207c0c421931d5190d5382dbcda321e120e twinkle-1.0.tar.gz 1172116
-SHA256 f3513deda4cf24f285d48538b2ccffca3ff2e936b942b71f30f7ac13896c58cc twinkle-1.0.tar.gz 1172116
diff --git a/net-im/twinkle/files/digest-twinkle-1.0.1 b/net-im/twinkle/files/digest-twinkle-1.0.1-r1
index e70199ce305d..e70199ce305d 100644
--- a/net-im/twinkle/files/digest-twinkle-1.0.1
+++ b/net-im/twinkle/files/digest-twinkle-1.0.1-r1
diff --git a/net-im/twinkle/files/twinkle-0.9-dtmf.patch b/net-im/twinkle/files/twinkle-0.9-dtmf.patch
deleted file mode 100644
index e6370210e20c..000000000000
--- a/net-im/twinkle/files/twinkle-0.9-dtmf.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: src/session.cpp
-===================================================================
---- src/session.cpp	(revision 223)
-+++ src/session.cpp	(working copy)
-@@ -653,18 +653,19 @@
- 		case DTMF_AUTO:
- 		case DTMF_INBAND:
- 			get_line()->ci_set_dtmf_supported(true, true);
-+			ui->cb_dtmf_supported(get_line()->get_line_number());
- 			break;
- 		case DTMF_RFC2833:
- 			get_line()->ci_set_dtmf_supported(false);
-+			ui->cb_dtmf_not_supported(get_line()->get_line_number());
- 			break;
- 		case DTMF_INFO:
- 			get_line()->ci_set_dtmf_supported(true, false, true);
-+			ui->cb_dtmf_supported(get_line()->get_line_number());
- 			break;
- 		default:
- 			assert(false);
- 		}
--		
--		ui->cb_line_state_changed();
- 	}
- 
- 	audio_rtp_session->run();
-@@ -675,10 +676,10 @@
- 		MEMMAN_DELETE(audio_rtp_session);
- 		delete audio_rtp_session;
- 		audio_rtp_session = NULL;
-+	
-+		get_line()->ci_set_dtmf_supported(false);
-+		ui->cb_line_state_changed();
- 	}
--	
--	get_line()->ci_set_dtmf_supported(false);
--	ui->cb_line_state_changed();
- }
- 
- t_audio_session *t_session::get_audio_session(void) const {
diff --git a/net-im/twinkle/files/twinkle-0.9-invite4xx.patch b/net-im/twinkle/files/twinkle-0.9-invite4xx.patch
deleted file mode 100644
index e9d1535ae4f9..000000000000
--- a/net-im/twinkle/files/twinkle-0.9-invite4xx.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: src/line.cpp
-===================================================================
---- src/line.cpp	(revision 225)
-+++ src/line.cpp	(working copy)
-@@ -966,9 +966,8 @@
- 			} else {
- 				d->recvd_response(r, tuid, tid);
- 			}
--		}
--		
--		if (r->hdr_cseq.method == INVITE) {
-+		} else {
-+			d->recvd_response(r, tuid, tid);
- 			pending_dialogs.remove(d);
- 			MEMMAN_DELETE(d);
- 			delete d;
diff --git a/net-im/twinkle/files/twinkle-0.9-memman.patch b/net-im/twinkle/files/twinkle-0.9-memman.patch
deleted file mode 100644
index ccd7dc7b8f97..000000000000
--- a/net-im/twinkle/files/twinkle-0.9-memman.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: src/audits/memman.cpp
-===================================================================
---- src/audits/memman.cpp	(revision 223)
-+++ src/audits/memman.cpp	(working copy)
-@@ -114,13 +114,22 @@
- 		return;
- 	}
- 
--	pointer_map.erase(p);
-+
- 	bool array_mismatch = (is_array != i->second.is_array);
--	mtx_memman.unlock();
- 
- 	// Check mixing of array new/delete
-+	// NOTE: after the pointer has been erased from pointer_map, the
-+	//       iterator i is invalid.
-+	//       The mutex mtx_memman should be unlocked before logging to
-+	//       avoid dead locks.
- 	if (array_mismatch) {
- 		num_array_mixing++;
-+		string allocation_filename = i->second.filename;
-+		int allocation_lineno = i->second.lineno;
-+		bool allocation_is_array = i->second.is_array;
-+		pointer_map.erase(p);
-+		mtx_memman.unlock();
-+		
- 		log_file->write_header("t_memman::trc_delete",
- 			LOG_MEMORY, LOG_WARNING);
- 		log_file->write_raw(filename);
-@@ -130,21 +139,24 @@
- 		log_file->write_raw(ptr2str(p));
- 		log_file->write_raw(" is deleted ");
- 		if (is_array) {
--			log_file->write_raw(" as array (delete []).\n");
-+			log_file->write_raw("as array (delete []).\n");
- 		} else {
--			log_file->write_raw(" normally (delete).\n");
-+			log_file->write_raw("normally (delete).\n");
- 		}
- 		log_file->write_raw("But it was allocated ");
--		if (i->second.is_array) {
--			log_file->write_raw(" as array (new []) \n");
-+		if (allocation_is_array) {
-+			log_file->write_raw("as array (new []) \n");
- 		} else {
--			log_file->write_raw(" normally (new) \n");
-+			log_file->write_raw("normally (new) \n");
- 		}
--		log_file->write_raw(i->second.filename);
-+		log_file->write_raw(allocation_filename);
- 		log_file->write_raw(", line ");
--		log_file->write_raw(i->second.lineno);
-+		log_file->write_raw(allocation_lineno);
- 		log_file->write_endl();
- 		log_file->write_footer();
-+	} else {
-+		pointer_map.erase(p);
-+		mtx_memman.unlock();
- 	}
- }
- 
diff --git a/net-im/twinkle/files/twinkle-1.0.1-icmp.patch b/net-im/twinkle/files/twinkle-1.0.1-icmp.patch
new file mode 100644
index 000000000000..fdd326364979
--- /dev/null
+++ b/net-im/twinkle/files/twinkle-1.0.1-icmp.patch
@@ -0,0 +1,20 @@
+Index: src/sockets/socket.cpp
+===================================================================
+--- src/sockets/socket.cpp	(revision 327)
++++ src/sockets/socket.cpp	(working copy)
+@@ -18,6 +18,7 @@
+ 
+ #include <cstdio>
+ #include <cerrno>
++#include <cstring>
+ #include <sys/un.h>
+ #include "twinkle_config.h"
+ #include "socket.h"
+@@ -184,6 +185,7 @@
+ 	
+ 	// Initialize message header to receive the ancillary data for
+ 	// an ICMP message.
++	memset(&msgh, 0, sizeof(struct msghdr));
+ 	msgh.msg_control = buf;
+ 	msgh.msg_controllen = 256;
+ 	msgh.msg_name = &dest_addr;
diff --git a/net-im/twinkle/twinkle-0.9-r2.ebuild b/net-im/twinkle/twinkle-0.9-r2.ebuild
deleted file mode 100644
index 47117a393064..000000000000
--- a/net-im/twinkle/twinkle-0.9-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-0.9-r2.ebuild,v 1.2 2007/01/06 15:47:48 drizzt Exp $
-
-inherit eutils qt3
-
-DESCRIPTION="a soft phone for your VOIP communcations using SIP"
-HOMEPAGE="http://www.twinklephone.com/"
-SRC_URI="http://www.xs4all.nl/~mfnboer/twinkle/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="arts speex ilbc zrtp"
-
-# Requires libqt-mt actually...  Is that *always* built, or do we need to check?
-RDEPEND=">=net-libs/ccrtp-1.5.0
-	>=dev-cpp/commoncpp2-1.4.1
-	$(qt_min_version 3.3.0)
-	arts? ( kde-base/arts )
-	media-libs/libsndfile
-	dev-libs/boost
-	speex? ( media-libs/speex )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	zrtp? ( net-libs/libzrtpcpp )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.4.1-badcflags.patch
-	epatch "${FILESDIR}"/${P}-dtmf.patch
-	epatch "${FILESDIR}"/${P}-invite4xx.patch
-	epatch "${FILESDIR}"/${P}-memman.patch
-}
-
-src_compile() {
-	econf \
-			$(use_with ilbc) \
-			$(use_with arts) \
-			$(use_with zrtp) \
-			$(use_with speex) || die 'Error: conf failed'
-	emake || die "Error: emake failed!"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README THANKS
-	domenu twinkle.desktop
-}
-
-pkg_postinst() {
-	elog "if you get crashes on startup re-emerge commoncpp2 ccrtp and	twinkle"
-	elog "see http://www.xs4all.nl/~mfnboer/twinkle/faq.html#crash_startup"
-}
diff --git a/net-im/twinkle/twinkle-1.0.1.ebuild b/net-im/twinkle/twinkle-1.0.1-r1.ebuild
index d6e7a1ce2150..35814d69b869 100644
--- a/net-im/twinkle/twinkle-1.0.1.ebuild
+++ b/net-im/twinkle/twinkle-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.0.1.ebuild,v 1.1 2007/05/19 23:56:23 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.0.1-r1.ebuild,v 1.1 2007/06/18 10:52:08 dragonheart Exp $
 
 
 ARTS_REQUIRED="never"
@@ -32,6 +32,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-0.4.1-badcflags.patch
+	epatch "${FILESDIR}"/${P}-icmp.patch
 }
 
 src_compile() {
diff --git a/net-im/twinkle/twinkle-1.0.ebuild b/net-im/twinkle/twinkle-1.0.ebuild
deleted file mode 100644
index e1e4434093e5..000000000000
--- a/net-im/twinkle/twinkle-1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.0.ebuild,v 1.1 2007/01/24 08:36:55 dragonheart Exp $
-
-inherit eutils qt3
-
-DESCRIPTION="a soft phone for your VOIP communcations using SIP"
-HOMEPAGE="http://www.twinklephone.com/"
-SRC_URI="http://www.xs4all.nl/~mfnboer/twinkle/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="arts speex ilbc zrtp"
-
-# Requires libqt-mt actually...  Is that *always* built, or do we need to check?
-RDEPEND=">=net-libs/ccrtp-1.5.0
-	>=dev-cpp/commoncpp2-1.4.2
-	$(qt_min_version 3.3.0)
-	arts? ( kde-base/arts )
-	media-libs/libsndfile
-	dev-libs/boost
-	speex? ( media-libs/speex )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	zrtp? ( net-libs/libzrtpcpp )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.4.1-badcflags.patch
-}
-
-src_compile() {
-	econf \
-			$(use_with ilbc) \
-			$(use_with arts) \
-			$(use_with zrtp) \
-			$(use_with speex) || die 'Error: conf failed'
-	emake || die "Error: emake failed!"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README THANKS
-	domenu twinkle.desktop
-}
-
-pkg_postinst() {
-	elog "if you get crashes on startup re-emerge commoncpp2 ccrtp and	twinkle"
-	elog "see http://www.xs4all.nl/~mfnboer/twinkle/faq.html#crash_startup"
-}