[SCM] kodi/master: Refresh patches

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Thu Jun 29 12:25:14 UTC 2017


The following commit has been merged in the master branch:
commit d40999fddbaa5517679281b69dc04daccb8f89c0
Author: Balint Reczey <balint.reczey at canonical.com>
Date:   Fri May 26 23:21:23 2017 +0200

    Refresh patches

diff --git a/debian/patches/0005-filesystem-ZipManager-skip-path-traversal.patch b/debian/patches/0005-filesystem-ZipManager-skip-path-traversal.patch
deleted file mode 100644
index a2869ce..0000000
--- a/debian/patches/0005-filesystem-ZipManager-skip-path-traversal.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 35cfe35608b15335ef21d798947fceab3f47c8d7 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi at users.noreply.github.com>
-Date: Wed, 10 May 2017 10:21:42 +0200
-Subject: [PATCH] [filesystem] ZipManager: skip path traversal
-
----
- xbmc/filesystem/ZipManager.cpp          |  3 ++-
- xbmc/filesystem/ZipManager.h            |  3 +++
- xbmc/filesystem/test/CMakeLists.txt     |  3 ++-
- xbmc/filesystem/test/TestZipManager.cpp | 38 +++++++++++++++++++++++++++++++++
- 4 files changed, 45 insertions(+), 2 deletions(-)
- create mode 100644 xbmc/filesystem/test/TestZipManager.cpp
-
-diff --git a/xbmc/filesystem/ZipManager.cpp b/xbmc/filesystem/ZipManager.cpp
-index df6220b..f2c6973 100644
---- a/xbmc/filesystem/ZipManager.cpp
-+++ b/xbmc/filesystem/ZipManager.cpp
-@@ -199,7 +199,8 @@ bool CZipManager::GetZipList(const CURL& url, std::vector<SZipEntry>& items)
-     // Jump after central file header extra field and file comment
-     mFile.Seek(ze.eclength + ze.clength,SEEK_CUR);
- 
--    items.push_back(ze);
-+    if (!std::regex_search(strName, PATH_TRAVERSAL))
-+      items.push_back(ze);
-   }
- 
-   /* go through list and figure out file header lengths */
-diff --git a/xbmc/filesystem/ZipManager.h b/xbmc/filesystem/ZipManager.h
-index 551fe5d..93243b9 100644
---- a/xbmc/filesystem/ZipManager.h
-+++ b/xbmc/filesystem/ZipManager.h
-@@ -32,12 +32,15 @@
- #define ECDREC_SIZE 22
- 
- #include <memory.h>
-+#include <regex>
- #include <string>
- #include <vector>
- #include <map>
- 
- class CURL;
- 
-+static const std::regex PATH_TRAVERSAL(R"_((^|\/|\\)\.{2}($|\/|\\))_");
-+
- struct SZipEntry {
-   unsigned int header;
-   unsigned short version;
-diff --git a/xbmc/filesystem/test/CMakeLists.txt b/xbmc/filesystem/test/CMakeLists.txt
-index 5d77633..5be4e3d 100644
---- a/xbmc/filesystem/test/CMakeLists.txt
-+++ b/xbmc/filesystem/test/CMakeLists.txt
-@@ -2,6 +2,7 @@ set(SOURCES TestDirectory.cpp
-             TestFile.cpp
-             TestFileFactory.cpp
-             TestRarFile.cpp
--            TestZipFile.cpp)
-+            TestZipFile.cpp
-+            TestZipManager.cpp)
- 
- core_add_test_library(filesystem_test)
-diff --git a/xbmc/filesystem/test/TestZipManager.cpp b/xbmc/filesystem/test/TestZipManager.cpp
-new file mode 100644
-index 0000000..b72dbb6
---- /dev/null
-+++ b/xbmc/filesystem/test/TestZipManager.cpp
-@@ -0,0 +1,38 @@
-+/*
-+ *      Copyright (C) 2017 Team XBMC
-+ *      http://xbmc.org
-+ *
-+ *  This Program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2, or (at your option)
-+ *  any later version.
-+ *
-+ *  This Program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with XBMC; see the file COPYING.  If not, see
-+ *  <http://www.gnu.org/licenses/>.
-+ *
-+ */
-+
-+#include "filesystem/ZipManager.h"
-+
-+#include "gtest/gtest.h"
-+
-+TEST(TestZipManager, PathTraversal)
-+{
-+  ASSERT_TRUE(std::regex_search("..", PATH_TRAVERSAL));
-+  ASSERT_TRUE(std::regex_search("../test.txt", PATH_TRAVERSAL));
-+  ASSERT_TRUE(std::regex_search("..\\test.txt", PATH_TRAVERSAL));
-+  ASSERT_TRUE(std::regex_search("test/../test.txt", PATH_TRAVERSAL));
-+  ASSERT_TRUE(std::regex_search("test\\../test.txt", PATH_TRAVERSAL));
-+  ASSERT_TRUE(std::regex_search("test\\..\\test.txt", PATH_TRAVERSAL));
-+
-+  ASSERT_FALSE(std::regex_search("...", PATH_TRAVERSAL));
-+  ASSERT_FALSE(std::regex_search("..test.txt", PATH_TRAVERSAL));
-+  ASSERT_FALSE(std::regex_search("test.txt..", PATH_TRAVERSAL));
-+  ASSERT_FALSE(std::regex_search("test..test.txt", PATH_TRAVERSAL));
-+}
--- 
-2.7.4
-
diff --git a/debian/patches/08-fix-s390x-build.patch b/debian/patches/08-fix-s390x-build.patch
index 4b88971..64c7b80 100644
--- a/debian/patches/08-fix-s390x-build.patch
+++ b/debian/patches/08-fix-s390x-build.patch
@@ -7,47 +7,44 @@ Forwarded: not-needed
 
 --- a/xbmc/cores/DllLoader/DllLoader.h
 +++ b/xbmc/cores/DllLoader/DllLoader.h
