diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b962cc31..84afdf129 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ ### v1.14.6 +**v1.14.6.7** *(2019-04-05)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.6.7/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.6.7/builds/4chan-X-noupdate.crx)] +- Update .crx files to CRX3. This should fix the errors when attempting to install them on newer versions of Chromium. + **v1.14.6.6** *(2019-04-05)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.6.6/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.6.6/builds/4chan-X-noupdate.crx)] - Sauce: Update DeviantArt filename format. #2237 - Sauce: Replace unmatched regex groups with empty string, not 'undefined' diff --git a/Makefile b/Makefile index f88841cff..d0b426c47 100644 --- a/Makefile +++ b/Makefile @@ -192,8 +192,8 @@ testbuilds/$(name)$1.crx.zip : \ package.json version.json tools/zip-crx.js node_modules/jszip/package.json node tools/zip-crx.js $1 -testbuilds/$(name)$1.crx : testbuilds/$(name)$1.crx.zip package.json tools/sign.js node_modules/node-rsa/package.json - node tools/sign.js $1 +testbuilds/$(name)$1.crx : $(foreach f,$(crx_contents),testbuilds/crx$1/$(f)) version.json tools/sign.sh | tmp + tools/sign.sh $1 testbuilds/$(name)$1.meta.js : src/meta/metadata.js src/meta/icon48.png version.json src/Archive/archives.json $(template_deps) | testbuilds $(template) $$< $$@ type=userscript channel=$1 diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index c0833841c..4d836c4ec 100644 Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js index 6d0a2392e..2967a936f 100644 --- a/builds/4chan-X-beta.meta.js +++ b/builds/4chan-X-beta.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.14.6.6 +// @version 1.14.6.7 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js index 4ba69267b..1a00c627f 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.14.6.6 +// @version 1.14.6.7 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -198,7 +198,7 @@ docSet = function() { }; g = { - VERSION: '1.14.6.6', + VERSION: '1.14.6.7', NAMESPACE: '4chan X.', boards: {} }; diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 3988f5766..960da2f41 100644 Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js index d5dc92880..2364abb2d 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.6.6 +// @version 1.14.6.7 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -198,7 +198,7 @@ docSet = function() { }; g = { - VERSION: '1.14.6.6', + VERSION: '1.14.6.7', NAMESPACE: '4chan X.', boards: {} }; diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index c41d637df..5dda04999 100644 Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index d759f80b0..5ee473866 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.6.6 +// @version 1.14.6.7 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 8c18265af..d0364caf6 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.6.6 +// @version 1.14.6.7 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -198,7 +198,7 @@ docSet = function() { }; g = { - VERSION: '1.14.6.6', + VERSION: '1.14.6.7', NAMESPACE: '4chan X.', boards: {} }; diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 3071bdbf2..8e9bdf656 100644 Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ diff --git a/builds/updates-beta.json b/builds/updates-beta.json index 13f56f219..e80819db1 100644 --- a/builds/updates-beta.json +++ b/builds/updates-beta.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.6.6", + "version": "1.14.6.7", "update_link": "https://www.4chan-x.net/builds/4chan-X-beta.crx" } ] diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml index a052cb2b9..4756ca4dc 100644 --- a/builds/updates-beta.xml +++ b/builds/updates-beta.xml @@ -1,7 +1,7 @@ - + diff --git a/builds/updates.json b/builds/updates.json index aba6a0280..e27870989 100644 --- a/builds/updates.json +++ b/builds/updates.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.6.6", + "version": "1.14.6.7", "update_link": "https://www.4chan-x.net/builds/4chan-X.crx" } ] diff --git a/builds/updates.xml b/builds/updates.xml index c9a36e205..0ff1b7cf0 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/crx-chromium-version.txt b/crx-chromium-version.txt new file mode 100644 index 000000000..2d4f0bd7a --- /dev/null +++ b/crx-chromium-version.txt @@ -0,0 +1 @@ +Chromium 73.0.3683.75 built on Debian buster/sid, running on Debian buster/sid diff --git a/tools/sign.sh b/tools/sign.sh new file mode 100755 index 000000000..fc856cc37 --- /dev/null +++ b/tools/sign.sh @@ -0,0 +1,8 @@ +#!/bin/bash +channel=$1 +mkdir -p tmp-crx +cp -r "testbuilds/crx$channel" "tmp-crx/crx$channel" +touch -d "$(jq -r '.date' version.json)" "tmp-crx/crx$channel"/* +chromium --pack-extension="tmp-crx/crx$channel" --pack-extension-key="$(dirname "$PWD")/4chan-x.keys/4chan-X.pem" +mv "tmp-crx/crx$channel.crx" "testbuilds/4chan-X$channel.crx" +rm -r 'tmp-crx/' diff --git a/version.json b/version.json index de2d47128..55858b5b0 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.14.6.6", - "date": "2019-04-05T04:21:37.757Z" + "version": "1.14.6.7", + "date": "2019-04-05T10:16:02.069Z" } \ No newline at end of file