Merge branch 'master' into 'EXPERIMENTAL-debian'

# Conflicts: # Makefile
checkin debian/files
2021-10-28 19:51:44 +00:00 · 2021-10-21 19:19:16 -04:00 · 2021-10-20 16:37:08 -04:00 · 2021-10-20 00:50:49 -04:00 · 2021-10-06 14:17:49 -04:00 · 2021-09-14 18:29:21 -04:00
45 changed files with 2536 additions and 153 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,8 @@
 build
 *.deb
 *.tgz
-I2P-Profile-Installer-0.03.exe
-I2P/
-router.info
-router.keys.dat
+./I2P/
+i2pversion_override
+*.crl
+*.crt
+*.pem
--- a/10
+++ b/10
@ -0,0 +1,10 @@
+FROM alpine:latest
+RUN apk update && apk add firefox make curl musl-locales dbus-x11 font-ubuntu-nerd jq --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing
+ADD . /src
+WORKDIR /src
+RUN make profile.tgz # && \
+RUN chown -R 1000:1000 /src/build/profile # && \
+RUN chmod -R +w /src/build/profile
+RUN ls -lah /src/build/profile
+#USER 1000
+CMD sh -c 'cd build/profile && ./i2pbrowser.sh'
--- a/HTTPSEverywhere.url
+++ b/HTTPSEverywhere.url
@ -1 +0,0 @@
-https://addons.mozilla.org/firefox/downloads/file/3716461/2021.4.15/https_everywhere-2021.4.15-an+fx.xpi
--- a/254
+++ b/254
@ -1,6 +1,40 @@
-all: install.exe
+-include i2pversion
+-include i2pversion_override

-prep: profile.tgz app-profile.tgz profile build/licenses build/I2P build/I2P/config
+-include config.mk
+
+preset=`rm .version; make .version`
+
+include .version
+
+PROFILE_VERSION=$(MAJOR).$(MINOR).$(BUILD)
+
+all: .version 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
+
+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
+
+jpackage: .version I2P all
+
+help: .version
+	@echo "I2P-Profile-Installer-$(PROFILE_VERSION)"
+	@echo "$(SIGNER)"
+	@echo "$(I2P_VERSION)"
+	@echo "$(MAJOR).$(MINOR).$(BUILD)"
+	@echo "$(preset)"
+
+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
@ -10,28 +44,41 @@ install.exe: prep

 export RES_DIR="../i2p.i2p/installer/resources"
 export PKG_DIR="../i2p.i2p/pkg-temp"
+export I2P_JBIGI="../i2p.i2p/installer/lib/jbigi"
+
+distclean: clean clean-extensions
+	rm -rf I2P
+
+I2P:
+	./build.sh

 build/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
 	rm -rf src/I2P/config/geoip src/I2P/config/webapps src/I2P/config/certificates
-	echo true | tee src/I2P/config/jpackaged ; true
-	cp $(RES_DIR)/clients.config src/I2P/config/ ; true
-	cp $(RES_DIR)/i2ptunnel.config src/I2P/config/ ; true
-	cp $(RES_DIR)/wrapper.config src/I2P/config/ ; true
-	cp $(RES_DIR)/hosts.txt src/I2P/config/hosts.txt ; true
-	cp -R $(RES_DIR)/certificates src/I2P/config/certificates ; true
-	mkdir -p src/I2P/config/geoip ; true
-	cp $(RES_DIR)/GeoLite2-Country.mmdb.gz src/I2P/config/geoip/GeoLite2-Country.mmdb.gz ; true
-	cp -R "$(PKG_DIR)"/webapps src/I2P/config/webapps ; true
-	cd src/I2P/config/geoip && gunzip GeoLite2-Country.mmdb.gz; cd ../../.. ; true
+	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
+	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
+	mkdir -p src/I2P/config/geoip
+	cp -v $(RES_DIR)/GeoLite2-Country.mmdb.gz src/I2P/config/geoip/GeoLite2-Country.mmdb.gz
+	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
+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

 #
 # Warning: a displayed license file of more than 28752 bytes
@ -45,7 +92,7 @@ build/licenses: build
 	unix2dos build/licenses/LICENSE.index

 clean:
-	rm -rf build app-profile-*.tgz profile-*.tgz I2P-Profile-Installer-*.exe *.deb
+	rm -rf build app-profile-*.tgz profile-*.tgz I2P-Profile-Installer-*.exe *.deb src/I2P/config *.su3 .version

 build:
 	@echo "creating build directory"
@ -53,9 +100,10 @@ build:

 profile: build/profile/user.js build/profile/prefs.js build/profile/bookmarks.html build/profile/storage-sync.sqlite copy-xpi

-profile.tgz: profile
-	$(eval PROFILE_VERSION := $(shell cat src/profile/version.txt))
+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 ../

@ -71,16 +119,17 @@ build/profile/bookmarks.html: build/profile src/profile/bookmarks.html
 build/profile/storage-sync.sqlite: build/profile src/profile/storage-sync.sqlite
 	cp src/profile/storage-sync.sqlite build/profile/storage-sync.sqlite

-copy-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2prhz@eyedeekay.github.io.xpi build/profile/extensions
+copy-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions
 	cp build/NoScript.xpi "build/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
 	cp build/HTTPSEverywhere.xpi "build/profile/extensions/https-everywhere-eff@eff.org.xpi"
-	cp build/i2prhz@eyedeekay.github.io.xpi build/profile/extensions/i2prhz@eyedeekay.github.io.xpi
+	cp build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions/i2ppb@eyedeekay.github.io.xpi

-app-profile: 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: .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))
+#	$(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 ../

@ -99,17 +148,19 @@ build/app-profile/bookmarks.html: build/app-profile src/app-profile/bookmarks.ht
 build/app-profile/storage-sync.sqlite: build/app-profile src/app-profile/storage-sync.sqlite
 	cp src/app-profile/storage-sync.sqlite build/app-profile/storage-sync.sqlite

-copy-app-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2prhz@eyedeekay.github.io.xpi build/app-profile/extensions
+copy-app-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions
 	cp build/HTTPSEverywhere.xpi "build/app-profile/extensions/https-everywhere-eff@eff.org.xpi"
-	cp build/i2prhz@eyedeekay.github.io.xpi build/app-profile/extensions/i2prhz@eyedeekay.github.io.xpi
+	cp build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions/i2ppb@eyedeekay.github.io.xpi

-build/i2prhz@eyedeekay.github.io.xpi:
-	curl -L `cat i2psetproxy.url` > build/i2prhz@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
+build/HTTPSEverywhere.xpi: HTTPSEverywhere.url
 	curl -L `cat HTTPSEverywhere.url` > build/HTTPSEverywhere.xpi

 clean-extensions:
@ -118,20 +169,36 @@ clean-extensions:
 extensions:HTTPSEverywhere.url NoScript.url i2psetproxy.url

 HTTPSEverywhere.url:
-	@echo "https://addons.mozilla.org/firefox/downloads/file/3716461/"`./amo-version.sh https-everywhere`"/https_everywhere-"`./amo-version.sh https-everywhere`"-an+fx.xpi" > HTTPSEverywhere.url
+	@echo "https://addons.mozilla.org/firefox/downloads/file/3809748/"`./amo-version.sh https-everywhere`"/https-everywhere-eff@eff.org.xpi" > HTTPSEverywhere.url

 NoScript.url:
 	@echo "https://addons.mozilla.org/firefox/downloads/file/3534184/"`./amo-version.sh noscript`"/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" > NoScript.url

 i2psetproxy.url:
-	@echo "https://addons.mozilla.org/firefox/downloads/file/3784917/"`./amo-version.sh i2pipb-rhizome-variant`"/i2prhz@eyedeekay.github.io" > i2psetproxy.url
+	@echo "https://addons.mozilla.org/firefox/downloads/file/3821635/"`./amo-version.sh i2p-in-private-browsing`"/i2ppb@eyedeekay.github.io.xpi" > i2psetproxy.url
+
+#https://addons.mozilla.org/firefox/downloads/file/3821635/i2p_in_private_browsing-0.112.1-an+fx.xpi
+#i2ppb@eyedeekay.github.io.xpi

 build/profile/extensions: build/profile
 	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
@ -143,15 +210,11 @@ 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
+	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
@ -168,7 +231,7 @@ uninstall:
 		/usr/share/applications/i2pbrowser.desktop \
 		/usr/share/applications/i2pconfig.desktop

-checkinstall:
+checkinstall: .version
 	checkinstall \
 		--default \
 		--install=no \
@ -178,10 +241,121 @@ checkinstall:
 		--pkggroup=net \
 		--pkgrelease=1 \
 		--pkgsource="https://i2pgit.org/i2p-hackers/i2p.firefox" \