-@@ -23,7 +23,7 @@
- #include "coffldr.h"
- #include "LibraryLoader.h"
- 
--#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__)
-+#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__)
- #define USE_LDT_KEEPER
- #include "ldt_keeper.h"
- #endif
+@@ -28,6 +28,7 @@
+     !defined(__arm__) && \
+     !defined(__aarch64__) && \
+     !defined(__mips__) && \
++    !defined(__s390x__) && \
+     !defined(__SH4__) && \
+     !defined(__sparc__) && \
+     !defined(__arc__) && \
 --- a/xbmc/cores/DllLoader/ldt_keeper.c
 +++ b/xbmc/cores/DllLoader/ldt_keeper.c
-@@ -19,7 +19,7 @@
-  */
- 
- //#ifndef __powerpc__
--#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__)
-+#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__)
- 
- #include "ldt_keeper.h"
- 
+@@ -24,6 +24,7 @@
+     !defined(__arm__) && \
+     !defined(__aarch64__) && \
+     !defined(__mips__) && \
++    !defined(__s390x__) && \
+     !defined(__SH4__) && \
+     !defined(__sparc__) && \
+     !defined(__arc__) && \
 --- a/xbmc/utils/MathUtils.h
 +++ b/xbmc/utils/MathUtils.h
-@@ -36,6 +36,7 @@
+@@ -35,6 +35,7 @@
+ #if defined(__ppc__) || \
      defined(__powerpc__) || \
      defined(__mips__) || \
-     defined(__arm__) || \
 +    defined(__s390x__) || \
-     defined(__aarch64__)
-   #define DISABLE_MATHUTILS_ASM_ROUND_INT
- #endif
+     defined(__arm__) || \
+     defined(__aarch64__) || \
+     defined(__SH4__) || \
 --- a/xbmc/threads/Atomics.cpp
 +++ b/xbmc/threads/Atomics.cpp
