[empathy/f14/master] - Add patch to use Fedora's CA-cert.

[Brian Pepple]

commit 5d53f7afb9e3f390beba09ae20afe18efed58cc1
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Sat Nov 6 22:20:09 2010 -0400

    - Add patch to use Fedora's CA-cert.

 ...ake-ca-certs-location-configurable-634197.patch |   64 ++++++++++++++++++++
 empathy.spec                                       |   13 ++++-
 2 files changed, 76 insertions(+), 1 deletions(-)
---
diff --git a/0001-Make-ca-certs-location-configurable-634197.patch b/0001-Make-ca-certs-location-configurable-634197.patch
new file mode 100644
index 0000000..10f3d3f
--- /dev/null
+++ b/0001-Make-ca-certs-location-configurable-634197.patch
@@ -0,0 +1,64 @@
+diff -urp empathy-2.32.0.1.OLD/configure.ac empathy-2.32.0.1/configure.ac
+--- empathy-2.32.0.1.OLD/configure.ac	2010-10-04 09:54:03.000000000 -0400
++++ empathy-2.32.0.1/configure.ac	2010-11-06 22:00:06.884066741 -0400
+@@ -244,6 +244,40 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GET
+ 
+ AM_GLIB_GNU_GETTEXT
+ 
++
++
++# -----------------------------------------------------------
++# Make CA certificates path configurable
++# Stolen from GIO's TLS
++# -----------------------------------------------------------
++AC_MSG_CHECKING([location of system Certificate Authority list])
++AC_ARG_WITH(ca-file,
++            [AC_HELP_STRING([--with-ca-file=@<:@path@:>@],
++                            [path to system Certificate Authority list])])
++if test "$with_ca_file" = "no"; then
++    AC_MSG_RESULT([disabled])
++else
++    if test -z "$with_ca_file"; then
++        for f in /etc/pki/tls/certs/ca-bundle.crt \
++                 /etc/ssl/certs/ca-certificates.crt; do
++            if test -f "$f"; then
++                with_ca_file="$f"
++            fi
++        done
++        if test -z "$with_ca_file"; then
++            AC_MSG_ERROR([could not find. Use --with-ca-file=path to set, or --without-ca-file to disable])
++        fi
++    fi
++
++    AC_MSG_RESULT($with_ca_file)
++    if ! test -f "$with_ca_file"; then
++        AC_MSG_ERROR([No such file '$with_ca_file'. Use --with-ca-file=path to set, or --without-ca-file to disable])
++    fi
++    GTLS_SYSTEM_CA_FILE="$with_ca_file"
++
++    AC_DEFINE_UNQUOTED([GTLS_SYSTEM_CA_FILE], ["$GTLS_SYSTEM_CA_FILE"], [path to system Certificate Authority list])
++fi
++
+ # -----------------------------------------------------------
+ # Connectivity integration
+ # -----------------------------------------------------------
+@@ -565,6 +599,7 @@ Configure summary:
+ 	Prefix......................:  ${prefix}
+ 	Coding style checks.........:  ${ENABLE_CODING_STYLE_CHECKS}
+ 	Use GTK+3...................:  ${have_gtk3}
++	CA Cert Path................:  ${GTLS_SYSTEM_CA_FILE}
+ 
+     Features:
+ 	Spell checking (enchant)....:  ${have_enchant}
+diff -urp empathy-2.32.0.1.OLD/libempathy/empathy-tls-verifier.c empathy-2.32.0.1/libempathy/empathy-tls-verifier.c
+--- empathy-2.32.0.1.OLD/libempathy/empathy-tls-verifier.c	2010-10-04 07:02:06.000000000 -0400
++++ empathy-2.32.0.1/libempathy/empathy-tls-verifier.c	2010-11-06 22:00:53.121066742 -0400
+@@ -44,7 +44,7 @@ enum {
+ };
+ 
+ static const gchar* system_ca_paths[] = {
+-  "/etc/ssl/certs/ca-certificates.crt",
++  GTLS_SYSTEM_CA_FILE,
+   NULL,
+ };
+ 
diff --git a/empathy.spec b/empathy.spec
index a2c8a91..5d395c3 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -12,7 +12,7 @@
 
 Name:		empathy
 Version:	2.32.0.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -21,6 +21,7 @@ URL:		http://live.gnome.org/Empathy
 
 Source0:	http://download.gnome.org/sources/%{name}/2.32/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
+Patch0:		0001-Make-ca-certs-location-configurable-634197.patch
 
 BuildRequires:	enchant-devel >= %{enchant_version}
 BuildRequires:	iso-codes-devel
@@ -48,6 +49,11 @@ BuildRequires:	unique-devel
 BuildRequires:	nautilus-sendto-devel
 BuildRequires:  telepathy-logger-devel >= 0.1.5
 BuildRequires:	folks-devel >= 0.1.15
+## Requires for reconf
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
+BuildRequires:	gnome-common
 
 Requires:	telepathy-filesystem
 Requires:	telepathy-mission-control >= %{tp_mc_min_version}
@@ -78,8 +84,10 @@ It is built on top of the Telepathy framework.
 
 %prep
 %setup -q
+%patch0 -p1 -b .ssl
 # force this to be regenerated
 rm data/empathy.desktop
+autoreconf
 
 %build
 ## GCC complains about some unused functions, so we forcibly show those as
@@ -154,6 +162,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
+* Sat Nov  6 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.32.0.1-3
+- Add patch to use Fedora's CA-cert.
+
 * Tue Oct 12 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.32.0.1-2
 - Rebuild for new tp-glib.