-		--maintainer="hankhill19580@gmail.com" \
-		--requires="firefox,wget,i2p,i2p-router" \
+		--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
+
+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
+
+I2P_DATE=`date +%Y-%m-%d`
+
+prepupdate:
+	cp -v "I2P-Profile-Installer-$(PROFILE_VERSION)-signed.exe" i2pwinupdate.su3
+
+i2pwinupdate.su3.torrent: prepupdate
+	mktorrent --announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a i2pwinupdate.su3
+
+torrent: i2pwinupdate.su3
+
+MAGNET=`bttools torrent printinfo i2pwinupdate.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g'`
+
+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
+
--- a/NoScript.url
+++ b/NoScript.url
@ -1 +0,0 @@
-https://addons.mozilla.org/firefox/downloads/file/3534184/11.2.8/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi
--- a/README.md
+++ b/README.md
@ -19,6 +19,7 @@ To build this, you will need the following software packages (all available in D
 * nsis
 * dos2unix
 * curl
+ * jq

 to build a Debian package, you'll also need

@ -89,6 +90,153 @@ with `sudo service i2p start` then you can run the script:

        /usr/local/bin/i2p-config-service-setup

+Including a jpackaged I2P Router(EXPERIMENTAL)
+----------------------------------------------
+
+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
+a Windows system and place it into a directory called `I2P` in your `i2p.firefox`
+checkout.
+
+Assuming a working java and jpackage environment on your Windows system, the
+following command should generate a suitable "App Image" in a directory
+called "I2P."
+
+        export I2P_VERSION=0.9.49
+        cp -R ../i2p.i2p/pkg-temp/lib build/lib
+        jpackage --type app-image --name I2P --app-version "$I2P_VERSION" \
+          --verbose \
+          --resource-dir build/lib \
+          --input build/lib --main-jar router.jar --main-class net.i2p.router.RouterLaunch
+
+Transfer the I2P directory to the machine where you build i2p.firefox if
+necessary, then complete the regular build instructions. If a jpackaged I2P router
+isn't present to use at build time, the inclusion will be skipped automatically
+with a non-fatal warning.
+
+In the near future, I'll start providing a pre-built app image to ease the
+build process for non-Windows users.
+
+End-to-End Windows build process using WSL
+------------------------------------------
+
+**If you've already done this once, you can just use:** `./build.sh && wsl make`
+**in `git bash`** to automatically build an installer.
+
+**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%`
+environment variable configured and `%ANT_HOME%/bin` on your `%PATH%`. You must have
+Cygwin installed. You must have `NSIS.exe` installed and `makensis` available on your
+`%PATH%`. You must have Git for Windows installed. When installing git for Windows,
+you should select "Checkout as is, commit as is" and leave line-endings alone.
+
+ 1. [Set up Windows Subsystem for Linux per Microsoft's instructions](https://docs.microsoft.com/en-us/windows/wsl/install-win10#manual-installation-steps)
+ 2. [Install Ubuntu Focal per Microsoft's instructions](https://www.microsoft.com/store/apps/9n6svws3rx71)
+ 3. Open Git Bash.
+ 4. Install prerequisites `wsl sudo apt-get update && sudo apt-get install make nsis dos2unix curl jq`
+ 5. Clone `i2p.i2p` and `i2p.firefox`
+
+        git clone https://github.com/i2p/i2p.i2p
+        git clone https://github.com/i2p/i2p.firefox
+
+ 6. 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 ..
+
+ 7. Move into the i2p.firefox directory. Run the `./build.sh` script.
+
+        cd i2p.firefox
+        ./build.sh
+
+ 8. Compile the NSIS installer using WSL.
+
+        wsl make
+
+End-to-End Windows build process using Cygwin
+---------------------------------------------
+
+**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%`
+environment variable configured and `%ANT_HOME%/bin` on your `%PATH%`. You must have
+WSL and git bash installed. You must have `NSIS.exe` installed and `makensis` available on your
+`%PATH%`. You must have Git for Windows installed. When installing git for Windows, you should
+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`
+
+        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
+  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.
+
+        cd i2p.firefox
+        ./build.sh
+
+ 5. Run `make` to build the installer.
+
+Doing a Release
+---------------
+
+Once you have the installer `.exe` file produced by NSIS, you're almost ready to
+do a release. As a final step, someone must sign the `.exe` file using a
+Certificate which Windows will recognize. The current signer of the Windows
+bundle is Zlatinb. Standard Windows signing tools are used.
+
+Building a signed update file
+-----------------------------
+
+Building a signed update file for automatically updating a Windows I2P router
+requires you to also have Go installed in your Cygwin or WSL environment.
+With WSL, you can do this using the command:
+
+        wsl sudo apt-get install golang-go
+
+With that dependency satisfied, you can then run:
+
+        wsl make su3
+
+to build the signing tool if necessary and then package the installer in a
+signed update file.
+
+It's also probably possible to do this with the Java I2P distribution and a
+`.bat` script.
+
+Docker Support
+--------------
+
+You can use a Docker container to install this browser profile as well. In order
+to do this, you can run the commands:
+
+        xhost + local:docker
+        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
+
+To build and run the container locally, clone this repository and run the
+
+        make run
+
+target.
+
 Issues
 ------

--- a/UPDATES.md
+++ b/UPDATES.md
@ -0,0 +1,29 @@
+Setting up an Update Server for an I2P Bundle
+=============================================
+
+It is important to set up a signed update server so that people are able to
+safely and anonymously update your I2P bundle.
+
+The quick way:
+--------------
+
+This process depends on my ability to push releases to github. If you are
+forking, setting up a dev server, or taking over because I got hit by a bus,
+you'll need to do it the complete way.
+
+For as long as I am building updates, you will be able to mirror the jpackaged
+Windows bundle by cloning the repository `https://github.com/eyedeekay/i2p` and
+running the `make docker run` target in that repository. You can retrieve the
+base32 address of your update server by viewing the log with 
+`docker logs eephttpd-jpackage | grep b32.i2p | tee eephttpd-address.md`. To
+update the site, run `./update.site.sh` in that repository.
+
+Once you have cloned the repository and started the container with
+`make docker run`, you can simply add `path/to/repo/update-site.sh` to your
+`crontab` and it will update at an interval of your choosing.
+
+The complete way:
+-----------------
+
+TODO: describe how to do it with less of the awesome fancy stuff I put together
+to make it easier on myself to keep an update server going.
--- a/amo-version.sh
+++ b/amo-version.sh
@ -1,3 +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] | .version' | tr -d '"'
+
--- a/build.sh
+++ b/build.sh
@ -0,0 +1,61 @@
+#!/bin/bash
+set -e 
+
+. i2pversion
+
+if [ -f i2pversion_override ]; then
+  . i2pversion_override
+fi
+
+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 [ -z "${JAVA_HOME}" ]; then
+  JAVA_HOME=`type -p java|xargs readlink -f|xargs dirname|xargs dirname`
+  echo "Building with: $JAVA, $JAVA_HOME"
+fi
+
+echo "cleaning"
+./clean.sh
+
+HERE="$PWD"
+cd "$HERE/../i2p.i2p/"
+git checkout "$VERSION"
+ant distclean preppkg-windows || 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"
+
+echo "compiling custom launcher"
+mkdir build
+cp "$I2P_JARS"/*.jar build
+
+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
+cd ..
+
+#echo "building launcher.jar"
+cd build
+"$JAVA_HOME"/bin/jar -cf launcher.jar net
+cd ..
+
+if [ -z $I2P_VERSION ]; then 
+    I2P_VERSION=$("$JAVA_HOME"/bin/java -cp build/router.jar net.i2p.router.RouterVersion | sed "s/.*: //" | head -n 1 | sed 's|-|.|g')
+fi
+echo "preparing to invoke jpackage for I2P version $I2P_VERSION"
+
+
+"$JAVA_HOME"/bin/jpackage --type app-image --name I2P --app-version "$I2P_VERSION" \
+  --verbose \
+  $JPACKAGE_OPTS \
+  --resource-dir build \
+  --java-options "--illegal-access=permit" \
+  --input build --main-jar launcher.jar --main-class net.i2p.router.WinLauncher
--- a/clean.sh
+++ b/clean.sh
@ -0,0 +1,17 @@
+#! /usr/bin/env sh
+
+rm -rf \
+	build \
+	eventlog.txt \
+	hostsdb.blockfile \
+	I2P \
+	i2p_1.0-1_amd64.deb \
+	libjbigi.so \
+	libjcpuid.so \
+	logs \
+	peerProfiles \
+	prngseed.rnd \
+	wrapper.log \
+	*.jar \
+	*.exe \
+	*.dmg
--- a/config.mk
+++ b/config.mk
@ -0,0 +1,2 @@
+SIGNER=hankhill19580@gmail.com
+export SIGNER=hankhill19580@gmail.com
--- a/debian/README.Debian
+++ b/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
--- a/debian/changelog
+++ b/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
--- a/debian/control
+++ b/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.
--- a/debian/copyright
+++ b/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.
+# 
--- a/debian/files
+++ b/debian/files
@ -0,0 +1 @@
+i2p-firefox-profile_1.05.0-1_source.buildinfo net optional
--- a/debian/i2p-firefox-profile-docs.docs
+++ b/debian/i2p-firefox-profile-docs.docs
@ -0,0 +1,2 @@
+README.source
+README.Debian
--- a/debian/install
+++ b/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/
--- a/debian/rules
+++ b/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"
--- a/debian/source/format
+++ b/debian/source/format
@ -0,0 +1 @@
+3.0 (quilt)
--- a/i2psetproxy.url
+++ b/i2psetproxy.url
@ -1 +0,0 @@
-https://addons.mozilla.org/firefox/downloads/file/3784917/0.108/i2prhz@eyedeekay.github.io
--- a/15
+++ b/15
@ -0,0 +1,15 @@
+#! /usr/bin/env sh
+
+
+#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
+VERSION=i2p-"$I2P_VERSION"
+export VERSION="$VERSION"
+
+#Uncomment this to build from the tip of the master.
+#I2P_VERSION=0.9.50
+#export I2P_VERSION=0.9.50
+#VERSION=master
+#export VERSION="$VERSION"
--- a/java/net/i2p/router/WinLauncher.java
+++ b/java/net/i2p/router/WinLauncher.java
@ -0,0 +1,108 @@
+package net.i2p.router;
+
+import java.io.*;
+import java.util.*;
+
+import net.i2p.crypto.*;
+
+import net.i2p.app.ClientAppManager;
+import net.i2p.router.RouterLaunch;
+import net.i2p.router.Router;
+import net.i2p.update.UpdateManager;
+import net.i2p.update.UpdatePostProcessor;
+import net.i2p.util.SystemVersion;
+import net.i2p.update.*;
+
+import static net.i2p.update.UpdateType.*;
+
+/**
+ * Launches a router from %PROGRAMFILES%/I2P using configuration data in
+ * %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
+ * router.pid - the pid of the java process.
+ */
+public class WinLauncher {
+    private static WindowsUpdatePostProcessor wupp = new WindowsUpdatePostProcessor();
+    public static void main(String[] args) throws Exception {
+        File programs = wupp.selectProgramFile();
+        if (!programs.exists())
+            programs.mkdirs();
+        else if (!programs.isDirectory()) {
+            System.err.println(programs + " exists but is not a directory. Please get it out of the way");
+            System.exit(1);
+        }
+
+        File home = selectHome();
+        if (!home.exists())
+            home.mkdirs();
+        else if (!home.isDirectory()) {
+            System.err.println(home + " exists but is not a directory. Please get it out of the way");
+            System.exit(1);
+        }
+
+        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"));
+
+        wupp.i2pRouter = new Router(System.getProperties());
+        System.out.println("Router is configured");
+
+        Thread registrationThread = new Thread(REGISTER_UPP);
+        registrationThread.setName("UPP Registration");
+        registrationThread.setDaemon(true);
+        registrationThread.start();
+
+        wupp.i2pRouter.runRouter();
+    }
+
+    private static final Runnable REGISTER_UPP = () -> {
+
+        // first wait for the RouterContext to appear
+        RouterContext ctx;
+        while ((ctx = (RouterContext) wupp.i2pRouter.getContext().getCurrentContext()) == null) {
+            sleep(1000);
+        }
+
+        // then wait for the update manager
+        ClientAppManager cam = ctx.clientAppManager();
+        UpdateManager um;
+        while ((um = (UpdateManager) cam.getRegisteredApp(UpdateManager.APP_NAME)) == null) {
+            sleep(1000);
+        }
+
+        wupp = new WindowsUpdatePostProcessor(ctx);
+        um.register(wupp, UpdateType.ROUTER_SIGNED_SU3, SU3File.TYPE_EXE);
+        um.register(wupp, UpdateType.ROUTER_DEV_SU3, SU3File.TYPE_EXE);
+    };
+
+    private static void sleep(int millis) {
+        try {
+            Thread.sleep(millis);
+        } catch (InterruptedException bad) {
+            bad.printStackTrace();
+            throw new RuntimeException(bad);
+        }
+    }
+
+    private static File selectHome() { //throws Exception {
+        if (SystemVersion.isWindows()) {
+            File home = new File(System.getProperty("user.home"));
+            File appData = new File(home, "AppData");
+            File local = new File(appData, "Local");
+            File i2p;
+            i2p = new File(local, "I2P");
+            System.out.println("Windows jpackage wrapper started, using: " + i2p + " as base config");
+            return i2p.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 started, using: " + programs + " as base config");
+            return programs.getAbsoluteFile();
+        }
+    }
+
+}
--- a/java/net/i2p/router/WinUpdateProcess.java
+++ b/java/net/i2p/router/WinUpdateProcess.java
@ -0,0 +1,72 @@
+package net.i2p.router;
+
+import net.i2p.router.*;
+import net.i2p.I2PAppContext;
+
+import java.util.function.*;
+import java.io.*;
+import net.i2p.util.Log;
+
+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{
+        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;
+            } else {
+                workDir.mkdirs();
+            }
+            return workDir;
+        }
+        return null;
+    }
+
+    private void runUpdateInstaller() throws IOException {
+        String version = versionSupplier.get();
+	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");
+
+        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) {
+                System.out.println("Unable to run update-program in background. Update will fail.");
+        }
+    }
+
+    @Override
+    public void run() {
+        try {
+            runUpdateInstaller();
+        } catch(IOException ioe) {
+            System.out.println("Error running updater, update may fail." + ioe);
+        }
+    }
+}
--- a/java/net/i2p/router/WindowsUpdatePostProcessor.java
+++ b/java/net/i2p/router/WindowsUpdatePostProcessor.java
@ -0,0 +1,119 @@
+package net.i2p.router;
+
+import java.io.*;
+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;
+import net.i2p.update.UpdateType;
+import net.i2p.update.UpdatePostProcessor;
+import net.i2p.util.Log;
+import net.i2p.util.SystemVersion;
+
+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 RouterContext ctx;
+    protected static Router i2pRouter = null;
+    
+    private final AtomicBoolean hook = new AtomicBoolean();
+
+    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;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+    
+    public File getFile() {
+        return positionedFile;
+    }
+
+    public void updateDownloadedandVerified(UpdateType type, int fileType, String version, File file) throws IOException {
+        _log.info("Got an update to post-process");
+
+        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));
+
+    }
+    
+    private File moveUpdateInstaller(File file) throws IOException {
+        RouterContext i2pContext = i2pRouter.getContext();
+        if (i2pContext != null) {
+            File newFile = new File(workDir(), fileName);
+            boolean renamedStatus = file.renameTo(newFile);
+            if (renamedStatus)
+              return newFile;
+            else
+              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");
+    }
+
+    private File workDir() throws IOException{
+        RouterContext i2pContext = i2pRouter.getContext();
+        if (i2pContext != null) {
+            File workDir = new File(i2pContext.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;
+            } else {
+                workDir.mkdirs();
+            }
+            return workDir;
+        }
+        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();
+        }
+    }
+
+}
--- a/license/NSS.txt
+++ b/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.
--- a/router.config
+++ b/router.config
@ -0,0 +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
--- a/src/app-profile/prefs.js
+++ b/src/app-profile/prefs.js
@ -53,3 +53,10 @@ user_pref("browser.newtabpage.activity-stream.feeds.section.highlights", false);
 user_pref("browser.newtabpage.activity-stream.feeds.section.topstories", false);
 user_pref("browser.newtabpage.activity-stream.default.sites", "http://127.0.0.1:7657/home,http://127.0.0.1:7657/i2psnark/,http://127.0.0.1:7657/susimail/");
 user_pref("browser.newtabpage.activity-stream.feeds.topsites", true);