-@@ -106,7 +106,7 @@
- ///////////////////////////////////////////////////////////////////////////
- long long cas2(volatile long long* pAddr, long long expectedVal, long long swapVal)
- {
--#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__aarch64__)// PowerPC and ARM
-+#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__aarch64__) || defined(__s390x__) // PowerPC and ARM
- // Not available/required
- // Hack to allow compilation
-   throw "cas2 is not implemented";
+@@ -110,6 +110,7 @@
+     defined(__powerpc__) || \
+     defined(__arm__) || \
+     defined(__aarch64__) || \
++    defined(__s390x__) || \
+     defined(__SH4__) || \
+     defined(__sparc__) || \
+     defined(__arc__) || \
 --- a/xbmc/threads/Atomics.h
 +++ b/xbmc/threads/Atomics.h
 @@ -22,7 +22,7 @@
@@ -61,12 +58,11 @@ Forwarded: not-needed
  long AtomicIncrement(volatile long* pAddr);
 --- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
 +++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
-@@ -293,7 +293,7 @@
- 
- 
- inline int NP2( unsigned x ) {
--#if defined(TARGET_POSIX) && !defined(__POWERPC__) && !defined(__PPC__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__)
-+#if defined(TARGET_POSIX) && !defined(__POWERPC__) && !defined(__PPC__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__)
-   // If there are any issues compiling this, just append a ' && 0'
-   // to the above to make it '#if defined(TARGET_POSIX) && 0'
- 
+@@ -299,6 +299,7 @@
+     !defined(__arm__) && \
+     !defined(__aarch64__) && \
+     !defined(__mips__) && \
++    !defined(__s390x__) && \
+     !defined(__SH4__) && \
+     !defined(__sparc__) && \
+     !defined(__arc__) && \
diff --git a/debian/patches/16-fix-alpha-build.patch b/debian/patches/16-fix-alpha-build.patch
index 0acfb99..3905a9b 100644
--- a/debian/patches/16-fix-alpha-build.patch
+++ b/debian/patches/16-fix-alpha-build.patch
@@ -3,62 +3,48 @@ Forwarded: not-needed
 Author:  Michael Cree <mcree at orcon.net.nz>
 Bug: https://bugs.debian.org/856815
 
-Index: kodi-17.0+dfsg1/xbmc/cores/DllLoader/DllLoader.h
-===================================================================
---- kodi-17.0+dfsg1.orig/xbmc/cores/DllLoader/DllLoader.h
-+++ kodi-17.0+dfsg1/xbmc/cores/DllLoader/DllLoader.h
-@@ -23,7 +23,7 @@
- #include "coffldr.h"
- #include "LibraryLoader.h"
- 
--#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__)
-+#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__) && !defined(__alpha__)
- #define USE_LDT_KEEPER
- #include "ldt_keeper.h"
- #endif
-Index: kodi-17.0+dfsg1/xbmc/cores/DllLoader/ldt_keeper.c
-===================================================================
---- kodi-17.0+dfsg1.orig/xbmc/cores/DllLoader/ldt_keeper.c
-+++ kodi-17.0+dfsg1/xbmc/cores/DllLoader/ldt_keeper.c
-@@ -19,7 +19,7 @@
-  */
- 
- //#ifndef __powerpc__
--#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__)
-+#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__) && !defined(__alpha__)
- 
- #include "ldt_keeper.h"
- 
-Index: kodi-17.0+dfsg1/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
-===================================================================
---- kodi-17.0+dfsg1.orig/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
-+++ kodi-17.0+dfsg1/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
-@@ -293,7 +293,7 @@ protected:
- 
- 
- inline int NP2( unsigned x ) {
--#if defined(TARGET_POSIX) && !defined(__POWERPC__) && !defined(__PPC__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__)
-+#if defined(TARGET_POSIX) && !defined(__POWERPC__) && !defined(__PPC__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__) && !defined(__alpha__)
-   // If there are any issues compiling this, just append a ' && 0'
-   // to the above to make it '#if defined(TARGET_POSIX) && 0'
- 
-Index: kodi-17.0+dfsg1/xbmc/threads/Atomics.cpp
-===================================================================
---- kodi-17.0+dfsg1.orig/xbmc/threads/Atomics.cpp
-+++ kodi-17.0+dfsg1/xbmc/threads/Atomics.cpp
-@@ -106,7 +106,7 @@ long cas(volatile long *pAddr, long expe
- ///////////////////////////////////////////////////////////////////////////
- long long cas2(volatile long long* pAddr, long long expectedVal, long long swapVal)
- {
--#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__aarch64__) || defined(__s390x__) // PowerPC and ARM
-+#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__aarch64__) || defined(__s390x__) || defined(__alpha__)// PowerPC and ARM
- // Not available/required
- // Hack to allow compilation
-   throw "cas2 is not implemented";
-Index: kodi-17.0+dfsg1/xbmc/threads/Atomics.h
-===================================================================
---- kodi-17.0+dfsg1.orig/xbmc/threads/Atomics.h
-+++ kodi-17.0+dfsg1/xbmc/threads/Atomics.h
+--- a/xbmc/cores/DllLoader/DllLoader.h
++++ b/xbmc/cores/DllLoader/DllLoader.h
+@@ -29,6 +29,7 @@
+     !defined(__aarch64__) && \
+     !defined(__mips__) && \
+     !defined(__s390x__) && \
++    !defined(__alpha__) && \
+     !defined(__SH4__) && \
+     !defined(__sparc__) && \
+     !defined(__arc__) && \
+--- a/xbmc/cores/DllLoader/ldt_keeper.c
++++ b/xbmc/cores/DllLoader/ldt_keeper.c
+@@ -25,6 +25,7 @@
+     !defined(__aarch64__) && \
+     !defined(__mips__) && \
+     !defined(__s390x__) && \
++    !defined(__alpha__) && \
+     !defined(__SH4__) && \
+     !defined(__sparc__) && \
+     !defined(__arc__) && \
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
+@@ -300,6 +300,7 @@
+     !defined(__aarch64__) && \
+     !defined(__mips__) && \
+     !defined(__s390x__) && \
++    !defined(__alpha__) && \
+     !defined(__SH4__) && \
+     !defined(__sparc__) && \
+     !defined(__arc__) && \
+--- a/xbmc/threads/Atomics.cpp
++++ b/xbmc/threads/Atomics.cpp
+@@ -111,6 +111,7 @@
+     defined(__arm__) || \
+     defined(__aarch64__) || \
+     defined(__s390x__) || \
++    defined(__alpha__) || \
+     defined(__SH4__) || \
+     defined(__sparc__) || \
+     defined(__arc__) || \
+--- a/xbmc/threads/Atomics.h
++++ b/xbmc/threads/Atomics.h
 @@ -22,7 +22,7 @@
  
  //! @todo Inline these methods
@@ -68,17 +54,13 @@ Index: kodi-17.0+dfsg1/xbmc/threads/Atomics.h
  long long cas2(volatile long long* pAddr, long long expectedVal, long long swapVal);
  #endif
  long AtomicIncrement(volatile long* pAddr);
-Index: kodi-17.0+dfsg1/xbmc/utils/MathUtils.h
-===================================================================
---- kodi-17.0+dfsg1.orig/xbmc/utils/MathUtils.h
-+++ kodi-17.0+dfsg1/xbmc/utils/MathUtils.h
-@@ -37,7 +37,8 @@
+--- a/xbmc/utils/MathUtils.h
++++ b/xbmc/utils/MathUtils.h
+@@ -36,6 +36,7 @@
+     defined(__powerpc__) || \
      defined(__mips__) || \
-     defined(__arm__) || \
      defined(__s390x__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || \
-+    defined(__alpha__)
-   #define DISABLE_MATHUTILS_ASM_ROUND_INT
- #endif
- 
++    defined(__alpha__) || \
+     defined(__arm__) || \
+     defined(__aarch64__) || \
+     defined(__SH4__) || \
diff --git a/debian/patches/17-add-test-for-CVE-2017-8314-with-autotools-build.patch b/debian/patches/17-add-test-for-CVE-2017-8314-with-autotools-build.patch
index 11b84c9..197d58c 100644
--- a/debian/patches/17-add-test-for-CVE-2017-8314-with-autotools-build.patch
+++ b/debian/patches/17-add-test-for-CVE-2017-8314-with-autotools-build.patch
@@ -10,14 +10,3 @@
  
  LIB=filesystemTest.a
  
---- a/xbmc/filesystem/test/TestZipManager.cpp
-+++ b/xbmc/filesystem/test/TestZipManager.cpp
-@@ -18,7 +18,7 @@
-  *
-  */
- 
--#include "filesystem/ZipManager.h"
-+#include "xbmc/filesystem/ZipManager.h"
- 
- #include "gtest/gtest.h"
- 
diff --git a/debian/patches/series b/debian/patches/series
index f7f2a61..bc7d374 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 0001-c-pluff-Fix-format-string-warnings.patch
 0003-Revert-droid-fix-builds-with-AML-disabled.patch
 0004-Allocate-and-free-AVFrames-with-the-proper-FFmpeg-AP.patch
-0005-filesystem-ZipManager-skip-path-traversal.patch
 01_reproducible_build.patch
 02_allow_all_arches.patch
 03-privacy.patch

-- 
kodi packaging



More information about the pkg-multimedia-commits mailing list