From 94ecd0c1009e21999530ae3b1617f44f8da8b7b5 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 8 Feb 2015 13:33:48 +0200 Subject: [PATCH 1/2] curl: revert to 7.37.1 This reverts commit 03d43b3abed539df0dc9fa56bec947607868930f. This reverts commit 9297b047a27ec6192bbec99dbb6280a5182233cc. stick with what ubuntu ships, and bump it only if bumped in kodi depends --- packages/web/curl/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web/curl/package.mk b/packages/web/curl/package.mk index 044b2daf2f..7dcecb8358 100644 --- a/packages/web/curl/package.mk +++ b/packages/web/curl/package.mk @@ -25,7 +25,7 @@ # there: http://forum.xbmc.org/showthread.php?tid=177557 PKG_NAME="curl" -PKG_VERSION="7.40.0" +PKG_VERSION="7.37.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="MIT" From 09975f85b6383c0a0ed1cf7f2d30f3ecfcc38010 Mon Sep 17 00:00:00 2001 From: fritsch Date: Wed, 11 Feb 2015 07:34:50 +0100 Subject: [PATCH 2/2] Revert "kodi: add PR6376" This reverts commit 10a557abf4f212ff7d5e519fdaf1c10131738681. --- .../kodi/patches/kodi-999.98-PR6376.patch | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 packages/mediacenter/kodi/patches/kodi-999.98-PR6376.patch diff --git a/packages/mediacenter/kodi/patches/kodi-999.98-PR6376.patch b/packages/mediacenter/kodi/patches/kodi-999.98-PR6376.patch deleted file mode 100644 index 3a4eb50d76..0000000000 --- a/packages/mediacenter/kodi/patches/kodi-999.98-PR6376.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3eec72d4fd109e9f153a375138c1a997bcf86d9a Mon Sep 17 00:00:00 2001 -From: wsnipex -Date: Sun, 8 Feb 2015 14:15:49 +0100 -Subject: [PATCH] [curl] don't return 0 in the write callback, it causes ftp - content lenght requests to fail - ---- - xbmc/filesystem/CurlFile.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp -index 7d68dab..e67d951 100644 ---- a/xbmc/filesystem/CurlFile.cpp -+++ b/xbmc/filesystem/CurlFile.cpp -@@ -100,7 +100,7 @@ extern "C" size_t write_callback(char *buffer, - size_t nitems, - void *userp) - { -- if(userp == NULL) return 0; -+ if(userp == NULL) return size * nitems; - - CCurlFile::CReadState *state = (CCurlFile::CReadState *)userp; - return state->WriteCallback(buffer, size, nitems);