add .app to clean script

# Conflicts:
#   src/nsis/i2pbrowser-version.nsi
#   src/win/i2pbrowser-private.bat
#   src/win/i2pbrowser.bat

.gitignore

@@ -5,4 +5,7 @@ build
 i2pversion_override
 *.crl
 *.crt
-*.pem
+*.pem
+*.p12
+.stfolder
+*.url

Makefile

@@ -8,25 +8,24 @@ preset=`rm .version; make .version`
 include .version
 
 PROFILE_VERSION=$(MAJOR).$(MINOR).$(BUILD)
-OS=`uname -s | tr '[:upper:]' '[:lower:]'`
 
-all: .version install.exe
+all: .version prep install.exe
 
 tag:
 	git tag $(PROFILE_VERSION)
 
 .version:
 	sed 's|!define VERSION||g' src/nsis/i2pbrowser-version.nsi | sed 's| |=|g' > .version
-	make version.txt src/nsis/i2pbrowser_jpackage.nsi
+	make version.txt i2pbrowser-jpackage.nsi
 
 version.txt:
 	echo "$(PROFILE_VERSION)" > src/profile/version.txt
 	echo "$(PROFILE_VERSION)" > src/app-profile/version.txt
 
-src/nsis/i2pbrowser_jpackage.nsi:
-	echo "!define I2P_VERSION $(I2P_VERSION)" > src/nsis/i2pbrowser_jpackage.nsi
+i2pbrowser-jpackage.nsi:
+	echo "!define I2P_VERSION $(I2P_VERSION)" > src/nsis/i2pbrowser-jpackage.nsi
 
-jpackage: .version I2P all
+jpackage: .version I2P build/I2P/config all
 
 help: .version
 	@echo "I2P-Profile-Installer-$(PROFILE_VERSION)"
@@ -35,40 +34,39 @@ help: .version
 	@echo "$(MAJOR).$(MINOR).$(BUILD)"
 	@echo "$(preset)"
 