+user_pref("ui.use_standins_for_native_colors", true);
+user_pref("webgl.disable-extensions", true);
+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("media.navigator.enabled", false);
+user_pref("dom.w3c_touch_events.enabled", false);
--- a/src/app-profile/storage-sync.sqlite
+++ b/src/app-profile/storage-sync.sqlite
--- a/src/app-profile/user.js
+++ b/src/app-profile/user.js
@ -216,3 +216,9 @@ user_pref("keyword.enabled", false);
 user_pref("extensions.allowPrivateBrowsingByDefault", true);
 user_pref("extensions.PrivateBrowsing.notification", false);
 user_pref("browser.newtabpage.activity-stream.feeds.topsites", true);
+user_pref("ui.use_standins_for_native_colors", true);
+user_pref("webgl.disable-extensions", true);
+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);
--- a/src/app-profile/version.txt
+++ b/src/app-profile/version.txt
@ -1 +1 @@
-0.4
+1.05.0
--- a/src/nsis/FindProcess.nsh
+++ b/src/nsis/FindProcess.nsh
@ -0,0 +1,122 @@
+/*  FindProcess.nsh
+*   
+*   written by Donald Miller
+*   Mar 7, 2007
+*   
+*/
+ 
+!include LogicLib.nsh
+!include WordFunc.nsh
+!insertmacro WordFind
+ 
+!ifndef FindProcess
+!define FindProcess         '!insertmacro FindProcess'
+ 
+!macro FindProcess ProcessList BoolReturn
+    Push '${ProcessList}'
+    Call FindProcess
+    Pop ${BoolReturn}
+!macroend
+ 
+Function FindProcess
+  # return True if any process in ProcessList is active
+  Exch $0     ; get ProcessList, save $0
+  Push $1
+  Push $2
+  Push $R0
+  Push $R1
+  Push $R2
+ 
+  StrCpy $2 "$0,"                 ; $2 = ProcessList
+ 
+  Push 0                          ; set return value = False
+ 
+  # method based upon one by Phoenix1701@gmail.com  1/27/07
+ 
+  System::Alloc 1024
+  Pop $R0                         ; process list buffer
+ 
+  # get an array of all process ids
+  System::Call "Psapi::EnumProcesses(i R0, i 1024, *i .R1)i .r0"
+  ${Unless} $0 = 0
+ 
+      IntOp $R1 $R1 / 4           ; Divide by sizeof(DWORD) to get $R1 process count
+      IntOp $R1 $R1 - 1           ; decr for 0 base loop
+ 
+      ClearErrors
+      ${For} $R2 0 $R1
+          # get a PID from the array
+          IntOp $0 $R2 << 2
+          IntOp $0 $0 + $R0           ; buffer.dword[i]
+          System::Call "*$0(i .r0)"   ; Get next PID
+ 
+          ${Unless} $0 = 0
+              Push $0
+              Call GetProcessName
+              Pop $1
+ 
+              # is this process one we are looking for?
+              ${WordFind} '$2' ',' 'E/$1' $0
+              ${Unless} ${Errors}
+                  # yes, change return value
+                  Pop $0          ; discard old result
+                  Push 1          ; set return True
+ 
+                  # exit the loop
+                  ${Break}
+              ${EndUnless}
+          ${EndUnless}
+      ${Next}
+ 
+  ${EndUnless}
+ 
+  System::Free $R0
+ 
+  Pop $0              ; get return value
+  Pop $R2             ; restore registers
+  Pop $R1
+  Pop $R0
+  Pop $2
+  Pop $1
+  Exch $0
+FunctionEnd
+ 
+Function GetProcessName
+  # ( Pid -- ProcessName )
+  Exch $2                     ; get Pid, save $2
+  Push $0
+  Push $1
+  Push $3
+  Push $R0
+ 
+  System::Call "Kernel32::OpenProcess(i 1040, i 0, i r2)i .r3"
+ 
+  StrCpy $2 "<unknown>"       ; set return value
+ 
+  ${Unless} $3 = 0            ; $3 is hProcess
+      # get hMod array
+      System::Alloc 1024
+      Pop $R0
+ 
+      # params: Pid, &hMod, sizeof(hMod), &cb
+      System::Call "Psapi::EnumProcessModules(i r3, i R0, i 1024, *i .r1)i .r0"
+ 
+      ${Unless} $0 = 0
+          # get first hMod
+          System::Call "*$R0(i .r0)"
+ 
+          # get BaseName; params: Pid, hMod, szBuffer, sizeof(szBuffer)
+          System::Call "Psapi::GetModuleBaseName(i r3, i r0, t .r2, i 256)i .r0"
+      ${EndUnless}
+ 
+      System::Free $R0
+      System::Call "kernel32::CloseHandle(i r3)"
+  ${EndUnless}
+ 
+  Pop $R0                     ; restore registers
+  Pop $3
+  Pop $1
+  Pop $0
+  Exch $2                     ; save process name
+FunctionEnd
+!endif
--- a/src/nsis/i2pbrowser-installer.nsi
+++ b/src/nsis/i2pbrowser-installer.nsi
@ -1,4 +1,4 @@
-# uncomment on v3
+# This now requires v3
 UniCode true

 !define APPNAME "I2PBrowser-Launcher"
