[Pkg-owncloud-commits] [owncloud] 02/02: Disable Flash and Silverlight plugins

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 7d8215fa193362620554d0856f53c839553787aa
Author: David Prévot <taffit at debian.org>
Date:   Thu Jan 2 16:42:15 2014 -0400

    Disable Flash and Silverlight plugins
    
    Thanks to the Fedora maintainers who noticed the binaries not rebuilt
    from source.
---
 ...017-Disable-Flash-and-Silverlight-plugins.patch | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  4 ++++
 3 files changed, 32 insertions(+)

diff --git a/debian/patches/0017-Disable-Flash-and-Silverlight-plugins.patch b/debian/patches/0017-Disable-Flash-and-Silverlight-plugins.patch
new file mode 100644
index 0000000..8191267
--- /dev/null
+++ b/debian/patches/0017-Disable-Flash-and-Silverlight-plugins.patch
@@ -0,0 +1,27 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
+Date: Thu, 2 Jan 2014 16:36:58 -0400
+Subject: Disable Flash and Silverlight plugins
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+We’re not yet building those binaries from source.
+
+Forwarded: not-needed
+---
+ apps/files_videoviewer/js/mediaelement-and-player.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/apps/files_videoviewer/js/mediaelement-and-player.js b/apps/files_videoviewer/js/mediaelement-and-player.js
+index d52868f..46952d1 100644
+--- a/apps/files_videoviewer/js/mediaelement-and-player.js
++++ b/apps/files_videoviewer/js/mediaelement-and-player.js
+@@ -816,7 +816,7 @@ mejs.MediaElementDefaults = {
+ 	// none: forces fallback view
+ 	mode: 'auto',
+ 	// remove or reorder to change plugin priority and availability
+-	plugins: ['flash','silverlight','youtube','vimeo'],
++	plugins: ['youtube','vimeo'],
+ 	// shows debug errors on screen
+ 	enablePluginDebug: false,
+ 	// overrides the type specified, useful for dynamic instantiation
diff --git a/debian/patches/series b/debian/patches/series
index 04b28e8..be08744 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ path/0013-Adapt-google-api-php-client-path.patch
 path/0014-Adapt-Dropbox-path.patch
 path/0015-Adapt-php-opencloud-path.patch
 path/0016-Adapt-Zend-path.patch
+0017-Disable-Flash-and-Silverlight-plugins.patch
diff --git a/debian/rules b/debian/rules
index 5126b4b..52eb6b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,6 +60,10 @@ override_dh_install:
 	rm -r debian/owncloud/usr/share/owncloud/apps/user_ldap/tests
 	rm    debian/owncloud/usr/share/owncloud/core/img/image-optimization.sh
 
+	# Binaries not rebuilt from source
+	rm    debian/owncloud/usr/share/owncloud/apps/files_videoviewer/js/flashmediaelement.swf
+	rm    debian/owncloud/usr/share/owncloud/apps/files_videoviewer/js/silverlightmediaelement.xap
+
 	# Minify JavaScript files.
 	rm debian/owncloud/usr/share/owncloud/apps/calendar/3rdparty/fullcalendar/js/fullcalendar.min.js
 	rm debian/owncloud/usr/share/owncloud/apps/activity/js/jquery.infinitescroll.min.js

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git