-prep: profile.tgz app-profile.tgz build/licenses build/I2P build/I2P/config launchers
+prep: profile.tgz app-profile.tgz profile build/licenses build/I2P build/I2P/config launchers
 	cp src/nsis/*.nsi build
 	cp src/nsis/*.nsh build
 	cp src/icons/*.ico build
 
-install.exe: prep
+install.exe: build/licenses
 	cd build && makensis i2pbrowser-installer.nsi && cp I2P-Profile-Installer-*.exe ../ && echo "built windows installer"
 
-export RES_DIR="../i2p.i2p/installer/resources"
-export PKG_DIR="../i2p.i2p/pkg-temp"
-export I2P_JBIGI="../i2p.i2p/installer/lib/jbigi"
+export RES_DIR="../i2p.i2p.jpackage-build/installer/resources"
+export PKG_DIR="../i2p.i2p.jpackage-build/pkg-temp"
+export I2P_JBIGI="../i2p.i2p.jpackage-build/installer/lib/jbigi"
 
 distclean: clean clean-extensions
 	rm -rf I2P
+	git clean -fd
 
 I2P:
 	./build.sh
 
-build/I2P: build
+build/I2P: I2P build
 	rm -rf build/I2P
 	cp -rv I2P build/I2P ; true
 	cp "$(I2P_JBIGI)"/*windows*.dll build/I2P/runtime/lib; true
 
-configdir: src/I2P/config
-
-src/I2P/config:
-	mkdir src/I2P/config
+src/I2P/config: build/I2P
+	mkdir -p src/I2P/config
 	rm -rf src/I2P/config/geoip src/I2P/config/webapps src/I2P/config/certificates
 	echo true | tee src/I2P/config/jpackaged
 	cp -v $(RES_DIR)/clients.config src/I2P/config/
 	cp -v $(RES_DIR)/i2ptunnel.config src/I2P/config/
 	cp -v $(RES_DIR)/wrapper.config src/I2P/config/
 	#grep -v 'router.updateURL' $(RES_DIR)/router.config > src/I2P/config/router.config
-	cat router.config >> src/I2P/config/router.config
+	cat router.config > src/I2P/config/router.config
 	cp -v $(RES_DIR)/hosts.txt src/I2P/config/hosts.txt
 	cp -R $(RES_DIR)/certificates src/I2P/config/certificates
 	cp -R $(RES_DIR)/eepsite src/I2P/config/eepsite
@@ -77,9 +75,10 @@ src/I2P/config:
 	cp -R "$(PKG_DIR)"/webapps src/I2P/config/webapps
 	cd src/I2P/config/geoip && gunzip GeoLite2-Country.mmdb.gz; cd ../../..
 
-build/I2P/config: build/I2P src/I2P/config
-	cp -rv src/I2P/config build/I2P/config ; true
-	cp -rv src/I2P/config build/I2P/.i2p ; true
+build/I2P/config: src/I2P/config build/I2P
+	cp -rv src/I2P/config build/I2P/config
+#	cp -rv build/I2P/* I2P/
+#	cp -rv src/I2P/config build/I2P/.i2p
 
 #
 # Warning: a displayed license file of more than 28752 bytes
@@ -93,230 +92,58 @@ 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 .version
+	rm -rf build app-profile-*.tgz profile-*.tgz I2P-Profile-Installer-*.exe *.deb src/I2P/config *.su3 .version *.url
+	git clean -fdx src build
 
 build:
 	@echo "creating build directory"
 	mkdir -p build
 
-portable-profile: .version I2P build/I2P
-	make profile.tgz
-	cp -rv build/profile build/portable-profile-$(OS)
-	cp src/win/i2pbrowser.bat build/portable-profile-$(OS)
-	cp src/win/i2pbrowser-private.bat build/portable-profile-$(OS)
+include makefiles/profile.mk
 
-profile: build/profile/user.js build/profile/prefs.js build/profile/bookmarks.html build/profile/storage-sync.sqlite copy-xpi
+include makefiles/app-profile.mk
 
-profile.tgz: .version profile
-#	$(eval PROFILE_VERSION := $(shell cat src/profile/version.txt))
-	@echo "building profile tarball $(PROFILE_VERSION)"
-	sh -c 'ls I2P && cp -rv build/I2P build/profile/I2P'; true
-	install -m755 src/unix/i2pbrowser.sh build/profile/i2pbrowser.sh
-	cd build && tar -czf profile-$(PROFILE_VERSION).tgz profile && cp profile-$(PROFILE_VERSION).tgz ../
+-include makefiles/new-extensions.mk
 
-build/profile/user.js: build/profile src/profile/user.js
-	cp src/profile/user.js build/profile/user.js
+include makefiles/extensions.mk
 
-build/profile/prefs.js: build/profile src/profile/prefs.js
-	cp src/profile/prefs.js build/profile/prefs.js
+include makefiles/build.mk
 
-build/profile/bookmarks.html: build/profile src/profile/bookmarks.html
-	cp src/profile/bookmarks.html build/profile/bookmarks.html
+include makefiles/install.mk
 
-build/profile/storage-sync.sqlite: build/profile src/profile/storage-sync.sqlite
-	cp src/profile/storage-sync.sqlite build/profile/storage-sync.sqlite
+include makefiles/su.mk
 
-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/i2ppb@eyedeekay.github.io.xpi build/profile/extensions/i2ppb@eyedeekay.github.io.xpi
+include makefiles/su-unsigned.mk
 
-portable-app-profile: .version I2P build/I2P
-	make app-profile.tgz
-	cp -rv build/app-profile build/portable-app-profile-$(OS)
-	cp src/win/i2pbrowser.bat build/portable-app-profile-$(OS)
-	cp src/win/i2pbrowser-private.bat build/portable-app-profile-$(OS)
-	cp src/win/i2pconfig.bat build/portable-app-profile-$(OS)
+include makefiles/docker.mk
 
-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
-
-app-profile.tgz: app-profile
-#	$(eval PROFILE_VERSION := $(shell cat src/app-profile/version.txt))
-	@echo "building app-profile tarball $(PROFILE_VERSION)"
-	sh -c 'ls I2P && cp -rv build/I2P build/app-profile/I2P'; true
-	install -m755 src/unix/i2pconfig.sh build/app-profile/i2pconfig.sh
-	cd build && tar -czf app-profile-$(PROFILE_VERSION).tgz app-profile && cp app-profile-$(PROFILE_VERSION).tgz ../
-
-build/app-profile/user.js: build/app-profile src/app-profile/user.js
-	cp src/app-profile/user.js build/app-profile/user.js
-
-build/app-profile/prefs.js: build/app-profile src/app-profile/prefs.js
-	cp src/app-profile/prefs.js build/app-profile/prefs.js
-
-build/app-profile/chrome/userChrome.css: build/app-profile/chrome src/app-profile/chrome/userChrome.css
-	cp src/app-profile/chrome/userChrome.css build/app-profile/chrome/userChrome.css
-
-build/app-profile/bookmarks.html: build/app-profile src/app-profile/bookmarks.html
-	cp src/app-profile/bookmarks.html build/app-profile/bookmarks.html
-
-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/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/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions/i2ppb@eyedeekay.github.io.xpi
-
-build-extensions: build/i2ppb@eyedeekay.github.io.xpi build/NoScript.xpi build/HTTPSEverywhere.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
-
-build/HTTPSEverywhere.xpi: HTTPSEverywhere.url
-	curl -L `cat HTTPSEverywhere.url` > build/HTTPSEverywhere.xpi
-
-clean-extensions:
-	rm -fv i2psetproxy.url NoScript.url HTTPSEverywhere.url
-
-extensions:HTTPSEverywhere.url NoScript.url i2psetproxy.url
-
-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/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
-	mkdir -p build/profile/extensions
-
-build/profile: build
-	mkdir -p build/profile
-
-build/win:
-	mkdir -p build/win/
-
-build/win/i2pbrowser.bat:
-	cp src/win/i2pbrowser.bat build/win/i2pbrowser.bat
-
-build/win/i2pconfig.bat:
-	cp src/win/i2pconfig.bat build/win/i2pconfig.bat
-
-build/win/i2pbrowser-private.bat:
-	cp src/win/i2pbrowser-private.bat build/win/i2pbrowser-private.bat
-
-launchers: build/win build/win/i2pbrowser.bat build/win/i2pbrowser-private.bat build/win/i2pconfig.bat
-
-build/app-profile/chrome: build/app-profile
-	mkdir -p build/app-profile/chrome
-	
-build/app-profile/extensions: build/app-profile
-	mkdir -p build/app-profile/extensions
-
-build/app-profile: build
-	mkdir -p build/app-profile
-
-install:
-	rm -rfv /etc/i2pbrowser \
-		/var/lib/i2pbrowser
-	mkdir -p /etc/i2pbrowser \
-		/var/lib/i2pbrowser
-	install -m644 src/unix/i2pbrowserrc /etc/i2pbrowser/i2pbrowserrc
-	install -m644 src/unix/i2pbrowserdebianrc /etc/i2pbrowser/i2pbrowserdebianrc
-	install -m755 build/profile/i2pbrowser.sh /usr/local/bin/i2pbrowser
-	install -m755 build/app-profile/i2pconfig.sh /usr/local/bin/i2pconfig
-	install -m755 src/unix/i2p-config-service-setup.sh /usr/local/bin/i2p-config-service-setup
-	cp -vr build/profile /var/lib/i2pbrowser/profile
-	cp -vr build/app-profile /var/lib/i2pbrowser/app-profile
-	cp -vr src/icons /var/lib/i2pbrowser/icons
-	cp src/unix/desktop/i2pbrowser.desktop /usr/share/applications
-	cp src/unix/desktop/i2pconfig.desktop /usr/share/applications
-
-uninstall:
-	rm -rfv /etc/i2pbrowser \
-		/var/lib/i2pbrowser \
-		/etc/i2pbrowser/i2pbrowserrc \
-		/usr/local/bin/i2pbrowser \
-		/usr/local/bin/i2pconfig \
-		/usr/local/bin/i2p-config-service-setup \
-		/usr/share/applications/i2pbrowser.desktop \
-		/usr/share/applications/i2pconfig.desktop
-
-checkinstall: .version
-	checkinstall \
-		--default \
-		--install=no \
-		--fstrans=yes \
-		--pkgname=i2p-firefox \
-		--pkgversion=$(PROFILE_VERSION) \
-		--pkggroup=net \
-		--pkgrelease=1 \
-		--pkgsource="https://i2pgit.org/i2p-hackers/i2p.firefox" \
-		--maintainer="$(SIGNER)" \
-		--requires="firefox,wget" \
-		--suggests="i2p,i2p-router,syndie,tor,tsocks" \
-		--nodoc \
-		--deldoc=yes \
-		--deldesc=yes \
-		--backup=no
-
-GOPATH=$(HOME)/go
-
-$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools:
-	git clone https://i2pgit.org/idk/su3-tools $(GOPATH)/src/i2pgit.org/idk/su3-tools; true
-	git pull --all
-	cd $(GOPATH)/src/i2pgit.org/idk/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)-signed" -signer "$(SIGNER)" -version "$(I2P_VERSION)"
-
-docker:
-	docker build -t geti2p/i2p.firefox .
-
-xhost:
-	xhost + local:docker
-
-run: docker xhost
-	docker run -it --rm \
-		--net=host \
-		-e DISPLAY=unix$(DISPLAY) \
-		-v /tmp/.X11-unix:/tmp/.X11-unix \
-		geti2p/i2p.firefox firefox --profile /src/build/profile
+include makefiles/debian.mk
 
 I2P_DATE=`date +%Y-%m-%d`
 
-prepupdate:
-	cp -v "I2P-Profile-Installer-$(PROFILE_VERSION)-signed.exe" i2pwinupdate.su3
+MAGNET=`bttools torrent printinfo i2pwinupdate.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
+MAGNET_TESTING=`bttools torrent printinfo i2pwinupdate-testing.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
 
-i2pwinupdate.su3.torrent: prepupdate
-	mktorrent --announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a i2pwinupdate.su3
+BLANK=`awk '! NF { print NR; exit }' changelog.txt`
 
-torrent: i2pwinupdate.su3
+I2P.zip: I2P-jpackage-windows-$(I2P_VERSION).zip
 
-MAGNET=`bttools torrent printinfo i2pwinupdate.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g'`
+I2P-jpackage-windows-$(I2P_VERSION).zip:
+	zip I2P-jpackage-windows-$(I2P_VERSION).zip -r build/I2P
 
-releases.json: torrent
-	@echo "["		| tee ../i2p.newsxml/data/win/beta/releases.json
-	@echo "  {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "    \"date\": \"$(I2P_DATE)\","			| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "    \"version\": \"$(I2P_VERSION)\","	| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "    \"minVersion\": \"1.5.0\","			| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "    \"minJavaVersion\": \"1.8\","		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "    \"updates\": {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "      \"su3\": {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "        \"torrent\": \"$(MAGNET)\","		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "        \"url\": ["		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "          \"http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3\""	| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "        ]"	| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "      }"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "    }"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "  }"			| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "]"			| tee -a ../i2p.newsxml/data/win/beta/releases.json
+changelog:
+	head -n "$(BLANK)" changelog.txt
+
+release-jpackage: I2P-jpackage-windows-$(I2P_VERSION).zip
+	head -n "$(BLANK)" changelog.txt | gothub release -p -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n i2p-jpackage-windows-$(I2P_VERSION) -d -; true
+
+update-release-jpackage:
+	head -n "$(BLANK)" changelog.txt | gothub edit -p -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n i2p-jpackage-windows-$(I2P_VERSION) -d -; true
+
+delete-release-jpackage:
+	gothub delete -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION); true
+
+upload-release-jpackage:
+	gothub upload -R -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n "i2p-jpackage-windows-$(I2P_VERSION)" -f "./I2P-jpackage-windows-$(I2P_VERSION).zip"
+
+jpackage-release: release-jpackage upload-release-jpackage

README.md

@@ -4,33 +4,41 @@ I2P Browsing Profile for Firefox
 Features:
 ---------
 
- - Automatically select an up-to-date, secure Firefox or Tor Browser(On Windows) variant
- - Automatically configure a profile for I2P
- - Automatically block-list all non-I2P local destinations
- - Enable first-party isolation, anti-fingerprinting, letterboxing
- - Automatically sandbox I2P, Non-I2P, and I2P-Application cookiestores
+- Automatically select an up-to-date, secure Firefox or Tor Browser(On Windows) variant
+- Automatically configure a profile for I2P
+- Automatically block-list all non-I2P local destinations
+- Enable first-party isolation, anti-fingerprinting, letterboxing
+- Automatically sandbox I2P, Non-I2P, and I2P-Application cookiestores
 
 Build Dependencies:
 -------------------
 
 To build this, you will need the following software packages (all available in Debian) :
 
- * make
- * nsis
- * dos2unix
- * curl
- * jq
+- make
+- nsis
+- dos2unix
+- curl
+- jq
 
-to build a Debian package, you'll also need
+In addition, you will need the NSIS plugin "ShellExecAsUser" which you can get from the
+[NSIS Wiki Page](https://nsis.sourceforge.io/ShellExecAsUser_plug-in). In order to install
+the plugin on Debian, Ubuntu, or using `WSL`, you can download the: [7zip release](https://nsis.sourceforge.io/mediawiki/images/6/68/ShellExecAsUser_amd64-Unicode.7z)
+and copy the content of `Plugins` to `/usr/share/nsis/Plugins`.
 
- * checkinstall
+```sh
+cp -rv Plugins/* /usr/share/nsis/Plugins/
+```
+
+To build a Debian package, you'll also need
+
+- checkinstall
 
 Preparation
 -----------
 
 Before you build, run the targets
 
-
         make clean-extensions
         make extensions
 
@@ -90,12 +98,8 @@ with `sudo service i2p start` then you can run the script:
 
         /usr/local/bin/i2p-config-service-setup
 
-Including a jpackaged I2P Router(EXPERIMENTAL)
-----------------------------------------------
-
-It is strongly advised that you use an up-to-date JDK 17 to build your
-jpackage! Releases will be built with an up-to-date OpenJDK LTS. Builds occur
-on a Windows 10 laptop, hashed, and transferred to a Linux laptop for signing.
+Including a jpackaged I2P Router
+--------------------------------
 
 In order to include a jpackaged(dependency-free) I2P router in the Profile
 Bundle you will need to build the jpackaged I2P router as an "App Image" on
@@ -163,6 +167,9 @@ you should select "Checkout as is, commit as is" and leave line-endings alone.
 End-to-End Windows build process using Cygwin
 ---------------------------------------------
 
+I highly recommend you look into the Chocolatey package manager, which makes it much
+easier to configure these tools and keep them up to date.
+
 **Prerequisites:** You need to have OpenJDK 14 or greater installed and configured
 with your `%JAVA_HOME%` environment variable configured and `%JAVA_HOME%/bin` on
 your `%PATH%`. You need to have Apache Ant installed and configured with `%ANT_HOME%`
@@ -173,27 +180,26 @@ select "Checkout as is, commit as is" and leave line-endings alone.
 
 TODO: Add links to the respective instructions for each of these.
 
- 1. Run the Cygwin `setup-$arch.exe` for your platform to set up new packages.
-   Select the `make` `jq` `dos2unix` and `curl` packages.
- 2. Open a cygwin terminal.
- 3. Clone `i2p.i2p` and `i2p.firefox`
+1. Run the Cygwin `setup-$arch.exe` for your platform to set up new packages. Select the `make` `jq` `dos2unix` and `curl` packages.
+2. Open a cygwin terminal.
+3. Clone `i2p.i2p` and `i2p.firefox`
 
         git clone https://github.com/i2p/i2p.i2p
         git clone https://github.com/i2p/i2p.firefox
 
- 3. Move to the i2p.i2p directory. Build the .jar files required to build the App Image
+4. Move to the i2p.i2p directory. Build the .jar files required to build the App Image
   inside i2p.i2p. Return to home.
 
         cd i2p.i2p
         ant clean pkg
         cd ..
 
- 4. Move into the i2p.firefox directory. Run the `./build.sh` script.
+5. Move into the i2p.firefox directory. Run the `./build.sh` script.
 
         cd i2p.firefox
         ./build.sh
 
- 5. Run `make` to build the installer.
+6. Run `make` to build the installer.
 
 Doing a Release
 ---------------

amo-version.sh

@@ -1,4 +1,4 @@
 #! /usr/bin/env sh
 
-curl -s "https://addons.mozilla.org/api/v5/addons/addon/$1/versions/?page_size=1" | jq '.results | .[0] | .version' | tr -d '"'
+curl -s "https://addons.mozilla.org/api/v5/addons/addon/$1/versions/?page_size=1" | jq '.results | .[0] | .file | .url' | tr -d '"'
 

build.sh

@@ -1,19 +1,27 @@
 #!/bin/bash
 set -e 
 
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+cd "$SCRIPT_DIR" || exit 1
+
 . i2pversion
 
 if [ -f i2pversion_override ]; then
   . i2pversion_override
 fi
 
+COUNT="Ten Nine Eight Seven Six Five Four Three Two One"
+
 JAVA=$(java --version | tr -d 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\n' | cut -d ' ' -f 2 | cut -d '.' -f 1 | tr -d '\n\t\- ')
 
 if [ "$JAVA" -lt "14" ]; then
   echo "Java 14+ must be used to compile with jpackage, java is $JAVA"
   exit 1
 fi
-sleep 2s
+if [ "$JAVA" -lt "17" ]; then
+  echo "It is highly recommended that you use Java 17+ to build release packages"
+fi
+sleep 5s
 
 if [ -z "${JAVA_HOME}" ]; then
   JAVA_HOME=`type -p java|xargs readlink -f|xargs dirname|xargs dirname`
@@ -24,22 +32,42 @@ echo "cleaning"
 ./clean.sh
 
 HERE="$PWD"
-cd "$HERE/../i2p.i2p/"
+if [ ! -d "$HERE/../i2p.i2p.jpackage-build/" ]; then
+  git clone https://i2pgit.org/i2p-hackers/i2p.i2p "$HERE/../i2p.i2p.jpackage-build/"
+fi
+cd "$HERE/../i2p.i2p.jpackage-build/"
 git checkout "$VERSION"
-ant distclean preppkg-windows || true
+for i in $COUNT; do
+  echo -n "$i...."; sleep 1s
+done
+ant distclean pkg || true
 
 cd "$HERE"
-RES_DIR="$HERE/../i2p.i2p/installer/resources"
-I2P_JARS="$HERE/../i2p.i2p/pkg-temp/lib"
-I2P_JBIGI="$HERE/../i2p.i2p/installer/lib//jbigi"
-I2P_PKG="$HERE/../i2p.i2p/pkg-temp"
+I2P_PKG="$HERE/../i2p.i2p.jpackage-build/pkg-temp"
+RES_DIR="$HERE/../i2p.i2p.jpackage-build/installer/resources"
+I2P_JARS="$I2P_PKG/lib"
+I2P_JBIGI="$HERE/../i2p.i2p.jpackage-build/installer/lib/jbigi"
+
 
 echo "compiling custom launcher"
 mkdir build
 cp "$I2P_JARS"/*.jar build
+if [ ! -f "$HERE/build/jna.jar" ]; then
+  wget -O "$HERE/build/jna.jar" "https://repo1.maven.org/maven2/net/java/dev/jna/jna/$JNA_VERSION/jna-$JNA_VERSION.jar"
+fi
+
+if [ ! -f "$HERE/build/jna-platform.jar" ]; then
+  wget -O "$HERE/build/jna-platform.jar" "https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/$JNA_VERSION/jna-platform-$JNA_VERSION.jar"
+fi
 
 cd java
-"$JAVA_HOME"/bin/javac -d ../build -classpath "$HERE"/build/i2p.jar:"$HERE"/build/router.jar:"$HERE"/build/routerconsole.jar net/i2p/router/WinLauncher.java net/i2p/router/WindowsUpdatePostProcessor.java net/i2p/router/WinUpdateProcess.java
+"$JAVA_HOME"/bin/javac -d ../build -classpath "$HERE/build/jna.jar":"$HERE/build/jna-platform.jar":"$HERE/build/i2p.jar":"$HERE/build/router.jar":"$HERE/build/routerconsole.jar" \
+  net/i2p/router/Elevator.java \
+  net/i2p/router/Shell32X.java \
+  net/i2p/router/WinLauncher.java \
+  net/i2p/router/WindowsUpdatePostProcessor.java \
+  net/i2p/router/WinUpdateProcess.java
+
 cd ..
 
 #echo "building launcher.jar"
@@ -55,7 +83,10 @@ echo "preparing to invoke jpackage for I2P version $I2P_VERSION"
 
 "$JAVA_HOME"/bin/jpackage --type app-image --name I2P --app-version "$I2P_VERSION" \
   --verbose \
+  --java-options "-Xmx512m" \
+  --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \
+  --java-options "--add-opens java.base/sun.nio.fs=ALL-UNNAMED" \
+  --java-options "--add-opens java.base/java.nio=ALL-UNNAMED" \
   $JPACKAGE_OPTS \
   --resource-dir build \
-  --java-options "--illegal-access=permit" \
   --input build --main-jar launcher.jar --main-class net.i2p.router.WinLauncher

changelog.txt

@@ -1,3 +1,62 @@
+2022-03-25 idk
+ * This release adds support for user-mode, non-privileged installation of the
+  jpackaged router and the browser profile. Admin installation is still supported
+  and detected automatically, to support existing bundles.
+ * On restart to update, will detect if a router requires admin rights to install
+  and will ask the user to authorize the update. In user-mode, no prompt will ever
+  be seen.
+ * Updates to the Firefox profiles to improve compatibility with more Firefoxes
+
+2022-02-10 idk
+* This release fixes automatic update using Bittorrent within the I2P network
+ and the custom Update PostProcessor.
+* Fixes the first-run launcher bug
+* Drastically simplifies the Windows build process
+* Adds support for development releases
+* Adds support for Debian packaging(Of just the Firefox profile)
+
+2021-11-1 idk
+* HTTPS Everywhere will now self-disable on some Firefox versions. This is not
+ an issue since HTTPS Everywhere is deprecated in favor of Firefox built-in
+ HTTPS enforcement features.
+* .bat Script: Detect location of C:\Program Files\I2P or
+ C\Program Files(x86)\I2P in launcher scripts
+* NSIS changes
+ - Make launcher scripts static artifacts instead of generating them during
+  the install process
+ - If a jpackaged I2P router is present in $checkout/I2P, include it in an
+  installer.
+ - If a running installer doesn't find an I2P router in Program Files, install
+  the jpackaged I2P router. Mark it as jpackaged so we can quickly determine
+  from other applications.
+* I2P in Private Browsing changes
+ - bugfix for `reset()` of dynamic theme
+ - bugfix for erroneous redirect/contain of mis-identified I2PSnark containers
+ - improve support for in-I2P HTTPS
+ - use global CSS on pageAction panels for HTTP, HTTPS, and Bittorrent(@sadie)
+ - improve support for I2PSnark web handler in HTTPS tabs
+ - icon update(@sadie)
+ - contain android-incompatible features so they won't be executed on Fennec
+ - translate into Spanish
+ - visually conceal/reveal features based on whether they are enabled/configured.
+* I2P Jpackage
+ - support for building an I2P Jpackage has been added to the build system
+  Note that support is platform-specific, to build a Windows jpackage one must
+  use a Windows OS, to build a Linux jpackage one must use a Linux OS. Only
+  Windows jpackages are used for a release product.
+ - For information about how releases are built see README.md and UPDATES.md
+ - The jpackaged router has the following differences from mainline I2P:
+  - The jars are installed to a different directory.
+  - The native libraries are installed to a different directory
+  - The wrapper script is not installed and not used, and replaced by the
+   browser launcher.
+  - The I2P executable is %programfiles%/I2P/I2P.exe, command-line flags are not
+   compatible but configuration files are.
+  - wrapper.config is unused
+  - The built-by entry will reflect that idk built the package
+  - Use flags to achieve compatibility with plugins that use Reflection on Java
+   17 jpackages
+
 2021-01-17 idk
 * Use Local Application Data instead of Roaming application data for router.config file
 * Use Roaming Application Daya only if a clients.config.d is present, indicating that the

clean.sh

@@ -1,5 +1,9 @@
 #! /usr/bin/env sh
 
+here=$(pwd)
+cd ../i2p.i2p.jpackage-build/
+ant distclean
+cd "$here"
 rm -rf \
 	build \
 	eventlog.txt \
@@ -12,6 +16,7 @@ rm -rf \
 	peerProfiles \
 	prngseed.rnd \
 	wrapper.log \
+	*.app \
 	*.jar \
 	*.exe \
 	*.dmg

debian/README.Debian

@@ -0,0 +1,9 @@
+i2p-firefox-profile for Debian
+-----------------------------
+
+This is a Firefox Profile and a bundle of Open-Source extensions which are
+packaged for convenience as a Debian-style package. The extensions themselves
+may not be packaged in Debian. They are side-loaded on the first run of the
+browser profile.
+
+ -- idk <hankhill19580@gmail.com>  Sat, 03 Jul 2021 23:32:29 -0400

debian/changelog

@@ -0,0 +1,5 @@
+i2p-firefox-profile (1.05.0-1) sid; urgency=medium
+
+  * Initial release. Closes i2pgit.org/i2p-hackers/i2p.firefox #5
+
+ -- eyedeekay <hankhill19580@gmail.com>  Sun, 22 Aug 2021 22:27:37 -0400

debian/control

@@ -0,0 +1,20 @@
+Source: i2p-firefox-profile
+Section: net
+Priority: optional
+Maintainer: idk <hankhill19580@gmail.com>
+Build-Depends: debhelper-compat (= 11)
+Standards-Version: 4.5.1
+Homepage: https://i2pgit.org/i2p-hackers/i2p.firefox
+Vcs-Browser: https://i2pgit.org/i2p-hackers/i2p.firefox
+Vcs-Git: https://i2pgit.org/i2p-hackers/i2p.firefox.git
+Rules-Requires-Root: no
+
+Package: i2p-firefox-profile
+Architecture: all
+Depends: firefox,wget,i2p | i2pd,${misc:Depends}
+Suggests: i2p,i2p-router,syndie,tor,tsocks
+Description: Browser profile for Firefox+I2P and script to launch it
+ Debian/Ubuntu port of the I2P Browser Profile for Firefox/Windows
+ systems. It is built from the same source and has identical
+ functionality to the Windows version, and in most ways should appear
+ nearly identical to it's Windows equivalent.

debian/copyright

@@ -0,0 +1,865 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: i2p-firefox-profile
+Upstream-Contact: idk hankhill19580@gmail.com
+Source: https://i2pgit.org/i2p-hackers/i2p.firefox
+
+Files: *
+Copyright: 2018 The Invisible Internet Project
+License: MIT
+
+Files: debian/*
+Copyright: 2021 idk <hankhill19580@gmail.com>
+License: MIT
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ 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 OR COPYRIGHT HOLDERS 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.
+
+# HTTPS Everwyhere:
+# Copyright © 2010-2012 Mike Perry <mikeperry@fscked.org>
+#                       Peter Eckersley <pde@eff.org>
+#                       and many others
+#                       (Licensed GPL v2+)
+# 
+# Incorporating code from NoScript,
+# Copyright © 2004-2007 Giorgio Maone <g.maone@informaction.com>
+# Licensed GPL v2+
+# 
+# Incorporating code from Convergence
+# Copyright © Moxie Marlinspike
+# Licensed GPL v3+
+# 
+# Incorporating code from URI.js
+# Copyright © Rodney Rehm
+# Licensed MIT, GPL V3
+# 
+# Incorporating code from js-lru
+# Copyright © 2010 Rasmus Andersson
+# Licensed MIT
+# 
+# The build system incorporates code from Python 2.6,
+# Copyright © 2001-2006 Python Software Foundation
+# Python Software Foundation License Version 2
+# 
+# Net License:  GPL v3+ (complete tree)
+#               GPL v2+ (if Moxie's NSS.js is absent)
+# 
+# 
+# Text of MIT License:
+# ====================
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+# 
+# 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 OR COPYRIGHT HOLDERS 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.
+# MIT License
+# 
+# Copyright (c) 2019 idk
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# 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 OR COPYRIGHT HOLDERS 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.
+# Mozilla Public License Version 2.0
+# ==================================
+# 
+# 1. Definitions
+# --------------
+# 
+# 1.1. "Contributor"
+#     means each individual or legal entity that creates, contributes to
+#     the creation of, or owns Covered Software.
+# 
+# 1.2. "Contributor Version"
+#     means the combination of the Contributions of others (if any) used
+#     by a Contributor and that particular Contributor's Contribution.
+# 
+# 1.3. "Contribution"
+#     means Covered Software of a particular Contributor.
+# 
+# 1.4. "Covered Software"
+#     means Source Code Form to which the initial Contributor has attached
+#     the notice in Exhibit A, the Executable Form of such Source Code
+#     Form, and Modifications of such Source Code Form, in each case
+#     including portions thereof.
+# 
+# 1.5. "Incompatible With Secondary Licenses"
+#     means
+# 
+#     (a) that the initial Contributor has attached the notice described
+#         in Exhibit B to the Covered Software; or
+# 
+#     (b) that the Covered Software was made available under the terms of
+#         version 1.1 or earlier of the License, but not also under the
+#         terms of a Secondary License.
+# 
+# 1.6. "Executable Form"
+#     means any form of the work other than Source Code Form.
+# 
+# 1.7. "Larger Work"
+#     means a work that combines Covered Software with other material, in
+#     a separate file or files, that is not Covered Software.
+# 
+# 1.8. "License"
+#     means this document.
+# 
+# 1.9. "Licensable"
+#     means having the right to grant, to the maximum extent possible,
+#     whether at the time of the initial grant or subsequently, any and
+#     all of the rights conveyed by this License.
+# 
+# 1.10. "Modifications"
+#     means any of the following:
+# 
+#     (a) any file in Source Code Form that results from an addition to,
+#         deletion from, or modification of the contents of Covered
+#         Software; or
+# 
+#     (b) any new file in Source Code Form that contains any Covered
+#         Software.
+# 
+# 1.11. "Patent Claims" of a Contributor
+#     means any patent claim(s), including without limitation, method,
+#     process, and apparatus claims, in any patent Licensable by such
+#     Contributor that would be infringed, but for the grant of the
+#     License, by the making, using, selling, offering for sale, having
+#     made, import, or transfer of either its Contributions or its
+#     Contributor Version.
+# 
+# 1.12. "Secondary License"
+#     means either the GNU General Public License, Version 2.0, the GNU
+#     Lesser General Public License, Version 2.1, the GNU Affero General
+#     Public License, Version 3.0, or any later versions of those
+#     licenses.
+# 
+# 1.13. "Source Code Form"
+#     means the form of the work preferred for making modifications.
+# 
+# 1.14. "You" (or "Your")
+#     means an individual or a legal entity exercising rights under this
+#     License. For legal entities, "You" includes any entity that
+#     controls, is controlled by, or is under common control with You. For
+#     purposes of this definition, "control" means (a) the power, direct
+#     or indirect, to cause the direction or management of such entity,
+#     whether by contract or otherwise, or (b) ownership of more than
+#     fifty percent (50%) of the outstanding shares or beneficial
+#     ownership of such entity.
+# 
+# 2. License Grants and Conditions
+# --------------------------------
+# 
+# 2.1. Grants
+# 
+# Each Contributor hereby grants You a world-wide, royalty-free,
+# non-exclusive license:
+# 
+# (a) under intellectual property rights (other than patent or trademark)
+#     Licensable by such Contributor to use, reproduce, make available,
+#     modify, display, perform, distribute, and otherwise exploit its
+#     Contributions, either on an unmodified basis, with Modifications, or
+#     as part of a Larger Work; and
+# 
+# (b) under Patent Claims of such Contributor to make, use, sell, offer
+#     for sale, have made, import, and otherwise transfer either its
+#     Contributions or its Contributor Version.
+# 
+# 2.2. Effective Date
+# 
+# The licenses granted in Section 2.1 with respect to any Contribution
+# become effective for each Contribution on the date the Contributor first
+# distributes such Contribution.
+# 
+# 2.3. Limitations on Grant Scope
+# 
+# The licenses granted in this Section 2 are the only rights granted under
+# this License. No additional rights or licenses will be implied from the
+# distribution or licensing of Covered Software under this License.
+# Notwithstanding Section 2.1(b) above, no patent license is granted by a
+# Contributor:
+# 
+# (a) for any code that a Contributor has removed from Covered Software;
+#     or
+# 
+# (b) for infringements caused by: (i) Your and any other third party's
+#     modifications of Covered Software, or (ii) the combination of its
+#     Contributions with other software (except as part of its Contributor
+#     Version); or
+# 
+# (c) under Patent Claims infringed by Covered Software in the absence of
+#     its Contributions.
+# 
+# This License does not grant any rights in the trademarks, service marks,
+# or logos of any Contributor (except as may be necessary to comply with
+# the notice requirements in Section 3.4).
+# 
+# 2.4. Subsequent Licenses
+# 
+# No Contributor makes additional grants as a result of Your choice to
+# distribute the Covered Software under a subsequent version of this
+# License (see Section 10.2) or under the terms of a Secondary License (if
+# permitted under the terms of Section 3.3).
+# 
+# 2.5. Representation
+# 
+# Each Contributor represents that the Contributor believes its
+# Contributions are its original creation(s) or it has sufficient rights
+# to grant the rights to its Contributions conveyed by this License.
+# 
+# 2.6. Fair Use
+# 
+# This License is not intended to limit any rights You have under
+# applicable copyright doctrines of fair use, fair dealing, or other
+# equivalents.
+# 
+# 2.7. Conditions
+# 
+# Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+# in Section 2.1.
+# 
+# 3. Responsibilities
+# -------------------
+# 
+# 3.1. Distribution of Source Form
+# 
+# All distribution of Covered Software in Source Code Form, including any
+# Modifications that You create or to which You contribute, must be under
+# the terms of this License. You must inform recipients that the Source
+# Code Form of the Covered Software is governed by the terms of this
+# License, and how they can obtain a copy of this License. You may not
+# attempt to alter or restrict the recipients' rights in the Source Code
+# Form.
+# 
+# 3.2. Distribution of Executable Form
+# 
+# If You distribute Covered Software in Executable Form then:
+# 
+# (a) such Covered Software must also be made available in Source Code
+#     Form, as described in Section 3.1, and You must inform recipients of
+#     the Executable Form how they can obtain a copy of such Source Code
+#     Form by reasonable means in a timely manner, at a charge no more
+#     than the cost of distribution to the recipient; and
+# 
+# (b) You may distribute such Executable Form under the terms of this
+#     License, or sublicense it under different terms, provided that the
+#     license for the Executable Form does not attempt to limit or alter
+#     the recipients' rights in the Source Code Form under this License.
+# 
+# 3.3. Distribution of a Larger Work
+# 
+# You may create and distribute a Larger Work under terms of Your choice,
+# provided that You also comply with the requirements of this License for
+# the Covered Software. If the Larger Work is a combination of Covered
+# Software with a work governed by one or more Secondary Licenses, and the
+# Covered Software is not Incompatible With Secondary Licenses, this
+# License permits You to additionally distribute such Covered Software
+# under the terms of such Secondary License(s), so that the recipient of
+# the Larger Work may, at their option, further distribute the Covered
+# Software under the terms of either this License or such Secondary
+# License(s).
+# 
+# 3.4. Notices
+# 
+# You may not remove or alter the substance of any license notices
+# (including copyright notices, patent notices, disclaimers of warranty,
+# or limitations of liability) contained within the Source Code Form of
+# the Covered Software, except that You may alter any license notices to
+# the extent required to remedy known factual inaccuracies.
+# 
+# 3.5. Application of Additional Terms
+# 
+# You may choose to offer, and to charge a fee for, warranty, support,
+# indemnity or liability obligations to one or more recipients of Covered
+# Software. However, You may do so only on Your own behalf, and not on
+# behalf of any Contributor. You must make it absolutely clear that any
+# such warranty, support, indemnity, or liability obligation is offered by
+# You alone, and You hereby agree to indemnify every Contributor for any
+# liability incurred by such Contributor as a result of warranty, support,
+# indemnity or liability terms You offer. You may include additional
+# disclaimers of warranty and limitations of liability specific to any
+# jurisdiction.
+# 
+# 4. Inability to Comply Due to Statute or Regulation
+# ---------------------------------------------------
+# 
+# If it is impossible for You to comply with any of the terms of this
+# License with respect to some or all of the Covered Software due to
+# statute, judicial order, or regulation then You must: (a) comply with
+# the terms of this License to the maximum extent possible; and (b)
+# describe the limitations and the code they affect. Such description must
+# be placed in a text file included with all distributions of the Covered
+# Software under this License. Except to the extent prohibited by statute
+# or regulation, such description must be sufficiently detailed for a
+# recipient of ordinary skill to be able to understand it.
+# 
+# 5. Termination
+# --------------
+# 
+# 5.1. The rights granted under this License will terminate automatically
+# if You fail to comply with any of its terms. However, if You become
+# compliant, then the rights granted under this License from a particular
+# Contributor are reinstated (a) provisionally, unless and until such
+# Contributor explicitly and finally terminates Your grants, and (b) on an
+# ongoing basis, if such Contributor fails to notify You of the
+# non-compliance by some reasonable means prior to 60 days after You have
+# come back into compliance. Moreover, Your grants from a particular
+# Contributor are reinstated on an ongoing basis if such Contributor
+# notifies You of the non-compliance by some reasonable means, this is the
+# first time You have received notice of non-compliance with this License
+# from such Contributor, and You become compliant prior to 30 days after
+# Your receipt of the notice.
+# 
+# 5.2. If You initiate litigation against any entity by asserting a patent
+# infringement claim (excluding declaratory judgment actions,
+# counter-claims, and cross-claims) alleging that a Contributor Version
+# directly or indirectly infringes any patent, then the rights granted to
+# You by any and all Contributors for the Covered Software under Section
+# 2.1 of this License shall terminate.
+# 
+# 5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+# end user license agreements (excluding distributors and resellers) which
+# have been validly granted by You or Your distributors under this License
+# prior to termination shall survive termination.
+# 
+# ************************************************************************
+# *                                                                      *
+# *  6. Disclaimer of Warranty                                           *
+# *  -------------------------                                           *
+# *                                                                      *
+# *  Covered Software is provided under this License on an "as is"       *
+# *  basis, without warranty of any kind, either expressed, implied, or  *
+# *  statutory, including, without limitation, warranties that the       *
+# *  Covered Software is free of defects, merchantable, fit for a        *
+# *  particular purpose or non-infringing. The entire risk as to the     *
+# *  quality and performance of the Covered Software is with You.        *
+# *  Should any Covered Software prove defective in any respect, You     *
+# *  (not any Contributor) assume the cost of any necessary servicing,   *
+# *  repair, or correction. This disclaimer of warranty constitutes an   *
+# *  essential part of this License. No use of any Covered Software is   *
+# *  authorized under this License except under this disclaimer.         *
+# *                                                                      *
+# ************************************************************************
+# 
+# ************************************************************************
+# *                                                                      *
+# *  7. Limitation of Liability                                          *
+# *  --------------------------                                          *
+# *                                                                      *
+# *  Under no circumstances and under no legal theory, whether tort      *
+# *  (including negligence), contract, or otherwise, shall any           *
+# *  Contributor, or anyone who distributes Covered Software as          *
+# *  permitted above, be liable to You for any direct, indirect,         *
+# *  special, incidental, or consequential damages of any character      *
+# *  including, without limitation, damages for lost profits, loss of    *
+# *  goodwill, work stoppage, computer failure or malfunction, or any    *
+# *  and all other commercial damages or losses, even if such party      *
+# *  shall have been informed of the possibility of such damages. This   *
+# *  limitation of liability shall not apply to liability for death or   *
+# *  personal injury resulting from such party's negligence to the       *
+# *  extent applicable law prohibits such limitation. Some               *
+# *  jurisdictions do not allow the exclusion or limitation of           *
+# *  incidental or consequential damages, so this exclusion and          *
+# *  limitation may not apply to You.                                    *
+# *                                                                      *
+# ************************************************************************
+# 
+# 8. Litigation
+# -------------
+# 
+# Any litigation relating to this License may be brought only in the
+# courts of a jurisdiction where the defendant maintains its principal
+# place of business and such litigation shall be governed by laws of that
+# jurisdiction, without reference to its conflict-of-law provisions.
+# Nothing in this Section shall prevent a party's ability to bring
+# cross-claims or counter-claims.
+# 
+# 9. Miscellaneous
+# ----------------
+# 
+# This License represents the complete agreement concerning the subject
+# matter hereof. If any provision of this License is held to be
+# unenforceable, such provision shall be reformed only to the extent
+# necessary to make it enforceable. Any law or regulation which provides
+# that the language of a contract shall be construed against the drafter
+# shall not be used to construe this License against a Contributor.
+# 
+# 10. Versions of the License
+# ---------------------------
+# 
+# 10.1. New Versions
+# 
+# Mozilla Foundation is the license steward. Except as provided in Section
+# 10.3, no one other than the license steward has the right to modify or
+# publish new versions of this License. Each version will be given a
+# distinguishing version number.
+# 
+# 10.2. Effect of New Versions
+# 
+# You may distribute the Covered Software under the terms of the version
+# of the License under which You originally received the Covered Software,
+# or under the terms of any subsequent version published by the license
+# steward.
+# 
+# 10.3. Modified Versions
+# 
+# If you create software not governed by this License, and you want to
+# create a new license for such software, you may create and use a
+# modified version of this License if you rename the license and remove
+# any references to the name of the license steward (except to note that
+# such modified license differs from this License).
+# 
+# 10.4. Distributing Source Code Form that is Incompatible With Secondary
+# Licenses
+# 
+# If You choose to distribute Source Code Form that is Incompatible With
+# Secondary Licenses under the terms of this version of the License, the
+# notice described in Exhibit B of this License must be attached.
+# 
+# Exhibit A - Source Code Form License Notice
+# -------------------------------------------
+# 
+#   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/.
+# 
+# If it is not possible or desirable to put the notice in a particular
+# file, then You may include the notice in a location (such as a LICENSE
+# file in a relevant directory) where a recipient would be likely to look
+# for such a notice.
+# 
+# You may add additional accurate notices of copyright ownership.
+# 
+# Exhibit B - "Incompatible With Secondary Licenses" Notice
+# ---------------------------------------------------------
+# 
+#   This Source Code Form is "Incompatible With Secondary Licenses", as
+#   defined by the Mozilla Public License, v. 2.0.
+# 
+# Note on GPL Compatibility
+# -------------------------
+# 
+# The MPL 2, section 3.3, permits you to combine NSS with code under the GNU
+# General Public License (GPL) version 2, or any later version of that
+# license, to make a Larger Work, and distribute the result under the GPL.
+# The only condition is that you must also make NSS, and any changes you
+# have made to it, available to recipients under the terms of the MPL 2 also.
+# 
+# Anyone who receives the combined code from you does not have to continue
+# to dual licence in this way, and may, if they wish, distribute under the
+# terms of either of the two licences - either the MPL alone or the GPL
+# alone. However, we discourage people from distributing copies of NSS under
+# the GPL alone, because it means that any improvements they make cannot be
+# reincorporated into the main version of NSS. There is never a need to do
+# this for license compatibility reasons.
+# 
+# Note on LGPL Compatibility
+# --------------------------
+# 
+# The above also applies to combining MPLed code in a single library with
+# code under the GNU Lesser General Public License (LGPL) version 2.1, or
+# any later version of that license. If the LGPLed code and the MPLed code
+# are not in the same library, then the copyleft coverage of the two
+# licences does not overlap, so no issues arise.
+# 
+# 
+# Mozilla Public License Version 2.0
+# ==================================
+# 
+# 1. Definitions
+# --------------
+# 
+# 1.1. "Contributor"
+#     means each individual or legal entity that creates, contributes to
+#     the creation of, or owns Covered Software.
+# 
+# 1.2. "Contributor Version"
+#     means the combination of the Contributions of others (if any) used
+#     by a Contributor and that particular Contributor's Contribution.
+# 
+# 1.3. "Contribution"
+#     means Covered Software of a particular Contributor.
+# 
+# 1.4. "Covered Software"
+#     means Source Code Form to which the initial Contributor has attached
+#     the notice in Exhibit A, the Executable Form of such Source Code
+#     Form, and Modifications of such Source Code Form, in each case
+#     including portions thereof.
+# 
+# 1.5. "Incompatible With Secondary Licenses"
+#     means
+# 
+#     (a) that the initial Contributor has attached the notice described
+#         in Exhibit B to the Covered Software; or
+# 
+#     (b) that the Covered Software was made available under the terms of
+#         version 1.1 or earlier of the License, but not also under the
+#         terms of a Secondary License.
+# 
+# 1.6. "Executable Form"
+#     means any form of the work other than Source Code Form.
+# 
+# 1.7. "Larger Work"
+#     means a work that combines Covered Software with other material, in 
+#     a separate file or files, that is not Covered Software.
+# 
+# 1.8. "License"
+#     means this document.
+# 
+# 1.9. "Licensable"
+#     means having the right to grant, to the maximum extent possible,
+#     whether at the time of the initial grant or subsequently, any and
+#     all of the rights conveyed by this License.
+# 
+# 1.10. "Modifications"
+#     means any of the following:
+# 
+#     (a) any file in Source Code Form that results from an addition to,
+#         deletion from, or modification of the contents of Covered
+#         Software; or
+# 
+#     (b) any new file in Source Code Form that contains any Covered
+#         Software.
+# 
+# 1.11. "Patent Claims" of a Contributor
+#     means any patent claim(s), including without limitation, method,
+#     process, and apparatus claims, in any patent Licensable by such
+#     Contributor that would be infringed, but for the grant of the
+#     License, by the making, using, selling, offering for sale, having
+#     made, import, or transfer of either its Contributions or its
+#     Contributor Version.
+# 
+# 1.12. "Secondary License"
+#     means either the GNU General Public License, Version 2.0, the GNU
+#     Lesser General Public License, Version 2.1, the GNU Affero General
+#     Public License, Version 3.0, or any later versions of those
+#     licenses.
+# 
+# 1.13. "Source Code Form"
+#     means the form of the work preferred for making modifications.
+# 
+# 1.14. "You" (or "Your")
+#     means an individual or a legal entity exercising rights under this
+#     License. For legal entities, "You" includes any entity that
+#     controls, is controlled by, or is under common control with You. For
+#     purposes of this definition, "control" means (a) the power, direct
+#     or indirect, to cause the direction or management of such entity,
+#     whether by contract or otherwise, or (b) ownership of more than
+#     fifty percent (50%) of the outstanding shares or beneficial
+#     ownership of such entity.
+# 
+# 2. License Grants and Conditions
+# --------------------------------
+# 
+# 2.1. Grants
+# 
+# Each Contributor hereby grants You a world-wide, royalty-free,
+# non-exclusive license:
+# 
+# (a) under intellectual property rights (other than patent or trademark)
+#     Licensable by such Contributor to use, reproduce, make available,
+#     modify, display, perform, distribute, and otherwise exploit its
+#     Contributions, either on an unmodified basis, with Modifications, or
+#     as part of a Larger Work; and
+# 
+# (b) under Patent Claims of such Contributor to make, use, sell, offer
+#     for sale, have made, import, and otherwise transfer either its
+#     Contributions or its Contributor Version.
+# 
+# 2.2. Effective Date
+# 
+# The licenses granted in Section 2.1 with respect to any Contribution
+# become effective for each Contribution on the date the Contributor first
+# distributes such Contribution.
+# 
+# 2.3. Limitations on Grant Scope
+# 
+# The licenses granted in this Section 2 are the only rights granted under
+# this License. No additional rights or licenses will be implied from the
+# distribution or licensing of Covered Software under this License.
+# Notwithstanding Section 2.1(b) above, no patent license is granted by a
+# Contributor:
+# 
+# (a) for any code that a Contributor has removed from Covered Software;
+#     or
+# 
+# (b) for infringements caused by: (i) Your and any other third party's
+#     modifications of Covered Software, or (ii) the combination of its
+#     Contributions with other software (except as part of its Contributor
+#     Version); or
+# 
+# (c) under Patent Claims infringed by Covered Software in the absence of
+#     its Contributions.
+# 
+# This License does not grant any rights in the trademarks, service marks,
+# or logos of any Contributor (except as may be necessary to comply with
+# the notice requirements in Section 3.4).
+# 
+# 2.4. Subsequent Licenses
+# 
+# No Contributor makes additional grants as a result of Your choice to
+# distribute the Covered Software under a subsequent version of this
+# License (see Section 10.2) or under the terms of a Secondary License (if
+# permitted under the terms of Section 3.3).
+# 
+# 2.5. Representation
+# 
+# Each Contributor represents that the Contributor believes its
+# Contributions are its original creation(s) or it has sufficient rights
+# to grant the rights to its Contributions conveyed by this License.
+# 
+# 2.6. Fair Use
+# 
+# This License is not intended to limit any rights You have under
+# applicable copyright doctrines of fair use, fair dealing, or other
+# equivalents.
+# 
+# 2.7. Conditions
+# 
+# Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+# in Section 2.1.
+# 
+# 3. Responsibilities
+# -------------------
+# 
+# 3.1. Distribution of Source Form
+# 
+# All distribution of Covered Software in Source Code Form, including any
+# Modifications that You create or to which You contribute, must be under
+# the terms of this License. You must inform recipients that the Source
+# Code Form of the Covered Software is governed by the terms of this
+# License, and how they can obtain a copy of this License. You may not
+# attempt to alter or restrict the recipients' rights in the Source Code
+# Form.
+# 
+# 3.2. Distribution of Executable Form
+# 
+# If You distribute Covered Software in Executable Form then:
+# 
+# (a) such Covered Software must also be made available in Source Code
+#     Form, as described in Section 3.1, and You must inform recipients of
+#     the Executable Form how they can obtain a copy of such Source Code
+#     Form by reasonable means in a timely manner, at a charge no more
+#     than the cost of distribution to the recipient; and
+# 
+# (b) You may distribute such Executable Form under the terms of this
+#     License, or sublicense it under different terms, provided that the
+#     license for the Executable Form does not attempt to limit or alter
+#     the recipients' rights in the Source Code Form under this License.
+# 
+# 3.3. Distribution of a Larger Work
+# 
+# You may create and distribute a Larger Work under terms of Your choice,
+# provided that You also comply with the requirements of this License for
+# the Covered Software. If the Larger Work is a combination of Covered
+# Software with a work governed by one or more Secondary Licenses, and the
+# Covered Software is not Incompatible With Secondary Licenses, this
+# License permits You to additionally distribute such Covered Software
+# under the terms of such Secondary License(s), so that the recipient of
+# the Larger Work may, at their option, further distribute the Covered
+# Software under the terms of either this License or such Secondary
+# License(s).
+# 
+# 3.4. Notices
+# 
+# You may not remove or alter the substance of any license notices
+# (including copyright notices, patent notices, disclaimers of warranty,
+# or limitations of liability) contained within the Source Code Form of
+# the Covered Software, except that You may alter any license notices to
+# the extent required to remedy known factual inaccuracies.
+# 
+# 3.5. Application of Additional Terms
+# 
+# You may choose to offer, and to charge a fee for, warranty, support,
+# indemnity or liability obligations to one or more recipients of Covered
+# Software. However, You may do so only on Your own behalf, and not on
+# behalf of any Contributor. You must make it absolutely clear that any
+# such warranty, support, indemnity, or liability obligation is offered by
+# You alone, and You hereby agree to indemnify every Contributor for any
+# liability incurred by such Contributor as a result of warranty, support,
+# indemnity or liability terms You offer. You may include additional
+# disclaimers of warranty and limitations of liability specific to any
+# jurisdiction.
+# 
+# 4. Inability to Comply Due to Statute or Regulation
+# ---------------------------------------------------
+# 
+# If it is impossible for You to comply with any of the terms of this
+# License with respect to some or all of the Covered Software due to
+# statute, judicial order, or regulation then You must: (a) comply with
+# the terms of this License to the maximum extent possible; and (b)
+# describe the limitations and the code they affect. Such description must
+# be placed in a text file included with all distributions of the Covered
+# Software under this License. Except to the extent prohibited by statute
+# or regulation, such description must be sufficiently detailed for a
+# recipient of ordinary skill to be able to understand it.
+# 
+# 5. Termination
+# --------------
+# 
+# 5.1. The rights granted under this License will terminate automatically
+# if You fail to comply with any of its terms. However, if You become
+# compliant, then the rights granted under this License from a particular
+# Contributor are reinstated (a) provisionally, unless and until such
+# Contributor explicitly and finally terminates Your grants, and (b) on an
+# ongoing basis, if such Contributor fails to notify You of the
+# non-compliance by some reasonable means prior to 60 days after You have
+# come back into compliance. Moreover, Your grants from a particular
+# Contributor are reinstated on an ongoing basis if such Contributor
+# notifies You of the non-compliance by some reasonable means, this is the
+# first time You have received notice of non-compliance with this License
+# from such Contributor, and You become compliant prior to 30 days after
+# Your receipt of the notice.
+# 
+# 5.2. If You initiate litigation against any entity by asserting a patent
+# infringement claim (excluding declaratory judgment actions,
+# counter-claims, and cross-claims) alleging that a Contributor Version
+# directly or indirectly infringes any patent, then the rights granted to
+# You by any and all Contributors for the Covered Software under Section
+# 2.1 of this License shall terminate.
+# 
+# 5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+# end user license agreements (excluding distributors and resellers) which
+# have been validly granted by You or Your distributors under this License
+# prior to termination shall survive termination.
+# 
+# ************************************************************************
+# *                                                                      *
+# *  6. Disclaimer of Warranty                                           *
+# *  -------------------------                                           *
+# *                                                                      *
+# *  Covered Software is provided under this License on an "as is"       *
+# *  basis, without warranty of any kind, either expressed, implied, or  *
+# *  statutory, including, without limitation, warranties that the       *
+# *  Covered Software is free of defects, merchantable, fit for a        *
+# *  particular purpose or non-infringing. The entire risk as to the     *
+# *  quality and performance of the Covered Software is with You.        *
+# *  Should any Covered Software prove defective in any respect, You     *
+# *  (not any Contributor) assume the cost of any necessary servicing,   *
+# *  repair, or correction. This disclaimer of warranty constitutes an   *
+# *  essential part of this License. No use of any Covered Software is   *
+# *  authorized under this License except under this disclaimer.         *
+# *                                                                      *
+# ************************************************************************
+# 
+# ************************************************************************
+# *                                                                      *
+# *  7. Limitation of Liability                                          *
+# *  --------------------------                                          *
+# *                                                                      *
+# *  Under no circumstances and under no legal theory, whether tort      *
+# *  (including negligence), contract, or otherwise, shall any           *
+# *  Contributor, or anyone who distributes Covered Software as          *
+# *  permitted above, be liable to You for any direct, indirect,         *
+# *  special, incidental, or consequential damages of any character      *
+# *  including, without limitation, damages for lost profits, loss of    *
+# *  goodwill, work stoppage, computer failure or malfunction, or any    *
+# *  and all other commercial damages or losses, even if such party      *
+# *  shall have been informed of the possibility of such damages. This   *
+# *  limitation of liability shall not apply to liability for death or   *
+# *  personal injury resulting from such party's negligence to the       *
+# *  extent applicable law prohibits such limitation. Some               *
+# *  jurisdictions do not allow the exclusion or limitation of           *
+# *  incidental or consequential damages, so this exclusion and          *
+# *  limitation may not apply to You.                                    *
+# *                                                                      *
+# ************************************************************************
+# 
+# 8. Litigation
+# -------------
+# 
+# Any litigation relating to this License may be brought only in the
+# courts of a jurisdiction where the defendant maintains its principal
+# place of business and such litigation shall be governed by laws of that
+# jurisdiction, without reference to its conflict-of-law provisions.
+# Nothing in this Section shall prevent a party's ability to bring
+# cross-claims or counter-claims.
+# 
+# 9. Miscellaneous
+# ----------------
+# 
+# This License represents the complete agreement concerning the subject
+# matter hereof. If any provision of this License is held to be
+# unenforceable, such provision shall be reformed only to the extent
+# necessary to make it enforceable. Any law or regulation which provides
+# that the language of a contract shall be construed against the drafter
+# shall not be used to construe this License against a Contributor.
+# 
+# 10. Versions of the License
+# ---------------------------
+# 
+# 10.1. New Versions
+# 
+# Mozilla Foundation is the license steward. Except as provided in Section
+# 10.3, no one other than the license steward has the right to modify or
+# publish new versions of this License. Each version will be given a
+# distinguishing version number.
+# 
+# 10.2. Effect of New Versions
+# 
+# You may distribute the Covered Software under the terms of the version
+# of the License under which You originally received the Covered Software,
+# or under the terms of any subsequent version published by the license
+# steward.
+# 
+# 10.3. Modified Versions
+# 
+# If you create software not governed by this License, and you want to
+# create a new license for such software, you may create and use a
+# modified version of this License if you rename the license and remove
+# any references to the name of the license steward (except to note that
+# such modified license differs from this License).
+# 
+# 10.4. Distributing Source Code Form that is Incompatible With Secondary
+# Licenses
+# 
+# If You choose to distribute Source Code Form that is Incompatible With
+# Secondary Licenses under the terms of this version of the License, the
+# notice described in Exhibit B of this License must be attached.
+# 
+# Exhibit A - Source Code Form License Notice
+# -------------------------------------------
+# 
+#   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/.
+# 
+# If it is not possible or desirable to put the notice in a particular
+# file, then You may include the notice in a location (such as a LICENSE
+# file in a relevant directory) where a recipient would be likely to look
+# for such a notice.
+# 
+# You may add additional accurate notices of copyright ownership.
+# 
+# Exhibit B - "Incompatible With Secondary Licenses" Notice
+# ---------------------------------------------------------
+# 
+#   This Source Code Form is "Incompatible With Secondary Licenses", as
+#   defined by the Mozilla Public License, v. 2.0.
+# 

debian/files

@@ -0,0 +1,2 @@
+i2p-firefox-profile_1.05.0-1_all.deb net optional
+i2p-firefox-profile_1.05.0-1_amd64.buildinfo net optional

debian/i2p-firefox-profile-docs.docs

@@ -0,0 +1,2 @@
+README.source
+README.Debian

debian/install

@@ -0,0 +1,10 @@
+src/unix/i2pbrowserrc /etc/i2pbrowser/i2pbrowserrc
+src/unix/i2pbrowserdebianrc /etc/i2pbrowser/i2pbrowserdebianrc
+src/unix/i2pbrowser.sh /usr/bin/
+src/unix/i2pconfig.sh /usr/bin/
+src/unix/i2p-config-service-setup.sh /usr/bin/
+src/profile /var/lib/i2pbrowser/profile
+src/app-profile /var/lib/i2pbrowser/app-profile
+src/icons /var/lib/i2pbrowser/icons
+src/unix/desktop/i2pbrowser-debian.desktop /usr/share/applications/
+src/unix/desktop/i2pconfig-debian.desktop /usr/share/applications/

debian/rules

@@ -0,0 +1,24 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+
+%:
+	dh $@
+
+override_dh_auto_build:
+	@echo "no need to do the windows build"
+
+override_dh_auto_install: debian/install
+	@echo "use debian/install"

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

i2pversion

@@ -1,15 +1,17 @@
 #! /usr/bin/env sh
 
+JNA_VERSION=5.10.0
+export JNA_VERSION=5.10.0
 
 #Comment this out to build from an alternate branch or
 # the tip of the master branch.
-I2P_VERSION=1.5.0
-export I2P_VERSION=1.5.0
+I2P_VERSION=1.7.0
+export I2P_VERSION=1.7.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
+#I2P_VERSION=1.7.0
+#export I2P_VERSION=1.7.0
 #VERSION=master
 #export VERSION="$VERSION"

java/net/i2p/router/Elevator.java

@@ -0,0 +1,33 @@
+package net.i2p.router;
+
+import com.sun.jna.WString;
+import com.sun.jna.platform.win32.Kernel32;
+import com.sun.jna.platform.win32.Kernel32Util;
+
+public class Elevator {
+    public static void main(String... args) {
+        executeAsAdministrator("c:\\windows\\system32\\notepad.exe", "");
+    }
+
+    public static void executeAsAdministrator(String command, String args) {
+        if (command == "" || command == null) {
+            System.out.println("No command specified");
+            return;
+        }
+        Shell32X.SHELLEXECUTEINFO execInfo = new Shell32X.SHELLEXECUTEINFO();
+        execInfo.lpFile = new WString(command);
+        if (args != null)
+            execInfo.lpParameters = new WString(args);
+        execInfo.nShow = Shell32X.SW_SHOWDEFAULT;
+        execInfo.fMask = Shell32X.SEE_MASK_NOCLOSEPROCESS;
+        execInfo.lpVerb = new WString("runas");
+        boolean result = Shell32X.INSTANCE.ShellExecuteEx(execInfo);
+
+        if (!result) {
+            int lastError = Kernel32.INSTANCE.GetLastError();
+            String errorMessage = Kernel32Util.formatMessageFromLastErrorCode(lastError);
+            throw new RuntimeException("Error performing elevation: " + lastError + ": " + errorMessage + " (apperror="
+                    + execInfo.hInstApp + ")");
+        }
+    }
+}

java/net/i2p/router/Shell32X.java

@@ -0,0 +1,111 @@
+package net.i2p.router;
+
+import java.util.*;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.WString;
+import com.sun.jna.platform.win32.Shell32;
+import com.sun.jna.platform.win32.WinDef.HINSTANCE;
+import com.sun.jna.platform.win32.WinDef.HWND;
+import com.sun.jna.platform.win32.WinNT.HANDLE;
+import com.sun.jna.platform.win32.WinReg.HKEY;
+import com.sun.jna.win32.W32APIOptions;
+
+public interface Shell32X extends Shell32 {
+    Shell32X INSTANCE = (Shell32X) Native.loadLibrary("shell32", Shell32X.class, W32APIOptions.UNICODE_OPTIONS);
+
+    int SW_HIDE = 0;
+    int SW_MAXIMIZE = 3;
+    int SW_MINIMIZE = 6;
+    int SW_RESTORE = 9;
+    int SW_SHOW = 5;
+    int SW_SHOWDEFAULT = 10;
+    int SW_SHOWMAXIMIZED = 3;
+    int SW_SHOWMINIMIZED = 2;
+    int SW_SHOWMINNOACTIVE = 7;
+    int SW_SHOWNA = 8;
+    int SW_SHOWNOACTIVATE = 4;
+    int SW_SHOWNORMAL = 1;
+
+    /** File not found. */
+    int SE_ERR_FNF = 2;
+
+    /** Path not found. */
+    int SE_ERR_PNF = 3;
+
+    /** Access denied. */
+    int SE_ERR_ACCESSDENIED = 5;
+
+    /** Out of memory. */
+    int SE_ERR_OOM = 8;
+
+    /** DLL not found. */
+    int SE_ERR_DLLNOTFOUND = 32;
+
+    /** Cannot share an open file. */
+    int SE_ERR_SHARE = 26;
+
+    int SEE_MASK_NOCLOSEPROCESS = 0x00000040;
+
+    int ShellExecute(int i, String lpVerb, String lpFile, String lpParameters, String lpDirectory, int nShow);
+
+    boolean ShellExecuteEx(SHELLEXECUTEINFO lpExecInfo);
+
+    public static class SHELLEXECUTEINFO extends Structure {
+        /*
+         * DWORD cbSize;
+         * ULONG fMask;
+         * HWND hwnd;
+         * LPCTSTR lpVerb;
+         * LPCTSTR lpFile;
+         * LPCTSTR lpParameters;
+         * LPCTSTR lpDirectory;
+         * int nShow;
+         * HINSTANCE hInstApp;
+         * LPVOID lpIDList;
+         * LPCTSTR lpClass;
+         * HKEY hkeyClass;
+         * DWORD dwHotKey;
+         * union {
+         * HANDLE hIcon;
+         * HANDLE hMonitor;
+         * } DUMMYUNIONNAME;
+         * HANDLE hProcess;
+         */
+
+        public int cbSize = size();
+        public int fMask;
+        public HWND hwnd;
+        public WString lpVerb;
+        public WString lpFile;
+        public WString lpParameters;
+        public WString lpDirectory;
+        public int nShow;
+        public HINSTANCE hInstApp;
+        public Pointer lpIDList;
+        public WString lpClass;
+        public HKEY hKeyClass;
+        public int dwHotKey;
+
+        /*
+         * Actually:
+         * union {
+         * HANDLE hIcon;
+         * HANDLE hMonitor;
+         * } DUMMYUNIONNAME;
+         */
+        public HANDLE hMonitor;
+        public HANDLE hProcess;
+
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] {
+                    "cbSize", "fMask", "hwnd", "lpVerb", "lpFile", "lpParameters",
+                    "lpDirectory", "nShow", "hInstApp", "lpIDList", "lpClass",
+                    "hKeyClass", "dwHotKey", "hMonitor", "hProcess",
+            });
+        }
+    }
+
+}

