From ec700d725dbb1fdb806e806f03753337cfe8f11d Mon Sep 17 00:00:00 2001 From: idk Date: Thu, 9 Sep 2021 19:15:22 -0400 Subject: [PATCH 1/5] upgrade i2pipb version --- HTTPSEverywhere.url | 2 +- Makefile | 19 ++++++++++--------- i2psetproxy.url | 2 +- src/nsis/i2pbrowser-installer.nsi | 8 ++++---- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/HTTPSEverywhere.url b/HTTPSEverywhere.url index 6be5966..84202f4 100644 --- a/HTTPSEverywhere.url +++ b/HTTPSEverywhere.url @@ -1 +1 @@ -https://addons.mozilla.org/firefox/downloads/file/3716461/2021.7.13/https_everywhere-2021.7.13-an+fx.xpi +https://addons.mozilla.org/firefox/downloads/file/3809748/2021.7.13/https-everywhere-eff@eff.org.xpi diff --git a/Makefile b/Makefile index fdff138..71f19ab 100644 --- a/Makefile +++ b/Makefile @@ -119,10 +119,10 @@ build/profile/bookmarks.html: build/profile src/profile/bookmarks.html build/profile/storage-sync.sqlite: build/profile src/profile/storage-sync.sqlite cp src/profile/storage-sync.sqlite build/profile/storage-sync.sqlite -copy-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2prhz@eyedeekay.github.io.xpi build/profile/extensions +copy-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions cp build/NoScript.xpi "build/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" cp build/HTTPSEverywhere.xpi "build/profile/extensions/https-everywhere-eff@eff.org.xpi" - cp build/i2prhz@eyedeekay.github.io.xpi build/profile/extensions/i2prhz@eyedeekay.github.io.xpi + cp build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions/i2ppb@eyedeekay.github.io.xpi app-profile: .version build/app-profile/user.js build/app-profile/prefs.js build/app-profile/chrome/userChrome.css build/app-profile/bookmarks.html build/app-profile/storage-sync.sqlite copy-app-xpi @@ -148,14 +148,14 @@ build/app-profile/bookmarks.html: build/app-profile src/app-profile/bookmarks.ht build/app-profile/storage-sync.sqlite: build/app-profile src/app-profile/storage-sync.sqlite cp src/app-profile/storage-sync.sqlite build/app-profile/storage-sync.sqlite -copy-app-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2prhz@eyedeekay.github.io.xpi build/app-profile/extensions +copy-app-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions cp build/HTTPSEverywhere.xpi "build/app-profile/extensions/https-everywhere-eff@eff.org.xpi" - cp build/i2prhz@eyedeekay.github.io.xpi build/app-profile/extensions/i2prhz@eyedeekay.github.io.xpi + cp build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions/i2ppb@eyedeekay.github.io.xpi -build-extensions: build/i2prhz@eyedeekay.github.io.xpi build/NoScript.xpi build/HTTPSEverywhere.xpi +build-extensions: build/i2ppb@eyedeekay.github.io.xpi build/NoScript.xpi build/HTTPSEverywhere.xpi -build/i2prhz@eyedeekay.github.io.xpi: i2psetproxy.url - curl -L `cat i2psetproxy.url` > build/i2prhz@eyedeekay.github.io.xpi +build/i2ppb@eyedeekay.github.io.xpi: i2psetproxy.url + curl -L `cat i2psetproxy.url` > build/i2ppb@eyedeekay.github.io.xpi build/NoScript.xpi: NoScript.url curl -L `cat NoScript.url` > build/NoScript.xpi @@ -169,14 +169,15 @@ clean-extensions: extensions:HTTPSEverywhere.url NoScript.url i2psetproxy.url HTTPSEverywhere.url: - @echo "https://addons.mozilla.org/firefox/downloads/file/3716461/"`./amo-version.sh https-everywhere`"/https_everywhere-"`./amo-version.sh https-everywhere`"-an+fx.xpi" > HTTPSEverywhere.url + @echo "https://addons.mozilla.org/firefox/downloads/file/3809748/"`./amo-version.sh https-everywhere`"/https-everywhere-eff@eff.org.xpi" > HTTPSEverywhere.url NoScript.url: @echo "https://addons.mozilla.org/firefox/downloads/file/3534184/"`./amo-version.sh noscript`"/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" > NoScript.url i2psetproxy.url: - @echo "https://addons.mozilla.org/firefox/downloads/file/3784917/"`./amo-version.sh i2pipb-rhizome-variant`"/i2prhz@eyedeekay.github.io" > i2psetproxy.url + @echo "https://addons.mozilla.org/firefox/downloads/file/3821635/"`./amo-version.sh i2p-in-private-browsing`"/i2ppb@eyedeekay.github.io.xpi" > i2psetproxy.url +#https://addons.mozilla.org/firefox/downloads/file/3821635/i2p_in_private_browsing-0.112.1-an+fx.xpi #i2ppb@eyedeekay.github.io.xpi build/profile/extensions: build/profile diff --git a/i2psetproxy.url b/i2psetproxy.url index bc1178e..9e98787 100644 --- a/i2psetproxy.url +++ b/i2psetproxy.url @@ -1 +1 @@ -https://addons.mozilla.org/firefox/downloads/file/3784917/0.108/i2prhz@eyedeekay.github.io +https://addons.mozilla.org/firefox/downloads/file/3821635/0.112.1/i2ppb@eyedeekay.github.io.xpi diff --git a/src/nsis/i2pbrowser-installer.nsi b/src/nsis/i2pbrowser-installer.nsi index 0f8f19e..87315db 100644 --- a/src/nsis/i2pbrowser-installer.nsi +++ b/src/nsis/i2pbrowser-installer.nsi @@ -310,7 +310,7 @@ Section Install SetOutPath "$INSTDIR\firefox.profile.i2p\extensions" File "profile\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" File profile\extensions\https-everywhere-eff@eff.org.xpi - File profile\extensions\i2prhz@eyedeekay.github.io.xpi + File profile\extensions\i2ppb@eyedeekay.github.io.xpi # Install the config profile createDirectory "$INSTDIR\firefox.profile.config.i2p" @@ -324,7 +324,7 @@ Section Install createDirectory "$INSTDIR\firefox.profile.config.i2p\extensions" SetOutPath "$INSTDIR\firefox.profile.config.i2p\extensions" File profile\extensions\https-everywhere-eff@eff.org.xpi - File profile\extensions\i2prhz@eyedeekay.github.io.xpi + File profile\extensions\i2ppb@eyedeekay.github.io.xpi # Install the config userChrome createDirectory "$INSTDIR\firefox.profile.config.i2p\chrome" @@ -414,10 +414,10 @@ Section "uninstall" # Uninstall the extensions Delete "$INSTDIR\firefox.profile.i2p\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" Delete "$INSTDIR\firefox.profile.i2p\extensions\https-everywhere-eff@eff.org.xpi" - Delete "$INSTDIR\firefox.profile.i2p\extensions\i2prhz@eyedeekay.github.io.xpi" + Delete "$INSTDIR\firefox.profile.i2p\extensions\i2ppb@eyedeekay.github.io.xpi" Delete "$INSTDIR\firefox.profile.config.i2p\extensions\https-everywhere-eff@eff.org.xpi" - Delete "$INSTDIR\firefox.profile.config.i2p\extensions\i2prhz@eyedeekay.github.io.xpi" + Delete "$INSTDIR\firefox.profile.config.i2p\extensions\i2ppb@eyedeekay.github.io.xpi" Delete "$INSTDIR\firefox.profile.config.i2p\config\userChrome.css" From 42eb5fdecd3b75e2ee575e80c4cb579c542a0fb9 Mon Sep 17 00:00:00 2001 From: idk Date: Mon, 13 Sep 2021 22:11:45 -0400 Subject: [PATCH 2/5] bump version number to 1.05.0 since it's embedding a 1.5 I2P router and it is version 04 of the profile. Embedding a router being a huge milestone, after all. --- src/nsis/i2pbrowser-version.nsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nsis/i2pbrowser-version.nsi b/src/nsis/i2pbrowser-version.nsi index 6e79be8..6bd9046 100644 --- a/src/nsis/i2pbrowser-version.nsi +++ b/src/nsis/i2pbrowser-version.nsi @@ -1,3 +1,3 @@ -!define VERSIONMAJOR 0 -!define VERSIONMINOR 04 +!define VERSIONMAJOR 1 +!define VERSIONMINOR 05 !define VERSIONBUILD 0 From 3c5208d50eb5f62feda8bc0c0be8a2d2f0656f9a Mon Sep 17 00:00:00 2001 From: idk Date: Tue, 14 Sep 2021 12:11:56 -0400 Subject: [PATCH 3/5] Make some of the make targets a little better for releasing --- Makefile | 8 ++++---- src/app-profile/version.txt | 2 +- src/profile/version.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 71f19ab..09ba354 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ export RES_DIR="../i2p.i2p/installer/resources" export PKG_DIR="../i2p.i2p/pkg-temp" export I2P_JBIGI="../i2p.i2p/installer/lib/jbigi" -distclean: clean +distclean: clean clean-extensions rm -rf I2P I2P: @@ -92,7 +92,7 @@ build/licenses: build unix2dos build/licenses/LICENSE.index clean: - rm -rf build app-profile-*.tgz profile-*.tgz I2P-Profile-Installer-*.exe *.deb src/I2P/config *.su3 + rm -rf build app-profile-*.tgz profile-*.tgz I2P-Profile-Installer-*.exe *.deb src/I2P/config *.su3 .version build: @echo "creating build directory" @@ -235,7 +235,7 @@ uninstall: /usr/share/applications/i2pbrowser.desktop \ /usr/share/applications/i2pconfig.desktop -checkinstall: version +checkinstall: .version checkinstall \ --default \ --install=no \ @@ -262,7 +262,7 @@ $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools: go mod vendor && go build su3: $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools - $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)" -signer "$(SIGNER)" -version "$(I2P_VERSION)" + $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)-signed" -signer "$(SIGNER)" -version "$(I2P_VERSION)" docker: docker build -t geti2p/i2p.firefox . diff --git a/src/app-profile/version.txt b/src/app-profile/version.txt index 728cb37..0a928bc 100644 --- a/src/app-profile/version.txt +++ b/src/app-profile/version.txt @@ -1 +1 @@ -0.04.0 +1.05.0 diff --git a/src/profile/version.txt b/src/profile/version.txt index 728cb37..0a928bc 100644 --- a/src/profile/version.txt +++ b/src/profile/version.txt @@ -1 +1 @@ -0.04.0 +1.05.0 From b50cd8c55b8be0ee0ff47a135c52260793234d84 Mon Sep 17 00:00:00 2001 From: idk Date: Tue, 14 Sep 2021 12:22:47 -0400 Subject: [PATCH 4/5] Switch I2P_VERSION back to using tags. New bundle was build with i2pversion_override 1.5.0 --- i2pversion | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/i2pversion b/i2pversion index 1967af4..96c59a0 100644 --- a/i2pversion +++ b/i2pversion @@ -3,13 +3,13 @@ #Comment this out to build from an alternate branch or # the tip of the master branch. -#I2P_VERSION=0.9.50 -#export I2P_VERSION=0.9.50 -#VERSION=i2p-$I2P_VERSION -#export VERSION="$VERSION" +I2P_VERSION=1.5.0 +export I2P_VERSION=1.5.0 +VERSION=i2p-"$I2P_VERSION" +export VERSION="$VERSION" #Uncomment this to build from the tip of the master. -I2P_VERSION=0.9.50 -export I2P_VERSION=0.9.50 -VERSION=master -export VERSION="$VERSION" +#I2P_VERSION=0.9.50 +#export I2P_VERSION=0.9.50 +#VERSION=master +#export VERSION="$VERSION" From a793e1117601d99b18b824501dbe629804df55d5 Mon Sep 17 00:00:00 2001 From: idk Date: Tue, 14 Sep 2021 16:32:27 -0400 Subject: [PATCH 5/5] add missing release instruction to README.md --- README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0f9fff3..4b3ab32 100644 --- a/README.md +++ b/README.md @@ -184,13 +184,21 @@ TODO: Add links to the respective instructions for each of these. ant clean pkg cd .. - 7. Move into the i2p.firefox directory. Run the `./build.sh` script. + 4. Move into the i2p.firefox directory. Run the `./build.sh` script. cd i2p.firefox ./build.sh 5. Run `make` to build the installer. +Doing a Release +--------------- + +Once you have the installer `.exe` file produced by NSIS, you're almost ready to +do a release. As a final step, someone must sign the `.exe` file using a +Certificate which Windows will recognize. The current signer of the Windows +bundle is Zlatinb. Standard Windows signing tools are used. + Building a signed update file ----------------------------- @@ -207,6 +215,9 @@ With that dependency satisfied, you can then run: to build the signing tool if necessary and then package the installer in a signed update file. +It's also probably possible to do this with the Java I2P distribution and a +`.bat` script. + Docker Support --------------