@ -11,11 +11,14 @@ UniCode true
 !define CONSOLE_URL "http://127.0.0.1:7657/home"

 !include i2pbrowser-version.nsi
+!include i2pbrowser-jpackage.nsi
+!include FindProcess.nsh

 var FFINSTEXE
 var FFNONTORINSTEXE
 var I2PINSTEXE

+
 !define FFINSTEXE
 !define FFNONTORINSTEXE
 !define FFINSTEXE32 "$PROGRAMFILES32\Mozilla Firefox\"
@ -27,14 +30,14 @@ var I2PINSTEXE

 !define RAM_NEEDED_FOR_64BIT 0x80000000

-InstallDir "$PROGRAMFILES\${COMPANYNAME}\${APPNAME}"
+InstallDir "$PROGRAMFILES64\${COMPANYNAME}\${APPNAME}"

 # rtf or txt file - remember if it is txt, it must be in the DOS text format (\r\n)
 LicenseData "licenses\LICENSE.index"
 # This will be in the installer/uninstaller's title bar
 Name "${COMPANYNAME} - ${APPNAME}"
 Icon ui2pbrowser_icon.ico
-OutFile "I2P-Profile-Installer-${VERSIONMAJOR}.${VERSIONMINOR}${VERSIONBUILD}.exe"
+OutFile "I2P-Profile-Installer-${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}.exe"

 RequestExecutionLevel admin

@ -169,10 +172,11 @@ Function .onInit
            StrCpy $FFINSTEXE "$PROFILE/Desktop/Tor Browser/Browser/"
        ${EndIf}
    ${EndIf}
-    ${If} ${FileExists} "${I2PINSTEXE32}/i2p.exe"
+    StrCpy $I2PINSTEXE "${I2PINSTEXE64}"
+    ${If} ${FileExists} "${I2PINSTEXE32}\i2p.exe"
        StrCpy $I2PINSTEXE "${I2PINSTEXE32}"
    ${EndIf}
-    ${If} ${FileExists} "${I2PINSTEXE64}/i2p.exe"
+    ${If} ${FileExists} "${I2PINSTEXE64}\i2p.exe"
        StrCpy $I2PINSTEXE "${I2PINSTEXE64}"
    ${EndIf}
 FunctionEnd
@ -185,6 +189,36 @@ FunctionEnd

 Function routerDetect
    ${If} ${FileExists} "$I2PINSTEXE"
+        Abort directory
+    ${Else}
+        createDirectory $I2PINSTEXE
+        SetOutPath $I2PINSTEXE
+        File /nonfatal /a /r "I2P\"
+        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\"
+
        Abort directory
    ${EndIf}
 FunctionEnd
@ -192,97 +226,71 @@ FunctionEnd
 # start default section
 Section Install

+    ${If} ${Silent}
+        ${Do}
+            ${FindProcess} "I2P.exe" $0
+            Sleep 500
+        ${LoopWhile} $0 <> 0
+    ${EndIf}
+
    # set the installation directory as the destination for the following actions
    createDirectory $INSTDIR
    SetOutPath $INSTDIR
    File ui2pbrowser_icon.ico

-    # Install the launcher scripts: This will need to be it's own section, since
-    # now I think we just need to let the user select if the user is using a non
-    # default Firefox path.
-    FileOpen $0 "$INSTDIR\i2pbrowser.bat" w
-    FileWrite $0 "@echo off"
-    FileWriteByte $0 "13"
-    FileWriteByte $0 "10"
+    # Update jpackaged I2P router, if it exists
    ${If} ${FileExists} "$I2PINSTEXE\jpackaged"
-        FileWrite $0 'start /D "%LOCALAPPDATA%\${APPNAME}" "" "$I2PINSTEXE\i2p.exe"'
-    ${Else}
-        FileWrite $0 'start "" "$I2PINSTEXE\i2p.exe"'
+        createDirectory $I2PINSTEXE
+        SetOutPath $I2PINSTEXE
+
+        ${If} ${Silent}
+          ReadEnvStr $0 OLD_I2P_VERSION
+          ${If} $0 < ${I2P_VERSION}
+            File /nonfatal /a /r "I2P\"
+            File /nonfatal "I2P\config\jpackaged"
+
+            createDirectory "$I2PINSTEXE\"
+            SetOutPath "$I2PINSTEXE\"
+
+            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\"
+          File /nonfatal "I2P\config\jpackaged"
+
+          createDirectory "$I2PINSTEXE\"
+          SetOutPath "$I2PINSTEXE\"
+
+          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}
-    FileWriteByte $0 "13"
-    FileWriteByte $0 "10"
-    FileWrite $0 'if exist "%LOCALAPPDATA%\${APPNAME}\firefox.profile.i2p\" ('
-    FileWrite $0 '  echo "profile is configured"'
-    FileWrite $0 ') else ('
-    FileWrite $0 '  echo "configuring profile"'
-    FileWriteByte $0 "13"
-    FileWriteByte $0 "10"
-    FileWrite $0 '  xcopy /s /i /y "$INSTDIR\firefox.profile.i2p" "%LOCALAPPDATA%\${APPNAME}\firefox.profile.i2p"'
-    FileWrite $0 ')'
-    FileWriteByte $0 "13"
-    FileWriteByte $0 "10"
-    FileWrite $0 'start "" "$FFINSTEXE\firefox.exe" -no-remote -profile "%LOCALAPPDATA%\${APPNAME}\firefox.profile.i2p" -url %1'
-    FileWriteByte $0 "13"
-    FileWriteByte $0 "10"
-    FileWrite $0 exit
-    FileWriteByte $0 "13"
-    FileWriteByte $0 "10"
-    FileClose $0

