merge with debian package from Matthew Bekkema from debian mentors

14 files changed, 338 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..75db865
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+ublock (1.1.1+dfsg-1) unstable; urgency=low
+
+  * Initial release (Closes: #778719)
+
+ -- Matthew Bekkema <mbekkema97@gmail.com>  Thu, 24 Sep 2015 23:28:36 +1000
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..d5fe04e
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,34 @@
+Source: ublock
+Section: web
+Priority: optional
+Maintainer: Matthew Bekkema <mbekkema97@gmail.com>
+Build-Depends: debhelper (>= 9),
+               mozilla-devscripts
+Standards-Version: 3.9.6
+Homepage: https://github.com/gorhill/uBlock
+
+Package: xul-ext-ublock
+Architecture: all
+Depends: ${xpi:Depends}, ${misc:Depends},
+         fonts-font-awesome,
+Recommends: ${xpi:Recommends}
+Breaks: ${xpi:Breaks}
+Provides: ${xpi:Provides}
+Enhances: ${xpi:Enhances}
+Description: general-purpose lightweight ads, malware, trackers blocker
+ uBlock is a small footprint blocker for against web ads, malware, trackers,
+ analytics and similar invasive items.
+ .
+ Compared to other blockers like AdBlock and Ghostery, µBlock is focused on
+ having a smaller memory and CPU footprint.
+
+Package: ublock-chromium-extension
+Architecture: all
+Depends: chromium, ${misc:Depends}
+Enhances: chromium
+Description: general-purpose lightweight ads, malware, trackers blocker
+ uBlock is a small footprint blocker for against web ads, malware, trackers,
+ analytics and similar invasive items.
+ .
+ Compared to other blockers like AdBlock and Ghostery, µBlock is focused on
+ having a smaller memory and CPU footprint.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..622ac5b
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,191 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: uBlock
+Source: https://github.com/gorhill/uBlock
+Files-Excluded: assets/thirdparties/adblock.gardar.net
+                assets/thirdparties/adblock.schack.dk
+                assets/thirdparties/dl.dropboxusercontent.com
+                assets/thirdparties/easylist-downloads.adblockplus.org/liste_fr.txt
+                assets/thirdparties/hosts-file.net
+                assets/thirdparties/liste-ar-adblock.googlecode.com
+                assets/thirdparties/mirror1.malwaredomains.com
+                assets/thirdparties/pgl.yoyo.org
+                assets/thirdparties/raw.githubusercontent.com/reek
+                assets/thirdparties/someonewhocares.org
+                assets/thirdparties/stanev.org
+                assets/thirdparties/winhelp2002.mvps.org
+                assets/thirdparties/www.fanboy.co.nz/fanboy-antifacebook.txt
+                assets/thirdparties/www.zoso.ro
+                assets/thirdparties/home.fredfiber.no
+
+
+Files: *
+Copyright: 2015 Raymond Hill
+           2015 The uBlock authors
+License: GPL-3+
+
+Files: assets/thirdparties/adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt
+       assets/thirdparties/raw.githubusercontent.com/k2jp/abp-japanese-filters/master/abp_jp.txt
+License: CC-BY-SA-3.0
+
+Files: assets/thirdparties/gitorious.org/adblock-latvian/adblock-latvian/raw/master_lists/latvian-list.txt
+License: CC-BY-SA-4.0
+
+Files: assets/thirdparties/www.fanboy.co.nz/fanboy-swedish.txt
+       assets/thirdparties/www.fanboy.co.nz/fanboy-vietnam.txt
+       assets/thirdparties/www.fanboy.co.nz/fanboy-korean.txt
+       assets/thirdparties/www.fanboy.co.nz/enhancedstats.txt
+License: CC-BY-3.0
+
+Files: assets/thirdparties/www.fanboy.co.nz/fanboy-ultimate.txt
+License: GPL-3+ or CC-BY-SA-3.0
+
+Files: assets/thirdparties/margevicius.lt/easylistlithuania.txt
+License: GPL-3
+
+Files: assets/thirdparties/easylist-downloads.adblockplus.org/easylist_noelemhide.txt
+       assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt
+       assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt
+       assets/thirdparties/easylist-downloads.adblockplus.org/easylistitaly.txt
+       assets/thirdparties/easylist-downloads.adblockplus.org/easylistgermany.txt
+       assets/thirdparties/easylist-downloads.adblockplus.org/easylistchina.txt
+       assets/thirdparties/easylist-downloads.adblockplus.org/easylistdutch.txt
+License: GPL-3+ or CC-BY-SA-3.0+
+
+Files: assets/thirdparties/easylist-downloads.adblockplus.org/fanboy-annoyance.txt
+       assets/thirdparties/easylist-downloads.adblockplus.org/fanboy-social.txt
+License: CC-BY-SA-3.0
+
+Files: assets/thirdparties/easylist-downloads.adblockplus.org/advblock.txt
+       assets/thirdparties/easylist-downloads.adblockplus.org/bitblock.txt
+License: CC-BY-SA-3.0
+
+Files: assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat
+License: MPL-2.0
+
+Files: assets/thirdparties/www.hufilter.hu/hufilter.txt
+       assets/thirdparties/raw.githubusercontent.com/szpeter80/hufilter/master/hufilter.txt
+License: CC-BY-SA-4.0
+
+Files: assets/thirdparties/raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt
+       assets/thirdparties/adblock-czechoslovaklist.googlecode.com/svn/filters.txt
+License: CC-BY-SA-4.0
+
+Files: assets/thirdparties/www.void.gr/kargig/void-gr-filters.txt
+License: CC-BY-SA-3.0
+
+Files: assets/thirdparties/raw.githubusercontent.com/AdBlockPlusIsrael/EasyListHebrew/master/EasyListHebrew.txt
+License: GPL-3+ or CC-BY-SA-3.0+
+
+Files: assets/thirdparties/raw.githubusercontent.com/wiltteri/wiltteri.txt/master/wiltteri.txt
+License: unlicense
+ This is free and unencumbered software released into the public domain.
+ .
+ Anyone is free to copy, modify, publish, use, compile, sell, or
+ distribute this software, either in source code form or as a compiled
+ binary, for any purpose, commercial or non-commercial, and by any
+ means.
+ .
+ In jurisdictions that recognize copyright laws, the author or authors
+ of this software dedicate any and all copyright interest in the
+ software to the public domain. We make this dedication for the benefit
+ of the public at large and to the detriment of our heirs and
+ successors. We intend this dedication to be an overt act of
+ relinquishment in perpetuity of all present and future rights to this
+ software under copyright law.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+ .
+ For more information, please refer to <http://unlicense.org/>
+
+Files: assets/thirdparties/raw.githubusercontent.com/cjx82630/cjxlist/master/cjxlist.txt
+       assets/thirdparties/cjxlist1.googlecode.com/svn/cjxlist.txt
+License: GPL-3+ or CC-BY-SA-3.0+
+
+Files: assets/thirdparties/raw.githubusercontent.com/adblockpolska/Adblock_PL_List/master/adblock_polska.txt
+License: GPL-3
+
+Files: assets/thirdparties/indonesianadblockrules.googlecode.com/hg/subscriptions/abpindo.txt
+License: GPL-3+ or CC-BY-SA-3.0+
+
+Files: assets/thirdparties/spam404bl.com/spam404scamlist.txt
+License: custom1
+ We give everyone permission to modify, copy and distribute this list.
+ While not mandatory, we would appreciate credit if you use this list.
+
+Files: assets/thirdparties/www.malwaredomainlist.com/hostslist/hosts.txt
+License: custom2
+ Our list can be used for free by anyone. Feel free to use it.
+
+Files: debian/*
+Copyright: 2015 Matthew Bekkema <mbekkema97@gmail.com>
+License: GPL-3+
+
+Files: debian/crxmake.sh
+Copyright: 2012 Canonical Ltd
+License: GPL-3
+
+
+License: GPL-3+
+ 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 3 of the License, 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 this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+License: GPL-3
+ 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; version 3 of the License.
+ .
+ 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 this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+License: CC-BY-3.0
+ This work is licensed under a Creative Commons Attribution 3.0
+ Unported License.
+ .
+ The complete text of the Creative Commons Attribution 3.0 Unported
+ License can be found at https://creativecommons.org/licenses/by/3.0/.
+
+License: CC-BY-SA-3.0
+ This work is licensed under a Creative Commons Attribution-ShareAlike
+ 3.0 Unported License.
+ .
+ The complete text of the Creative Commons Attribution-ShareAlike 3.0
+ Unported License can be found at https://creativecommons.org/licenses/by-sa/3.0/.
+
+License: CC-BY-SA-4.0
+ This work is licensed under a Creative Commons Attribution-ShareAlike
+ 4.0 International License.
+ .
+ The complete text of the Creative Commons Attribution-ShareAlike 4.0
+ Unported License can be found at https://creativecommons.org/licenses/by-sa/4.0/.
+
+License: MPL-2.0
+ This Source Code Form is subject to the terms of the Mozilla Public License,
+ v. 2.0. If a copy of the MPL was not distributed with this file,
+ You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/debian/crxmake.sh b/debian/crxmake.sh
new file mode 100755
index 0000000..50269df
--- /dev/null
+++ b/debian/crxmake.sh
@@ -0,0 +1,45 @@
+#!/bin/bash -e
+#
+# Purpose: Pack a Chromium extension directory into crx format
+
+if test $# -ne 2; then
+  echo "Usage: crxmake.sh <extension dir> <pem path>"
+  exit 1
+fi
+
+dir=$1
+key=$2
+name=$(basename "$dir")
+crx="$name.crx"
+pub="$name.pub"
+sig="$name.sig"
+zip="$name.zip"
+trap 'rm -f "$pub" "$sig" "$zip"' EXIT
+
+# zip up the crx dir
+cwd=$(pwd -P)
+(cd "$dir" && zip -qr -9 -X "$cwd/$zip" .)
+
+# signature
+openssl sha1 -sha1 -binary -sign "$key" < "$zip" > "$sig"
+
+# public key
+openssl rsa -pubout -outform DER < "$key" > "$pub" 2>/dev/null
+
+byte_swap () {
+  # Take "abcdefgh" and return it as "ghefcdab"
+  echo "${1:6:2}${1:4:2}${1:2:2}${1:0:2}"
+}
+
+crmagic_hex="4372 3234" # Cr24
+version_hex="0200 0000" # 2
+pub_len_hex=$(byte_swap $(printf '%08x\n' $(ls -l "$pub" | awk '{print $5}')))
+sig_len_hex=$(byte_swap $(printf '%08x\n' $(ls -l "$sig" | awk '{print $5}')))
+(
+  echo "$crmagic_hex $version_hex $pub_len_hex $sig_len_hex" | xxd -r -p
+  cat "$pub" "$sig" "$zip"
+) > "$crx"
+echo "Wrote $crx"
+
+eid=`cat $key | openssl rsa -pubout -outform DER | openssl dgst -sha256 | awk '{print $2}' | cut -c 1-32 | tr '0-9a-f' 'a-p'`
+echo "ID: $eid"
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..c11a520
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+doc
+MANIFESTO.md
+README.md
diff --git a/debian/patches/disable-nonfree-filters.patch b/debian/patches/disable-nonfree-filters.patch
new file mode 100644
index 0000000..f10d537
--- /dev/null
+++ b/debian/patches/disable-nonfree-filters.patch
@@ -0,0 +1,25 @@
+Description: Disable nonfree filters by default
+ Nonfree filters have been removed from this package but they are automatically
+ redownloaded if they are enabled. This patch disables those filters by default.
+Author: Matthew Bekkema <mbekkema97@gmail.com>
+Date:   Sat, 23 May 2015 17:56:03 +1000
+
+
+
+--- a/assets/ublock/filter-lists.json
++++ b/assets/ublock/filter-lists.json
+@@ -203,12 +203,14 @@
+         "supportURL": "http://www.malwaredomains.com/"
+         },
+     "mirror1.malwaredomains.com/files/justdomains": {
++        "off": true,
+         "title": "Malware domains",
+         "group": "malware",
+         "homeURL": "http://malwaredomains.lehigh.edu/files/justdomains",
+         "supportURL": "http://www.malwaredomains.com/"
+         },
+     "pgl.yoyo.org/as/serverlist": {
++        "off": true,
+         "title": "Peter Lowe’s Ad server list",
+         "group": "ads",
+         "homeURL": "http://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext",
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0122ad8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable-nonfree-filters.patch
diff --git a/debian/pocmfhgeiahdhpfcinnchmkpekjlfdpj.json b/debian/pocmfhgeiahdhpfcinnchmkpekjlfdpj.json
new file mode 100644
index 0000000..a4b5df1
--- /dev/null
+++ b/debian/pocmfhgeiahdhpfcinnchmkpekjlfdpj.json
@@ -0,0 +1,4 @@
+{
+  "external_crx": "/usr/share/chromium/extensions/uBlock0.chromium.crx",
+  "external_version": "1.1.1"
+}
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..de145d6
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@ --with xul-ext --buildsystem=xul_ext
+
+
+override_dh_auto_build:
+	./tools/make-firefox.sh
+	xpi-pack dist/build/uBlock0.firefox xul-ext-ublock.xpi
+	
+	./tools/make-chromium.sh
+	./debian/crxmake.sh ./dist/build/uBlock0.chromium ./debian/uBlock0.pem
+
+
+override_dh_auto_install:
+	install-xpi xul-ext-ublock.xpi -x LICENSE.txt
+
+
+override_dh_auto_clean:
+	./tools/make-clean.sh
+	rm -f *.xpi
+	rm -f *.crx
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/ublock-chromium-extension.install b/debian/ublock-chromium-extension.install
new file mode 100644
index 0000000..597c443
--- /dev/null
+++ b/debian/ublock-chromium-extension.install
@@ -0,0 +1,2 @@
+uBlock0.chromium.crx usr/share/chromium/extensions/
+debian/pocmfhgeiahdhpfcinnchmkpekjlfdpj.json usr/share/chromium/extensions/
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..c0a1687
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=repacksuffix=+dfsg,dversionmangle=s/\+(repack|dfsg|ds|deb)\d*$// \
+https://github.com/gorhill/uBlock/releases .*/archive/(.*)\.tar\.gz
diff --git a/debian/xul-ext-ublock.links b/debian/xul-ext-ublock.links
new file mode 100644
index 0000000..4c07c72
--- /dev/null
+++ b/debian/xul-ext-ublock.links
@@ -0,0 +1 @@
+/usr/share/fonts-font-awesome/fonts/fontawesome-webfont.ttf /usr/share/xul-ext/ublock/css/fonts/fontawesome-webfont.ttf