diff options
| author | Michael Cronenworth <mike@cchtml.com> | 2014-06-09 08:38:12 -0500 |
|---|---|---|
| committer | Michael Cronenworth <mike@cchtml.com> | 2014-06-09 08:38:12 -0500 |
| commit | 9f74cbfd1fe66cc32a0604c7971abb1a6afd3a6d (patch) | |
| tree | d6a70c00aff1820551e7675bec260ce003d35863 | |
| parent | b3154eb2409f36635c416e0ee1533daff3b3822e (diff) | |
| download | xbmc-rpm-9f74cbfd1fe66cc32a0604c7971abb1a6afd3a6d.tar.gz xbmc-rpm-9f74cbfd1fe66cc32a0604c7971abb1a6afd3a6d.tar.xz xbmc-rpm-9f74cbfd1fe66cc32a0604c7971abb1a6afd3a6d.zip | |
Update to 13.1 final
| -rw-r--r-- | xbmc-13.1-curl.patch | 36 | ||||
| -rwxr-xr-x | xbmc-generate-tarball-xz.sh | 2 | ||||
| -rw-r--r-- | xbmc.spec | 19 |
3 files changed, 51 insertions, 6 deletions
diff --git a/xbmc-13.1-curl.patch b/xbmc-13.1-curl.patch new file mode 100644 index 0000000..f4a586f --- /dev/null +++ b/xbmc-13.1-curl.patch @@ -0,0 +1,36 @@ +From b47117d9d0e1be09a298079919cc335baf2f37f0 Mon Sep 17 00:00:00 2001 +From: Pierre Ossman <pierre@ossman.eu> +Date: Sun, 25 May 2014 17:10:03 +0200 +Subject: [PATCH] curl: don't mess with the default cipher list as we can't + know the format + +--- + xbmc/filesystem/CurlFile.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp +index 30de6f9..0a5ea14 100644 +--- a/xbmc/filesystem/CurlFile.cpp ++++ b/xbmc/filesystem/CurlFile.cpp +@@ -394,7 +394,7 @@ CCurlFile::CCurlFile() + m_username = ""; + m_password = ""; + m_httpauth = ""; +- m_cipherlist = "DEFAULT"; ++ m_cipherlist = ""; + m_proxytype = PROXY_HTTP; + m_state = new CReadState(); + m_oldState = NULL; +@@ -608,7 +608,8 @@ void CCurlFile::SetCommonOptions(CReadState* state) + g_curlInterface.easy_setopt(h, CURLOPT_IGNORE_CONTENT_LENGTH, 1); + + // Setup allowed TLS/SSL ciphers. New versions of cURL may deprecate things that are still in use. +- g_curlInterface.easy_setopt(h, CURLOPT_SSL_CIPHER_LIST, m_cipherlist.c_str()); ++ if (!m_cipherlist.empty()) ++ g_curlInterface.easy_setopt(h, CURLOPT_SSL_CIPHER_LIST, m_cipherlist.c_str()); + } + + void CCurlFile::SetRequestHeaders(CReadState* state) +-- +1.9.3 + diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh index f6fda30..17f33fb 100755 --- a/xbmc-generate-tarball-xz.sh +++ b/xbmc-generate-tarball-xz.sh @@ -1,7 +1,7 @@ #!/bin/sh MAJORVERSION=13 -MINORVERSION=1rc1 +MINORVERSION=1 #GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96 #GITSHORT=ge988513 #PRERELEASE=Gotham @@ -1,13 +1,13 @@ -%global PRERELEASE rc1 -#global DIRVERSION %{version} +#global PRERELEASE rc1 +%global DIRVERSION %{version} #global GITCOMMIT Gotham_r2-ge988513 # use the line below for pre-releases -%global DIRVERSION %{version}%{PRERELEASE} +#global DIRVERSION %{version}%{PRERELEASE} %global _hardened_build 1 Name: xbmc Version: 13.1 -Release: 0.3.rc1%{?dist} +Release: 1%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ @@ -40,6 +40,10 @@ Patch4: xbmc-13.0-versioning.patch # https://github.com/xbmc/xbmc/pull/4696 Patch5: xbmc-13.0-dbus-power.patch +# Fix default cipher string +# https://github.com/xbmc/xbmc/pull/4794 +Patch6: xbmc-13.1-curl.patch + # External ffmpeg patches Patch100: 0001-Revert-drop-support-for-external-ffmpeg.patch Patch101: 0002-Revert-linux-link-ffmpeg-statically.patch @@ -150,7 +154,7 @@ BuildRequires: libva-devel BuildRequires: libvdpau-devel %endif BuildRequires: libvorbis-devel -BuildRequires: libxml-devel +BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: lzo-devel BuildRequires: mariadb-devel @@ -247,6 +251,7 @@ library. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %patch100 -p1 %patch101 -p1 @@ -395,6 +400,10 @@ fi %changelog +* Mon Jun 09 2014 Michael Cronenworth <mike@cchtml.com> - 13.1-1 +- Update to 13.1 final +- Fix default cipher string for Fedora curl (RFBZ #3253) + * Thu May 29 2014 Ken Dreyer <ktdreyer@ktdreyer.com> - 13.1-0.3.rc1 - Unbundle Roboto fonts (RFBZ #3256). Thanks Mohamed El Morabity. |