rpms/centerim/F-11 centerim-4.22.7-nss.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 centerim.spec, 1.20, 1.21 sources, 1.11, 1.12

Wed Apr 29 17:29:36 UTC 2009

Author: lkundrak

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

Modified Files:
	.cvsignore centerim.spec sources 
Added Files:
	centerim-4.22.7-nss.patch 
Log Message:
* Wed Jan 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 1:4.22.6-1
- New upstream release
- Disable openssl due to licensing trouble
- Fix dependencies


centerim-4.22.7-nss.patch:

--- NEW FILE centerim-4.22.7-nss.patch ---
>From cf415ea0a45fc77153dd1969d486aa9a1bf95e6f Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Wed, 29 Apr 2009 19:10:59 +0200
Subject: [PATCH] Fix libgadu and libicq NSS cryptography support

Fixes needed to get it compile with Fedora's nss_ossl_compat
library.
---
 configure.ac      |    2 ++
 libgadu/events.c  |    4 +++-
 libgadu/libgadu.c |    4 +++-
 libgadu/libgadu.h |    6 +++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index a5f3fa0..6ddaa32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,6 +213,7 @@ if test "x$with_ssl" != "xno"; then
 		# drags in NSPR as well
                 PKG_CHECK_MODULES(NSS, nss >= 3)
 		CFLAGS="$CFLAGS $NSS_CFLAGS"
+		CXXFLAGS="$CXXFLAGS $NSS_CFLAGS"
 		LIBS="$LIBS $NSS_LIBS"
 
 		# The compatibility layer
@@ -220,6 +221,7 @@ if test "x$with_ssl" != "xno"; then
                 if test -n "$with_nss_compat" -a "x$with_nss_compat" != "xno"; then
                         if test -f "${with_nss_compat}"; then
                                 CFLAGS="$CFLAGS -I${with_nss_compat} -I/usr/include/nspr4"
+                                CXXFLAGS="$CXXFLAGS -I${with_nss_compat} -I/usr/include/nspr4"
                         fi
                         AC_CHECK_LIB(nss_compat_ossl, SSL_CTX_new, [
                                 AC_DEFINE(HAVE_NSS_COMPAT, 1, [use nss_compat])
diff --git a/libgadu/events.c b/libgadu/events.c
index 3242d16..6ebc261 100644
--- a/libgadu/events.c
+++ b/libgadu/events.c
@@ -38,9 +38,11 @@
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
-#if defined(HAVE_OPENSSL) || defined(HAVE_NSS_COMPAT)
+#if defined(HAVE_OPENSSL)
 #  include <openssl/err.h>
 #  include <openssl/x509.h>
+#elif defined(HAVE_NSS_COMPAT)
+#  include <nss_compat_ossl/nss_compat_ossl.h>
 #elif HAVE_GNUTLS
 #  include <gnutls/gnutls.h>
 #endif
diff --git a/libgadu/libgadu.c b/libgadu/libgadu.c
index 58c2df5..b3f5585 100644
--- a/libgadu/libgadu.c
+++ b/libgadu/libgadu.c
@@ -41,10 +41,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#if defined(HAVE_OPENSSL) || defined(HAVE_NSS_COMPAT)
+#if defined(HAVE_OPENSSL)
 #define OPENSSL_NO_KRB5 1
 #  include <openssl/err.h>
 #  include <openssl/rand.h>
+#elif defined(HAVE_NSS_COMPAT)
+#  include <nss_compat_ossl/nss_compat_ossl.h>
 #elif HAVE_GNUTLS
 #include <gnutls/gnutls.h>
 #endif
diff --git a/libgadu/libgadu.h b/libgadu/libgadu.h
index 5bd96e7..abb36e1 100644
--- a/libgadu/libgadu.h
+++ b/libgadu/libgadu.h
@@ -37,7 +37,7 @@ extern "C" {
 #include <stdio.h>
 #include <stdarg.h>
 
-#if defined(HAVE_OPENSSL) || defined(HAVE_NSS_COMPAT)
+#if defined(HAVE_OPENSSL)
 
 #ifndef OPENSSL_NO_KRB5
 #define OPENSSL_NO_KRB5 1
@@ -45,6 +45,10 @@ extern "C" {
 
 #include <openssl/ssl.h>
 
+#elif defined(HAVE_NSS_COMPAT)
+
+#include <nss_compat_ossl/nss_compat_ossl.h>
+
 #elif HAVE_GNUTLS
 #include <gnutls/openssl.h>
 #endif
-- 
1.6.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 Jan 2009 23:17:10 -0000	1.11
+++ .cvsignore	29 Apr 2009 17:29:05 -0000	1.12
@@ -1 +1 @@
-centerim-4.22.6.tar.gz
+centerim-4.22.7.tar.bz2


Index: centerim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/F-11/centerim.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- centerim.spec	24 Feb 2009 07:00:35 -0000	1.20
+++ centerim.spec	29 Apr 2009 17:29:05 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           centerim
-Version:        4.22.6
-Release:        2
+Version:        4.22.7
+Release:        1%{?dist}
 Epoch:          1
 
 Summary:        Text mode menu- and window-driven IM
@@ -8,11 +8,12 @@ Summary:        Text mode menu- and wind
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.centerim.org/
-Source0:        http://www.centerim.org/download/releases/%{name}-%{version}.tar.gz
+Source0:        http://www.centerim.org/download/releases/%{name}-%{version}.tar.bz2
 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.7-nss.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,6 +24,10 @@ BuildRequires:  gpgme-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  lzo-devel >= 2
+BuildRequires:  nss_compat_ossl-devel
+BuildRequires:  nss-devel
+BuildRequires:  nspr-devel
+BuildRequires:  autoconf
 
 BuildConflicts: openssl-devel
 
@@ -41,11 +46,17 @@ 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
+mv ChangeLog.utf8 ChangeLog
 
 
 %build
+autoconf
 %configure \
-        --with-ssl \
+        --with-ssl --with-nss_compat \
         --disable-rpath \
         --enable-locales-fix
 make %{?_smp_flags}
@@ -82,7 +93,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/centerim
 %{_bindir}/cimconv
 %{_bindir}/CenterIMLog2HTML.py
-%exclude %{_bindir}/CenterIMLog2HTML.py?
 %{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/*.svg
@@ -90,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 29 2009 Lubomir Rintel <lkundrak at v3.sk> - 1:4.22.7-1
+- New upstream version
+- Re-enable SSL, provided by NSS
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.22.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/centerim/F-11/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 Jan 2009 23:17:10 -0000	1.11
+++ sources	29 Apr 2009 17:29:05 -0000	1.12
@@ -1 +1 @@
-b26cb94fc5cb68fd3ca8a11ab0bb031c  centerim-4.22.6.tar.gz
+2db303baa9b7680c2cccb3314bfa7ae2  centerim-4.22.7.tar.bz2


