rpms/centerim/F-13 centerim-4.22.8-nss.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 centerim.spec, 1.24, 1.25 import.log, 1.1, 1.2 sources, 1.13, 1.14

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/centerim/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11527/F-13

Modified Files:
	.cvsignore centerim.spec import.log sources 
Added Files:
	centerim-4.22.8-nss.patch 
Log Message:
Merge from Rawhide

centerim-4.22.8-nss.patch:
 libgadu.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE centerim-4.22.8-nss.patch ---
>From 3e8cb1fb8e662a205c6f3689d7abce5110893f16 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Thu, 18 Feb 2010 23:40:00 +0100
Subject: [PATCH] Use RAND_add() with nss_compat_openssl

It does not provide RAND_seed().
---
 libgadu/libgadu.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/libgadu/libgadu.c b/libgadu/libgadu.c
index b3f5585..ce05b26 100644
--- a/libgadu/libgadu.c
+++ b/libgadu/libgadu.c
@@ -760,8 +760,15 @@ struct gg_session *gg_login(const struct gg_login_params *p)
 			time(&rstruct.time);
 			rstruct.ptr = (void *) &rstruct;                        
 
+#ifdef HAVE_NSS_COMPAT
+			/* nss compat ossl doesn't implement that, despite
+			 * having a definition in header */
+			RAND_add((void *) rdata, sizeof(rdata), sizeof(rdata));
+			RAND_add((void *) &rstruct, sizeof(rstruct), sizeof(rstruct));
+#else
 			RAND_seed((void *) rdata, sizeof(rdata));
 			RAND_seed((void *) &rstruct, sizeof(rstruct));
+#endif
 		}
 
 		sess->ssl_ctx = SSL_CTX_new(TLSv1_client_method());
-- 
1.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/F-13/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	7 Sep 2009 10:47:02 -0000	1.13
+++ .cvsignore	21 Feb 2010 12:57:44 -0000	1.14
@@ -1 +1 @@
-centerim-4.22.8.tar.gz
+centerim-4.22.9.tar.gz


Index: centerim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/F-13/centerim.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- centerim.spec	7 Sep 2009 10:39:10 -0000	1.24
+++ centerim.spec	21 Feb 2010 12:57:44 -0000	1.25
@@ -1,5 +1,5 @@
 Name:           centerim
-Version:        4.22.8
+Version:        4.22.9
 Release:        1%{?dist}
 Epoch:          1
 
@@ -13,6 +13,7 @@ Source1:        http://www.centerim.org/
 Source2:        centerim.desktop
 
 Patch0:         centerim-4.22.6-url-escape-fedora.patch
+Patch1:         centerim-4.22.8-nss.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,6 +46,7 @@ Internal RSS reader and a client for Liv
 %prep
 %setup -q
 %patch0 -p1 -b .url-escape-fedora
+%patch1 -p1 -b .nss
 
 iconv -f iso8859-1 -t utf8 ChangeLog >ChangeLog.utf8
 touch -r ChangeLog ChangeLog.utf8
@@ -98,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Feb 18 2010 Lubomir Rintel <lkundrak at v3.sk> - 1:4.22.9-1
+- Fix build
+- New upstream release
+
 * Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 1:4.22.8-1
 - New upstream release
 - Our NSS patch integrated


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/F-13/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	5 Jul 2008 21:47:31 -0000	1.1
+++ import.log	21 Feb 2010 12:57:44 -0000	1.2
@@ -1 +1,2 @@
 centerim-4_22_6-0_1_20080705git_fc10:HEAD:centerim-4.22.6-0.1.20080705git.fc10.src.rpm:1215294450
+centerim-4_22_9-1_fc14:F-13:centerim-4.22.9-1.fc14.src.rpm:1266757043


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/F-13/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	7 Sep 2009 10:47:02 -0000	1.13
+++ sources	21 Feb 2010 12:57:44 -0000	1.14
@@ -1 +1 @@
-24f3d0f7c064f429879bc1626273b59b  centerim-4.22.8.tar.gz
+c43911508205e0277529230c8316a298  centerim-4.22.9.tar.gz