Fix for ssl connection problems with newer openssl versions, bug #224095 thank Anton Bolshakov for report!

Package-Manager: portage-2.1.4.4

5 files changed, 127 insertions, 5 deletions

diff --git a/net-im/sim/ChangeLog b/net-im/sim/ChangeLog
index f52e8fb6be7d..8ab43cbc89e1 100644
--- a/net-im/sim/ChangeLog
+++ b/net-im/sim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/sim
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.88 2008/05/11 13:24:42 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.89 2008/05/30 07:33:53 pva Exp $
+
+*sim-0.9.4.3-r2 (30 May 2008)
+
+  30 May 2008; Peter Volkov <pva@gentoo.org>
+  +files/sim-0.9.4.3-sslv23.patch, sim-0.9.4.3-r1.ebuild,
+  +sim-0.9.4.3-r2.ebuild:
+  Fix for ssl connection problems with newer openssl versions, bug #224095
+  thank Anton Bolshakov for report!
 
   11 May 2008; Peter Volkov <pva@gentoo.org> sim-9999.ebuild:
   Fixed dependencies, e.g. flex should not be in RDEPEND, bug #221339 thank
diff --git a/net-im/sim/Manifest b/net-im/sim/Manifest
index 667bd5123c97..89eda444176b 100644
--- a/net-im/sim/Manifest
+++ b/net-im/sim/Manifest
@@ -1,7 +1,9 @@
 AUX sim-0.9.4.3-double-message-fix.patch 882 RMD160 adf7304d31d6cb90b4c64098b5ec993355d050fc SHA1 43d1dc1d32cc8a229b1ff6759f1e5bc6f6bdc627 SHA256 997d40dd9a23b55e02c8dc0a5c9bcf81de93b0dd0c2bea673961e1e31d76cc41
+AUX sim-0.9.4.3-sslv23.patch 336 RMD160 21dd720d0fb3594b452c931143fd9f206ed70a5a SHA1 1581ff9f660bd9ec5f56f97f7edeeec000a717a6 SHA256 c79e982824a1b8cd7da1dc06a180cfb8a51a4a5a863dcaa4deb749c1390848f3
 DIST sim-0.9.4.3-r1919_1924.patch.bz2 53044 RMD160 9982bc984fb8befe0680cae7115fdad575936458 SHA1 e8e7cc8da756f5e7686e416afe79a42cb76442d9 SHA256 80717eac7096c6a4b72edcf88c90926e0cd1e8760dd101f5a3986e6d3f16e17f
 DIST sim-0.9.4.3.tar.bz2 3251965 RMD160 2a1ced43d1e25e7b4fc95a88b7356c9991252d3c SHA1 6d181b4cb6b8470dd874a409578c02504f157b3e SHA256 305ee38897f11b2e68471d0f771f5487ac08e77f5ca2d47e2c350894ffc1a1b9
-EBUILD sim-0.9.4.3-r1.ebuild 2769 RMD160 25d37aa83816ae0c314bb47841fb4dc31f50845c SHA1 7b0db2b588820ec0912666fbd6972dca34dcaa0c SHA256 37d2f3b40e7c96049117ed856e13fd44850698834569612b36fa92066bca3e3f
+EBUILD sim-0.9.4.3-r1.ebuild 2771 RMD160 35bfac8eb62057c7f2dc06080107ce843e4d2fe5 SHA1 0a4ebc264e4435bd095ddf840daee31691842978 SHA256 84ff1d146b83f5dec9573abe54cf0685cc9fd53868b4451fdd72a3740b85cced
+EBUILD sim-0.9.4.3-r2.ebuild 2814 RMD160 8ce2edb9fcf05bc52477a12df7cb744587cff55b SHA1 cf9fc11a3c653f02f2f0ddb11f4dcb8ae0d72b35 SHA256 245d85a9171890e255c8cad996ed92c26cdbe1621578cee2b30cdafbe1d9dced
 EBUILD sim-9999.ebuild 3119 RMD160 b3d2f3eb4762c90f35d9ac023ec8d9ac00b26588 SHA1 01fc65e74a9abb12730cc9dbe017bb42bac97bcc SHA256 007eb4e96904f72bd8d8f022ff3ebea9d970494e9fa14ac4de9b1795127d37da
-MISC ChangeLog 12966 RMD160 04c6d1560a56f85dd04cc62862db77bacdb5b0bd SHA1 3a1268839464bde1d7584cff94d8f212578c3bdc SHA256 4fc1f7aa7c7bd586a1b9da697dae3d070eb0900297d737a93a3cc072c00ded0c
+MISC ChangeLog 13238 RMD160 e57e94ff29454f1a137ee4cdf73129310466be35 SHA1 82145b4abfdb52a7d250b5da91261bb65a78ff81 SHA256 76f0295200f7bd78aebe4a6b4a5091ad5f5c3d62b8bd5153052cb507b9d50ca9
 MISC metadata.xml 507 RMD160 7ff8ac8164276338a780a1e8441ca14b7f41a7e4 SHA1 b1b15267602a354ad1124c9eccf281b5b5960d2f SHA256 260177f2cc2f6010a6d29dccb4190b8d7480f5af803fb73bdf0ac151a685b92f
