Added patch to fix mysql queries with multiple results hanging YATE.

svn path=/trunk/; revision=600

4 files changed, 116 insertions, 0 deletions

diff --git a/net-voip/yate/ChangeLog b/net-voip/yate/ChangeLog
index 252cc59..cdc8458 100644
--- a/net-voip/yate/ChangeLog
+++ b/net-voip/yate/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Oct 2007; Tais M. Hansen <mellen@osd.dk>
+  +files/yate-1.3.0-mysql-multiple-results.diff, +yate-1.3.0-r1.ebuild:
+  Fixed multiple results in MySQL queries hanging YATE
+
   03 Sep 2007; Tais M. Hansen <mellen@osd.dk> +yate-1.3.0.ebuild:
   Version bump
 
diff --git a/net-voip/yate/Manifest b/net-voip/yate/Manifest
index f3eae67..cde0fe0 100644
--- a/net-voip/yate/Manifest
+++ b/net-voip/yate/Manifest
@@ -1,9 +1,11 @@
 AUX yate-0.9.0-gtk2.diff 339 RMD160 c505b49856e7af958146faeb630059ccfc769156 SHA1 c97256bb5dd4686fe8c973c588077d91d2917ded SHA256 68d8b05dd084d2967d548e471208d39abc910a96fcd46b627cc9f1131d3cf5ee
 AUX yate-1.2.0-enable-speex-in-ysip.patch 1768 RMD160 28e9a4d3101b626219770769d5f5c08762cca9a3 SHA1 d2748a9223111aa97ad8f04e367aec75454b799e SHA256 7f607bb099b612a441f992e4968b58b0bd12fa1fec9938cb707e1591641b072e
+AUX yate-1.3.0-mysql-multiple-results.diff 376 RMD160 005d4fae96a5f19c0586479501d19a1ec35873d4 SHA1 f6d07109c717d5a0aa7457c80ead9cecef91c285 SHA256 4bcf597db81c43ab7e5445cc76b2ab1efb9143290458a47f85420c0ac3a0c018
 AUX yate.confd 157 RMD160 8021309e1ae52a8818836797a716d619bb3ee130 SHA1 891728e4dbc22501954fe4d5d26612dfa552d177 SHA256 af22cccd40a02f31d79a75dcb957d4c0f0ba0e124e87df1466a75093f1dc4391
 AUX yate.rc6 451 RMD160 258046e03ada20c86c37c65a9e1235c941766e1d SHA1 e5a857bbdca7c41a39b8de226697ce4aff42c683 SHA256 04663d67ff7c0aa4bfbf9e0fe4197dea56c5864786785f874ea3292f01651ba1
 DIST yate-1.2.0-1.tar.gz 1248848 RMD160 6a3d7f9247282bef89c18bff01efcbe31a73fa8d SHA1 6361b8ff4cd03cf4bf908022b99d3854f9d94a63 SHA256 9e58857408e98b957dc72e164a135c2de7ea9a221d214e6bab3ca4020f656273
 DIST yate-1.3.0-1.tar.gz 1294420 RMD160 d135f5f8bd3378a3e8d2d96b39ccb3aa4c6e77f6 SHA1 cb662e2495a445f91bdf396e6ae76bf3ad0c0995 SHA256 97f6e6011828c98caebf511d9bd9b74b8411add939df6dbe028eda85cf819f77
 EBUILD yate-1.2.0-r1.ebuild 2281 RMD160 544d2b0031b6ef03bac60c087be8ad67df0bcca3 SHA1 fbb00ef0558a33692c6cc72f4c1ab036610706a4 SHA256 24aff5f71cc87ae74ea4a4ebb3789fa1d1296f2fb478213b95dc33bac43552e4
+EBUILD yate-1.3.0-r1.ebuild 2379 RMD160 93de74fb6b65712a62ea7eff88452f3096885f86 SHA1 ac2691444427e672dd194ee19cc0121071661a0f SHA256 1e30691a2d5b0077627c29da9715b0533dc3e30b58146eef8078ee09c7199514
 EBUILD yate-1.3.0.ebuild 2319 RMD160 78842cdcef8b754d7b75f0ffa90e7c246d558cd3 SHA1 5b430d2dedf4381267ce6d0dbaf030785b45db6b SHA256 af3fad3052953092bf4e211f2b97b28ca50805fa1b7c7df23664e1e657309cce
 MISC ChangeLog 461 RMD160 39a4a07ecf55c5114f47609060f6ee240a53ad4b SHA1 8be6c58a9f7e766a0c26ba44dc94a0bd19ca896e SHA256 f40b16da626fcb197dfe16c5b785e05d291a61539bb36347697f412a3ec66ea0