-    FileOpen $0 "$INSTDIR\i2pbrowser-private.bat" w
-    FileWrite $0 "@echo off"
-    FileWriteByte $0 "13"
-    FileWriteByte $0 "10"
-    ${If} ${FileExists} "$I2PINSTEXE\jpackaged"
-        FileWrite $0 'start /D "%LOCALAPPDATA%\${APPNAME}" "" "$I2PINSTEXE\i2p.exe"'
-    ${Else}
-        FileWrite $0 'start "" "$I2PINSTEXE\i2p.exe"'
-    ${EndIf}
-    FileWriteByte $0 "13"
-    FileWriteByte $0 "10"
-    FileWrite $0 'if exist "%LOCALAPPDATA%\${APPNAME}\firefox.profile.i2p\" ('
-    FileWrite $0 '  echo "profile is configured"'
-    FileWrite $0 ') else ('
-    FileWrite $0 '  echo "configuring profile"'
-    FileWriteByte $0 "13"
-    FileWriteByte $0 "10"
-    FileWrite $0 '  xcopy /s /i /y "$INSTDIR\firefox.profile.i2p" "%LOCALAPPDATA%\${APPNAME}\firefox.profile.i2p"'
-    FileWrite $0 ')'
-    FileWriteByte $0 "13"
-    FileWriteByte $0 "10"
-    FileWrite $0 'start "" "$FFINSTEXE\firefox.exe" -no-remote -profile "%LOCALAPPDATA%\${APPNAME}\firefox.profile.i2p" -private-window about:blank'
-    FileWriteByte $0 "13"
-    FileWriteByte $0 "10"
-    FileWrite $0 exit
-    FileWriteByte $0 "13"
-    FileWriteByte $0 "10"
-    FileClose $0
-
-
-    # Install the launcher scripts: This will need to be it's own section, since
-    # now I think we just need to let the user select if the user is using a non
-    # default Firefox path.
-    FileOpen $0 "$INSTDIR\i2pconfig.bat" w
-    FileWrite $0 "@echo off"
-    FileWriteByte $0 "13"
-    FileWriteByte $0 "10"
-    FileWrite $0 'if exist "%LOCALAPPDATA%\${APPNAME}\firefox.profile.config.i2p\" ('
-    FileWrite $0 '  echo "profile is configured"'
-    FileWrite $0 ') else ('
-    FileWrite $0 '  echo "configuring profile"'
-    FileWriteByte $0 "13"
-    FileWriteByte $0 "10"
-    FileWrite $0 '  xcopy /s /i /y "$INSTDIR\firefox.profile.config.i2p" "%LOCALAPPDATA%\${APPNAME}\firefox.profile.config.i2p"'
-    FileWrite $0 ')'
-    FileWriteByte $0 "13"
-    FileWriteByte $0 "10"
-    FileWrite $0 'start "" "$FFNONTORINSTEXE\firefox.exe" -no-remote -profile "%LOCALAPPDATA%\${APPNAME}\firefox.profile.config.i2p" -url %1'
-    FileWriteByte $0 "13"
-    FileWriteByte $0 "10"
-    FileWrite $0 exit
-    FileWriteByte $0 "13"
-    FileWriteByte $0 "10"
-    FileClose $0
+    # Install the launcher scripts
+    createDirectory "$INSTDIR\licenses"
+    SetOutPath "$INSTDIR"
+    File win/i2pbrowser.bat
+    File win/i2pbrowser-private.bat
+    File win/i2pconfig.bat

    # Install the licenses
    createDirectory "$INSTDIR\licenses"
@ -302,7 +310,7 @@ Section Install
    SetOutPath "$INSTDIR\firefox.profile.i2p\extensions"
    File "profile\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
    File profile\extensions\https-everywhere-eff@eff.org.xpi
-    File profile\extensions\i2prhz@eyedeekay.github.io.xpi
+    File profile\extensions\i2ppb@eyedeekay.github.io.xpi

    # Install the config profile
    createDirectory "$INSTDIR\firefox.profile.config.i2p"
@ -316,7 +324,7 @@ Section Install
    createDirectory "$INSTDIR\firefox.profile.config.i2p\extensions"
    SetOutPath "$INSTDIR\firefox.profile.config.i2p\extensions"
    File profile\extensions\https-everywhere-eff@eff.org.xpi
-    File profile\extensions\i2prhz@eyedeekay.github.io.xpi
+    File profile\extensions\i2ppb@eyedeekay.github.io.xpi

    # Install the config userChrome
    createDirectory "$INSTDIR\firefox.profile.config.i2p\chrome"
@ -325,10 +333,13 @@ Section Install

    SetOutPath "$INSTDIR"
    createDirectory "$SMPROGRAMS\${APPNAME}"
-    CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "C:\Windows\system32\cmd.exe" "/c $\"$INSTDIR\i2pbrowser.bat$\" ${CONSOLE_URL}" "$INSTDIR\ui2pbrowser_icon.ico"
-    CreateShortCut "$SMPROGRAMS\${APPNAME}\Private Browsing-${APPNAME}.lnk" "C:\Windows\system32\cmd.exe" "/c $\"$INSTDIR\i2pbrowser-private.bat$\"" "$INSTDIR\ui2pbrowser_icon.ico"
-    CreateShortCut "$DESKTOP\${APPNAME}.lnk" "C:\Windows\system32\cmd.exe" "/c $\"$INSTDIR\i2pbrowser.bat$\" ${CONSOLE_URL}" "$INSTDIR\ui2pbrowser_icon.ico"
-    CreateShortCut "$DESKTOP\Private Browsing-${APPNAME}.lnk" "C:\Windows\system32\cmd.exe" "/c $\"$INSTDIR\i2pbrowser-private.bat$\"" "$INSTDIR\ui2pbrowser_icon.ico"
+    CreateShortCut "$SMPROGRAMS\${APPNAME}\Browse I2P.lnk" "C:\Windows\system32\cmd.exe" "/c $\"$INSTDIR\i2pbrowser.bat$\" ${CONSOLE_URL}" "$INSTDIR\ui2pbrowser_icon.ico"
+    CreateShortCut "$SMPROGRAMS\${APPNAME}\Browse I2P - Temporary Identity.lnk" "C:\Windows\system32\cmd.exe" "/c $\"$INSTDIR\i2pbrowser-private.bat$\"" "$INSTDIR\ui2pbrowser_icon.ico"
+;    CreateShortCut "$SMPROGRAMS\${APPNAME}\I2P Applications.lnk" "C:\Windows\system32\cmd.exe" "/c $\"$INSTDIR\i2pconfig.bat$\"" "$INSTDIR\ui2pbrowser_icon.ico"
+
+    CreateShortCut "$DESKTOP\Browse I2P.lnk" "C:\Windows\system32\cmd.exe" "/c $\"$INSTDIR\i2pbrowser.bat$\" ${CONSOLE_URL}" "$INSTDIR\ui2pbrowser_icon.ico"
+    CreateShortCut "$DESKTOP\Browse I2P - Temporary Identity.lnk" "C:\Windows\system32\cmd.exe" "/c $\"$INSTDIR\i2pbrowser-private.bat$\"" "$INSTDIR\ui2pbrowser_icon.ico"
+;    CreateShortCut "$DESKTOP\I2P Applications.lnk" "C:\Windows\system32\cmd.exe" "/c $\"$INSTDIR\i2pconfig.bat$\"" "$INSTDIR\ui2pbrowser_icon.ico"

    ;# Point the browser config setting in the base router.config
    FileOpen $0 "$I2PINSTEXE\router.config" a
@ -403,10 +414,10 @@ Section "uninstall"
    # Uninstall the extensions
    Delete "$INSTDIR\firefox.profile.i2p\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
    Delete "$INSTDIR\firefox.profile.i2p\extensions\https-everywhere-eff@eff.org.xpi"
-    Delete "$INSTDIR\firefox.profile.i2p\extensions\i2prhz@eyedeekay.github.io.xpi"
+    Delete "$INSTDIR\firefox.profile.i2p\extensions\i2ppb@eyedeekay.github.io.xpi"

    Delete "$INSTDIR\firefox.profile.config.i2p\extensions\https-everywhere-eff@eff.org.xpi"
-    Delete "$INSTDIR\firefox.profile.config.i2p\extensions\i2prhz@eyedeekay.github.io.xpi"
+    Delete "$INSTDIR\firefox.profile.config.i2p\extensions\i2ppb@eyedeekay.github.io.xpi"

    Delete "$INSTDIR\firefox.profile.config.i2p\config\userChrome.css"