diff --git a/net-im/sim/files/sim-0.9.4.3-sslv23.patch b/net-im/sim/files/sim-0.9.4.3-sslv23.patch
new file mode 100644
index 000000000000..d0207ce2fe7c
--- /dev/null
+++ b/net-im/sim/files/sim-0.9.4.3-sslv23.patch
@@ -0,0 +1,11 @@
+--- sim/sslclient.cpp.orig	2006-02-01 04:24:25.000000000 +0800
++++ sim/sslclient.cpp	2008-04-23 20:59:47.000000000 +0800
+@@ -406,7 +406,7 @@
+ 
+ bool SSLClient::initTLS1(bool bDH)
+ {
+-    mpCTX = SSL_CTX_new(TLSv1_method());
++    mpCTX = SSL_CTX_new(SSLv23_client_method());
+     if (mpCTX == NULL)
+         return false;
+     if (bDH){
diff --git a/net-im/sim/sim-0.9.4.3-r1.ebuild b/net-im/sim/sim-0.9.4.3-r1.ebuild
index 4d69978e0c1a..a3f7b945acc4 100644
--- a/net-im/sim/sim-0.9.4.3-r1.ebuild
+++ b/net-im/sim/sim-0.9.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.4.3-r1.ebuild,v 1.8 2008/05/04 11:51:10 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.4.3-r1.ebuild,v 1.9 2008/05/30 07:33:53 pva Exp $
 
 inherit kde-functions eutils flag-o-matic
 
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
 
 pkg_nofetch() {
 	einfo "${CATEGORY}/${P} contains icons and sounds with unclear licensing and thus"
-	einfo "you have to download and it put into ${DISTDIR} by yourself."
+	einfo "you have to download and it put into '${DISTDIR}' by yourself."
 	einfo "Download location:"
 	echo
 	einfo "${SRC_URI}"
diff --git a/net-im/sim/sim-0.9.4.3-r2.ebuild b/net-im/sim/sim-0.9.4.3-r2.ebuild
new file mode 100644
index 000000000000..78f9b6a4e921
--- /dev/null
+++ b/net-im/sim/sim-0.9.4.3-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.4.3-r2.ebuild,v 1.1 2008/05/30 07:33:53 pva Exp $
+
+inherit kde-functions eutils flag-o-matic
+
+DESCRIPTION="Simple Instant Messenger (with KDE support). ICQ/AIM/Jabber/MSN/Yahoo."
+HOMEPAGE="http://sim-im.org/"
+SRC_URI="mirror://berlios/sim-im/${P}.tar.bz2
+	http://dev.gentoo.org/~pva/${P}-r1919_1924.patch.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug kde spell ssl"
+
+RESTRICT="fetch"
+
+# kdebase-data provides the icon "licq.png"
+RDEPEND="kde? ( =kde-base/kdelibs-3.5*
+				|| ( =kde-base/kdebase-data-3.5* =kde-base/kdebase-3.5* ) )
+		 !kde? ( $(qt_min_version 3)
+				 spell? ( app-text/aspell ) )
+		 ssl? ( dev-libs/openssl )
+		 dev-libs/libxml2
+		 dev-libs/libxslt
+		 sys-libs/zlib
+		 x11-libs/libXScrnSaver"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	app-arch/zip
+	x11-proto/scrnsaverproto"
+
+pkg_nofetch() {
+	einfo "${CATEGORY}/${P} contains icons and sounds with unclear licensing and thus"
+	einfo "you have to download and it put into '${DISTDIR}' by yourself."
+	einfo "Download location:"
+	echo
+	einfo "${SRC_URI}"
+	echo
+	einfo "See http://archives.gentoo.org/gentoo-dev/msg_144003.xml for further"
+	einfo "information."
+}
+
+pkg_setup() {
+	if use kde; then
+		if use spell; then
+			if ! built_with_use "=kde-base/kdelibs-3.5*" spell; then
+				ewarn "kde-base/kdelibs were merged without spell in USE."
+				ewarn "Thus spelling will not work in sim. Please, either"
+				ewarn "reemerge kde-base/kdelibs with spell in USE or emerge"
+				ewarn 'sim with USE="-spell" to avoid this message.'
+				ebeep
+			fi
+		else
+			if built_with_use "=kde-base/kdelibs-3.5*" spell; then
+				ewarn 'kde-base/kdelibs were merged with spell in USE.'
+				ewarn 'Thus spelling will work in sim. Please, either'
+				ewarn 'reemerge kde-base/kdelibs without spell in USE or emerge'
+				ewarn 'sim with USE="spell" to avoid this message.'
+				ebeep
+			fi
+		fi
+		if ! built_with_use "=kde-base/kdelibs-3.5*" arts; then
+			myconf="--without-arts"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-double-message-fix.patch
+	epatch "${FILESDIR}"/${P}-sslv23.patch
+	epatch ../${P}-r1919_1924.patch
+	if use kde; then
+		set-kdedir 3
+	fi
+}
+
+src_compile() {
+	filter-flags -fstack-protector -fstack-protector-all
+
+	# Workaround for bug #119906
+	append-flags -fno-stack-protector
+
+	use kde || use spell || export DO_NOT_COMPILE="$DO_NOT_COMPILE plugins/spell"
+
+	econf ${myconf} $(use_enable kde) \
+		  $(use_with ssl) \
+		  $(use_enable debug) || die "econf failed"
+
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed."
+	dodoc TODO README AUTHORS.sim jisp-resources.txt ChangeLog
+}