diff --git a/net-voip/yate/files/yate-1.3.0-mysql-multiple-results.diff b/net-voip/yate/files/yate-1.3.0-mysql-multiple-results.diff
new file mode 100644
index 0000000..3d16ac5
--- /dev/null
+++ b/net-voip/yate/files/yate-1.3.0-mysql-multiple-results.diff
@@ -0,0 +1,13 @@
+--- yate/modules/mysqldb.cpp	2006-12-19 20:59:53.000000000 +0100
++++ yate-1.3.0-1/modules/mysqldb.cpp	2007-09-26 16:27:11.921551155 +0200
+@@ -247,9 +247,9 @@
+ 		}
+ 	    }
+ 	    mysql_free_result(res);
+ 	}
+-    } while (mysql_more_results(m_conn));
++    } while (mysql_next_result(m_conn) == 0);
+ 
+     if (m_msg) {
+ 	m_msg->setParam("affected",String(affected));
+ 	if (warns)
diff --git a/net-voip/yate/yate-1.3.0-r1.ebuild b/net-voip/yate/yate-1.3.0-r1.ebuild
new file mode 100644
index 0000000..7c357d3
--- /dev/null
+++ b/net-voip/yate/yate-1.3.0-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+DESCRIPTION="YATE - Yet Another Telephony Engine"
+HOMEPAGE="http://yate.null.ro/"
+SRC_URI="http://yate.null.ro/tarballs/yate1/${P}-1.tar.gz"
+
+S=${WORKDIR}/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gsm gtk h323 ilbc mysql postgres pri spandsp speex wanpipe zaptel"
+
+DEPEND="media-sound/sox
+	doc? ( || ( app-doc/doxygen >=dev-util/kdoc-2.0_alpha54 ) )
+	gsm? ( media-sound/gsm )
+	gtk? ( >=x11-libs/gtk+-2.6.8 )
+	h323? ( >=net-libs/openh323-1.15.3
+		dev-libs/pwlib )
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql )
+	pri? ( net-libs/libpri )
+	spandsp? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	wanpipe? ( net-misc/wanpipe )
+	zaptel? ( net-misc/zaptel )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	# fix gtk2 plugin makefile
+	epatch ${FILESDIR}/${PN}-0.9.0-gtk2.diff
+	epatch ${FILESDIR}/${PN}-1.2.0-enable-speex-in-ysip.patch
+	epatch ${FILESDIR}/${PN}-1.3.0-mysql-multiple-results.diff
+}
+
+src_compile() {
+	# Figure out which doc generators are available.
+	local extraopts
+	if use doc && has_version app-doc/doxygen; then
+		extraopts+=" --with-doxygen"
+	else
+		extraopts+=" --without-doxygen"
+	fi
+
+	if use doc && has_version dev-util/kdoc; then
+		extraopts+=" --with-kdoc"
+	else
+		extraopts+=" --without-kdoc"
+	fi
+
+	econf \
+		$(use_enable ilbc) \
+		$(use_with gsm libgsm) \
+		$(use_with gtk libgtk2) \
+		$(use_with h323 openh323 /usr) \
+		$(use_with h323 pwlib /usr) \
+		$(use_with mysql mysql /usr) \
+		$(use_with postgres libpq /usr) \
+		$(use_with pri libpri) \
+		$(use_with spandsp) \
+		$(use_with speex libspeex) \
+		$(use_with wanpipe wphwec /usr) \
+		${extraopts} \
+		|| die "Configure failed"
+
+	emake all contrib || die "Building failed"
+
+	if use doc; then
+		emake apidocs || die "Building API docs failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR=${D} install-noapi || die "emake install-noapi failed"
+
+	if use doc; then
+		emake DESTDIR=${D} install-api || die "emake install-api failed"
+	fi
+
+	newinitd ${FILESDIR}/yate.rc6 yate
+	newconfd ${FILESDIR}/yate.confd yate
+
+	if [ "${P}" != "${PF}" ]; then
+		cd ${D}/usr/share/doc
+		mv ${P} ${PF}
+	fi
+
+	insinto /usr/share/doc/${PF}/scripts
+	cp -R ${S}/scripts/* ${D}/usr/share/doc/${PF}/scripts/
+	rm -f ${D}/usr/share/doc/${PF}/scripts/Makefile*
+}