Fix bug 110562.

Package-Manager: portage-2.0.53_rc7

4 files changed, 42 insertions, 4 deletions

diff --git a/x11-misc/synergy/ChangeLog b/x11-misc/synergy/ChangeLog
index 4ce821b152c3..2b1032cf43c3 100644
--- a/x11-misc/synergy/ChangeLog
+++ b/x11-misc/synergy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/synergy
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.36 2005/11/03 12:43:48 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.37 2005/11/11 22:04:39 nelchael Exp $
+
+  12 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/synergy-1.2.5-print-buffer.patch, synergy-1.2.5.ebuild:
+  Fix bug 110562 - segfault when server is started with --help.
 
   03 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> -synergy-1.2.2.ebuild,
   -synergy-1.2.3.ebuild, synergy-1.2.4.ebuild, synergy-1.2.5.ebuild:
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 34255751d35b..0d8a3ebc60e6 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,6 +1,7 @@
-MD5 0a55828b000d3b4cb3230c7bd7c030a4 ChangeLog 4291
+MD5 b9d125be3a2613313e15c8c8f6ac0f74 ChangeLog 4474
 MD5 d8b0d98a25b5d57140f0bd5f7e6307b0 files/digest-synergy-1.2.4 65
 MD5 6ae1c41860d170a2a890a695cf65877f files/digest-synergy-1.2.5 65
+MD5 13e6e9a7fe7aba9b1a817d4668051646 files/synergy-1.2.5-print-buffer.patch 649
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 MD5 6de4947e46d4bdf52a050b3f00aac8f3 synergy-1.2.4.ebuild 896
-MD5 034e0270fa6464b1cb390de60aa36f0b synergy-1.2.5.ebuild 900
+MD5 3f1b252cc1a290484709b71a9ef8735c synergy-1.2.5.ebuild 1000
diff --git a/x11-misc/synergy/files/synergy-1.2.5-print-buffer.patch b/x11-misc/synergy/files/synergy-1.2.5-print-buffer.patch
new file mode 100644
index 000000000000..99cc3a93e9c4
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.2.5-print-buffer.patch
@@ -0,0 +1,21 @@
+diff -Nru synergy-1.2.5.orig/lib/base/CLog.cpp synergy-1.2.5/lib/base/CLog.cpp
+--- synergy-1.2.5.orig/lib/base/CLog.cpp	2005-10-27 00:37:38.000000000 +0200
++++ synergy-1.2.5/lib/base/CLog.cpp	2005-10-27 00:38:17.000000000 +0200
+@@ -118,7 +118,7 @@
+ 	int pad = g_priorityPad;
+ 
+ 	// print to buffer
+-	char stack[1024];
++	char stack[4096];
+ 	va_list args;
+ 	va_start(args, fmt);
+ 	char* buffer = CStringUtil::vsprint(stack,
+@@ -150,7 +150,7 @@
+ 	}
+ 
+ 	// compute prefix padding length
+-	char stack[1024];
++	char stack[4096];
+ 	sprintf(stack, "%d", line);
+ 	int pad = strlen(file) + 1 /* comma */ +
+ 				strlen(stack) + 1 /* colon */ + 1 /* space */ +
diff --git a/x11-misc/synergy/synergy-1.2.5.ebuild b/x11-misc/synergy/synergy-1.2.5.ebuild
index 074402da8ea4..751c1aa13f75 100644
--- a/x11-misc/synergy/synergy-1.2.5.ebuild
+++ b/x11-misc/synergy/synergy-1.2.5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.2.5.ebuild,v 1.2 2005/11/03 12:43:48 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.2.5.ebuild,v 1.3 2005/11/11 22:04:39 nelchael Exp $
+
+inherit eutils
 
 DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers."
 SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz"
@@ -12,6 +14,13 @@ IUSE=""
 
 DEPEND="virtual/x11"
 
+src_unpack() {
+
+	unpack "${A}"
+	epatch "${FILESDIR}/${P}-print-buffer.patch"
+
+}
+
 src_compile() {
 
 	econf --sysconfdir=/etc || die
@@ -25,11 +34,14 @@ src_install () {
 	dodoc AUTHORS BUGS ChangeLog HISTORY NEWS PORTING README TODO
 	insinto /etc
 	doins ${S}/examples/synergy.conf
+
 }
 
 pkg_postinst() {
+
 	einfo
 	einfo "${PN} can also be used to connect to computers running Windows."
 	einfo "Visit ${HOMEPAGE} to find the Windows client."
 	einfo
+
 }