diff --git a/.cvsignore b/.cvsignore index 88549ea..2268463 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -centerim-4.22.8.tar.gz +centerim-4.22.9.tar.gz diff --git a/centerim-4.22.8-nss.patch b/centerim-4.22.8-nss.patch new file mode 100644 index 0000000..4e60301 --- /dev/null +++ b/centerim-4.22.8-nss.patch @@ -0,0 +1,33 @@ +From 3e8cb1fb8e662a205c6f3689d7abce5110893f16 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +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 + diff --git a/centerim.spec b/centerim.spec index 950386c..dc6e169 100644 --- a/centerim.spec +++ b/centerim.spec @@ -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/images/b/b5/Centerim_b.svg 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 LiveJournal are provided. %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 - 1:4.22.9-1 +- Fix build +- New upstream release + * Mon Sep 07 2009 Lubomir Rintel - 1:4.22.8-1 - New upstream release - Our NSS patch integrated diff --git a/import.log b/import.log index 3696fcc..2a9b994 100644 --- a/import.log +++ b/import.log @@ -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:EL-6:centerim-4.22.9-1.fc14.src.rpm:1278622679 diff --git a/sources b/sources index f96692b..014551a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -24f3d0f7c064f429879bc1626273b59b centerim-4.22.8.tar.gz +c43911508205e0277529230c8316a298 centerim-4.22.9.tar.gz