disable signing in releaser script

.gitignore

@@ -22,3 +22,7 @@ cmd
 *.zip
 *.tar.gz
 config_override.sh
+i2pkeys
+onionkeys
+tlskeys
+tmp

Makefile

@@ -7,7 +7,7 @@ preset=`rm .version; make version`
 
 -include .version
 
-PROFILE_VERSION=$(MAJOR).$(MINOR).$(BUILD)
+PROFILE_VERSION=$(VERSIONMAJOR).$(VERSIONMINOR).$(VERSIONBUILD)
 
 all: version prep install.exe
 
@@ -59,7 +59,7 @@ install.exe: #build/licenses
 
 export RES_DIR="../i2p.i2p.jpackage-build/installer/resources"
 export PKG_DIR="../i2p.i2p.jpackage-build/pkg-temp"
-export I2P_JBIGI="../i2p.i2p.jpackage-build/installer/lib/jbigi"
+#export I2P_JBIGI="../i2p.i2p.jpackage-build/installer/lib/jbigi"
 
 distclean: clean
 	rm -rf I2P
@@ -70,7 +70,7 @@ I2P:
 build/I2P: I2P build
 	rm -rf build/I2P
 	cp -rv I2P build/I2P ; true
-	cp "$(I2P_JBIGI)"/*windows*.dll build/I2P/runtime/lib; true
+#	cp "$(I2P_JBIGI)"/*windows*.dll build/I2P/runtime/lib; true
 
 src/I2P/config:
 	mkdir -p src/I2P/config
@@ -130,8 +130,11 @@ include makefiles/debian.mk
 
 I2P_DATE=`date +%Y-%m-%d`
 
-MAGNET=`bttools torrent printinfo i2pwinupdate.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
+MAGNET=`bttools torrent dumpinfo i2pwinupdate.su3.torrent | grep 'Magnet' | sed 's|Magnet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
-MAGNET_TESTING=`bttools torrent printinfo i2pwinupdate-testing.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
+MAGNET_TESTING=`bttools torrent dumpinfo i2pwinupdate-testing.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
+
+magnet:
+	echo "$(MAGNET)"
 
 BLANK=`awk '! NF { print NR; exit }' changelog.txt`
 

build.sh

@@ -25,6 +25,8 @@ if [ -z $machine ]; then
   esac
 fi
 
+ICON="src/icons/ui2pbrowser_icon.ico"
+
 if [ "$machine" = "Mac" ]; then
   rm -rf I2P
   ./getprebuilt.sh
@@ -33,6 +35,8 @@ elif [ "$machine" = "Linux" ]; then
   rm -rf I2P
   ./getprebuilt.sh
   exit 0
+elif [ "$machine" = "unix" ]; then
+  ICON=src/icons/windowsUIToopie2.png
 fi
 
 . "$SCRIPT_DIR/launcher.sh"
@@ -63,7 +67,7 @@ if [ ! -d "I2P" ]; then
   --app-content src/win/torbrowser-windows.sh \
   --app-content src/icons/windowsUIToopie2.png \
   --app-content src/icons/ui2pbrowser_icon.ico \
-  --icon src/icons/windowsUIToopie2.png \
+  --icon "${ICON}" \
   --input build --main-jar launcher.jar --main-class net.i2p.router.WinLauncher
 fi
 

config.sh

@@ -14,6 +14,8 @@ if [[ -n "$IS_WSL" || -n "$WSL_DISTRO_NAME" ]]; then
     export PATH="/c/Program Files/Java/jdk-19/bin/:$PATH:/c/Program Files/Java/jdk-19/bin/"
     JAVA_HOME="/c/Program Files/Java/jdk-19"
     export JAVA_HOME="/c/Program Files/Java/jdk-19"
+    HOST=win32
+    export HOST=win32
 fi
 
 if [ "${uname}" != "Linux" ]; then
@@ -21,6 +23,8 @@ if [ "${uname}" != "Linux" ]; then
     export PATH="/c/Program Files/Java/jdk-19/bin/:$PATH:/c/Program Files/Java/jdk-19/bin/"
     JAVA_HOME="/c/Program Files/Java/jdk-19"
     export JAVA_HOME="/c/Program Files/Java/jdk-19"
+    HOST=win32
+    export HOST=win32
 fi
 
 
@@ -74,9 +78,13 @@ fi
 if [[ -n "$IS_WSL" || -n "$WSL_DISTRO_NAME" ]]; then
     PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
     export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+    PATH="$PATH:C:\Users\user\Downloads\m4-1.4.14-1-bin\bin"
+    export PATH="$PATH:C:\Users\user\Downloads\m4-1.4.14-1-bin\bin"
 fi
 
 if [ "${uname}" != "Linux" ]; then
     PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
     export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+    PATH="$PATH:C:\Users\user\Downloads\m4-1.4.14-1-bin\bin"
+    export PATH="$PATH:C:\Users\user\Downloads\m4-1.4.14-1-bin\bin"
 fi

i2pversion

@@ -2,15 +2,14 @@
 
 JNA_VERSION=5.12.1
 export JNA_VERSION=5.12.1
-I2PFIREFOX_VERSION=1.0.5
+I2PFIREFOX_VERSION=1.0.7
-export I2PFIREFOX_VERSION=1.0.5
+export I2PFIREFOX_VERSION=1.0.7
 # Comment this out to build from an alternate branch or
 # the tip of the master branch.
 VERSIONMAJOR=2
-VERSIONMINOR=0
+VERSIONMINOR=1
 VERSIONBUILD=0
 I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
 export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
-VERSION=i2p-2.0.0
+VERSION=i2p-2.1.0
-export VERSION=i2p-2.0.0
+export VERSION=i2p-2.1.0
-

java/net/i2p/router/WinLauncher.java

@@ -88,7 +88,7 @@ public class WinLauncher extends CopyConfigDir {
     File programs = programFile();
     File home = homeDir();
 
-    System.setProperty("i2p.dir.base", programs.getAbsolutePath());
+    System.setProperty("i2p.dir.base", new File(programs.getAbsolutePath(), "config").getAbsolutePath());
     System.setProperty("i2p.dir.config", home.getAbsolutePath());
     System.setProperty("router.pid",
                        String.valueOf(ProcessHandle.current().pid()));

launcher.sh

@@ -41,24 +41,27 @@ sleep 5s
 HERE="$PWD"
 if [ ! -d "$HERE/../i2p.i2p.jpackage-build/" ]; then
   git clone --depth=1 -b "$VERSION" https://i2pgit.org/i2p-hackers/i2p.i2p "$HERE/../i2p.i2p.jpackage-build/"
-  tar --exclude="$HERE/../i2p.i2p.jpackage-build/.git" -cvzf i2p.i2p.jpackage-build.tar.gz "$HERE/../i2p.i2p.jpackage-build/"
 fi
 cd "$HERE/../i2p.i2p.jpackage-build/"
-git pull --all
+git pull --tags
+git archive --format=tar.gz --output="$HERE/../i2p.firefox/i2p.i2p.jpackage-build.tar.gz" "$VERSION"
 for i in $COUNT; do
   echo -n "$i...."; sleep 1s
 done
 ant distclean pkg || true
+ant jbigi
 
 cd "$HERE"
 export I2P_PKG="$HERE/../i2p.i2p.jpackage-build/pkg-temp"
 export RES_DIR="$HERE/../i2p.i2p.jpackage-build/installer/resources"
 export I2P_JARS="$I2P_PKG/lib"
 export I2P_JBIGI="$HERE/../i2p.i2p.jpackage-build/installer/lib/jbigi"
+export I2P_JBIGI_JAR="$HERE/../i2p.i2p.jpackage-build/build/jbigi.jar"
 
 echo "compiling custom launcher"
 mkdir -p build
 cp "$I2P_JARS"/*.jar build
+cp "$I2P_JBIGI_JAR" build
 if [ ! -f "$HERE/build/jna.jar" ]; then
   wget -O "$HERE/build/jna.jar" "https://repo1.maven.org/maven2/net/java/dev/jna/jna/$JNA_VERSION/jna-$JNA_VERSION.jar"
 fi
@@ -71,8 +74,12 @@ if [ ! -f "$HERE/build/i2pfirefox.jar" ]; then
   wget -O "$HERE/build/i2pfirefox.jar" "https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/$I2PFIREFOX_VERSION/i2pfirefox.jar"
 fi
 
+for dll in "$I2P_JBIGI/"*windows*.dll; do
+  jar uf "$HERE/build/jbigi.jar" "$dll"
+done
+
 cd java
-"$JAVA_HOME"/bin/javac -d ../build -classpath "$HERE/build/i2pfirefox.jar:$HERE/build/jna.jar":"$HERE/build/jna-platform.jar":"$HERE/build/i2p.jar":"$HERE/build/router.jar":"$HERE/build/routerconsole.jar" \
+"$JAVA_HOME"/bin/javac -d ../build -classpath "$HERE/build/i2pfirefox.jar:$HERE/build/jna.jar":"$HERE/build/jna-platform.jar":"$HERE/build/i2p.jar":"$HERE/build/router.jar":"$HERE/build/routerconsole.jar":"$HERE/build/jbigi.jar" \
   net/i2p/router/CopyConfigDir.java \
   net/i2p/router/Elevator.java \
   net/i2p/router/Shell32X.java \

makefiles/su.mk

@@ -7,11 +7,11 @@ $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools:
 		go mod vendor && go build
 
 prepupdate:
-	cp -v "I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3" i2pwinupdate.su3
+	cp -v "I2P-Easy-Install-Bundle-$(PROFILE_VERSION)-signed.su3" i2pwinupdate.su3
 
 su3: $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools
-	$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)-signed" -signer "$(SIGNER)" -version "$(I2P_VERSION)"
+	$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Easy-Install-Bundle-$(PROFILE_VERSION)-signed" -signer "$(SIGNER)" -version "$(PROFILE_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" $(PROFILE_VERSION) $(SIGNER)
+	java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Easy-Install-Bundle-$(PROFILE_VERSION)-signed.exe I2P-Easy-Install-Bundle-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" $(PROFILE_VERSION) $(SIGNER)
 
 i2pwinupdate.su3.torrent: prepupdate su3
 	mktorrent \

sign.sh

@@ -40,6 +40,8 @@ if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
     linuxsign I2P-Easy-Install-Bundle-$I2P_VERSION.exe
     cp "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" "I2P-Easy-Install-Bundle-$I2P_VERSION-signed.exe"
 else
-    signtool.exe sign -a "I2P-Easy-Install-Bundle-$I2P_VERSION.exe"
+    #signtool.exe sign -a "I2P-Easy-Install-Bundle-$I2P_VERSION.exe"
+    echo "WARNING: Signing is temporarily disabled for the installer."
+    sleep 5s
     cp "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" "I2P-Easy-Install-Bundle-$I2P_VERSION-signed.exe"
 fi