Merge branch 'master' of 127.0.0.1:i2p-hackers/i2p.firefox

Merge branch 'EXPERIMENTAL-debian' into 'master'
Adds support for building a `.deb` package for Debian or Ubuntu using "Official" tools(debuild, etc) Closes #5 See merge request i2p-hackers/i2p.firefox!5
2022-01-31 12:49:46 -05:00 · 2022-01-30 23:33:04 +00:00 · 2022-01-30 23:32:48 +00:00 · 2022-01-14 11:30:17 -05:00 · 2022-01-14 10:41:56 -05:00 · 2021-12-20 16:17:03 -05:00
32 changed files with 1647 additions and 58 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,4 +5,5 @@ build
 i2pversion_override
 *.crl
 *.crt
-*.pem
+*.pem
+*.p12
--- 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.7.13/https_everywhere-2021.7.13-an+fx.xpi
--- a/183
+++ b/183
@ -46,8 +46,9 @@ export RES_DIR="../i2p.i2p/installer/resources"
 export PKG_DIR="../i2p.i2p/pkg-temp"
 export I2P_JBIGI="../i2p.i2p/installer/lib/jbigi"

-distclean: clean
+distclean: clean clean-extensions
 	rm -rf I2P
+	git clean -fd

 I2P:
 	./build.sh
@ -67,7 +68,7 @@ src/I2P/config:
 	cp -v $(RES_DIR)/i2ptunnel.config src/I2P/config/
 	cp -v $(RES_DIR)/wrapper.config src/I2P/config/
 	#grep -v 'router.updateURL' $(RES_DIR)/router.config > src/I2P/config/router.config
-	cat router.config  >> src/I2P/config/router.config
+	cat router.config >> src/I2P/config/router.config
 	cp -v $(RES_DIR)/hosts.txt src/I2P/config/hosts.txt
 	cp -R $(RES_DIR)/certificates src/I2P/config/certificates
 	cp -R $(RES_DIR)/eepsite src/I2P/config/eepsite
@ -76,7 +77,8 @@ src/I2P/config:
 	cp -R "$(PKG_DIR)"/webapps src/I2P/config/webapps
 	cd src/I2P/config/geoip && gunzip GeoLite2-Country.mmdb.gz; cd ../../..

-build/I2P/config: build/I2P src/I2P/config
+build/I2P/config: build/I2P 
+	make src/I2P/config; true
 	cp -rv src/I2P/config build/I2P/config ; true
 	cp -rv src/I2P/config build/I2P/.i2p ; true

@ -92,7 +94,7 @@ build/licenses: build
 	unix2dos build/licenses/LICENSE.index

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

 build:
 	@echo "creating build directory"
@ -103,7 +105,7 @@ profile: build/profile/user.js build/profile/prefs.js build/profile/bookmarks.ht
 profile.tgz: .version profile
 #	$(eval PROFILE_VERSION := $(shell cat src/profile/version.txt))
 	@echo "building profile tarball $(PROFILE_VERSION)"
-	bash -c 'ls I2P && cp -rv build/I2P build/profile/I2P'; true
+	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 ../

@ -119,17 +121,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: .version build/app-profile/user.js build/app-profile/prefs.js build/app-profile/chrome/userChrome.css build/app-profile/bookmarks.html build/app-profile/storage-sync.sqlite copy-app-xpi

 app-profile.tgz: app-profile
 #	$(eval PROFILE_VERSION := $(shell cat src/app-profile/version.txt))
 	@echo "building app-profile tarball $(PROFILE_VERSION)"
-	bash -c 'ls I2P && cp -rv build/I2P build/app-profile/I2P'; true
+	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 ../

@ -148,17 +150,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:
@ -167,13 +171,20 @@ 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/3887295/"`./amo-version.sh i2p-in-private-browsing`"/i2ppb@eyedeekay.github.io.xpi" > i2psetproxy.url
+#
+#	TODO: switch to the "Rhizome" variant which has extended permission to do things like set the homepage.
+#	@echo "https://addons.mozilla.org/firefox/downloads/file/3799074/"`./amo-version.sh i2pipb-rhizome-variant`"/i2prhz@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
@ -205,15 +216,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
@ -230,7 +237,7 @@ uninstall:
 		/usr/share/applications/i2pbrowser.desktop \
 		/usr/share/applications/i2pconfig.desktop

-checkinstall: version
+checkinstall: .version
 	checkinstall \
 		--default \
 		--install=no \
@ -257,4 +264,128 @@ $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools:
 		go mod vendor && go build

 su3: $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools
-	$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)" -signer "$(SIGNER)" -version "$(I2P_VERSION)"
+	$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)-signed" -signer "$(SIGNER)" -version "$(I2P_VERSION)"
+	java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Profile-Installer-$(PROFILE_VERSION)-signed.exe I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" "$(I2P_VERSION)" $(SIGNER)
+
+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.su3" i2pwinupdate.su3
+
+i2pwinupdate.su3.torrent: prepupdate
+	mktorrent --announce=http://tracker2.postman.i2p/announce.php --announce=http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a --announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a i2pwinupdate.su3
+
+torrent: i2pwinupdate.su3.torrent
+
+MAGNET=`bttools torrent printinfo i2pwinupdate.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|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
+
+BLANK=`awk '! NF { print NR; exit }' changelog.txt`
+
+I2P.zip: I2P-jpackage-windows-$(I2P_VERSION).zip
+
+I2P-jpackage-windows-$(I2P_VERSION).zip:
+	zip I2P-jpackage-windows-$(I2P_VERSION).zip -r I2P
+
+changelog:
+	head -n "$(BLANK)" changelog.txt
+
+release-jpackage: I2P-jpackage-windows-$(I2P_VERSION).zip
+	head -n "$(BLANK)" changelog.txt | gothub release -p -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n i2p-jpackage-windows-$(I2P_VERSION) -d -; true
+
+update-release-jpackage:
+	head -n "$(BLANK)" changelog.txt | gothub edit -p -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n i2p-jpackage-windows-$(I2P_VERSION) -d -; true
+
+delete-release-jpackage:
+	gothub delete -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION); true
+
+upload-release-jpackage:
+	gothub upload -R -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n "i2p-jpackage-windows-$(I2P_VERSION)" -f "./I2P-jpackage-windows-$(I2P_VERSION).zip"
+
+jpackage-release: release-jpackage upload-release-jpackage
--- a/NoScript.url
+++ b/NoScript.url
@ -1 +0,0 @@
-https://addons.mozilla.org/firefox/downloads/file/3534184/11.2.11/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi
--- a/README.md
+++ b/README.md
@ -184,13 +184,21 @@ TODO: Add links to the respective instructions for each of these.
        ant clean pkg
        cd ..

- 7. Move into the i2p.firefox directory. Run the `./build.sh` script.
+ 4. Move into the i2p.firefox directory. Run the `./build.sh` script.

        cd i2p.firefox
        ./build.sh

 5. Run `make` to build the installer.

+Doing a Release
+---------------
+
+Once you have the installer `.exe` file produced by NSIS, you're almost ready to
+do a release. As a final step, someone must sign the `.exe` file using a
+Certificate which Windows will recognize. The current signer of the Windows
+bundle is Zlatinb. Standard Windows signing tools are used.
+
 Building a signed update file
 -----------------------------

@ -207,6 +215,28 @@ With that dependency satisfied, you can then run:
 to build the signing tool if necessary and then package the installer in a
 signed update file.

+It's also probably possible to do this with the Java I2P distribution and a
+`.bat` script.
+
+Docker Support
+--------------
+
+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/build.sh
+++ b/build.sh
@ -13,6 +13,10 @@ if [ "$JAVA" -lt "14" ]; then
  echo "Java 14+ must be used to compile with jpackage, java is $JAVA"
  exit 1
 fi
+if [ "$JAVA" -lt "17" ]; then
+  echo "It is highly recommended that you use Java 17+ to build release packages"
+  sleep 5s
+fi
 sleep 2s

 if [ -z "${JAVA_HOME}" ]; then
@ -55,6 +59,10 @@ echo "preparing to invoke jpackage for I2P version $I2P_VERSION"

 "$JAVA_HOME"/bin/jpackage --type app-image --name I2P --app-version "$I2P_VERSION" \
  --verbose \
+  --java-options "-Xmx512m" \
+  --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \
+  --java-options "--add-opens java.base/sun.nio.fs=ALL-UNNAMED" \
+  --java-options "--add-opens java.base/java.nio=ALL-UNNAMED" \
  $JPACKAGE_OPTS \
  --resource-dir build \
  --java-options "--illegal-access=permit" \
--- a/changelog.txt
+++ b/changelog.txt
@ -1,3 +1,45 @@
+2021-11-1 idk
+* HTTPS Everywhere will now self-disable on some Firefox versions. This is not
+ an issue since HTTPS Everywhere is deprecated in favor of Firefox built-in
+ HTTPS enforcement features.
+* .bat Script: Detect location of C:\Program Files\I2P or
+ C\Program Files(x86)\I2P in launcher scripts
+* NSIS changes
+ - Make launcher scripts static artifacts instead of generating them during
+  the install process
+ - If a jpackaged I2P router is present in $checkout/I2P, include it in an
+  installer.
+ - If a running installer doesn't find an I2P router in Program Files, install
+  the jpackaged I2P router. Mark it as jpackaged so we can quickly determine
+  from other applications.
+* I2P in Private Browsing changes
+ - bugfix for `reset()` of dynamic theme
+ - bugfix for erroneous redirect/contain of mis-identified I2PSnark containers
+ - improve support for in-I2P HTTPS
+ - use global CSS on pageAction panels for HTTP, HTTPS, and Bittorrent(@sadie)
+ - improve support for I2PSnark web handler in HTTPS tabs
+ - icon update(@sadie)
+ - contain android-incompatible features so they won't be executed on Fennec
+ - translate into Spanish
+ - visually conceal/reveal features based on whether they are enabled/configured.
+* I2P Jpackage
+ - support for building an I2P Jpackage has been added to the build system
+  Note that support is platform-specific, to build a Windows jpackage one must
+  use a Windows OS, to build a Linux jpackage one must use a Linux OS. Only
+  Windows jpackages are used for a release product.
+ - For information about how releases are built see README.md and UPDATES.md
+ - The jpackaged router has the following differences from mainline I2P:
+  - The jars are installed to a different directory.
+  - The native libraries are installed to a different directory
+  - The wrapper script is not installed and not used, and replaced by the
+   browser launcher.
+  - The I2P executable is %programfiles%/I2P/I2P.exe, command-line flags are not
+   compatible but configuration files are.
+  - wrapper.config is unused
+  - The built-by entry will reflect that idk built the package
+  - Use flags to achieve compatibility with plugins that use Reflection on Java
+   17 jpackages
+
 2021-01-17 idk
 * Use Local Application Data instead of Roaming application data for router.config file
 * Use Roaming Application Daya only if a clients.config.d is present, indicating that the
--- 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,2 @@
+i2p-firefox-profile_1.05.0-1_all.deb net optional
+i2p-firefox-profile_1.05.0-1_amd64.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/16
+++ b/16
@ -3,13 +3,13 @@

 #Comment this out to build from an alternate branch or
 # the tip of the master branch.
-#I2P_VERSION=0.9.50
-#export I2P_VERSION=0.9.50
-#VERSION=i2p-$I2P_VERSION
-#export VERSION="$VERSION"
+I2P_VERSION=1.6.1
+export I2P_VERSION=1.6.1
+VERSION=i2p-"$I2P_VERSION"
+export VERSION="$VERSION"

 #Uncomment this to build from the tip of the master.
-I2P_VERSION=0.9.50
-export I2P_VERSION=0.9.50
-VERSION=master
-export VERSION="$VERSION"
+#I2P_VERSION=0.9.50
+#export I2P_VERSION=0.9.50
+#VERSION=master
+#export VERSION="$VERSION"
--- 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/src/app-profile/storage-sync.sqlite
+++ b/src/app-profile/storage-sync.sqlite
--- a/src/app-profile/version.txt
+++ b/src/app-profile/version.txt
@ -1 +1 @@
-0.04.0
+1.06.1
--- a/src/nsis/i2pbrowser-installer.nsi
+++ b/src/nsis/i2pbrowser-installer.nsi
@ -310,7 +310,7 @@ Section Install
    SetOutPath "$INSTDIR\firefox.profile.i2p\extensions"
    File "profile\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
    File profile\extensions\https-everywhere-eff@eff.org.xpi
-    File profile\extensions\i2prhz@eyedeekay.github.io.xpi
+    File profile\extensions\i2ppb@eyedeekay.github.io.xpi

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

    # Install the config userChrome
    createDirectory "$INSTDIR\firefox.profile.config.i2p\chrome"
@ -414,10 +414,10 @@ Section "uninstall"
    # Uninstall the extensions
    Delete "$INSTDIR\firefox.profile.i2p\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
    Delete "$INSTDIR\firefox.profile.i2p\extensions\https-everywhere-eff@eff.org.xpi"
-    Delete "$INSTDIR\firefox.profile.i2p\extensions\i2prhz@eyedeekay.github.io.xpi"
+    Delete "$INSTDIR\firefox.profile.i2p\extensions\i2ppb@eyedeekay.github.io.xpi"

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

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

--- a/src/nsis/i2pbrowser-jpackage.nsi
+++ b/src/nsis/i2pbrowser-jpackage.nsi
@ -1 +1 @@
-!define I2P_VERSION 0.9.50
+!define I2P_VERSION 1.6.1
--- a/src/nsis/i2pbrowser-version.nsi
+++ b/src/nsis/i2pbrowser-version.nsi
@ -1,3 +1,3 @@
-!define VERSIONMAJOR 0
-!define VERSIONMINOR 04
-!define VERSIONBUILD 0
+!define VERSIONMAJOR 1
+!define VERSIONMINOR 06
+!define VERSIONBUILD 1
--- a/src/profile/storage-sync.sqlite
+++ b/src/profile/storage-sync.sqlite
--- a/src/profile/version.txt
+++ b/src/profile/version.txt
@ -1 +1 @@
-0.04.0
+1.06.1
--- 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
@ -1,13 +1,18 @@
@echo on

-if not exist "%ProgramFiles%\I2P\" (
-  set "ProgramFiles=C:\Program Files"
+set "I2PPath=%ProgramFiles%\I2P\"
+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" "%ProgramFiles%\I2P\i2p.exe"
+  start "i2p" /D "%LOCALAPPDATA%\I2P" "%I2PPath%\i2p.exe"
 ) else (
-  start "i2p" "%ProgramFiles%\I2P\i2p.exe"
+  start "i2p" "%I2PPath%\i2p.exe"
 )

 timeout /t 3
--- a/src/win/i2pbrowser.bat
+++ b/src/win/i2pbrowser.bat
@ -1,13 +1,18 @@
@echo on

-if not exist "%ProgramFiles%\I2P\" (
-  set "ProgramFiles=C:\Program Files"
+set "I2PPath=%ProgramFiles%\I2P\"
+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" "%ProgramFiles%\I2P\i2p.exe"
+  start "i2p" /D "%LOCALAPPDATA%\I2P" "%I2PPath%\i2p.exe"
 ) else (
-  start "i2p" "%ProgramFiles%\I2P\i2p.exe"
+  start "i2p" "%I2PPath%\i2p.exe"
 )

 timeout /t 3
Author	SHA1	Message	Date
idk	6128b98ece	Merge branch 'master' of 127.0.0.1:i2p-hackers/i2p.firefox	2022-01-31 12:49:46 -05:00
idk	7636ab24d6	Merge branch 'EXPERIMENTAL-debian' into 'master' Adds support for building a `.deb` package for Debian or Ubuntu using "Official" tools(debuild, etc) Closes #5 See merge request i2p-hackers/i2p.firefox!5	2022-01-30 23:33:04 +00:00
idk	3d45bde893	Merge branch 'master' into 'EXPERIMENTAL-debian' # Conflicts: # Makefile # debian/files	2022-01-30 23:32:48 +00:00
idk	30f24f6386	use git clean to clean up workspace in distclean target. Add todo.	2022-01-14 11:30:17 -05:00
idk	b9c7a7dffb	ignore jpackage config generations error when an I2P jpackage isn't being included.	2022-01-14 10:41:56 -05:00
idk	e1e84bf0ea	Un-escape the URL which comes escaped from bttools(TODO: fix issue in bttools).	2021-12-20 16:17:03 -05:00
idk	ef45bf3944	Un-escape the URL which comes escaped from bttools(TODO: fix issue in bttools).	2021-12-20 13:52:38 -05:00
idk	7ce35e0010	fix issue in torrent generation line	2021-12-09 21:54:43 -05:00
idk	22e22c8175	fix torrent generator targets	2021-12-08 23:07:12 -05:00
idk	82104baa5a	set probable default path before checking list of paths in windows bat file	2021-12-08 10:33:08 -05:00
idk	57a8f6a1a0	Fix bug, bump version	2021-12-07 22:25:42 -05:00
idk	a96d33027c	Update router version	2021-12-07 14:40:43 -05:00
idk	3125f13138	Sign with my Router News keys instead of my plugin keys	2021-11-07 15:14:07 -05:00
idk	d53974d5b9	bump NSIS build to 1.05.1	2021-11-06 15:49:28 -04:00
idk	4d6c1d4df1	zip should be recursive	2021-11-06 13:57:14 -04:00
idk	de6c0dfd2f	Add upload targets for the jpackage zips	2021-11-06 13:49:39 -04:00
idk	187cf7dfef	Add upload targets for the jpackage zips	2021-11-06 13:48:41 -04:00
idk	a9563fd763	update version in build system	2021-11-06 13:21:24 -04:00
idk	060db1cff6	update changelog entries	2021-11-01 14:26:42 -04:00
idk	28fc12d1be	update the changelog	2021-11-01 14:25:26 -04:00
idk	1aba1177c2	Add flags to jpackage for plugins that use reflection to work. Add a warning if compiling with less than Java 17 and sleep longer if using less than java 17.	2021-10-30 20:38:55 -04:00
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	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	d13e2317dd	Make it run in Docker too	2021-08-20 00:12:36 -04:00
idk	0575913c19	update where it places the desktop files	2021-07-06 13:32:47 -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
				`@ -1 +0,0 @@`
				`https://addons.mozilla.org/firefox/downloads/file/3716461/2021.7.13/https_everywhere-2021.7.13-an+fx.xpi`
 @ -1 +1 @@
 .04.0
 .06.1