[empathy] Add patch to use Fedora's ca-cert

Brian Pepple bpepple at fedoraproject.org
Tue Nov 16 19:44:49 UTC 2010


commit dc92689ff53c8d86742befc31b7cf7176f1895a0
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Tue Nov 16 14:46:58 2010 -0500

    Add patch to use Fedora's ca-cert

 ca-cert.patch |   12 ++++++++++++
 empathy.spec  |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/ca-cert.patch b/ca-cert.patch
new file mode 100644
index 0000000..4c0820a
--- /dev/null
+++ b/ca-cert.patch
@@ -0,0 +1,12 @@
+diff -urp empathy-2.91.2.OLD/libempathy/empathy-tls-verifier.c empathy-2.91.2/libempathy/empathy-tls-verifier.c
+--- empathy-2.91.2.OLD/libempathy/empathy-tls-verifier.c	2010-11-08 07:23:22.000000000 -0500
++++ empathy-2.91.2/libempathy/empathy-tls-verifier.c	2010-11-16 14:29:19.678198850 -0500
+@@ -44,7 +44,7 @@ enum {
+ };
+ 
+ static const gchar* system_ca_paths[] = {
+-  "/etc/ssl/certs/ca-certificates.crt",
++  "/etc/pki/tls/certs/ca-bundle.crt",
+   NULL,
+ };
+ 
diff --git a/empathy.spec b/empathy.spec
index f9fbd22..5ea0e27 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -24,6 +24,9 @@ Source0:	http://download.gnome.org/sources/%{name}/2.91/%{name}-%{version}.tar.b
 Source1:	%{name}-README.ConnectionManagers
 # http://git.gnome.org/browse/empathy/commit/?id=5d15b2ed1f68d17364a53549ceb503275c62769d
 Patch0:		folks-api-changes.patch
+# Patch to use Fedora's ca-cert. This can be dropped with the next
+# version since this has been fixed upstream.
+Patch1:         ca-cert.patch
 
 BuildRequires:	enchant-devel >= %{enchant_version}
 BuildRequires:	iso-codes-devel
@@ -78,6 +81,7 @@ It is built on top of the Telepathy framework.
 %prep
 %setup -q
 %patch0 -p1 -b .folks-api
+%patch1 -p1 -b .ca-certs
 # force this to be regenerated
 rm data/empathy.desktop
 
@@ -155,8 +159,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
-* Mon Nov 15 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.91.2-2
+* Tue Nov 16 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.91.2-2
 - Bump min versions for gtk3, glib2, tp-glib, and folks.
+- Add patch to use Fedora's ca-cert.
 - Drop BR on unique3. No longer needed.
 
 * Mon Nov 15 2010 Bastien Nocera <bnocera at redhat.com> 2.91.2-1


More information about the scm-commits mailing list