From 395a547a95d1c2c3843831d6de8975d9fc22e5eb Mon Sep 17 00:00:00 2001 From: Dimitris Apostolou Date: Wed, 25 Sep 2019 11:47:48 +0300 Subject: [PATCH 1/2] Update to Firefox 60.9.0esr, i2pd 2.28.0, NoScript 11.0.3 Former-commit-id: fbdd0448ac3035b8ade6b6dc50e711df56ff5bb1 --- linux/build/build | 4 ++-- osx/build/build | 6 +++--- windows/build/build.cmd | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/linux/build/build b/linux/build/build index e686304..a739e1f 100755 --- a/linux/build/build +++ b/linux/build/build @@ -12,7 +12,7 @@ cd $dir arch=$(uname -m) language=$(echo $LANG | cut -c-5 | sed s/_/-/g) -version="60.7.1esr" +version="60.9.0esr" application="firefox" ftpmirror="https://ftp.mozilla.org/pub/$application/releases/$version" @@ -100,7 +100,7 @@ curl -L -f -# -o ../app/browser/extensions/langpack-ru@firefox.mozilla.org.xpi h curl -L -f -# -o ../app/browser/extensions/langpack-en-US@firefox.mozilla.org.xpi https://addons.mozilla.org/firefox/downloads/file/978493/english_us_language_pack-60.0buildid20180605171542-an+fx.xpi echo "Downloading NoScript extension..." -curl -L -f -# -o ../app/browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi https://addons.mozilla.org/firefox/downloads/file/3028550/noscript_security_suite-10.6.3-an+fx.xpi +curl -L -f -# -o ../app/browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi https://addons.mozilla.org/firefox/downloads/file/3383315/noscript_security_suite-11.0.3-an+fx.xpi echo "Adding standard configs..." cp profile/* ../data/ diff --git a/osx/build/build b/osx/build/build index f233212..8e38155 100755 --- a/osx/build/build +++ b/osx/build/build @@ -12,8 +12,8 @@ cd $dir arch=$(uname -m) language=$(osascript -e 'user locale of (get system info)' | sed -e 's/_/-/g') -version="60.7.1esr" -i2pdversion="2.26.0" +version="60.9.0esr" +i2pdversion="2.28.0" ftpmirror="https://ftp.mozilla.org/pub/firefox/releases/${version}" @@ -107,7 +107,7 @@ curl -L -f -# -o ../FirefoxESR.app/Contents/Resources/browser/extensions/langpac curl -L -f -# -o ../FirefoxESR.app/Contents/Resources/browser/extensions/langpack-en-US@firefox.mozilla.org.xpi "https://addons.mozilla.org/firefox/downloads/file/978493/english_us_language_pack-60.0buildid20180605171542-an+fx.xpi" echo "Downloading NoScript extension..." -curl -L -f -# -o ../FirefoxESR.app/Contents/Resources/browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi "https://addons.mozilla.org/firefox/downloads/file/3028550/noscript_security_suite-10.6.3-an+fx.xpi" +curl -L -f -# -o ../FirefoxESR.app/Contents/Resources/browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi "https://addons.mozilla.org/firefox/downloads/file/3383315/noscript_security_suite-11.0.3-an+fx.xpi" echo "Adding standard configs..." cp profile/* ../data/ diff --git a/windows/build/build.cmd b/windows/build/build.cmd index 1f13682..ac766c4 100644 --- a/windows/build/build.cmd +++ b/windows/build/build.cmd @@ -7,8 +7,8 @@ REM See full license text in LICENSE file at top of project tree setlocal enableextensions set CURL=%~dp0curl.exe -set FFversion=60.7.1 -set I2Pdversion=2.26.0 +set FFversion=60.9.0 +set I2Pdversion=2.28.0 call :GET_LOCALE call :GET_PROXY call :GET_ARCH @@ -89,7 +89,7 @@ if "%locale%"=="ru" ( ) else ( echo Downloading NoScript extension ) -"%CURL%" -L -f -# -o ..\Firefox\App\Firefox\browser\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi https://addons.mozilla.org/firefox/downloads/file/3028550/noscript_security_suite-10.6.3-an+fx.xpi +"%CURL%" -L -f -# -o ..\Firefox\App\Firefox\browser\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi https://addons.mozilla.org/firefox/downloads/file/3383315/noscript_security_suite-11.0.3-an+fx.xpi if errorlevel 1 ( echo ERROR:%ErrorLevel% && pause && exit ) else (echo OK!) REM echo. From 3fc37f5da46e428c7a2bc6a11e9ab3cad9e581eb Mon Sep 17 00:00:00 2001 From: r4sas Date: Wed, 25 Sep 2019 09:57:30 +0000 Subject: [PATCH 2/2] add i2pd 2.28.0 linux static binaries Signed-off-by: r4sas Former-commit-id: 7b97f62dda83afb6311163320f34324bff1ec505 --- linux/i2pd/i2pd-amd64.REMOVED.git-id | 2 +- linux/i2pd/i2pd-i386.REMOVED.git-id | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/i2pd/i2pd-amd64.REMOVED.git-id b/linux/i2pd/i2pd-amd64.REMOVED.git-id index 24222cd..3f40de1 100644 --- a/linux/i2pd/i2pd-amd64.REMOVED.git-id +++ b/linux/i2pd/i2pd-amd64.REMOVED.git-id @@ -1 +1 @@ -8ac8c1452a00b9654755be88ab805982c1d56a92 \ No newline at end of file +48a65b189f6d01cb50c7d7a48c4d430d8f6d0a3f \ No newline at end of file diff --git a/linux/i2pd/i2pd-i386.REMOVED.git-id b/linux/i2pd/i2pd-i386.REMOVED.git-id index 6cb7c8e..9241780 100644 --- a/linux/i2pd/i2pd-i386.REMOVED.git-id +++ b/linux/i2pd/i2pd-i386.REMOVED.git-id @@ -1 +1 @@ -af5de0612c40f715740fd4d168aa444b4baca790 \ No newline at end of file +fbf287fc4d521a4cdb1345779045e3f8375bb14b \ No newline at end of file