java/net/i2p/router/WinLauncher.java

@@ -1,6 +1,8 @@
 package net.i2p.router;
 
 import java.io.*;
+import java.net.InetAddress;
+import java.net.Socket;
 import java.util.*;
 
 import net.i2p.crypto.*;
@@ -17,23 +19,17 @@ import static net.i2p.update.UpdateType.*;
 
 /**
  * Launches a router from %PROGRAMFILES%/I2P using configuration data in
- * %LOCALAPPDATA%/I2P..  Uses Java 9 APIs.
-
+ * %LOCALAPPDATA%/I2P.. Uses Java 9 APIs.
+ * 
  * Sets the following properties:
  * i2p.dir.base - this points to the (read-only) resources inside the bundle
- * i2p.dir.config this points to the (read-write) config directory in local appdata
+ * i2p.dir.config this points to the (read-write) config directory in local
+ * appdata
  * router.pid - the pid of the java process.
  */
 public class WinLauncher {
-    private static WindowsUpdatePostProcessor wupp = new WindowsUpdatePostProcessor();
-    private static boolean portable;
     public static void main(String[] args) throws Exception {
-        for (int i = 0; i < args.length; i++) {
-            if (args[i] == "portable") {
-            	portable = true;
-            }
-        }
-        File programs = wupp.selectProgramFile();
+        File programs = selectProgramFile();
         if (!programs.exists())
             programs.mkdirs();
         else if (!programs.isDirectory()) {
@@ -52,9 +48,16 @@ public class WinLauncher {
         System.setProperty("i2p.dir.base", programs.getAbsolutePath());
         System.setProperty("i2p.dir.config", home.getAbsolutePath());
         System.setProperty("router.pid", String.valueOf(ProcessHandle.current().pid()));
-        System.out.println("\t"+System.getProperty("i2p.dir.base") +"\n\t"+System.getProperty("i2p.dir.config")+"\n\t"+ System.getProperty("router.pid"));
+        System.out.println("\t" + System.getProperty("i2p.dir.base") + "\n\t" + System.getProperty("i2p.dir.config")
+                + "\n\t" + System.getProperty("router.pid"));
 
-        wupp.i2pRouter = new Router(System.getProperties());
+        // do a quick check to see of port 7657 is already occupied
+        if (i2pIsRunning()) {
+            System.err.println("I2P is already running");
+            System.exit(0);
+        }
+
+        // wupp.i2pRouter = new Router(System.getProperties());
         System.out.println("Router is configured");
 
         Thread registrationThread = new Thread(REGISTER_UPP);
@@ -62,25 +65,43 @@ public class WinLauncher {
         registrationThread.setDaemon(true);
         registrationThread.start();
 
-        wupp.i2pRouter.runRouter();
+        // wupp.i2pRouter.runRouter();
+        RouterLaunch.main(args);
+    }
+
+    private static boolean i2pIsRunning() {
+        // check if there's something listening on port 7657
+        try {
+            InetAddress localhost = InetAddress.getLocalHost();
+            Socket s = new Socket(localhost, 7657);
+            s.close();
+            return true;
+        } catch (IOException e) {
+            return false;
+        }
     }
 
     private static final Runnable REGISTER_UPP = () -> {
 
         // first wait for the RouterContext to appear
         RouterContext ctx;
-        while ((ctx = (RouterContext) wupp.i2pRouter.getContext().getCurrentContext()) == null) {
+        while ((ctx = (RouterContext) RouterContext.getCurrentContext()) == null) {
             sleep(1000);
         }
 
         // then wait for the update manager
-        ClientAppManager cam = ctx.clientAppManager();
+
+        ClientAppManager cam;
+        while ((cam = ctx.clientAppManager()) == null) {
+            sleep(1000);
+        }
+
         UpdateManager um;
         while ((um = (UpdateManager) cam.getRegisteredApp(UpdateManager.APP_NAME)) == null) {
             sleep(1000);
         }
 
-        wupp = new WindowsUpdatePostProcessor(ctx);
+        WindowsUpdatePostProcessor wupp = new WindowsUpdatePostProcessor(ctx);
         um.register(wupp, UpdateType.ROUTER_SIGNED_SU3, SU3File.TYPE_EXE);
         um.register(wupp, UpdateType.ROUTER_DEV_SU3, SU3File.TYPE_EXE);
     };
@@ -94,8 +115,18 @@ public class WinLauncher {
         }
     }
 
-    private static File selectHome() { //throws Exception {
-        if (SystemVersion.isWindows() && !portable) {
+    private static File selectHome() { // throws Exception {
+        String path_override = System.getenv("I2P_CONFIG");
+        if (path_override != null) {
+            File path = new File(path_override);
+            if (path != null && path.exists()) {
+                if (path.isDirectory())
+                    return path.getAbsoluteFile();
+                else
+                    throw new RuntimeException("I2P_CONFIG is not a directory: " + path);
+            }
+        }
+        if (SystemVersion.isWindows()) {
             File home = new File(System.getProperty("user.home"));
             File appData = new File(home, "AppData");
             File local = new File(appData, "Local");
@@ -106,9 +137,32 @@ public class WinLauncher {
         } else {
             File jrehome = new File(System.getProperty("java.home"));
             File programs = new File(jrehome.getParentFile().getParentFile(), ".i2p");
-            System.out.println("portable jpackage wrapper started, using: " + programs + " as base config");
+            System.out.println("Linux portable jpackage wrapper started, using: " + programs + " as base config");
             return programs.getAbsoluteFile();
         }
     }
 
+    private static File selectProgramFile() {
+        String path_override = System.getenv("I2P");
+        if (path_override != null) {
+            File path = new File(path_override);
+            if (path.exists()) {
+                if (path.isDirectory())
+                    return path.getAbsoluteFile();
+                else
+                    throw new RuntimeException("I2P is not a directory: " + path);
+            }
+        }
+        if (SystemVersion.isWindows()) {
+            File jrehome = new File(System.getProperty("java.home"));
+            File programs = jrehome.getParentFile();
+            System.out.println("Windows portable jpackage wrapper found, using: " + programs + " as working config");
+            return programs.getAbsoluteFile();
+        } else {
+            File jrehome = new File(System.getProperty("java.home"));
+            File programs = new File(jrehome.getParentFile().getParentFile(), "i2p");
+            System.out.println("Linux portable jpackage wrapper found, using: " + programs + " as working config");
+            return programs.getAbsoluteFile();
+        }
+    }
 }

java/net/i2p/router/WinUpdateProcess.java

@@ -11,20 +11,20 @@ class WinUpdateProcess implements Runnable {
     private final RouterContext ctx;
     private final Supplier<String> versionSupplier;
     private final Supplier<File> fileSupplier;
-    
+
     WinUpdateProcess(RouterContext ctx, Supplier<String> versionSupplier, Supplier<File> fileSupplier) {
         this.ctx = ctx;
         this.versionSupplier = versionSupplier;
         this.fileSupplier = fileSupplier;
     }
-    
-    private File workDir() throws IOException{
+
+    private File workDir() throws IOException {
         if (ctx != null) {
             File workDir = new File(ctx.getConfigDir().getAbsolutePath(), "i2p_update_win");
             if (workDir.exists()) {
                 if (workDir.isFile())
                     throw new IOException(workDir + " exists but is a file, get it out of the way");
-                    return null;
+                return null;
             } else {
                 workDir.mkdirs();
             }
@@ -35,37 +35,43 @@ class WinUpdateProcess implements Runnable {
 
     private void runUpdateInstaller() throws IOException {
         String version = versionSupplier.get();
-	File file = fileSupplier.get();
-	if (file == null)
-	    return;
+        File file = fileSupplier.get();
+        if (file == null)
+            return;
 
         var workingDir = workDir();
         var logFile = new File(workingDir, "log-" + version + ".txt");
 
-        ProcessBuilder pb = new ProcessBuilder(file.getAbsolutePath());
-        var env = pb.environment();
-        env.put("OLD_I2P_VERSION", version);
-        env.remove("RESTART_I2P");
+        if (logFile.canWrite()) {
+            // check if we can write to the log file. If we can, use the ProcessBuilder to
+            // run the installer.
+            ProcessBuilder pb = new ProcessBuilder(file.getAbsolutePath(), "/S", "/D=" + workingDir.getAbsolutePath());
+            var env = pb.environment();
+            env.put("OLD_I2P_VERSION", version);
+            env.remove("RESTART_I2P");
 
-        int exitCode = ctx.router().scheduledGracefulExitCode();
-        if (exitCode == Router.EXIT_HARD_RESTART || exitCode == Router.EXIT_GRACEFUL_RESTART)
-            env.put("RESTART_I2P", "true");
+            int exitCode = ctx.router().scheduledGracefulExitCode();
+            if (exitCode == Router.EXIT_HARD_RESTART || exitCode == Router.EXIT_GRACEFUL_RESTART)
+                env.put("RESTART_I2P", "true");
 
-        try {
-            pb.directory(workingDir).
-                redirectErrorStream(true).
-                redirectOutput(logFile).
-                start();
-        } catch (IOException ex) {
+            try {
+                pb.directory(workingDir).redirectErrorStream(true).redirectOutput(logFile).start();
+            } catch (IOException ex) {
                 System.out.println("Unable to run update-program in background. Update will fail.");
+            }
+        } else {
+            // If we cant write to the log file and we're on Windows, use the elevator to
+            // execute the installer instead of the ProcessBuilder.
+            Elevator.executeAsAdministrator(file.getAbsolutePath(), " /S /D=" + workingDir.getAbsolutePath());
         }
+
     }
 
     @Override
     public void run() {
         try {
             runUpdateInstaller();
-        } catch(IOException ioe) {
+        } catch (IOException ioe) {
             System.out.println("Error running updater, update may fail." + ioe);
         }
     }

java/net/i2p/router/WindowsUpdatePostProcessor.java

@@ -5,7 +5,6 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.*;
 
-
 import net.i2p.crypto.*;
 import static net.i2p.update.UpdateType.*;
 import net.i2p.I2PAppContext;
@@ -18,82 +17,79 @@ import java.lang.ProcessBuilder;
 import java.lang.Process;
 import java.lang.InterruptedException;
 
-
 public class WindowsUpdatePostProcessor implements UpdatePostProcessor {
-    private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(WindowsUpdatePostProcessor.class);
+    private final Log _log;
     private final RouterContext ctx;
-    protected static Router i2pRouter = null;
-    
     private final AtomicBoolean hook = new AtomicBoolean();
+    private final String fileName = "i2p-jpackage-update.exe";
 
     private volatile String version;
 
     private volatile File positionedFile = null;
-    private final String fileName = "i2p-jpackage-update.exe";
-
-    WindowsUpdatePostProcessor() {
-    	this.ctx = null;
-    }
 
     WindowsUpdatePostProcessor(RouterContext ctx) {
         this.ctx = ctx;
+        this._log = ctx.logManager().getLog(WindowsUpdatePostProcessor.class);
     }
 
     public String getVersion() {
         return version;
     }
-    
+
     public File getFile() {
         return positionedFile;
     }
 
-    public void updateDownloadedandVerified(UpdateType type, int fileType, String version, File file) throws IOException {
+    public void updateDownloadedandVerified(UpdateType type, int fileType, String version, File file)
+            throws IOException {
         _log.info("Got an update to post-process");
+        if (SystemVersion.isWindows()) {
 
-        if (type != UpdateType.ROUTER_SIGNED_SU3 && type != UpdateType.ROUTER_DEV_SU3) {
-            _log.warn("Unsupported update type " + type);
-            return;
+            if (type != UpdateType.ROUTER_SIGNED_SU3 && type != UpdateType.ROUTER_DEV_SU3) {
+                _log.warn("Unsupported update type " + type);
+                return;
+            }
+
+            if (fileType != SU3File.TYPE_EXE) {
+                _log.warn("Unsupported file type " + fileType);
+                return;
+            }
+
+            this.positionedFile = moveUpdateInstaller(file);
+            this.version = version;
+
+            if (!hook.compareAndSet(false, true)) {
+                _log.info("shutdown hook was already set");
+                return;
+            }
+
+            _log.info("adding shutdown hook");
+
+            ctx.addFinalShutdownTask(new WinUpdateProcess(ctx, this::getVersion, this::getFile));
         }
-
-        if (fileType != SU3File.TYPE_EXE) {
-            _log.warn("Unsupported file type " + fileType);
-            return;
-        }
-        
-        this.positionedFile = moveUpdateInstaller(file);
-        this.version = version;
-        
-        if (!hook.compareAndSet(false,true)) {
-            _log.info("shutdown hook was already set");
-            return;
-        }
-
-        _log.info("adding shutdown hook");
-        ctx.addFinalShutdownTask(new WinUpdateProcess(ctx, this::getVersion, this::getFile));
-
     }
-    
+
     private File moveUpdateInstaller(File file) throws IOException {
-        RouterContext i2pContext = i2pRouter.getContext();
-        if (i2pContext != null) {
+        if (this.ctx != null) {
             File newFile = new File(workDir(), fileName);
             boolean renamedStatus = file.renameTo(newFile);
             if (renamedStatus)
-              return newFile;
+                return newFile;
             else
-              throw new IOException("WindowsUpdatePostProcesssor unable to move file to working directory, update will fail");
+                throw new IOException(
+                        "WindowsUpdatePostProcesssor unable to move file to working directory, update will fail");
         }
-        throw new IOException("Router context not available to WindowsUpdatePostProcesssor, unable to find working directory, update will fail");
+        throw new IOException(
+                "Router context not available to WindowsUpdatePostProcesssor, unable to find working directory, update will fail");
     }
 
-    private File workDir() throws IOException{
-        RouterContext i2pContext = i2pRouter.getContext();
-        if (i2pContext != null) {
-            File workDir = new File(i2pContext.getConfigDir().getAbsolutePath(), "i2p_update_win");
+    private File workDir() throws IOException {
+        if (this.ctx != null) {
+            File workDir = new File(this.ctx.getConfigDir().getAbsolutePath(), "i2p_update_win");
             if (workDir.exists()) {
                 if (workDir.isFile())
                     throw new IOException(workDir + " exists but is a file, get it out of the way");
-                    return null;
+                return null;
             } else {
                 workDir.mkdirs();
             }
@@ -102,18 +98,4 @@ public class WindowsUpdatePostProcessor implements UpdatePostProcessor {
         return null;
     }
 
-    protected File selectProgramFile() {
-        if (SystemVersion.isWindows()) {
-            File jrehome = new File(System.getProperty("java.home"));
-            File programs = jrehome.getParentFile();
-            System.out.println("Windows portable jpackage wrapper found, using: " + programs + " as working config");            
-            return programs.getAbsoluteFile();
-        } else {
-            File jrehome = new File(System.getProperty("java.home"));
-            File programs = new File(jrehome.getParentFile().getParentFile(), "i2p");
-            System.out.println("Linux portable jpackage wrapper found, using: " + programs + " as working config");            
-            return programs.getAbsoluteFile();
-        }
-    }
-
 }

license/NSS.txt

@@ -0,0 +1,403 @@
+NSS is available under the Mozilla Public License, version 2, a copy of which
+is below.
+
+Note on GPL Compatibility
+-------------------------
+
+The MPL 2, section 3.3, permits you to combine NSS with code under the GNU
+General Public License (GPL) version 2, or any later version of that
+license, to make a Larger Work, and distribute the result under the GPL.
+The only condition is that you must also make NSS, and any changes you
+have made to it, available to recipients under the terms of the MPL 2 also.
+
+Anyone who receives the combined code from you does not have to continue
+to dual licence in this way, and may, if they wish, distribute under the
+terms of either of the two licences - either the MPL alone or the GPL
+alone. However, we discourage people from distributing copies of NSS under
+the GPL alone, because it means that any improvements they make cannot be
+reincorporated into the main version of NSS. There is never a need to do
+this for license compatibility reasons.
+
+Note on LGPL Compatibility
+--------------------------
+
+The above also applies to combining MPLed code in a single library with
+code under the GNU Lesser General Public License (LGPL) version 2.1, or
+any later version of that license. If the LGPLed code and the MPLed code
+are not in the same library, then the copyleft coverage of the two
+licences does not overlap, so no issues arise.
+
+
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  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/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

makefiles/app-profile.mk

@@ -0,0 +1,28 @@
+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
+
+app-profile.tgz: app-profile
+#	$(eval PROFILE_VERSION := $(shell cat src/app-profile/version.txt))
+	@echo "building app-profile tarball $(PROFILE_VERSION)"
+	sh -c 'ls build/I2P && cp -rv build/I2P build/app-profile/I2P'; true
+	install -m755 src/unix/i2pconfig.sh build/app-profile/i2pconfig.sh
+	cd build && tar -czf app-profile-$(PROFILE_VERSION).tgz app-profile && cp app-profile-$(PROFILE_VERSION).tgz ../
+
+build/app-profile/user.js: build/app-profile src/app-profile/user.js
+	cp src/app-profile/user.js build/app-profile/user.js
+
+build/app-profile/prefs.js: build/app-profile src/app-profile/prefs.js
+	cp src/app-profile/prefs.js build/app-profile/prefs.js
+
+build/app-profile/chrome/userChrome.css: build/app-profile/chrome src/app-profile/chrome/userChrome.css
+	cp src/app-profile/chrome/userChrome.css build/app-profile/chrome/userChrome.css
+
+build/app-profile/bookmarks.html: build/app-profile src/app-profile/bookmarks.html
+	cp src/app-profile/bookmarks.html build/app-profile/bookmarks.html
+
+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/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi build/https-everywhere-eff@eff.org.xpi build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions
+	cp build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi "build/app-profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
+	cp build/https-everywhere-eff@eff.org.xpi "build/app-profile/extensions/https-everywhere-eff@eff.org.xpi"
+	cp build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions/i2ppb@eyedeekay.github.io.xpi

makefiles/build.mk

@@ -0,0 +1,28 @@
+build/profile/extensions: build/profile
+	mkdir -p build/profile/extensions
+
+build/profile: build
+	mkdir -p build/profile
+
+build/win:
+	mkdir -p build/win/
+
+build/win/i2pbrowser.bat:
+	cp src/win/i2pbrowser.bat build/win/i2pbrowser.bat
+
+build/win/i2pconfig.bat:
+	cp src/win/i2pconfig.bat build/win/i2pconfig.bat
+
+build/win/i2pbrowser-private.bat:
+	cp src/win/i2pbrowser-private.bat build/win/i2pbrowser-private.bat
+
+launchers: build/win build/win/i2pbrowser.bat build/win/i2pbrowser-private.bat build/win/i2pconfig.bat
+
+build/app-profile/chrome: build/app-profile
+	mkdir -p build/app-profile/chrome
+	
+build/app-profile/extensions: build/app-profile
+	mkdir -p build/app-profile/extensions
+
+build/app-profile: build
+	mkdir -p build/app-profile

makefiles/debian.mk

@@ -0,0 +1,55 @@
+orig:
+	tar --exclude=debian --exclude=.git -cvzf ../i2p-firefox-profile_$(PROFILE_VERSION).orig.tar.gz .
+
+## HOWTO: If you need to release a package to launchpad, build for the oldest
+## release launchpad supports(bionic AFIACT). Then, after the build is
+## published, copy it to the other distributions. When bionic is out of date,
+## update it to the new LTS.
+
+bionic:
+	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) bionic; urgency=medium|g" debian/changelog
+	make orig
+	debuild -S
+	make dput
+
+focal:
+	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) focal; urgency=medium|g" debian/changelog
+	make orig
+	debuild -S
+	make dput
+
+groovy:
+	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) groovy; urgency=medium|g" debian/changelog
+	make orig
+	debuild -S
+	make dput
+
+buster:
+	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) buster; urgency=medium|g" debian/changelog
+	make orig
+	debuild -S
+	make dput
+
+bullseye:
+	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) bullseye; urgency=medium|g" debian/changelog
+	make orig
+	debuild -S
+	make dput
+
+trixie:
+	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) trixie; urgency=medium|g" debian/changelog
+	make orig
+	debuild -S
+	make dput
+
+sid:
+	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) sid; urgency=medium|g" debian/changelog
+	make orig
+	debuild -S
+	make dput
+
+dput:
+	dput --simulate --force ppa:i2p-community/ppa ../i2p-firefox-profile_$(PROFILE_VERSION)-1_source.changes || exit
+	dput --force ppa:i2p-community/ppa ../i2p-firefox-profile_$(PROFILE_VERSION)-1_source.changes
+
+launchpad: bionic

makefiles/docker.mk

@@ -0,0 +1,12 @@
+docker:
+	docker build -t geti2p/i2p.firefox .
+
+xhost:
+	xhost + local:docker
+
+run: docker xhost
+	docker run -it --rm \
+		--net=host \
+		-e DISPLAY=unix$(DISPLAY) \
+		-v /tmp/.X11-unix:/tmp/.X11-unix \
+		geti2p/i2p.firefox firefox --profile /src/build/profile

makefiles/extensions.mk

@@ -0,0 +1,25 @@
+
+build-extensions: extensions build/i2ppb@eyedeekay.github.io.xpi build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi build/https-everywhere-eff@eff.org.xpi
+
+build/i2ppb@eyedeekay.github.io.xpi: i2psetproxy.url
+	curl -L `cat i2psetproxy.url` > build/i2ppb@eyedeekay.github.io.xpi
+
+build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi: NoScript.url
+	curl -L `cat NoScript.url` > "build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
+
+build/https-everywhere-eff@eff.org.xpi: HTTPSEverywhere.url
+	curl -L `cat HTTPSEverywhere.url` > build/https-everywhere-eff@eff.org.xpi
+
+clean-extensions:
+	rm -fv i2psetproxy.url NoScript.url HTTPSEverywhere.url build/i2ppb@eyedeekay.github.io.xpi build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi build/https-everywhere-eff@eff.org.xpi
+
+extensions: HTTPSEverywhere.url NoScript.url i2psetproxy.url
+
+HTTPSEverywhere.url:
+	@echo `./amo-version.sh https-everywhere` > HTTPSEverywhere.url
+
+NoScript.url:
+	@echo `./amo-version.sh noscript` > NoScript.url
+
+i2psetproxy.url:
+	@echo `./amo-version.sh i2p-in-private-browsing` > i2psetproxy.url

makefiles/install.mk

@@ -0,0 +1,39 @@
+install:
+	install -D -m644 src/unix/i2pbrowserrc /etc/i2pbrowser/i2pbrowserrc
+	install -D -m644 src/unix/i2pbrowserdebianrc /etc/i2pbrowser/i2pbrowserdebianrc
+	install -D -m755 build/profile/i2pbrowser.sh /usr/local/bin/i2pbrowser
+	install -D -m755 build/app-profile/i2pconfig.sh /usr/local/bin/i2pconfig
+	install -D -m755 src/unix/i2p-config-service-setup.sh /usr/local/bin/i2p-config-service-setup
+	cp -vr build/profile /var/lib/i2pbrowser/profile
+	cp -vr build/app-profile /var/lib/i2pbrowser/app-profile
+	cp -vr src/icons /var/lib/i2pbrowser/icons
+	cp src/unix/desktop/i2pbrowser.desktop /usr/share/applications
+	cp src/unix/desktop/i2pconfig.desktop /usr/share/applications
+
+uninstall:
+	rm -rfv /etc/i2pbrowser \
+		/var/lib/i2pbrowser \
+		/etc/i2pbrowser/i2pbrowserrc \
+		/usr/local/bin/i2pbrowser \
+		/usr/local/bin/i2pconfig \
+		/usr/local/bin/i2p-config-service-setup \
+		/usr/share/applications/i2pbrowser.desktop \
+		/usr/share/applications/i2pconfig.desktop
+
+checkinstall: .version
+	checkinstall \
+		--default \
+		--install=no \
+		--fstrans=yes \
+		--pkgname=i2p-firefox \
+		--pkgversion=$(PROFILE_VERSION) \
+		--pkggroup=net \
+		--pkgrelease=1 \
+		--pkgsource="https://i2pgit.org/i2p-hackers/i2p.firefox" \
+		--maintainer="$(SIGNER)" \
+		--requires="firefox,wget" \
+		--suggests="i2p,i2p-router,syndie,tor,tsocks" \
+		--nodoc \
+		--deldoc=yes \
+		--deldesc=yes \
+		--backup=no

makefiles/new-extensions.mk

@@ -0,0 +1,31 @@
+
+build-new-extensions: build/i2ppb@eyedeekay.github.io.xpi build/uBlock0@raymondhill.net.xpi build/jsr@javascriptrestrictor.xpi build/onioncbt@eyedeekay.github.io.xpi build/{b86e4813-687a-43e6-ab65-0bde4ab75758}.xpi
+
+build/uBlock0@raymondhill.net.xpi:
+	curl -L `cat UblockOrigin.url` > build/uBlock0@raymondhill.net.xpi
+
+build/jsr@javascriptrestrictor.xpi:
+	curl -L `cat JShelter.url` > build/jsr@javascriptrestrictor.xpi
+
+build/onioncbt@eyedeekay.github.io.xpi:
+	curl -L `cat onioncontainer.url` > build/onioncbt@eyedeekay.github.io.xpi
+
+build/{b86e4813-687a-43e6-ab65-0bde4ab75758}.xpi:
+	curl -L `cat LocalCDN.url` > build//{b86e4813-687a-43e6-ab65-0bde4ab75758}.xpi
+
+UBlockOrigin.url:
+	@echo `./amo-version.sh ublock-origin` > UBlockOrigin.url
+
+JShelter.url:
+	@echo "`./amo-version.sh javascript-restrictor`" > JShelter.url
+
+onioncontainer.url:
+	@echo `./amo-version.sh onion-in-container-browsing` > onioncontainer.url
+
+LocalCDN.url:
+	@echo `./amo-version.sh localcdn-fork-of-decentraleyes` > LocalCDN.url
+
+clean-new-extensions:
+	rm -f UBlockOrigin.url JShelter.url onioncontainer.url LocalCDN.url build/i2ppb@eyedeekay.github.io.xpi build/onioncbt@eyedeekay.github.io.xpi
+
+new-extensions: UBlockOrigin.url JShelter.url onioncontainer.url LocalCDN.url

makefiles/profile.mk

@@ -0,0 +1,26 @@
+
+profile: build/profile/user.js build/profile/prefs.js build/profile/bookmarks.html build/profile/storage-sync.sqlite copy-xpi
+
+profile.tgz: .version profile
+#	$(eval PROFILE_VERSION := $(shell cat src/profile/version.txt))
+	@echo "building profile tarball $(PROFILE_VERSION)"
+	sh -c 'ls build/I2P && cp -rv build/I2P build/profile/I2P'; true
+	install -m755 src/unix/i2pbrowser.sh build/profile/i2pbrowser.sh
+	cd build && tar -czf profile-$(PROFILE_VERSION).tgz profile && cp profile-$(PROFILE_VERSION).tgz ../
+
+build/profile/user.js: build/profile src/profile/user.js
+	cp src/profile/user.js build/profile/user.js
+
+build/profile/prefs.js: build/profile src/profile/prefs.js
+	cp src/profile/prefs.js build/profile/prefs.js
+
+build/profile/bookmarks.html: build/profile src/profile/bookmarks.html
+	cp src/profile/bookmarks.html build/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/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi build/https-everywhere-eff@eff.org.xpi build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions
+	cp build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi "build/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
+	cp build/https-everywhere-eff@eff.org.xpi "build/profile/extensions/https-everywhere-eff@eff.org.xpi"
+	cp build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions/i2ppb@eyedeekay.github.io.xpi

makefiles/su-unsigned.mk

@@ -0,0 +1,35 @@
+
+prepupdate-unsignedexe:
+	cp -v "I2P-Profile-Installer-$(PROFILE_VERSION).su3" i2pwinupdate-unsignedexe.su3
+
+su3-unsignedexe: $(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)"
+	java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Profile-Installer-$(PROFILE_VERSION).exe I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" "$(I2P_VERSION)" $(SIGNER)
+
+i2pwinupdate-unsignedexe.su3.torrent: prepupdate-unsignedexe su3-unsignedexe
+	mktorrent \
+		--announce=http://tracker2.postman.i2p/announce.php \
+		--announce=http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a \
+		--announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a \
+		i2pwinupdate-unsignedexe.su3
+
+torrent-unsignedexe: i2pwinupdate-unsignedexe.su3.torrent
+
+testing-releases.json: torrent-unsignedexe
+	mkdir -p ../i2p.newsxml/data/win/testing/
+	@echo "["		| tee ../i2p.newsxml/data/win/testing/releases.json
+	@echo "  {"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "    \"date\": \"$(I2P_DATE)\","			| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "    \"version\": \"$(I2P_VERSION)\","	| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "    \"minVersion\": \"1.5.0\","			| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "    \"minJavaVersion\": \"1.8\","		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "    \"updates\": {"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "      \"su3\": {"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "        \"torrent\": \"$(MAGNET_TESTING)\","		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "        \"url\": ["		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "          \"http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3\""	| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "        ]"	| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "      }"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "    }"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "  }"			| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "]"			| tee -a ../i2p.newsxml/data/win/testing/releases.json

makefiles/su.mk

@@ -0,0 +1,41 @@
+GOPATH=$(HOME)/go
+
+$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools:
+	git clone https://i2pgit.org/idk/su3-tools $(GOPATH)/src/i2pgit.org/idk/su3-tools; true
+	git pull --all
+	cd $(GOPATH)/src/i2pgit.org/idk/su3-tools && \
+		go mod vendor && go build
+
+prepupdate:
+	cp -v "I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3" i2pwinupdate.su3
+
+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)-signed" -signer "$(SIGNER)" -version "$(I2P_VERSION)"
+	java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Profile-Installer-$(PROFILE_VERSION)-signed.exe I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" "$(I2P_VERSION)" $(SIGNER)
+
+i2pwinupdate.su3.torrent: prepupdate su3
+	mktorrent \
+		--announce=http://tracker2.postman.i2p/announce.php \
+		--announce=http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a \
+		--announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a \
+		i2pwinupdate.su3
+
+torrent: i2pwinupdate.su3.torrent
+
+releases.json: torrent
+	@echo "["		| tee ../i2p.newsxml/data/win/beta/releases.json
+	@echo "  {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"date\": \"$(I2P_DATE)\","			| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"version\": \"$(I2P_VERSION)\","	| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"minVersion\": \"1.5.0\","			| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"minJavaVersion\": \"1.8\","		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"updates\": {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "      \"su3\": {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "        \"torrent\": \"$(MAGNET)\","		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "        \"url\": ["		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "          \"http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3\""	| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "        ]"	| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "      }"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    }"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "  }"			| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "]"			| tee -a ../i2p.newsxml/data/win/beta/releases.json

router.config

@@ -1,3 +1,3 @@
 router.updateURL=http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3
-router.newsURL=http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/win/stable/news.su3
-router.backupNewsURL=http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news/win/stable/news.su3
+router.newsURL=http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news/win/beta/news.su3
+router.backupNewsURL=http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/win/beta/news.su3

src/I2P/portable/addressbook/config.txt

@@ -1,11 +0,0 @@
-should_publish=false
-proxy_host=127.0.0.1
-proxy_port=4444
-update_delay=1
-log=../log/addrbook_log.txt
-last_modified=../log/addrbook_last_modified.txt
-etags=../log/addrbook_etags.txt
-subscriptions=subscriptions.txt
-local_addressbook=userhosts.txt
-router_addressbook=../hosts.txt
-published_addressbook=../eepsite/hosts.txt

src/I2P/portable/clients.config

@@ -1,15 +0,0 @@
-clientApp.0.main=net.i2p.router.web.RouterConsoleRunner
-clientApp.0.name=I2P Router Console
-clientApp.0.args=7657 127.0.0.1 ./webapps/
-clientApp.0.delay=0
-clientApp.0.startOnLoad=true
-clientApp.1.main=net.i2p.i2ptunnel.TunnelControllerGroup
-clientApp.1.name=Application tunnels
-clientApp.1.args=i2ptunnel.config
-clientApp.1.delay=120
-clientApp.1.startOnLoad=true
-clientApp.2.main=net.i2p.apps.systray.UrlLauncher
-clientApp.2.name=Open Router Console in web browser at startup
-clientApp.2.args=http://127.0.0.1:7657/index.jsp
-clientApp.2.delay=15
-clientApp.2.startOnLoad=true

src/I2P/portable/i2ptunnel.config

@@ -1,119 +0,0 @@
-tunnel.0.description=HTTP proxy for browsing eepsites and the web
-tunnel.0.i2cpHost=127.0.0.1
-tunnel.0.i2cpPort=7654
-tunnel.0.interface=127.0.0.1
-tunnel.0.listenPort=4444
-tunnel.0.name=I2P HTTP Proxy
-tunnel.0.option.i2cp.closeIdleTime=1800000
-tunnel.0.option.i2cp.closeOnIdle=false
-tunnel.0.option.i2cp.delayOpen=false
-tunnel.0.option.i2cp.newDestOnResume=false
-tunnel.0.option.i2cp.reduceIdleTime=900000
-tunnel.0.option.i2cp.reduceOnIdle=false
-tunnel.0.option.i2cp.reduceQuantity=1
-tunnel.0.option.i2p.streaming.connectDelay=1000
-tunnel.0.option.inbound.backupQuantity=1
-tunnel.0.option.inbound.length=2
-tunnel.0.option.inbound.lengthVariance=0
-tunnel.0.option.inbound.nickname=shared clients
-tunnel.0.option.inbound.quantity=2
-tunnel.0.option.outbound.backupQuantity=1
-tunnel.0.option.outbound.length=2
-tunnel.0.option.outbound.lengthVariance=0
-tunnel.0.option.outbound.nickname=shared clients
-tunnel.0.option.outbound.quantity=2
-tunnel.0.option.persistentClientKey=false
-tunnel.0.proxyList=false.i2p,blue.proxynet.i2p
-tunnel.0.sharedClient=true
-tunnel.0.startOnLoad=true
-tunnel.0.type=httpclient
-tunnel.1.description=IRC proxy to access the anonymous IRC network
-tunnel.1.i2cpHost=127.0.0.1
-tunnel.1.i2cpPort=7654
-tunnel.1.interface=127.0.0.1
-tunnel.1.listenPort=6668
-tunnel.1.name=IRC Proxy
-tunnel.1.option.i2cp.closeIdleTime=1200000
-tunnel.1.option.i2cp.closeOnIdle=false
-tunnel.1.option.i2cp.delayOpen=true
-tunnel.1.option.i2cp.newDestOnResume=false
-tunnel.1.option.i2cp.reduceIdleTime=600000
-tunnel.1.option.i2cp.reduceOnIdle=true
-tunnel.1.option.i2cp.reduceQuantity=1
-tunnel.1.option.i2p.streaming.connectDelay=1000
-tunnel.1.option.inbound.backupQuantity=0
-tunnel.1.option.inbound.length=2
-tunnel.1.option.inbound.lengthVariance=0
-tunnel.1.option.inbound.nickname=IRC Proxy
-tunnel.1.option.inbound.quantity=2
-tunnel.1.option.outbound.backupQuantity=0
-tunnel.1.option.outbound.length=2
-tunnel.1.option.outbound.lengthVariance=0
-tunnel.1.option.outbound.nickname=IRC Proxy
-tunnel.1.option.outbound.quantity=2
-tunnel.1.option.persistentClientKey=false
-tunnel.1.privKeyFile=i2ptunnel1-privKeys.dat
-tunnel.1.sharedClient=false
-tunnel.1.startOnLoad=true
-tunnel.1.targetDestination=irc.postman.i2p,irc.freshcoffee.i2p
-tunnel.1.type=ircclient
-tunnel.2.description=smtp server
-tunnel.2.i2cpHost=127.0.0.1
-tunnel.2.i2cpPort=7654
-tunnel.2.interface=127.0.0.1
-tunnel.2.listenPort=7659
-tunnel.2.name=smtp.postman.i2p
-tunnel.2.option.i2cp.closeIdleTime=1800000
-tunnel.2.option.i2cp.closeOnIdle=false
-tunnel.2.option.i2cp.delayOpen=true
-tunnel.2.option.i2cp.newDestOnResume=false
-tunnel.2.option.i2cp.reduceIdleTime=900000
-tunnel.2.option.i2cp.reduceOnIdle=true
-tunnel.2.option.i2cp.reduceQuantity=1
-tunnel.2.option.i2p.streaming.connectDelay=1000
-tunnel.2.option.inbound.backupQuantity=1
-tunnel.2.option.inbound.length=2
-tunnel.2.option.inbound.lengthVariance=0
-tunnel.2.option.inbound.nickname=shared clients
-tunnel.2.option.inbound.quantity=2
-tunnel.2.option.outbound.backupQuantity=1
-tunnel.2.option.outbound.length=2
-tunnel.2.option.outbound.lengthVariance=0
-tunnel.2.option.outbound.nickname=shared clients
-tunnel.2.option.outbound.quantity=2
-tunnel.2.option.persistentClientKey=false
-tunnel.2.privKeyFile=i2ptunnel4-privKeys.dat
-tunnel.2.sharedClient=true
-tunnel.2.startOnLoad=true
-tunnel.2.targetDestination=smtp.postman.i2p
-tunnel.2.type=client
-tunnel.3.description=pop3 server
-tunnel.3.i2cpHost=127.0.0.1
-tunnel.3.i2cpPort=7654
-tunnel.3.interface=127.0.0.1
-tunnel.3.listenPort=7660
-tunnel.3.name=pop3.postman.i2p
-tunnel.3.option.i2cp.closeIdleTime=1800000
-tunnel.3.option.i2cp.closeOnIdle=false
-tunnel.3.option.i2cp.delayOpen=false
-tunnel.3.option.i2cp.newDestOnResume=false
-tunnel.3.option.i2cp.reduceIdleTime=900000
-tunnel.3.option.i2cp.reduceOnIdle=true
-tunnel.3.option.i2cp.reduceQuantity=1
-tunnel.3.option.i2p.streaming.connectDelay=1000
-tunnel.3.option.inbound.backupQuantity=1
-tunnel.3.option.inbound.length=2
-tunnel.3.option.inbound.lengthVariance=0
-tunnel.3.option.inbound.nickname=shared clients
-tunnel.3.option.inbound.quantity=2
-tunnel.3.option.outbound.backupQuantity=1
-tunnel.3.option.outbound.length=2
-tunnel.3.option.outbound.lengthVariance=0
-tunnel.3.option.outbound.nickname=shared clients
-tunnel.3.option.outbound.quantity=2
-tunnel.3.option.persistentClientKey=false
-tunnel.3.privKeyFile=i2ptunnel5-privKeys.dat
-tunnel.3.sharedClient=true
-tunnel.3.startOnLoad=true
-tunnel.3.targetDestination=pop.postman.i2p
-tunnel.3.type=client

src/I2P/portable/logger.config

@@ -1,10 +0,0 @@
-logger.format=d p [t] c: m
-logger.dateFormat=HH:mm:ss.SSS
-logger.displayOnScreen=TRUE
-logger.logFileName=logs/log-#.txt
-logger.logFileSize=10m
-logger.logRotationLimit=2
-logger.defaultLevel=WARN
-logger.minimumOnScreenLevel=CRIT
-logger.consoleBufferSize=20
-# log limit overrides:

src/I2P/portable/router.config

@@ -1,27 +0,0 @@
-# NOTE: This I2P config file must use UTF-8 encoding
-i2np.bandwidth.inboundBurstKBytes=22520
-i2np.bandwidth.inboundBurstKBytesPerSecond=128
-i2np.bandwidth.inboundKBytesPerSecond=128
-i2np.bandwidth.outboundBurstKBytes=22520
-i2np.bandwidth.outboundBurstKBytesPerSecond=128
-i2np.bandwidth.outboundKBytesPerSecond=128
-i2np.laptopMode=false
-i2np.ntcp.autoip=true
-i2np.ntcp.enable=true
-i2np.udp.addressSources=local,upnp,ssu
-i2np.upnp.enable=true
-i2p.dir.config=.
-prng.buffers=16
-router.dynamicKeys=false
-router.maxParticipatingTunnels=150
-router.newsRefreshFrequency=86400000
-router.sharePercentage=80
-router.updatePolicy=notify
-router.updateProxyHost=127.0.0.1
-router.updateProxyPort=4444
-router.updateThroughProxy=true
-router.updateURL=http://echelon.i2p/i2p/i2pupdate.sud,http://stats.i2p/i2p/i2pupdate.sud,http://www.i2p2.i2p/_static/i2pupdate.sud,http://update.postman.i2p/i2pupdate.sud
-router.updateUnsigned=false
-routerconsole.lang=en
-routerconsole.summaryRefresh=30
-time.disabled=false

src/I2P/portable/systray.config

@@ -1,14 +0,0 @@
-# NOTE: The system tray control currently only works on Windows and KDE.
-
-# The filename (with full path if needed) of the browser to be used by the
-# system tray control to launch the router console. You may also append command
-# line parameters like so:
-#
-#     browser=/usr/bin/opera -newpage
-#
-# If you set this value to 'default', systray will attempt to identify and use
-# your system's default browser.
-browser=default
-
-# The port the router console listens on.
-port=7657

src/I2P/portable/webapps.config

@@ -1,4 +0,0 @@
-# NOTE: This I2P config file must use UTF-8 encoding
-webapps.addressbook.startOnLoad=true
-webapps.i2ptunnel.startOnLoad=true
-webapps.routerconsole.startOnLoad=true

src/app-profile/prefs.js

@@ -60,3 +60,4 @@ user_pref("webgl.disable-fail-if-major-performance-caveat", true);
 user_pref("webgl.enable-webgl2", false);
 user_pref("media.navigator.enabled", false);
 user_pref("dom.w3c_touch_events.enabled", false);
+user_pref("browser.display.use_system_colors", false);

src/app-profile/user.js

@@ -1,19 +1,18 @@
-# Overrides for Extension Preferences
-# Tor Browser Bundle
-# Do not edit this file.
-#
-# This file is modified from a file included in the Tor Browser Bundle.
-#
-# Copyright 2017 The Tor Project.  See LICENSE.tor for licensing information.
+/*
+Overrides#
+for Extension Preferences# Tor Browser Bundle# Do not edit this file.##This file is modified from a file included in the Tor Browser Bundle.##Copyright 2017 The Tor Project.See LICENSE.tor#
+for licensing information.
 
-# HTTPS Everywhere Preferences:
+HTTPS Everywhere Preferences:
+*/
 user_pref("extensions.https_everywhere._observatory.popup_shown", true);
 user_pref("extensions.https_everywhere.toolbar_hint_shown", true);
 
-# NoScript Preferences:
-# In order to disable all scripts by default, uncomment the following line...
-# user_pref("capability.policy.maonoscript.javascript.enabled", "noAccess");
-# and comment out the following line
+/*
+NoScript Preferences: #In order to disable all scripts by
+default, uncomment the following line...#user_pref("capability.policy.maonoscript.javascript.enabled", "noAccess");#
+and comment out the following line
+*/
 user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
 user_pref("capability.policy.maonoscript.sites", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
 user_pref("noscript.default", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
@@ -106,7 +105,7 @@ user_pref("network.proxy.ftp_port", 4444);
 user_pref("network.proxy.socks", "127.0.0.1");
 user_pref("network.proxy.socks_port", 4444);
 user_pref("network.proxy.share_proxy_settings", true);
-user_pref("browser.startup.homepage", "about:blank");
+user_pref("browser.startup.homepage", "http://127.0.0.1:7657/home");
 
 // Privacy-harden and disable irrelevant features.
 user_pref("app.normandy.api_url", "");
@@ -222,3 +221,4 @@ user_pref("webgl.min_capability_mode", true);
 user_pref("webgl.disable-fail-if-major-performance-caveat", true);
 user_pref("webgl.enable-webgl2", false);
 user_pref("dom.w3c_touch_events.enabled", false);
+user_pref("browser.display.use_system_colors", false);

src/app-profile/version.txt

@@ -1 +1 @@
-1.05.0
+1.07.1

src/nsis/i2pbrowser-installer.nsi

@@ -6,7 +6,7 @@ UniCode true
 !define DESCRIPTION "This launches Firefox with a browser profile pre-configured to use i2p"
 !define FIREFOX_MESSAGE "Could not find Firefox.  Please point to where you have installed Firefox.  If you have not installed Firefox yet, exit this installer and install Firefox, then start this installer again."
 !define I2P_MESSAGE "Could not find I2P.  Please point to where you have installed I2P.  If you have not installed I2P yet, exit this installer and install I2P, then start this installer again."
-!define LAUNCH_TEXT "Launch the i2p browser?"
+!define LAUNCH_TEXT "Start I2P?"
 !define LICENSE_TITLE "Many Licenses"
 !define CONSOLE_URL "http://127.0.0.1:7657/home"
 
@@ -18,7 +18,7 @@ var FFINSTEXE
 var FFNONTORINSTEXE
 var I2PINSTEXE
 
-
+SetOverwrite on
 !define FFINSTEXE
 !define FFNONTORINSTEXE
 !define FFINSTEXE32 "$PROGRAMFILES32\Mozilla Firefox\"
@@ -27,6 +27,8 @@ var I2PINSTEXE
 !define I2PINSTEXE
 !define I2PINSTEXE32 "$PROGRAMFILES32\i2p"
 !define I2PINSTEXE64 "$PROGRAMFILES64\i2p"
+!define I2PINSTEXE_USERMODE "$LOCALAPPDATA\i2p"
+
 
 !define RAM_NEEDED_FOR_64BIT 0x80000000
 
@@ -39,7 +41,7 @@ Name "${COMPANYNAME} - ${APPNAME}"
 Icon ui2pbrowser_icon.ico
 OutFile "I2P-Profile-Installer-${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}.exe"
 
-RequestExecutionLevel admin
+RequestExecutionLevel user
 
 !include LogicLib.nsh
 !include x64.nsh
@@ -144,45 +146,57 @@ Page instfiles
 !include i2pbrowser-mozcompat.nsi
 
 Function .onInit
+    StrCpy $I2PINSTEXE "${I2PINSTEXE64}"
+    UserInfo::GetAccountType
+    pop $0
+    ${If} $0 != "admin"
+        StrCpy $INSTDIR "$LOCALAPPDATA\${COMPANYNAME}\${APPNAME}"
+        StrCpy $I2PINSTEXE "${I2PINSTEXE_USERMODE}"
+    ${EndIf}
     !insertmacro MUI_LANGDLL_DISPLAY
     Call ShouldInstall64Bit
     ${If} $0 == 1
-        ${If} ${FileExists} "${FFINSTEXE64}/firefox.exe"
+        ${If} ${FileExists} "${FFINSTEXE64}\firefox.exe"
             StrCpy $FFINSTEXE "${FFINSTEXE64}"
             StrCpy $FFNONTORINSTEXE "${FFINSTEXE64}"
-    ${ElseIf} ${FileExists} "${FFINSTEXE32}/firefox.exe"
+    ${ElseIf} ${FileExists} "${FFINSTEXE32}\firefox.exe"
             StrCpy $FFINSTEXE "${FFINSTEXE32}"
             StrCpy $FFNONTORINSTEXE "${FFINSTEXE32}"
         ${EndIf}
-        ${If} ${FileExists} "$PROFILE/OneDrive/Desktop/Tor Browser/Browser/firefox.exe"
-            StrCpy $FFINSTEXE "$PROFILE/OneDrive/Desktop/Tor Browser/Browser/"
+        ${If} ${FileExists} "$PROFILE\OneDrive\Desktop\Tor Browser\Browser\firefox.exe"
+            StrCpy $FFINSTEXE "$PROFILE\OneDrive\Desktop\Tor Browser\Browser\"
         ${EndIf}
-        ${If} ${FileExists} "$PROFILE/Desktop/Tor Browser/Browser/firefox.exe"
-            StrCpy $FFINSTEXE "$PROFILE/Desktop/Tor Browser/Browser/"
+        ${If} ${FileExists} "$PROFILE\Desktop\Tor Browser\Browser\firefox.exe"
+            StrCpy $FFINSTEXE "$PROFILE\Desktop\Tor Browser\Browser\"
         ${EndIf}
     ${Else}
-        ${If} ${FileExists} "${FFINSTEXE32}/firefox.exe"
+        ${If} ${FileExists} "${FFINSTEXE32}\firefox.exe"
             StrCpy $FFINSTEXE "${FFINSTEXE32}"
             StrCpy $FFNONTORINSTEXE "${FFINSTEXE32}"
         ${EndIf}
-        ${If} ${FileExists} "$PROFILE/OneDrive/Desktop/Tor Browser/Browser/firefox.exe"
-            StrCpy $FFINSTEXE "$PROFILE/OneDrive/Desktop/Tor Browser/Browser/"
+        ${If} ${FileExists} "$PROFILE\OneDrive\Desktop\Tor Browser\Browser\firefox.exe"
+            StrCpy $FFINSTEXE "$PROFILE\OneDrive\Desktop\Tor Browser\Browser\"
         ${EndIf}
-        ${If} ${FileExists} "$PROFILE/Desktop/Tor Browser/Browser/firefox.exe"
-            StrCpy $FFINSTEXE "$PROFILE/Desktop/Tor Browser/Browser/"
+        ${If} ${FileExists} "$PROFILE\Desktop\Tor Browser\Browser\firefox.exe"
+            StrCpy $FFINSTEXE "$PROFILE\Desktop\Tor Browser\Browser\"
         ${EndIf}
     ${EndIf}
-    StrCpy $I2PINSTEXE "${I2PINSTEXE64}"
-    ${If} ${FileExists} "${I2PINSTEXE32}\i2p.exe"
-        StrCpy $I2PINSTEXE "${I2PINSTEXE32}"
-    ${EndIf}
-    ${If} ${FileExists} "${I2PINSTEXE64}\i2p.exe"
+    UserInfo::GetAccountType
+    pop $0
+    ${If} $0 == "admin"
         StrCpy $I2PINSTEXE "${I2PINSTEXE64}"
+        ${If} ${FileExists} "${I2PINSTEXE32}\i2p.exe"
+            StrCpy $I2PINSTEXE "${I2PINSTEXE32}"
+        ${EndIf}
+        ${If} ${FileExists} "${I2PINSTEXE64}\i2p.exe"
+            StrCpy $I2PINSTEXE "${I2PINSTEXE64}"
+        ${EndIf}
     ${EndIf}
+    # look for user installs
 FunctionEnd
 
 Function firefoxDetect
-    ${If} ${FileExists} "$FFINSTEXE/firefox.exe"
+    ${If} ${FileExists} "$FFINSTEXE\firefox.exe"
         Abort directory
     ${EndIf}
 FunctionEnd
@@ -194,30 +208,12 @@ Function routerDetect
         createDirectory $I2PINSTEXE
         SetOutPath $I2PINSTEXE
         File /nonfatal /a /r "I2P\"
+        File /nonfatal /a /r "I2P\I2P.exe"
         File /nonfatal "I2P\config\jpackaged"
 
         createDirectory "$I2PINSTEXE\"
         SetOutPath "$I2PINSTEXE\"
-        File /nonfatal "I2P\config\clients.config"
-        File /nonfatal "I2P\config\i2ptunnel.config"
-        File /nonfatal "I2P\config\wrapper.config"
-        File /nonfatal "I2P\config\hosts.txt"
-
-        createDirectory "$I2PINSTEXE\webapps\"
-        SetOutPath "$I2PINSTEXE\webapps\"
-        File /nonfatal /a /r "I2P\config\webapps\"
-
-        createDirectory "$I2PINSTEXE\geoip\"
-        SetOutPath "$I2PINSTEXE\geoip\"
-        File /nonfatal /a /r "I2P\config\geoip\"
-
-        createDirectory "$I2PINSTEXE\certificates\"
-        SetOutPath "$I2PINSTEXE\certificates\"
-        File /nonfatal /a /r "I2P\config\certificates\"
-
-        createDirectory "$I2PINSTEXE\eepsite\"
-        SetOutPath "$I2PINSTEXE\eepsite\"
-        File /nonfatal /a /r "I2P\config\eepsite\"
+        File /nonfatal /a /r "I2P/config/*"
 
         Abort directory
     ${EndIf}
@@ -251,18 +247,8 @@ Section Install
 
             createDirectory "$I2PINSTEXE\"
             SetOutPath "$I2PINSTEXE\"
+            File /nonfatal /a /r "I2P/config/*"
 
-            createDirectory "$I2PINSTEXE\webapps\"
-            SetOutPath "$I2PINSTEXE\webapps\"
-            File /nonfatal /a /r "I2P\config\webapps\"
-
-            createDirectory "$I2PINSTEXE\geoip\"
-            SetOutPath "$I2PINSTEXE\geoip\"
-            File /nonfatal /a /r "I2P\config\geoip\"
-
-            createDirectory "$I2PINSTEXE\certificates\"
-            SetOutPath "$I2PINSTEXE\certificates\"
-            File /nonfatal /a /r "I2P\config\certificates\"
           ${EndIf}  
         ${Else}
           File /nonfatal /a /r "I2P\"
@@ -270,66 +256,30 @@ Section Install
 
           createDirectory "$I2PINSTEXE\"
           SetOutPath "$I2PINSTEXE\"
+          File /nonfatal /a /r "I2P/config/*"
 
-          createDirectory "$I2PINSTEXE\webapps\"
-          SetOutPath "$I2PINSTEXE\webapps\"
-          File /nonfatal /a /r "I2P\config\webapps\"
-
-          createDirectory "$I2PINSTEXE\geoip\"
-          SetOutPath "$I2PINSTEXE\geoip\"
-          File /nonfatal /a /r "I2P\config\geoip\"
-
-          createDirectory "$I2PINSTEXE\certificates\"
-          SetOutPath "$I2PINSTEXE\certificates\"
-          File /nonfatal /a /r "I2P\config\certificates\"
         ${EndIf}
     ${EndIf}
 
     # Install the launcher scripts
-    createDirectory "$INSTDIR\licenses"
+    createDirectory "$INSTDIR"
     SetOutPath "$INSTDIR"
-    File win/i2pbrowser.bat
-    File win/i2pbrowser-private.bat
-    File win/i2pconfig.bat
+    File "win/*"
 
     # Install the licenses
     createDirectory "$INSTDIR\licenses"
     SetOutPath "$INSTDIR\licenses"
-    File /r licenses\*.*
+    File /a /r "licenses/*"
 
     # Install the profile
     createDirectory "$INSTDIR\firefox.profile.i2p"
     SetOutPath "$INSTDIR\firefox.profile.i2p"
-    File profile\user.js
-    File profile\prefs.js
-    File profile\bookmarks.html
-    File profile\storage-sync.sqlite
-
-    # Install the extensions
-    createDirectory "$INSTDIR\firefox.profile.i2p\extensions"
-    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\i2ppb@eyedeekay.github.io.xpi
+    File /a /r "profile/*"
 
     # Install the config profile
     createDirectory "$INSTDIR\firefox.profile.config.i2p"
     SetOutPath "$INSTDIR\firefox.profile.config.i2p"
-    File app-profile\user.js
-    File app-profile\prefs.js
-    File app-profile\bookmarks.html
-    File app-profile\storage-sync.sqlite
-
-    # Install the config extensions
-    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\i2ppb@eyedeekay.github.io.xpi
-
-    # Install the config userChrome
-    createDirectory "$INSTDIR\firefox.profile.config.i2p\chrome"
-    SetOutPath "$INSTDIR\firefox.profile.config.i2p\chrome"
-    File app-profile\chrome\userChrome.css
+    File /a /r "app-profile/*"
 
     SetOutPath "$INSTDIR"
     createDirectory "$SMPROGRAMS\${APPNAME}"
@@ -349,6 +299,9 @@ Section Install
     FileWrite $0 "routerconsole.browser=$\"$INSTDIR\i2pconfig.bat$\""
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
+    FileWrite $0 "router.disableTunnelTesting=false"
+    FileWriteByte $0 "13"
+    FileWriteByte $0 "10"
     FileClose $0
 
     SetShellVarContext current
@@ -366,6 +319,9 @@ Section Install
     createDirectory "$I2PAPPDATA"
     SetOutPath "$I2PAPPDATA"
 
+    IfFileExists "$LOCALAPPDATA\I2P\eepsite\docroot" +2 0
+        File /nonfatal /a /r "I2P\eepsite"
+
     ;# Point the browser config setting in the working config
     FileOpen $0 "$I2PAPPDATA\router.config" a
     FileSeek $0 0 END
@@ -374,6 +330,9 @@ Section Install
     FileWrite $0 "routerconsole.browser=$\"$INSTDIR\i2pconfig.bat$\""
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
+    FileWrite $0 "router.disableTunnelTesting=false"
+    FileWriteByte $0 "13"
+    FileWriteByte $0 "10"
     FileClose $0
 
     createDirectory "$I2PINSTEXE"
@@ -392,7 +351,7 @@ SectionEnd
 Section "uninstall"
 
     # Remove the licenses
-    rmDir /r "$INSTDIR\licenses"
+    rmDir /r "$INSTDIR\"
 
     # Uninstall the launcher scripts
     Delete $INSTDIR\i2pbrowser.bat
@@ -400,31 +359,13 @@ Section "uninstall"
     Delete $INSTDIR\i2pbrowser-private.bat
     Delete $INSTDIR\ui2pbrowser_icon.ico
 
-    # Uninstall the profile
-    Delete $INSTDIR\firefox.profile.i2p\prefs.js
-    Delete $INSTDIR\firefox.profile.i2p\user.js
-    Delete $INSTDIR\firefox.profile.i2p\bookmarks.html
-    Delete $INSTDIR\firefox.profile.i2p\storage-sync.sqlite
-
-    Delete $INSTDIR\firefox.profile.config.i2p\prefs.js
-    Delete $INSTDIR\firefox.profile.config.i2p\user.js
-    Delete $INSTDIR\firefox.profile.config.i2p\bookmarks.html
-    Delete $INSTDIR\firefox.profile.config.i2p\storage-sync.sqlite
-
-    # 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\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\i2ppb@eyedeekay.github.io.xpi"
-
-    Delete "$INSTDIR\firefox.profile.config.i2p\config\userChrome.css"
-
     # Remove shortcuts and folders
     Delete "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk"
     Delete "$SMPROGRAMS\${APPNAME}\Private Browsing-${APPNAME}.lnk"
     Delete "$SMPROGRAMS\Uninstall-${APPNAME}.lnk"
+    Delete "$SMPROGRAMS\${APPNAME}\Browse I2P.lnk"
+    Delete "$DESKTOP\Browse I2P - Temporary Identity.lnk"
+    Delete "$DESKTOP\Browse I2P.lnk"
     Delete "$DESKTOP\${APPNAME}.lnk"
     Delete "$DESKTOP\Private Browsing-${APPNAME}.lnk"
     rmDir "$SMPROGRAMS\${APPNAME}"
@@ -452,9 +393,9 @@ Function LaunchLink
   ${If} ${Silent}
     ReadEnvStr $0 RESTART_I2P
     ${If} $0 != ""
-      Exec "$INSTDIR\i2pbrowser.bat"
+      ShellExecAsUser::ShellExecAsUser "open" "$DESKTOP\Browse I2P.lnk"
     ${EndIf}  
   ${Else}
-    Exec "$INSTDIR\i2pbrowser.bat"
+    ShellExecAsUser::ShellExecAsUser "open" "$DESKTOP\Browse I2P.lnk"
   ${EndIf}
 FunctionEnd

src/nsis/i2pbrowser-jpackage.nsi

@@ -1 +1 @@
-!define I2P_VERSION 0.9.50
+!define I2P_VERSION 1.7.0

src/nsis/i2pbrowser-version.nsi

@@ -1,3 +1,3 @@
 !define VERSIONMAJOR 1
-!define VERSIONMINOR 05
-!define VERSIONBUILD 0
+!define VERSIONMINOR 07
+!define VERSIONBUILD 3

src/profile/prefs.js

@@ -58,3 +58,5 @@ user_pref("webgl.disable-fail-if-major-performance-caveat", true);
 user_pref("webgl.enable-webgl2", false);
 user_pref("media.navigator.enabled", false);
 user_pref("dom.w3c_touch_events.enabled", false);
+user_pref("browser.privatebrowsing.autostart", false);
+user_pref("browser.display.use_system_colors", false);

src/profile/user.js

@@ -1,19 +1,18 @@
-# Overrides for Extension Preferences
-# Tor Browser Bundle
-# Do not edit this file.
-#
-# This file is modified from a file included in the Tor Browser Bundle.
-#
-# Copyright 2017 The Tor Project.  See LICENSE.tor for licensing information.
+/*
+Overrides#
+for Extension Preferences# Tor Browser Bundle# Do not edit this file.##This file is modified from a file included in the Tor Browser Bundle.##Copyright 2017 The Tor Project.See LICENSE.tor#
+for licensing information.
 
-# HTTPS Everywhere Preferences:
+HTTPS Everywhere Preferences:
+*/
 user_pref("extensions.https_everywhere._observatory.popup_shown", true);
 user_pref("extensions.https_everywhere.toolbar_hint_shown", true);
 
-# NoScript Preferences:
-# In order to disable all scripts by default, uncomment the following line...
-# user_pref("capability.policy.maonoscript.javascript.enabled", "noAccess");
-# and comment out the following line
+/*
+NoScript Preferences: #In order to disable all scripts by
+default, uncomment the following line...#user_pref("capability.policy.maonoscript.javascript.enabled", "noAccess");#
+and comment out the following line
+*/
 user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
 user_pref("capability.policy.maonoscript.sites", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
 user_pref("noscript.default", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
@@ -83,6 +82,9 @@ user_pref("extensions.torbutton.use_nontor_proxy", true);
 //user_pref("extensions.torlauncher.socks_port_use_ipc", );
 //user_pref("extensions.torlauncher.socks_ipc_path", "");
 
+// TODO: this is a Tor Browser specific setting which is ignored on Firefox. If
+// I make it true, the SOCKS outproxy will have something to connect to. But I
+// need to test more to find out if that's prudent.
 user_pref("extensions.torlauncher.start_tor", false);
 //user_pref("extensions.torlauncher.default_bridge_type", "");
 user_pref("extensions.torlauncher.prompt_at_startup", false);
@@ -106,7 +108,7 @@ user_pref("network.proxy.ftp_port", 4444);
 user_pref("network.proxy.socks", "127.0.0.1");
 user_pref("network.proxy.socks_port", 4444);
 user_pref("network.proxy.share_proxy_settings", true);
-user_pref("browser.startup.homepage", "about:blank");
+user_pref("browser.startup.homepage", "http://127.0.0.1:7657/home");
 
 // Privacy-harden and disable irrelevant features.
 user_pref("app.normandy.api_url", "");
@@ -222,3 +224,5 @@ user_pref("webgl.min_capability_mode", true);
 user_pref("webgl.disable-fail-if-major-performance-caveat", true);
 user_pref("webgl.enable-webgl2", false);
 user_pref("dom.w3c_touch_events.enabled", false);
+user_pref("browser.privatebrowsing.autostart", false);
+user_pref("browser.display.use_system_colors", false);

src/profile/version.txt

@@ -1 +1 @@
-1.05.0
+1.07.1

src/unix/desktop/i2pbrowser-debian.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=/usr/bin/i2pbrowser.sh
+Name=I2P Browser
+Categories=Network;WebBrowser;
+Icon=/var/lib/i2pbrowser/icons/ui2pbrowser_icon.ico

src/unix/desktop/i2pconfig-debian.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=/usr/bin/i2pconfig.sh
+Name=I2P Configuration
+Categories=Network;WebBrowser;
+Icon=/var/lib/i2pbrowser/icons/ui2pbrowser_icon.ico

src/win/i2pbrowser-private.bat

@@ -1,58 +1,51 @@
 @echo on
 
+set "I2PPath=%ProgramFiles%\I2P\"
 if exist "%ProgramFiles%\I2P\" (
   set "I2PPath=%ProgramFiles%\I2P\"
-  set "I2PProfilePath=%ProgramFiles%\I2P\I2PBrowser-Launcher\firefox.profile.i2p"
-  if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\" (
-    echo "profile is configured, updating extensions"
-    xcopy /s /i /y "%I2PProfilePath%\extensions" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\extensions"
-  ) else (
-    echo "configuring profile"
-    xcopy /s /i /y "%I2PProfilePath%" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p"
-  )
-  set "I2PProfilePath=%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p"
 )
 
-if exist "%ProgramFiles(x86)%\I2P\" {
+if exist "%ProgramFiles(x86)%\I2P" (
   set "I2PPath=%ProgramFiles(x86)%\I2P"
-  set "I2PProfilePath=%ProgramFiles%\I2P\I2PBrowser-Launcher\firefox.profile.i2p"
-  if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\" (
-    echo "profile is configured, updating extensions"
-    xcopy /s /i /y "%I2PProfilePath%\extensions" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\extensions"
-  ) else (
-    echo "configuring profile"
-    xcopy /s /i /y "%I2PProfilePath%" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p"
-  )
-  set "I2PProfilePath=%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p"
-}
+)
 
-set "scriptPath=%~dp0"
-if exist "%scriptPath%\I2P\" (
-  set "I2PPath=%scriptPath%\I2P\"
-  set "I2PProfilePath=%scriptPath%\"
-  set "PortableArg=portable"
+set "I2PPath=%LocalAppData%\I2P\"
+if exist "%LocalAppData%\I2P\I2P.exe" (
+  set "I2PPath=%LocalAppData%\I2P\"
 )
 
 if exist "%I2PPath%\jpackaged" (
-  start "i2p" /D "%LOCALAPPDATA%\I2P" "%I2PPath%\i2p.exe" "%PortableArg%"
+  cd "%LOCALAPPDATA%\I2P"
+  start "i2p" /D "%LOCALAPPDATA%\I2P" "%I2PPath%\i2p.exe"
 ) else (
   start "i2p" "%I2PPath%\i2p.exe"
 )
 
 timeout /t 3
 
+if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\" (
+  echo "profile is configured, updating extensions"
+  xcopy /s /i /y "%I2PPath%\I2PBrowser-Launcher\firefox.profile.i2p\extensions" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\extensions"
+) else (
+  echo "configuring profile"
+  xcopy /s /i /y "%I2PPath%\I2PBrowser-Launcher\firefox.profile.i2p" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p"
+)
+
+xcopy /s /i /y "%I2PPath%\I2PBrowser-Launcher\firefox.profile.i2p\user.js" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\user.js"
+xcopy /s /i /y "%I2PPath%\I2PBrowser-Launcher\firefox.profile.i2p\prefs.js" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\prefs.js"
+
 if exist "%USERPROFILE%/Desktop/Tor Browser/Browser/firefox.exe" (
-  start "i2pbrowser" "%USERPROFILE%/Desktop/Tor Browser/Browser/firefox.exe" -no-remote -profile "%I2PProfilePath%" -private-window about:blank
+  start "i2pbrowser" "%USERPROFILE%/Desktop/Tor Browser/Browser/firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p" -private-window about:blank
   exit
 )
 
 if exist "%USERPROFILE%/OneDrive/Desktop/Tor Browser/Browser/firefox.exe" (
-  start "i2pbrowser" "%USERPROFILE%/OneDrive/Desktop/Tor Browser/Browser/firefox.exe" -no-remote -profile "%I2PProfilePath%" -private-window about:blank
+  start "i2pbrowser" "%USERPROFILE%/OneDrive/Desktop/Tor Browser/Browser/firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p" -private-window about:blank
   exit
 )
 
 if exist "%ProgramFiles%\Mozilla Firefox\firefox.exe" (
-  start "i2pbrowser" "%ProgramFiles%\Mozilla Firefox\firefox.exe" -no-remote -profile "%I2PProfilePath%" -private-window about:blank
+  start "i2pbrowser" "%ProgramFiles%\Mozilla Firefox\firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p" -private-window about:blank
   exit
 )
 

src/win/i2pbrowser.bat

@@ -1,46 +1,39 @@
 @echo on
 
+set "I2PPath=%ProgramFiles%\I2P\"
 if exist "%ProgramFiles%\I2P\" (
   set "I2PPath=%ProgramFiles%\I2P\"
-  set "I2PProfilePath=%ProgramFiles%\I2P\I2PBrowser-Launcher\firefox.profile.i2p"
-  if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\" (
-    echo "profile is configured, updating extensions"
-    xcopy /s /i /y "%I2PProfilePath%\extensions" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\extensions"
-  ) else (
-    echo "configuring profile"
-    xcopy /s /i /y "%I2PProfilePath%" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p"
-  )
-  set "I2PProfilePath=%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p"
 )
 
-if exist "%ProgramFiles(x86)%\I2P\" {
+if exist "%ProgramFiles(x86)%\I2P" (
   set "I2PPath=%ProgramFiles(x86)%\I2P"
-  set "I2PProfilePath=%ProgramFiles%\I2P\I2PBrowser-Launcher\firefox.profile.i2p"
-  if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\" (
-    echo "profile is configured, updating extensions"
-    xcopy /s /i /y "%I2PProfilePath%\extensions" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\extensions"
-  ) else (
-    echo "configuring profile"
-    xcopy /s /i /y "%I2PProfilePath%" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p"
-  )
-  set "I2PProfilePath=%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p"
-}
+)
 
-set "scriptPath=%~dp0"
-if exist "%scriptPath%\I2P\" (
-  set "I2PPath=%scriptPath%\I2P\"
-  set "I2PProfilePath=%scriptPath%\"
-  set "PortableArg=portable"
+set "I2PPath=%LocalAppData%\I2P\"
+if exist "%LocalAppData%\I2P\I2P.exe" (
+  set "I2PPath=%LocalAppData%\I2P\"
 )
 
 if exist "%I2PPath%\jpackaged" (
-  start "i2p" /D "%LOCALAPPDATA%\I2P" "%I2PPath%\i2p.exe" "%PortableArg%"
+  cd "%LOCALAPPDATA%\I2P"
+  start "i2p" /D "%LOCALAPPDATA%\I2P" "%I2PPath%\i2p.exe"
 ) else (
   start "i2p" "%I2PPath%\i2p.exe"
 )
 
 timeout /t 3
 
+if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\" (
+  echo "profile is configured, updating extensions"
+  xcopy /s /i /y "%I2PPath%\I2PBrowser-Launcher\firefox.profile.i2p\extensions" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\extensions"
+) else (
+  echo "configuring profile"
+  xcopy /s /i /y "%I2PPath%\I2PBrowser-Launcher\firefox.profile.i2p" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p"
+)
+
+xcopy /s /i /y "%I2PPath%\I2PBrowser-Launcher\firefox.profile.i2p\user.js" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\user.js"
+xcopy /s /i /y "%I2PPath%\I2PBrowser-Launcher\firefox.profile.i2p\prefs.js" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\prefs.js"
+
 if exist "%USERPROFILE%/Desktop/Tor Browser/Browser/firefox.exe" (
   start "i2pbrowser" "%USERPROFILE%/Desktop/Tor Browser/Browser/firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p" -url %1
   exit

src/win/i2pconfig.bat

@@ -1,13 +1,43 @@
-@echo off
+@echo on
+
+set "I2PPath=%ProgramFiles%\I2P\"
+if exist "%ProgramFiles%\I2P\" (
+  set "I2PPath=%ProgramFiles%\I2P\"
+)
+
+if exist "%ProgramFiles(x86)%\I2P" (
+  set "I2PPath=%ProgramFiles(x86)%\I2P"
+)
+
+set "I2PPath=%LocalAppData%\I2P\"
+if exist "%LocalAppData%\I2P\I2P.exe" (
+  set "I2PPath=%LocalAppData%\I2P\"
+)
 
 if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p\" (
   echo "profile is configured"
-  xcopy /s /i /y "$INSTDIR\firefox.profile.i2p\extensions" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\extensions"
+  xcopy /s /i /y "%I2PPath%\I2PBrowser-Launcher\firefox.profile.config.i2p\extensions" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p\extensions"
 ) else (
   echo "configuring profile"
-  xcopy /s /i /y "$INSTDIR\firefox.profile.config.i2p" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p"
+  xcopy /s /i /y "%I2PPath%\I2PBrowser-Launcher\firefox.profile.config.i2p" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p"
 )
 
-start "i2pconfig" "c:\Program Files\Mozilla Firefox\firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p" -url %1
+xcopy /s /i /y "%I2PPath%\I2PBrowser-Launcher\firefox.profile.config.i2p\user.js" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p\user.js"
+xcopy /s /i /y "%I2PPath%\I2PBrowser-Launcher\firefox.profile.config.i2p\prefs.js" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p\prefs.js"
+
+if exist "%ProgramFiles%\Mozilla Firefox\firefox.exe" (
+  start "i2pbrowser" "%ProgramFiles%\Mozilla Firefox\firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p" -url %1
+  exit
+)
+
+if exist "%USERPROFILE%/Desktop/Tor Browser/Browser/firefox.exe" (
+  start "i2pbrowser" "%USERPROFILE%/Desktop/Tor Browser/Browser/firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p" -url %1
+  exit
+)
+
+if exist "%USERPROFILE%/OneDrive/Desktop/Tor Browser/Browser/firefox.exe" (
+  start "i2pbrowser" "%USERPROFILE%/OneDrive/Desktop/Tor Browser/Browser/firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p" -url %1
+  exit
+)
 
 exit