@ -421,7 +432,10 @@ Section "uninstall"
    rmDir "$INSTDIR\firefox.profile.i2p"
    rmDir "$LOCALAPPDATA\${APPNAME}"
    rmDir "$INSTDIR"
-
+    
+    ${If} ${FileExists} "$I2PINSTEXE\jpackaged"
+        rmDir "$I2PINSTEXE"
+    ${EndIf}
    # delete the uninstaller
    Delete "$INSTDIR\uninstall-i2pbrowser.exe"

@ -435,5 +449,12 @@ SectionEnd
 !insertmacro MUI_PAGE_FINISH

 Function LaunchLink
-  ExecShell "" "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk"
+  ${If} ${Silent}
+    ReadEnvStr $0 RESTART_I2P
+    ${If} $0 != ""
+      Exec "$INSTDIR\i2pbrowser.bat"
+    ${EndIf}  
+  ${Else}
+    Exec "$INSTDIR\i2pbrowser.bat"
+  ${EndIf}
 FunctionEnd
--- a/src/nsis/i2pbrowser-jpackage.nsi
+++ b/src/nsis/i2pbrowser-jpackage.nsi
@ -0,0 +1 @@
+!define I2P_VERSION 0.9.50
--- a/src/nsis/i2pbrowser-version.nsi
+++ b/src/nsis/i2pbrowser-version.nsi
@ -1,3 +1,3 @@
-!define VERSIONMAJOR 0
-!define VERSIONMINOR 04
-!define VERSIONBUILD 
+!define VERSIONMAJOR 1
+!define VERSIONMINOR 05
+!define VERSIONBUILD 0
--- a/src/profile/prefs.js
+++ b/src/profile/prefs.js
@ -51,3 +51,10 @@ user_pref("browser.newtabpage.activity-stream.feeds.section.highlights", false);
 user_pref("browser.newtabpage.activity-stream.feeds.section.topstories", false);
 user_pref("browser.newtabpage.activity-stream.default.sites", "http://planet.i2p/,http://legwork.i2p/,http://i2pwiki.i2p/,http://i2pforums.i2p/,http://zzz.i2p/");
 user_pref("browser.newtabpage.activity-stream.feeds.topsites", true);
+user_pref("ui.use_standins_for_native_colors", true);
+user_pref("webgl.disable-extensions", true);
+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("media.navigator.enabled", false);
+user_pref("dom.w3c_touch_events.enabled", false);
--- a/src/profile/storage-sync.sqlite
+++ b/src/profile/storage-sync.sqlite
--- a/src/profile/user.js
+++ b/src/profile/user.js
@ -170,7 +170,7 @@ user_pref("dom.serviceWorkers.enabled", false);
 user_pref("dom.serviceWorkers.interception.enabled", false);
 user_pref("dom.storage.enabled", false);
 user_pref("dom.webaudio.enabled", false);
-user_pref("extensions.autoDisableScopes", 14);
+user_pref("extensions.autoDisableScopes", 0);
 user_pref("extensions.getAddons.cache.enabled", false);
 user_pref("extensions.getAddons.showPane", false);
 user_pref("extensions.pocket.enabled", false);
@ -216,3 +216,9 @@ user_pref("keyword.enabled", false);
 user_pref("extensions.allowPrivateBrowsingByDefault", true);
 user_pref("extensions.PrivateBrowsing.notification", false);
 user_pref("browser.newtabpage.activity-stream.feeds.topsites", true);
+user_pref("ui.use_standins_for_native_colors", true);
+user_pref("webgl.disable-extensions", true);
+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);
--- a/src/profile/version.txt
+++ b/src/profile/version.txt
@ -1 +1 @@
-0.4
+1.05.0
--- a/src/unix/desktop/i2pbrowser-debian.desktop
+++ b/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
--- a/src/unix/desktop/i2pconfig-debian.desktop
+++ b/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
--- a/src/unix/i2pbrowser.sh
+++ b/src/unix/i2pbrowser.sh
@ -40,4 +40,5 @@ if [ -z $FIREFOX ]; then
  exit 1
 fi

