From 1fc18ba8aea06437e7038c408094375012f02250 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rog=C3=A9rio=20Brito?= Date: Thu, 12 Jan 2017 13:56:58 -0200 Subject: [PATCH 1/1] debian/patches: Add patch from upstream to fix extraction from youtube. Closes: #850893, #851157 --- debian/patches/fix_youtube_extraction.patch | 22 +++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 23 insertions(+) create mode 100644 debian/patches/fix_youtube_extraction.patch diff --git a/debian/patches/fix_youtube_extraction.patch b/debian/patches/fix_youtube_extraction.patch new file mode 100644 index 0000000..e3ba6e5 --- /dev/null +++ b/debian/patches/fix_youtube_extraction.patch @@ -0,0 +1,22 @@ +From d1aeacd9bfe12bdf064d8888f77ccf8bd30f1723 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sergey=20M=E2=80=A4?= +Date: Tue, 10 Jan 2017 21:25:29 +0700 +Subject: [PATCH] [youtube] Fix extraction (closes #11663, #11664) + +--- + youtube_dl/jsinterp.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/youtube_dl/jsinterp.py b/youtube_dl/jsinterp.py +index a8df4ae..24cdec2 100644 +--- a/youtube_dl/jsinterp.py ++++ b/youtube_dl/jsinterp.py +@@ -213,7 +213,7 @@ def interpret_expression(self, expr, local_vars, allow_recursion): + def extract_object(self, objname): + obj = {} + obj_m = re.search( +- (r'(?:var\s+)?%s\s*=\s*\{' % re.escape(objname)) + ++ (r'(?([a-zA-Z$0-9]+\s*:\s*function\(.*?\)\s*\{.*?\}(?:,\s*)?)*)' + + r'\}\s*;', + self.code) diff --git a/debian/patches/series b/debian/patches/series index 21895fb..43a336f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ skip_support_file_installation.patch fix_libav_compat_outdated.patch +fix_youtube_extraction.patch -- 2.41.1