[tor-commits] [tor-browser/tor-browser-52.1.0esr-7.0-2] Bug 16285: Exclude ClearKey system for now

[gk at torproject.org]

commit 46d6d3a534c8f8c56194415c0839a4a90d17049b
Author: Georg Koppen <gk at torproject.org>
Date:   Mon May 22 12:44:40 2017 +0000

    Bug 16285: Exclude ClearKey system for now
    
    In the past the ClearKey system had not been compiled when specifying
    --disable-eme. But that changed and it is even bundled nowadays (see:
    Mozilla's bug 1300654). We don't want to ship it right now as the use
    case for it is not really visible while the code had security
    vulnerabilities in the past.
---
 browser/installer/package-manifest.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 43c89a9..1233249 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -814,8 +814,8 @@ bin/libfreebl_32int64_3.so
 
 
 ; media
- at RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX at clearkey@DLL_SUFFIX@
- at RESPATH@/gmp-clearkey/0.1/clearkey.info
+;@RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX at clearkey@DLL_SUFFIX@
+;@RESPATH@/gmp-clearkey/0.1/clearkey.info
 
 ; gfx
 #ifdef XP_WIN