curl: update to curl-7.36.0

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-04-05 18:52:19 +02:00
parent 9eb6834a85
commit 97230bafa8
3 changed files with 32 additions and 36 deletions

View File

@ -23,18 +23,9 @@
# see also http://trac.xbmc.org/ticket/14674 .
# Easiest way to reproduce is to install gdrive addon and play a video from
# there: http://forum.xbmc.org/showthread.php?tid=177557
# - curl-7.35.0+ suffers from http://sourceforge.net/p/curl/bugs/1329/
# see http://openelec.tv/forum/120-news-announcements/70230-beta-openelec-4-0-beta-4-released#102526
# ERROR: CCurlFile::Stat - Failed: SSL connect error(35) for https://r3---sn-uxaxovg-5gos.googlevideo.com/videoplayback?ms=au&mt=1396702895&mv=m&id=o-ALo-Jz1LzwTiuQsF_PQdKzyWDm1Y423KOiPAk1wqHYrO&upn=PXY5TrK_TKk&ratebypass=yes&source=youtube&key=yt5&requiressl=yes&ipbits=0&sver=3&gcr=se&sparams=gcr,id,ip,ipbits,itag,ratebypass,requiressl,source,upn,expire&fexp=906399,909207,914088,916625,944603,937417,913434,936916,934022,936923&ip=213.112.234.108&itag=22&expire=1396727620&signature=688EA13BC8E378BD984F94336156EB3E90181B8F.5372D0B8B3650E6A8063B5148F9F4B353B0FA059
# to test (dont work):
# OpenELEC:~ # curl https://r3---sn-uxaxovg-5gos.googlevideo.com/videoplayback?ms=au&mt=1396702895&mv=m&id=o-ALo-Jz1LzwTiuQsF_PQdKzyWDm1Y423KOiPAk1wqHYrO&upn=PXY5TrK_TKk&ratebypass=yes&source=youtube&key=yt5&requiressl=yes&ipbits=0&sver=3&gcr=se&sparams=gcr,id,ip,ipbits,itag,ratebypass,requiressl,source,upn,expire&fexp=906399,909207,914088,916625,944603,937417,913434,936916,934022,936923&ip=213.112.234.108&itag=22&expire=1396727620&signature=688EA13BC8E378BD984F94336156EB3E90181B8F.5372D0B8B3650E6A8063B5148F9F4B353B0FA059
# OpenELEC:~ # curl: (35) error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure
# to test (works):
# OpenELEC:~ # curl --ciphers ALL https://r3---sn-uxaxovg-5gos.googlevideo.com/videoplayback?ms=au&mt=1396702895&mv=m&id=o-ALo-Jz1LzwTiuQsF_PQdKzyWDm1Y423KOiPAk1wqHYrO&upn=PXY5TrK_TKk&ratebypass=yes&source=youtube&key=yt5&requiressl=yes&ipbits=0&sver=3&gcr=se&sparams=gcr,id,ip,ipbits,itag,ratebypass,requiressl,source,upn,expire&fexp=906399,909207,914088,916625,944603,937417,913434,936916,934022,936923&ip=213.112.234.108&itag=22&expire=1396727620&signature=688EA13BC8E378BD984F94336156EB3E90181B8F.5372D0B8B3650E6A8063B5148F9F4B353B0FA059
# OpenELEC:~ #
PKG_NAME="curl"
PKG_VERSION="7.34.0"
PKG_VERSION="7.36.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="MIT"

View File

@ -0,0 +1,31 @@
Apply fix from 38d582ff541353d738858299d4a2b78bafac03ed to unbreak
building with --disable-manual.
We don't use the literal patch since that means re-generating files
from the tarball that are usually shipped.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
diff -Nura curl-7.36.0.orig/src/tool_hugehelp.c curl-7.36.0/src/tool_hugehelp.c
--- curl-7.36.0.orig/src/tool_hugehelp.c 2014-03-31 19:28:23.018515093 -0300
+++ curl-7.36.0/src/tool_hugehelp.c 2014-03-31 19:28:09.994076200 -0300
@@ -4165,6 +4165,10 @@
" these mailing lists instead of mailing any individual.\n"
, stdout) ;
}
+#else /* !USE_MANUAL */
+/* built-in manual is disabled, blank function */
+#include "tool_hugehelp.h"
+void hugehelp(void) {}
#endif /* USE_MANUAL */
#else
/*
@@ -8192,5 +8196,9 @@
}
inflateEnd(&z);
}
+#else
+/* built-in manual is disabled, blank function */
+#include "tool_hugehelp.h"
+void hugehelp(void) {}
#endif /* USE_MANUAL */
#endif /* HAVE_LIBZ */

View File

@ -1,26 +0,0 @@
From 69e0602a6d44f2d1bc93f059f275417c37a05b48 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 29 Mar 2014 13:18:26 +0200
Subject: [PATCH] rtsp: parse "Session:" header properly
backport https://github.com/bagder/curl/commit/4ff71183b999761b07d54dd44743a4d59b2dad84
---
lib/rtsp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/rtsp.c b/lib/rtsp.c
index 9d7a9a9..6e7aecd 100644
--- a/lib/rtsp.c
+++ b/lib/rtsp.c
@@ -761,7 +761,7 @@ CURLcode Curl_rtsp_parseheader(struct connectdata *conn,
char *start;
/* Find the first non-space letter */
- start = header + 9;
+ start = header + 8;
while(*start && ISSPACE(*start))
start++;
--
1.7.2.5