From 22e7f39ef9f3db70a1ea21093442fbb71d2c255b Mon Sep 17 00:00:00 2001 From: R4SAS Date: Tue, 23 Jan 2018 11:50:18 +0300 Subject: [PATCH] update noscript, fix build scripts Former-commit-id: bf078e96a88d009698354a58e52599c1f101b9cd --- linux/build/build.sh | 7 +++++-- linux/build/preferences/syspref.js | 4 ++-- osx/build/build.sh | 7 +++++-- osx/build/preferences/syspref.js | 4 ++-- windows/README.md | 1 + windows/build/build.cmd | 18 +++++++++++++----- windows/build/preferences/syspref.js | 4 ++-- windows_prebuilt/build/build_7z.bat | 2 +- windows_prebuilt/build/build_exe.bat | 2 +- 9 files changed, 32 insertions(+), 17 deletions(-) diff --git a/linux/build/build.sh b/linux/build/build.sh index af362ba..2de3456 100755 --- a/linux/build/build.sh +++ b/linux/build/build.sh @@ -81,9 +81,12 @@ sed -i 's/ServerURL=.*/ServerURL=-/' ../app/application.ini # sed -i 's/ServerURL=.*/ServerURL=-/' ../app/webapprt/webapprt.ini # Done! +echo "Downloading language packs..." +curl -L -f -# -o ../app/browser/extensions/langpack-ru@firefox.mozilla.org.xpi https://addons.mozilla.org/firefox/downloads/file/605634/russian_ru_language_pack-52.0-fx.xpi?src=version-history +curl -L -f -# -o ../app/browser/extensions/langpack-en-US@firefox.mozilla.org.xpi https://addons.mozilla.org/firefox/downloads/file/605596/english_us_language_pack-52.0-fx.xpi?src=version-history + echo "Downloading NoScript extension..." -curl -L -f -# -O https://secure.informaction.com/download/releases/noscript-5.1.8.2.xpi -mv noscript-5.1.8.2.xpi ../app/browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi +curl -L -f -# -o ../app/browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi https://addons.mozilla.org/firefox/downloads/file/806790/noscript_security_suite-5.1.8.3-fx+sm.xpi echo "Adding standard configs..." cp profile/* ../data/ diff --git a/linux/build/preferences/syspref.js b/linux/build/preferences/syspref.js index 04c5b55..0d8b5f8 100644 --- a/linux/build/preferences/syspref.js +++ b/linux/build/preferences/syspref.js @@ -250,8 +250,8 @@ pref("network.proxy.type", 1); pref("network.cookie.prefsMigrated", true); pref("noscript.ABE.enabled", false); pref("noscript.ABE.wanIpAsLocal", false); -pref("noscript.firstRunRedirection.pending", "5.1.8.2"); -pref("noscript.version", "5.1.8.2"); +pref("noscript.firstRunRedirection.pending", "5.1.8.3"); +pref("noscript.version", "5.1.8.3"); pref("noscript.visibleUIChecked", true); pref("pdfjs.disabled", true); pref("pdfjs.enableWebGL", false); diff --git a/osx/build/build.sh b/osx/build/build.sh index 2936ad4..2132601 100755 --- a/osx/build/build.sh +++ b/osx/build/build.sh @@ -84,9 +84,12 @@ rm $file # sed -i 's/ServerURL=.*/ServerURL=-/' ../app/webapprt/webapprt.ini # Done! +echo "Downloading language packs..." +curl -L -f -# -o ../FirefoxESR.app/Contents/Resources/browser/extensions/langpack-ru@firefox.mozilla.org.xpi https://addons.mozilla.org/firefox/downloads/file/605634/russian_ru_language_pack-52.0-fx.xpi?src=version-history +curl -L -f -# -o ../FirefoxESR.app/Contents/Resources/browser/extensions/langpack-en-US@firefox.mozilla.org.xpi https://addons.mozilla.org/firefox/downloads/file/605596/english_us_language_pack-52.0-fx.xpi?src=version-history + echo "Downloading NoScript extension..." -curl -L -f -# -O https://secure.informaction.com/download/releases/noscript-5.1.8.2.xpi -mv noscript-5.1.8.2.xpi ../FirefoxESR.app/Contents/Resources/browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi +curl -L -f -# -o ../FirefoxESR.app/Contents/Resources/browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi https://addons.mozilla.org/firefox/downloads/file/806790/noscript_security_suite-5.1.8.3-fx+sm.xpi echo "Adding standard configs..." cp profile/* ../data/ diff --git a/osx/build/preferences/syspref.js b/osx/build/preferences/syspref.js index 04c5b55..0d8b5f8 100644 --- a/osx/build/preferences/syspref.js +++ b/osx/build/preferences/syspref.js @@ -250,8 +250,8 @@ pref("network.proxy.type", 1); pref("network.cookie.prefsMigrated", true); pref("noscript.ABE.enabled", false); pref("noscript.ABE.wanIpAsLocal", false); -pref("noscript.firstRunRedirection.pending", "5.1.8.2"); -pref("noscript.version", "5.1.8.2"); +pref("noscript.firstRunRedirection.pending", "5.1.8.3"); +pref("noscript.version", "5.1.8.3"); pref("noscript.visibleUIChecked", true); pref("pdfjs.disabled", true); pref("pdfjs.enableWebGL", false); diff --git a/windows/README.md b/windows/README.md index 5679e02..6605cfc 100644 --- a/windows/README.md +++ b/windows/README.md @@ -13,5 +13,6 @@ Links to software used for building i2pdbrowser * Curl: https://winampplugins.co.uk/curl/ * CA Root Certificates: https://raw.githubusercontent.com/bagder/ca-bundle/master/ca-bundle.crt * sed: http://unxutils.sourceforge.net/ +* Firefox Portable launcher: https://portableapps.com/apps/internet/firefox-portable-esr SHA512SUMS created with `find * -type f -print0 | xargs -0 -i sha512sum {}` command \ No newline at end of file diff --git a/windows/build/build.cmd b/windows/build/build.cmd index 6bae22d..4b0e39c 100644 --- a/windows/build/build.cmd +++ b/windows/build/build.cmd @@ -59,16 +59,24 @@ if "%locale%"=="ru" ( sed -i "s/Enabled=1/Enabled=0/g" ..\Firefox\App\Firefox\application.ini sed -i "s/ServerURL=.*/ServerURL=-/" ..\Firefox\App\Firefox\application.ini +if "%locale%"=="ru" ( + echo Загрузка языковых пакетов +) else ( + echo Downloading language packs +) +"%CURL%" -L -f -# -o ..\Firefox\App\Firefox\browser\extensions\langpack-ru@firefox.mozilla.org.xpi https://addons.mozilla.org/firefox/downloads/file/605634/russian_ru_language_pack-52.0-fx.xpi?src=version-history +if errorlevel 1 ( echo ERROR:%ErrorLevel% && pause && exit ) else (echo OK!) +"%CURL%" -L -f -# -o ..\Firefox\App\Firefox\browser\extensions\langpack-en-US@firefox.mozilla.org.xpi https://addons.mozilla.org/firefox/downloads/file/605596/english_us_language_pack-52.0-fx.xpi?src=version-history +if errorlevel 1 ( echo ERROR:%ErrorLevel% && pause && exit ) else (echo OK!) + +echo. if "%locale%"=="ru" ( echo Загрузка дополнения NoScript ) else ( echo Downloading NoScript extension ) - -"%CURL%" -L -f -# -O https://secure.informaction.com/download/releases/noscript-5.1.8.2.xpi +"%CURL%" -L -f -# -o ..\Firefox\App\Firefox\browser\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi https://addons.mozilla.org/firefox/downloads/file/806790/noscript_security_suite-5.1.8.3-fx+sm.xpi if errorlevel 1 ( echo ERROR:%ErrorLevel% && pause && exit ) else (echo OK!) -copy /Y noscript-5.1.8.2.xpi ..\Firefox\App\Firefox\browser\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi > nul -del /Q noscript-5.1.8.2.xpi echo. if "%locale%"=="ru" ( @@ -124,7 +132,7 @@ goto :eof :GET_ARCH set xOS=win32 -if defined PROCESSOR_ARCHITEW6432 (set xOS=x64) else if "%PROCESSOR_ARCHITECTURE%"=="AMD64" set xOS=win64 +REM if defined PROCESSOR_ARCHITEW6432 (set xOS=x64) else if "%PROCESSOR_ARCHITECTURE%"=="AMD64" set xOS=win64 goto :eof :eof diff --git a/windows/build/preferences/syspref.js b/windows/build/preferences/syspref.js index 04c5b55..0d8b5f8 100644 --- a/windows/build/preferences/syspref.js +++ b/windows/build/preferences/syspref.js @@ -250,8 +250,8 @@ pref("network.proxy.type", 1); pref("network.cookie.prefsMigrated", true); pref("noscript.ABE.enabled", false); pref("noscript.ABE.wanIpAsLocal", false); -pref("noscript.firstRunRedirection.pending", "5.1.8.2"); -pref("noscript.version", "5.1.8.2"); +pref("noscript.firstRunRedirection.pending", "5.1.8.3"); +pref("noscript.version", "5.1.8.3"); pref("noscript.visibleUIChecked", true); pref("pdfjs.disabled", true); pref("pdfjs.enableWebGL", false); diff --git a/windows_prebuilt/build/build_7z.bat b/windows_prebuilt/build/build_7z.bat index f5d7be3..6888166 100644 --- a/windows_prebuilt/build/build_7z.bat +++ b/windows_prebuilt/build/build_7z.bat @@ -6,7 +6,7 @@ REM See full license text in LICENSE file at top of project tree echo Создаем 7z архив с набором... REM На выходе получаем 7z архив, в котором будут лежать папки Firefox, I2Pd и StartI2PdBrowser.bat из папки src уровнем выше. -7z a -t7z -m0=lzma2 -mx=9 -aoa -mfb=273 -md=512m -ms=on I2PdBrowserPortable_1.2.6.7z ..\..\windows\Firefox ..\..\I2Pd ..\src\StartI2PdBrowser.bat +7z a -t7z -m0=lzma2 -mx=9 -aoa -mfb=273 -md=512m -ms=on I2PdBrowserPortable_1.2.6.7z ..\..\windows\Firefox ..\..\windows\i2pd ..\src\StartI2PdBrowser.bat echo Готово! pause \ No newline at end of file diff --git a/windows_prebuilt/build/build_exe.bat b/windows_prebuilt/build/build_exe.bat index 9b2c19e..7283fb8 100644 --- a/windows_prebuilt/build/build_exe.bat +++ b/windows_prebuilt/build/build_exe.bat @@ -6,7 +6,7 @@ REM See full license text in LICENSE file at top of project tree echo Создаем 7z архив с набором... REM На выходе получаем 7z архив, в котором будут лежать папки Firefox, I2Pd, src и файл StartI2PdBrowser.exe уровнем выше. -7z a -t7z -m0=lzma2 -mx=9 -aoa -mfb=273 -md=512m -ms=on I2PdBrowserPortable.7z ..\..\Firefox ..\..\I2Pd ..\src ..\StartI2PdBrowser.exe +7z a -t7z -m0=lzma2 -mx=9 -aoa -mfb=273 -md=512m -ms=on I2PdBrowserPortable.7z ..\..\windows\Firefox ..\..\windows\i2pd ..\src ..\StartI2PdBrowser.exe echo Создаем 7z SFX - самораспаковывающийся архив... REM На выходе получаем самораспаковывающийся архив, архив после этого удаляем.