-$FIREFOX --profile "$BROWSING_PROFILE" $@
+echo $FIREFOX --profile "$BROWSING_PROFILE" $@
+$FIREFOX --profile "$BROWSING_PROFILE" $@
--- a/src/win/i2pbrowser-private.bat
+++ b/src/win/i2pbrowser-private.bat
@ -0,0 +1,42 @@
+@echo on
+
+if exist "%ProgramFiles%\I2P\" (
+  set "I2PPath=%ProgramFiles%\I2P\"
+)
+
+if exist "%ProgramFiles(x86)%\I2P" {
+  set "I2PPath=%ProgramFiles(x86)%\I2P"
+}
+
+if exist "%ProgramFiles%\I2P\jpackaged" (
+  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 "%ProgramFiles%\I2P\I2PBrowser-Launcher\firefox.profile.i2p\extensions" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\extensions"
+) else (
+  echo "configuring profile"
+  xcopy /s /i /y "%ProgramFiles%\I2P\I2PBrowser-Launcher\firefox.profile.i2p" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p"
+)
+
+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" -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 "%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 "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p" -private-window about:blank
+  exit
+)
+
+exit
--- a/src/win/i2pbrowser.bat
+++ b/src/win/i2pbrowser.bat
@ -0,0 +1,42 @@
+@echo on
+
+if exist "%ProgramFiles%\I2P\" (
+  set "I2PPath=%ProgramFiles%\I2P\"
+)
+
+if exist "%ProgramFiles(x86)%\I2P" {
+  set "I2PPath=%ProgramFiles(x86)%\I2P"
+}
+
+if exist "%ProgramFiles%\I2P\jpackaged" (
+  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 "%ProgramFiles%\I2P\I2PBrowser-Launcher\firefox.profile.i2p\extensions" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\extensions"
+) else (
+  echo "configuring profile"
+  xcopy /s /i /y "%ProgramFiles%\I2P\I2PBrowser-Launcher\firefox.profile.i2p" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p"
+)
+
+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
+)
+
+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.i2p" -url %1
+  exit
+)
+
+if exist "%ProgramFiles%\Mozilla Firefox\firefox.exe" (
+  start "i2pbrowser" "%ProgramFiles%\Mozilla Firefox\firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p" -url %1
+  exit
+)
+
+exit
--- a/src/win/i2pconfig.bat
+++ b/src/win/i2pconfig.bat
@ -0,0 +1,13 @@
+@echo off
+
+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"
+) else (
+  echo "configuring profile"
+  xcopy /s /i /y "$INSTDIR\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
+
+exit
Author	SHA1	Message	Date
idk	461d138d53	Merge branch 'master' into 'EXPERIMENTAL-debian' # Conflicts: # Makefile	2021-10-28 19:51:44 +00:00
idk	3ee7e440e0	checkin debian/files	2021-10-21 19:19:16 -04:00
idk	3c01ebd094	generate releases.json from make target.	2021-10-20 16:37:08 -04:00
idk	60ac2d7ec4	generate releases.json from make target.	2021-10-20 00:50:49 -04:00
idk	3d51872275	Set path to %ProgramFiles%/I2P correctly per-platform and without depending on global envars	2021-10-06 14:17:49 -04:00
idk	76899caf68	Indicate how to push to launchpad in the makefile	2021-09-14 18:29:21 -04:00
idk	6a898b410c	Merge branch 'master' of i2pgit.org:i2p-hackers/i2p.firefox into EXPERIMENTAL-debian	2021-09-14 18:09:56 -04:00
idk	a793e11176	add missing release instruction to README.md	2021-09-14 16:32:27 -04:00
idk	b50cd8c55b	Switch I2P_VERSION back to using tags. New bundle was build with i2pversion_override 1.5.0	2021-09-14 12:22:47 -04:00
idk	3c5208d50e	Make some of the make targets a little better for releasing	2021-09-14 12:11:56 -04:00
idk	42eb5fdecd	bump version number to 1.05.0 since it's embedding a 1.5 I2P router and it is version 04 of the profile. Embedding a router being a huge milestone, after all.	2021-09-13 22:11:45 -04:00
idk	ec700d725d	upgrade i2pipb version	2021-09-09 19:15:22 -04:00
idk	e0a1b93e9e	add dput targets for ppa	2021-08-23 00:01:07 -04:00
idk	f924c2c534	Make it build on Launchpad	2021-08-22 23:30:34 -04:00
idk	5340809fa7	Fix most of the lintian errors	2021-08-22 22:50:01 -04:00
idk	40de7a8f67	Merge branch 'master' of i2pgit.org:i2p-hackers/i2p.firefox into EXPERIMENTAL-debian	2021-08-22 17:47:21 -04:00
idk	6dbee9db3c	Merge branch 'EXPERIMENTAL-docker' into 'master' Add a Dockerfile and Docker instructions Closes #6 See merge request i2p-hackers/i2p.firefox!4	2021-08-22 21:46:59 +00:00
idk	34452b9a4a	Merge branch 'master' of i2pgit.org:i2p-hackers/i2p.firefox into EXPERIMENTAL-debian	2021-08-22 17:41:52 -04:00
idk	220b6756b6	Merge branch 'master' of i2pgit.org:i2p-hackers/i2p.firefox into EXPERIMENTAL-docker	2021-08-22 17:21:20 -04:00
idk	7f7f021e45	Merge branch 'EXPERIMENTAL-jpackage' into 'master' Embed a jpackaged router in the installer. Self-Updating. See merge request i2p-hackers/i2p.firefox!3	2021-08-22 21:19:48 +00:00
idk	f9b02fe13f	Re-update extension URL's	2021-08-22 17:15:08 -04:00
idk	6026ee3ec6	Merge branch 'EXPERIMENTAL-jpackage' of i2pgit.org:i2p-hackers/i2p.firefox into EXPERIMENTAL-jpackage	2021-08-22 17:13:07 -04:00
idk	3c508f4190	Merge branch 'master' of i2pgit.org:i2p-hackers/i2p.firefox into EXPERIMENTAL-jpackage	2021-08-22 17:12:14 -04:00
idk	91abc574d3	Merge branch 'master' into 'EXPERIMENTAL-jpackage' # Conflicts: # .gitignore # Makefile # src/app-profile/version.txt # src/nsis/i2pbrowser-installer.nsi # src/nsis/i2pbrowser-version.nsi # src/profile/version.txt	2021-08-22 20:58:48 +00:00
idk	bae0412ebc	add newsURL and backupNewsURL to router.config	2021-08-20 13:07:06 -04:00
idk	e73a5969db	Merge branch 'EXPERIMENTAL-jpackage' of 127.0.0.1:i2p-hackers/i2p.firefox into EXPERIMENTAL-docker	2021-08-20 01:45:46 -04:00
idk	3440bff5b2	Merge branch 'EXPERIMENTAL-jpackage' of 127.0.0.1:i2p-hackers/i2p.firefox into EXPERIMENTAL-debian	2021-08-20 01:36:08 -04:00
idk	e764c7b773	Add Dockerfile	2021-08-20 01:01:06 -04:00
idk	7c62c8ecda	Add a target for creating light tags at release time	2021-08-20 00:51:31 -04:00
idk	d13e2317dd	Make it run in Docker too	2021-08-20 00:12:36 -04:00
idk	7ff4eb5e37	Set autodisabledscopes to 0	2021-08-19 23:54:37 -04:00
idk	e6928d64ce	Uninstall a jpackaged router if found	2021-08-19 22:28:48 -04:00
idk	ad373eface	Add update server basics	2021-08-19 21:01:23 -04:00
idk	d52e79c72e	don't fail if cloneing su3-tools fails, don't delete router.config in clean.sh	2021-08-19 20:40:59 -04:00
idk	71b9b9c6ec	check in basic router.config with update url, build su3-tools if it isn't yet	2021-08-19 20:13:08 -04:00
idk	f8ff48f723	work on getting it signed on Windows	2021-08-19 19:30:11 -04:00
idk	8b089ad49e	Put update config url into it's own file	2021-08-19 19:20:01 -04:00
idk	afdb51370e	configure the router.updateURL by default	2021-08-19 16:52:53 -04:00
idk	2ff2e462a9	configure the router.updateURL by default	2021-08-19 16:09:28 -04:00
idk	41f4f80a4d	configure the router.updateURL by default	2021-08-19 15:14:21 -04:00
idk	aee8cdbe5f	add --java-options --illega-access=permit to support MuWire plugin	2021-08-19 11:53:09 -04:00
idk	15a2386981	Use a "static" filename, ending in exe, in moveUpdateInstaller in case of differences in file-extension handling across various Windows platforms and configurations	2021-08-19 11:46:15 -04:00
idk	8aefcff4b1	Check return value of renameTo, if false throw an IOException.	2021-08-18 14:57:30 -04:00
idk	1b35c8dc8b	use a supplier to get the file path when starting the WinUpdateProcess, fix logging issues	2021-08-18 13:28:08 -04:00
idk	e7ea163a64	More intelligible shortcut label text	2021-08-17 12:03:39 -04:00
idk	2b95573f7a	Fix working directory which was still copied over from zab's	2021-08-15 18:41:53 -04:00
idk	51aa9a97b1	Build the process with processbuilder, check the I2P version when upgrading from NSIS in silent mode, check the RESTART_I2P environment variable when upgrading from NSIS in silent mode	2021-08-15 14:42:02 -04:00
idk	8737093b6d	add WinUpdateProcess.java to the java src's	2021-08-14 10:17:56 -04:00
idk	688b9ca309	Fixes for many, but not all the things from zab's code review	2021-08-14 02:08:45 -04:00
idk	ac7336f669	mix in eepsite config	2021-08-02 23:46:20 -04:00
idk	51a63dfb35	mix in eepsite config	2021-08-02 23:27:35 -04:00
idk	2c328bec86	Try and get it to use a native jbigi	2021-08-02 21:16:40 -04:00
idk	fa54305df3	Try and get it to use a native jbigi	2021-08-02 21:05:49 -04:00
idk	d7036f7a96	Try and get it to use a native jbigi	2021-08-02 20:16:44 -04:00
idk	111ecebe6c	Try and get it to use a native jbigi	2021-08-02 20:12:38 -04:00
idk	272ff689e7	Try and get it to use a native jbigi	2021-08-02 20:02:06 -04:00
idk	3b544d0e25	Try and get it to use a native jbigi	2021-08-02 19:57:11 -04:00
idk	7b24afba86	fix quotes on set	2021-08-02 19:16:05 -04:00
idk	5b8c3e4b2a	Wait 3 seconds after starting I2P	2021-08-02 18:59:24 -04:00
idk	86b6413a9b	echo on for a little while	2021-08-02 18:58:41 -04:00
idk	cd15ee07c1	Force a non-x86 ProgramFiles path	2021-08-02 17:51:47 -04:00
idk	59ca9d1d7f	Exec the bat file directly rather than using the shortcut	2021-08-02 17:37:56 -04:00
idk	94feece528	Use the copy of the profile from inside the %programfiles%/i2p	2021-08-02 17:20:33 -04:00
idk	fc1cce1f4b	Make sure working config dir is created. Add Tor Browser support to .bat scripts. Register UPP in a thread, see @zlatinb's example in i2p-jpackage-mac.	2021-08-02 17:05:24 -04:00
idk	5218f18599	Make sure working config dir is created. Add Tor Browser support to .bat scripts. Register UPP in a thread, see @zlatinb's example in i2p-jpackage-mac.	2021-08-02 17:04:44 -04:00
idk	b79044bcce	fix static references in Winlauncher And WindowsUpdatePostProcessor	2021-08-02 14:17:02 -04:00
idk	8453c4092c	fix up new launcher scripts with the right paths	2021-08-02 13:46:10 -04:00
idk	a90e7db310	Make some targets more reliable	2021-08-02 12:54:54 -04:00
idk	eacb19034a	No need anymore to generate launcher scripts at install time, so move them to src/win directory	2021-08-02 12:19:01 -04:00
idk	14b40177fe	checkin UPDATES.md doc, but also force gitlab to send me a notification email normally	2021-07-28 09:45:54 -04:00
idk	f54d989ea7	Remove unix changes, they can go in EXPERIMENTAL-debian	2021-07-23 19:39:07 -04:00
idk	99f6029578	Always use i2pbrowser-version.nsi as the source of the version of the profile	2021-07-15 17:08:46 -04:00
idk	50097f335a	add su3 signing to makefile	2021-07-15 16:19:59 -04:00
idk	d943bf98ca	Tabs to spaces	2021-07-15 16:06:31 -04:00
idk	1504d65ba7	fix path in Makefile	2021-07-15 16:01:15 -04:00
idk	7ef6e9149d	fix build issues, allow overriding i2p version with a file	2021-07-15 15:48:34 -04:00
idk	a8117ce0fc	move the updated installer to the application directory, pass the renamed file the the thing that starts the process. Don't start the shutdown or monitor it in any way.	2021-07-13 21:49:02 -04:00
idk	1430d73103	remove superfluous files from checkin, automatically import them from the sibling i2p.i2p repository	2021-07-06 14:06:23 -04:00
idk	b5de7de981	update jpackages, remove debian dir, that will be merged from EXPERIMENTAL-debian	2021-07-06 13:57:23 -04:00
idk	0575913c19	update where it places the desktop files	2021-07-06 13:32:47 -04:00
idk	59dc5d65e0	Add missing line to while loop	2021-07-04 10:35:07 -04:00
idk	f384477700	Lay out the basics of a Debian or Ubuntu package	2021-07-04 00:37:38 -04:00
idk	3af9c06f01	Start a Debian package	2021-07-03 23:46:22 -04:00
idk	6165131c66	When a Silent installer is run, loop until there isn't an I2P.exe process anymore.	2021-07-03 22:39:54 -04:00
idk	a5db548ad5	Get the exe path not the dir	2021-07-01 20:32:09 -04:00
idk	7dfd857b43	Cancel if shutdownGracefullyAndRerun returns false	2021-07-01 20:22:37 -04:00
idk	008025d76f	Don't pass the /D flag it's not required	2021-07-01 20:18:39 -04:00
idk	755a47d6f2	Make WinLauncher extend WindowsUpdatePostProcessor	2021-07-01 20:05:21 -04:00
idk	97f3dbd71f	OK I think that registers it	2021-07-01 19:52:21 -04:00
idk	ffd7bfb834	Set up NSIS to be silennt	2021-07-01 18:30:23 -04:00
idk	ab58ec31ff	I think that might be a working UpdatePostProcessor, now to figure out how to register it	2021-07-01 18:20:16 -04:00
idk	da9f7695a7	Start working on an updater thing for the jpackage builds	2021-07-01 16:55:29 -04:00
idk	a6481d7bd7	switch to Rhizome variant of IPB plugin. Update extensions at install time	2021-07-01 10:26:19 -04:00
idk	b62d64bb0f	fix include optional jpackage install in profile.tgz line	2021-05-31 12:23:49 -04:00
idk	8424727dae	Windows does not seem to have an application power saving mode that would affect I2P at this time.	2021-05-25 13:50:18 -04:00
idk	10f02140a3	Make it possible to optionally generate jpackage which can be added to a Linux tar.gzipped firefox profile+script. If a Firefox is added to this .tar.gz in a directory called ./firefox/, and that Firefox is configured to be portable and avoid the disk, the launching script will favor the local Firefox and it should never need to touch anything outside the directory it's unpacked in, making it usable from a flash drive without touching the disk on a host, for instance. More generally, forming the basis of a TBB-like package	2021-05-25 13:46:37 -04:00
idk	c66d08d9d8	updater isn't enough, it needs to go all the way to preppkg. For now ignore a build error which doesn't matter to the jpackaged router	2021-05-23 01:00:05 -04:00
idk	bf9e8cae14	Set i2pversion and version tag in i2version file	2021-05-23 00:14:14 -04:00
idk	5ce0477d46	Set i2pversion and version tag in i2version file	2021-05-23 00:07:56 -04:00
idk	13af013cbd	Ant updater is faster and good enough	2021-05-22 22:30:39 -04:00
idk	ff1451c0dc	Correct version number	2021-05-22 22:26:13 -04:00
idk	986b003f20	Make sure the build script enforces the use of a tagged, released version	2021-05-22 22:23:03 -04:00
idk	2099c1f5fa	No need to run i2p.exe from i2pconfig.bat	2021-04-04 09:27:10 -04:00
idk	1edb0c3e0e	Make sure curl gets the L flag	2021-04-04 01:47:33 -04:00
idk	ca89bc017b	Try and limit the xcopy prompt	2021-04-04 01:26:16 -04:00
idk	d5fd31eba9	Install profiles to %PROGRAMFILES% and copy afterward, if necessary, using batch scripts. This eliminates all essential use of %LOCALAPPDATA% by NSIS. One place still uses it technically, but it can recover from failure there.	2021-04-04 01:14:10 -04:00
idk	12f124d259	Install profiles to %PROGRAMFILES% and copy afterward, if necessary, using batch scripts. This eliminates all essential use of %LOCALAPPDATA% by NSIS. One place still uses it technically, but it can recover from failure there.	2021-04-04 01:12:33 -04:00
idk	55a7be91c6	Install profiles to %PROGRAMFILES% and copy afterward, if necessary, using batch scripts. This eliminates all essential use of %LOCALAPPDATA% by NSIS. One place still uses it technically, but it can recover from failure there.	2021-04-04 01:04:57 -04:00
idk	98d1a80347	Install profiles to %PROGRAMFILES% and copy afterward, if necessary, using batch scripts. This eliminates all essential use of %LOCALAPPDATA% by NSIS. One place still uses it technically, but it can recover from failure there.	2021-04-04 00:37:14 -04:00
idk	8aae087969	check router.config when in program files too	2021-04-03 23:37:11 -04:00
idk	d2d272f17a	check for i2p.exe at install time	2021-04-03 23:25:23 -04:00
idk	0429c2bab5	Reference localappdata from bat scripts instead of at install time	2021-04-03 23:21:34 -04:00
idk	2d24c57c8e	Just use LOCALAPPDATA since when we elevate in the NSIS script has no effect	2021-04-03 23:03:28 -04:00
idk	f0a4001b53	Fix conflicting files for case-insensitive filesystems.	2021-04-03 22:55:56 -04:00
idk	b678d1434a	Fix conflicting files for case-insensitive filesystems.	2021-04-03 22:52:47 -04:00
idk	ee2a7cc93d	Install the config files to %PROGRAMFILES% since it should avoid the multiple-encodings error	2021-04-03 20:06:31 -04:00
idk	0c3fe5b37d	Find the path by finding the JRE and traversing up	2021-04-03 19:53:09 -04:00
idk	b8a4633113	Find the path by finding the JRE and traversing up	2021-04-03 19:16:32 -04:00
idk	b4b09ea5da	Try not setting the base dir for now since that seems to be causing it to stall on my wiwindows machine	2021-04-03 18:45:30 -04:00
idk	4df405978f	Print some stuff for debugging	2021-04-03 18:37:17 -04:00
idk	cb821a72ad	set i2p.dir.base to PROGRAMFILES/i2p	2021-04-03 18:24:59 -04:00
idk	8218591986	Configure for ProgramFiles based installs	2021-04-03 18:08:44 -04:00
idk	9a03137a67	Start a WinLauncher	2021-04-03 17:30:31 -04:00
idk	03bba27c14	Start a WinLauncher	2021-04-03 17:29:41 -04:00
idk	9998692bbd	Start a WinLauncher	2021-04-03 16:39:26 -04:00
Zlatin Balevsky	506d2035cb	backward slashes so it compiles on windows	2021-04-03 16:35:58 +01:00
Zlatin Balevsky	5783feb348	do not show the 'where is i2p' page if we are about to deploy jpackage	2021-04-03 16:34:24 +01:00
Zlatin Balevsky	afb3ca87b4	always set UniCode true	2021-04-03 16:33:10 +01:00
Zlatin Balevsky	dc08fda98b	ant updater does not include jetty jars	2021-04-03 16:32:28 +01:00
idk	c3c0a8ae28	correctly unpacked jpackaged file	2021-03-30 00:06:22 -04:00
idk	2e95100bf4	make configdir an alias for src/I2P/config so we don't call it all the time. Only a convenience target to update the config files in the experimental branch for now.	2021-03-29 23:32:43 -04:00
idk	cd02426571	make src/I2P/config a target for now, so it doesn't accidentally recreate directories	2021-03-29 23:28:58 -04:00
idk	1eece32f73	make build a dependency of build/I2P	2021-03-29 23:12:36 -04:00
idk	a4b99698af	make build/I2P/config a separate target	2021-03-29 23:10:46 -04:00
idk	075d5e4181	Remove the config stuff from I2P directory, which is gitignored	2021-03-29 22:57:55 -04:00
idk	8b3d0babda	Remove the config stuff from I2P directory, which is gitignored	2021-03-29 22:56:24 -04:00
idk	ac3036e819	Work on jpackage detailed build instructions	2021-03-27 02:30:16 -04:00
idk	0e60f158ce	Work on jpackage detailed build instructions	2021-03-27 01:38:52 -04:00
idk	e438fff266	Work on jpackage detailed build instructions	2021-03-27 01:38:00 -04:00
idk	c244dc9fe7	Work on jpackage detailed build instructions	2021-03-27 01:12:37 -04:00
idk	ddc6704351	Make it so debs can be built without running NSIS	2021-03-26 23:59:42 -04:00
idk	8adf9b83a4	Add default start command	2021-03-26 23:35:59 -04:00
idk	e22abb872e	Make the launcher command it accepts variable so I can pass arguments in the snap	2021-03-26 21:15:29 -04:00
idk	8f70bc346d	Add a note to the readme about pre-built images	2021-03-26 18:09:13 -04:00
idk	30909d1353	Give it a way to know it's working on a jpackaged router and if so update itself	2021-03-26 18:07:32 -04:00
idk	a218f0d580	This one Actually Works(tm)	2021-03-26 17:37:55 -04:00
idk	0a0f063f1b	This one Actually Works(tm)	2021-03-26 17:24:20 -04:00
idk	50ab03e195	copy resources from sibling branch for jpackaged router experiment	2021-03-26 00:52:45 -04:00
idk	3cdc0d674a	Start an experimental jpackage-included branch	2021-03-25 20:59:22 -04:00
				`@ -1 +0,0 @@`
				`https://addons.mozilla.org/firefox/downloads/file/3716461/2021.4.15/https_everywhere-2021.4.15-an+fx.xpi`
				`@ -0,0 +1 @@`
				`i2p-firefox-profile_1.05.0-1_source.buildinfo net optional`
 @ -1 +1 @@
 .4
 .05.0