Update release notes

.github/workflows/ant-latest.yml

@@ -0,0 +1,128 @@
+
+name: Java 22 CI
+
+on: [push]
+
+jobs:
+
+  nsis-jdk22:
+    runs-on: windows-latest
+    steps:
+      - uses: Vampire/setup-wsl@v3
+        with:
+          distribution: Ubuntu-20.04
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+          git config --global user.email "github@i2p.net"
+          git config --global user.name "eyedeekay Github CI Build"
+      - uses: actions/checkout@v4
+      - run: wsl apt-get update
+      - run: wsl apt-get install -y nsis nsis-common nsis-pluginapi wget dos2unix curl jq gpg gettext
+      - name: Set up JDK 22
+        uses: actions/setup-java@v4
+        with:
+          java-version: '22'
+          distribution: 'temurin'
+      - name: build with script
+        run: bash -c "./buildscripts/unsigned.sh; ls *.exe"
+      - name: Upload archived copy of I2P router source embedded in the build
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p.i2p.jpackage-build.tar.gz
+          path: i2p.i2p.jpackage-build.tar.gz
+      - name: Upload prebuilt jpackage bundle without any plugins or modded config
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-Prebuilt.zip
+          path: I2P-Prebuilt.zip
+      - name: Upload I2P-Easy-Install-Bundle-unsigned.exe
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-Easy-Install-Bundle-unsigned-jdk22.exe
+          path: I2P-Easy-Install-Bundle-*.exe
+
+  buildjpackagexe-jdk22:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 22
+        uses: actions/setup-java@v4
+        with:
+          java-version: '22'
+          distribution: 'temurin'
+      - name: build with script
+        run: bash -c "./buildscripts/exe.sh; ls *.exe"
+      - name: Upload I2P-Easy-Install-Bundle-unsigned.exe
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-EXE-unsigned-jdk22.exe
+          path: I2P-EXE-*.exe
+
+  buildjpackagmsi-jdk22:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 22
+        uses: actions/setup-java@v4
+        with:
+          java-version: '22'
+          distribution: 'temurin'
+      - name: build with script
+        run: bash -c "./buildscripts/msi.sh; ls *.msi"
+      - name: Upload I2P-Easy-Install-Bundle-unsigned.msi
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-MSI-unsigned-jdk22.msi
+          path: I2P-MSI-*.msi
+
+  buildzip-jdk22:
+    runs-on: windows-latest
+    steps:
+      - uses: Vampire/setup-wsl@v3
+        with:
+          distribution: Ubuntu-20.04
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+          git config --global user.email "github@i2p.net"
+          git config --global user.name "eyedeekay Github CI Build"
+      - uses: actions/checkout@v4
+      - run: wsl apt-get update
+      - run: wsl apt-cache search 7zip
+      - run: wsl apt-get install -y nsis nsis-common nsis-pluginapi wget dos2unix curl jq gpg gettext zip p7zip-full ca-certificates
+      - run: choco install wget
+      - name: Set up JDK 22
+        uses: actions/setup-java@v4
+        with:
+          java-version: '22'
+          distribution: 'temurin'
+      - name: build with script
+        run: bash -c "./buildscripts/zip.sh; ls -d * */* "
+      - name: Upload I2P-windows-portable.zip
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-windows-portable-jdk22.zip
+          path: I2P-windows-portable.zip
+        
+  buildtgz-jdk22:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 22
+        uses: actions/setup-java@v4
+        with:
+          java-version: '22'
+          distribution: 'temurin'
+      - run: |
+          sudo apt-get update
+          sudo apt-get install -y nsis nsis-common nsis-pluginapi wget dos2unix curl jq gpg gettext
+      - name: build with script
+        run: ./buildscripts/targz.sh; ls *.tar.gz
+      - name: Upload I2P.tar.gz
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-jdk22.tar.gz
+          path: I2P.tar.gz

.github/workflows/ant.yml

@@ -27,6 +27,16 @@ jobs:
           distribution: 'temurin'
       - name: build with script
         run: bash -c "./buildscripts/unsigned.sh; ls *.exe"
+      - name: Upload archived copy of I2P router source embedded in the build
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p.i2p.jpackage-build.tar.gz
+          path: i2p.i2p.jpackage-build.tar.gz
+      - name: Upload prebuilt jpackage bundle without any plugins or modded config
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-Prebuilt.zip
+          path: I2P-Prebuilt.zip
       - name: Upload I2P-Easy-Install-Bundle-unsigned.exe
         uses: actions/upload-artifact@v4
         with:

.github/workflows/release-nightly-latest.yml

@@ -0,0 +1,94 @@
+name: Nightly Release
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            changelog.txt
+            docs/RELEASE.md
+          sparse-checkout-cone-mode: false
+      - name: sleep 22 minutes
+        run: |
+          echo "sleeping 22 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 21 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 20 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 19 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 18 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 17 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 16 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 15 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 14 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 13 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 12 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 11 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 10 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 9 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 8 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 7 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 6 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 5 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 4 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 3 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 2 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 1 minutes to wait for artifacts"
+          sleep 1m
+      - name: Download artifacts
+        id: download-artifact
+        uses: dawidd6/action-download-artifact@v3
+        with:
+          skip_unpack: true
+          workflow: ant-latest.yml
+          if_no_artifact_found: fail
+      # remove .zip file extension
+      - run: for f in *.zip; do unzip "$f"; rm "$f"; done
+      - run: cp changelog.txt changelog-java22.txt
+      - run: echo "" | tee -a changelog-java22.txt
+      - run: echo "## Checksums" | tee -a changelog-java22.txt
+      - run: echo "" | tee -a changelog-java22.txt
+      - run: echo '```' | tee -a changelog-java22.txt
+      - run: sha256sum * | tee -a changelog-java22.txt
+      - run: echo '```' | tee -a changelog-java22.txt
+      - run: echo "" | tee -a changelog-java22.txt
+      - run: echo '```' | tee -a changelog-java22.txt
+      - run: file * | tee -a changelog-java22.txt
+      - run: echo '```' | tee -a changelog-java22.txt
+      - run: echo "" | tee -a changelog-java22.txt
+      - run: cat docs/RELEASE.md changelog-java22.txt > RELEASE.md
+      - name: Upload artifacts
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: "*"
+          prerelease: true
+          allowUpdates: true
+          replacesArtifacts: true
+          makeLatest: true
+          tag: nightly
+          bodyFile: "RELEASE.md"

.github/workflows/release-nightly.yml

@@ -0,0 +1,89 @@
+name: Nightly 22 Release
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            changelog.txt
+            docs/RELEASE.md
+          sparse-checkout-cone-mode: false
+      - name: sleep 15 minutes
+        run: |
+          echo "sleeping 20 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 19 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 18 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 17 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 16 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 15 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 14 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 13 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 12 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 11 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 10 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 9 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 8 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 7 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 6 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 5 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 4 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 3 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 2 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 1 minutes to wait for artifacts"
+          sleep 1m
+      - name: Download artifacts
+        id: download-artifact
+        uses: dawidd6/action-download-artifact@v3
+        with:
+          skip_unpack: true
+          workflow: ant.yml
+          if_no_artifact_found: fail
+      # remove .zip file extension
+      - run: for f in *.zip; do unzip "$f"; rm "$f"; done
+      - run: echo "" | tee -a changelog.txt
+      - run: echo "## Checksums" | tee -a changelog.txt
+      - run: echo "" | tee -a changelog.txt
+      - run: echo '```' | tee -a changelog.txt
+      - run: sha256sum * | tee -a changelog.txt
+      - run: echo '```' | tee -a changelog.txt
+      - run: echo "" | tee -a changelog.txt
+      - run: echo '```' | tee -a changelog.txt
+      - run: file * | tee -a changelog.txt
+      - run: echo '```' | tee -a changelog.txt
+      - run: echo "" | tee -a changelog.txt
+      - run: cat docs/RELEASE.md changelog.txt > RELEASE.md
+      - name: Upload artifacts
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: "*"
+          prerelease: true
+          allowUpdates: true
+          replacesArtifacts: true
+          makeLatest: true
+          tag: nightly
+          bodyFile: "RELEASE.md"

README.md

@@ -95,8 +95,8 @@ Windows Build
 -------------
 
 After installing the dependencies and completing the preparations,
-just run `make`.  This will produce the install.exe - the windows
-installer, which sets up the shortcuts to launch Firefox on Windows.
+just run `buildscripts/unsigned.sh`.  This will produce the install.exe - the
+windows installer, which sets up the shortcuts to launch Firefox on Windows.
 Building without a jpackage is no longer supported.
 
 When generating a build it's important to make sure that the
@@ -137,7 +137,7 @@ Ubuntu in WSL.
  7. Move into the i2p.firefox directory. Run the `./buildscripts/build.sh` script.
 
         cd i2p.firefox
-        ./buildscripts/build.sh
+        ./buildscripts/unsigned.sh
 
  8. Compile the NSIS installer using WSL.
 
@@ -178,8 +178,7 @@ 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.
+Certificate which Windows will recognize. Standard Windows signing tools are used.
 
 ```sh
 ./release.sh

buildscripts/build.sh

@@ -55,7 +55,12 @@ echo "preparing to invoke jpackage for I2P version $I2P_VERSION"
 rm -rf I2P
 
 if [ ! -d "I2P" ]; then
-"$JAVA_HOME"/bin/jpackage --type app-image --name I2P --app-version "$I2P_VERSION" \
+  if echo "$I2P_VERSION" | grep "master"; then
+    RELEASE_VERSION="9.9.9"
+  else
+    RELEASE_VERSION="$I2P_VERSION"
+  fi
+"$JAVA_HOME"/bin/jpackage --type app-image --name I2P --app-version "$RELEASE_VERSION" \
   --verbose \
   --java-options "-Xmx512m" \
   --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \
@@ -81,3 +86,4 @@ cp "$SCRIPT_DIR/../i2p.i2p.jpackage-build/LICENSE.txt" license/I2P.txt
 mkdir -p "$SCRIPT_DIR"/build/I2P
 cp -rv "$SCRIPT_DIR"/I2P/* "$SCRIPT_DIR"/build/I2P
 cp -rv src/I2P/config build/I2P/config
+zip -r I2P-Prebuilt.zip build/I2P/

buildscripts/exe.sh

@@ -8,7 +8,12 @@ cd "$SCRIPT_DIR" || exit 1
 . ./config.sh
 . ./i2pversion
 ./buildscripts/build.sh
-jpackage --name I2P-EXE --app-version "$I2P_VERSION" \
+if echo "$I2P_VERSION" | grep "master"; then
+    RELEASE_VERSION="9.9.9"
+else
+    RELEASE_VERSION="$I2P_VERSION"
+fi
+jpackage --name I2P-EXE --app-version "$RELEASE_VERSION" \
     --verbose \
     --java-options "-Xmx512m" \
     --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \

buildscripts/launcher.sh

@@ -48,9 +48,16 @@ export I2P_JARS="$I2P_PKG/lib"
 export I2P_JBIGI="$SCRIPT_DIR/../i2p.i2p.jpackage-build/installer/lib/jbigi"
 export I2P_JBIGI_JAR="$SCRIPT_DIR/../i2p.i2p.jpackage-build/build/jbigi.jar"
 if [ ! -d "$SCRIPT_DIR/../i2p.i2p.jpackage-build/" ]; then
+  if [ -d "$SCRIPT_DIR/../i2p.i2p/" ]; then
+    echo cloning from local i2p.i2p checkout
+    git clone --depth=1 -b "$VERSION" -l "$SCRIPT_DIR/../i2p.i2p/" "$SCRIPT_DIR/../i2p.i2p.jpackage-build/"
+  else
+    echo cloning from remote i2p.i2p repository
     git clone --depth=1 -b "$VERSION" https://i2pgit.org/i2p-hackers/i2p.i2p "$SCRIPT_DIR/../i2p.i2p.jpackage-build/"
   fi
+fi
 cd "$SCRIPT_DIR/../i2p.i2p.jpackage-build/"
+echo "setting up git branch for build"
 OLDEXTRA=$(find . -name RouterVersion.java -exec grep 'String EXTRA' {} \;)
 if [ -z "$EXTRA" ]; then
   export EXTRACODE="win"
@@ -58,12 +65,10 @@ if [ -z "$EXTRA" ]; then
 fi
 if [ "$VERSION" = master ]; then
   VERSIONDATE="$(date +%m%d)"
-  export TAG_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
 else
   export TAG_VERSION="$VERSION"
 fi
-
-
+echo "build is: i2p-$TAG_VERSION-$VERSIONDATE-$EXTRACODE"
 
 find . -name RouterVersion.java -exec sed -i "s|$OLDEXTRA|$EXTRA|g" {} \;
 git switch - || :
@@ -82,7 +87,7 @@ ant jbigi
 cd "$SCRIPT_DIR"
 
 mkdir -p "$SCRIPT_DIR/src/I2P/config"
-rm -rf "$SCRIPT_DIR/src/I2P/config/geoip" "$SCRIPT_DIR/src/I2P/config/webapps" "$SCRIPT_DIR/src/I2P/config/certificates"
+rm -rf "$SCRIPT_DIR/src/I2P/config/geoip" "$SCRIPT_DIR/src/I2P/config/webapps" "$SCRIPT_DIR/src/I2P/config/certificates" "$SCRIPT_DIR/src/I2P/config/eepsite"
 cp -v "$RES_DIR/clients.config" "$SCRIPT_DIR/src/I2P/config/"
 cp -v "$RES_DIR/wrapper.config" "$SCRIPT_DIR/src/I2P/config/"
 #grep -v 'router.updateURL' $(RES_DIR)/router.config > "$SCRIPT_DIR"/src/I2P/config/router.config
@@ -115,11 +120,11 @@ if [ ! -f "$SCRIPT_DIR/build/i2pfirefox.zip" ]; then
   wget_download "https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/$I2PFIREFOX_VERSION/plugin.zip" -O "$SCRIPT_DIR/build/i2pfirefox.zip"
 fi
 
-if [ ! -d "$SCRIPT_DIR/build/I2P/config/plugins/i2pfirefox" ]; then
-  mkdir -p "$SCRIPT_DIR/build/I2P/config/plugins/"
-  unzip "$SCRIPT_DIR/build/i2pfirefox.zip" -d "$SCRIPT_DIR/build/I2P/config/plugins/"
-  rm -rf "$SCRIPT_DIR/build/I2P/config/plugins/i2pfirefox"
-  mv "$SCRIPT_DIR/build/I2P/config/plugins/plugin" "$SCRIPT_DIR/build/I2P/config/plugins/i2pfirefox"
+if [ ! -d "$SCRIPT_DIR/src/I2P/config/plugins/i2pfirefox" ]; then
+  mkdir -p "$SCRIPT_DIR/src/I2P/config/plugins/"
+  unzip "$SCRIPT_DIR/build/i2pfirefox.zip" -d "$SCRIPT_DIR/src/I2P/config/plugins/"
+  rm -rf "$SCRIPT_DIR/src/I2P/config/plugins/i2pfirefox"
+  mv "$SCRIPT_DIR/src/I2P/config/plugins/plugin" "$SCRIPT_DIR/src/I2P/config/plugins/i2pfirefox"
 fi
 
 for dll in "$I2P_JBIGI/"*windows*.dll; do
@@ -128,12 +133,11 @@ done
 
 cd "$SCRIPT_DIR"/java
 "$JAVA_HOME"/bin/javac -Xlint:deprecation -d ../build -classpath "$SCRIPT_DIR/build/i2pfirefox.jar:$SCRIPT_DIR/build/jna.jar:$SCRIPT_DIR/build/jna-platform.jar":"$SCRIPT_DIR/build/i2p.jar:$SCRIPT_DIR/build/router.jar:$SCRIPT_DIR/build/routerconsole.jar:$SCRIPT_DIR/build/jbigi.jar" \
-  net/i2p/router/CopyConfigDir.java \
-  net/i2p/router/WindowsServiceUtil.java \
-  net/i2p/router/WindowsAppUtil.java \
   net/i2p/router/I2PAppUtil.java \
-  net/i2p/router/WinUpdatePostProcessor.java \
+  net/i2p/router/WindowsAppUtil.java \
+  net/i2p/router/WindowsServiceUtil.java \
   net/i2p/router/WinLauncher.java \
+  net/i2p/router/WinUpdatePostProcessor.java \
   net/i2p/router/WinUpdateProcess.java \
   net/i2p/router/ZipUpdateProcess.java
 

buildscripts/msi.sh

@@ -9,7 +9,12 @@ cd "$SCRIPT_DIR" || exit 1
 . ./i2pversion
 
 "$SCRIPT_DIR"/buildscripts/build.sh
-jpackage --name I2P-MSI --app-version "$I2P_VERSION" \
+if echo "$I2P_VERSION" | grep "master"; then
+    RELEASE_VERSION="9.9.9"
+else
+    RELEASE_VERSION="$I2P_VERSION"
+fi
+jpackage --name I2P-MSI --app-version "$RELEASE_VERSION" \
     --verbose \
     --java-options "-Xmx512m" \
     --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \

buildscripts/release-download.sh

@@ -29,14 +29,14 @@ fi
 
 
 
-echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -t "$I2P_VERSION"
-github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -t "$I2P_VERSION"
+echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -t "i2p-firefox-$I2P_VERSION"
+github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -t "i2p-firefox-$I2P_VERSION"
 
 echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$I2P_VERSION"
-github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$I2P_VERSION"
+github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "i2p-firefox-$I2P_VERSION"
 
-echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p.i2p.jpackage-build.tar.gz" -t "$I2P_VERSION"
-github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p.i2p.jpackage-build.tar.gz" -t "$I2P_VERSION"
+echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p.i2p.jpackage-build.tar.gz" -t "i2p-firefox-$I2P_VERSION"
+github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p.i2p.jpackage-build.tar.gz" -t "i2p-firefox-$I2P_VERSION"
 
-echo github-release download -u "$GITHUB_USERNAME" -r i2p -t "$I2P_VERSION" -n "./I2P-jpackage-windows-$I2P_VERSION.zip"
-github-release download -u "$GITHUB_USERNAME" -r i2p -t "$I2P_VERSION" -n "./I2P-jpackage-windows-$I2P_VERSION.zip"
+echo github-release download -u "$GITHUB_USERNAME" -r i2p -t "i2p-firefox-$I2P_VERSION" -n "./I2P-jpackage-windows-$I2P_VERSION.zip"
+github-release download -u "$GITHUB_USERNAME" -r i2p -t "i2p-firefox-$I2P_VERSION" -n "./I2P-jpackage-windows-$I2P_VERSION.zip"

buildscripts/release-torrent.sh

@@ -36,13 +36,13 @@ java -cp "$I2P_LIBS/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Easy-Ins
 rm -f i2pwinupdate.su3.torrent
 cp -v I2P-Easy-Install-Bundle-$I2P_VERSION-signed.su3 i2pwinupdate.su3
 
-java -cp "$I2P_LIBS/*" "org.klomp.snark.Storage" -a http://tracker2.postman.i2p/announce.php -a http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a -a http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a -c "$SIGNER" -m "Official torrent for Windows Easy-Install version $I2P_VERSION" i2pwinupdate.su3
+java -cp "$I2P_LIBS/*" "org.klomp.snark.Storage" -a http://tracker2.postman.i2p/announce.php -c "$SIGNER" -m "Official torrent for Windows Easy-Install version $I2P_VERSION" i2pwinupdate.su3
 echo "~~~~~~~~~~"
 MAGNET=$(transmission-show -m "i2pwinupdate.su3.torrent" 2>&1 3>&1 | tail -n 1)
 echo "$MAGNET"
 ZIPCHECKSUM=$(sha256sum "i2pwinupdate.su3")
-echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3"
-github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3"
+echo github-release upload -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3"
+github-release upload -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3"
 ZIPCHECKSUM=$(sha256sum "i2pwinupdate.su3.torrent")
-echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3.torrent" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3.torrent"
-github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3.torrent" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3.torrent"
+echo github-release upload -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3.torrent" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3.torrent"
+github-release upload -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3.torrent" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3.torrent"

buildscripts/wine-jpackage.sh

@@ -0,0 +1,5 @@
+#! /usr/bin/env sh
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
+cd "$SCRIPT_DIR" || exit 1
+

docs/RELEASE.md

@@ -1,15 +1,3 @@
-# I2P Easy-Install Bundle for Windows 2.5.0
+# I2P Easy-Install 2.7.0
 
-This is a pre-release of the I2P Easy-Install Bundle for Windows.
-
-## 2.5.0 Release Notes.
-
-This release, I2P 2.5.0, provides more user-facing improvements than the 2.4.0 release, which was focused on implementing the NetDB isolation strategy.
-
-New features have been added to I2PSnark like the ability to search through torrents. Bugs have been fixed to improve compatibility with other I2P torrent clients like BiglyBT and qBittorrent. We would like to thank all of the developers who have worked with libtorrent and qBittorrent to enable and improve their I2P support. New features have also been added to SusiMail including support for Markdown formatting in emails and the ability to drag-and-drop attachments into emails. Tunnels created with the Hidden Services manager now support "Keepalive" which improves performance and compatibility with web technologies, enabling more sophisticated I2P sites.
-
-During this release we also made several tweaks to the NetDB to improve its resilience to spam and to improve the router's ability to reject suspicious messages. This was part of an effort to "audit" the implementation of "Sub-DB isolation" defenses from the 2.4.0 release. This investigation uncovered one minor isolation-piercing event which we repaired. This issue was discovered and fixed internally by the I2P team.
-
-During this release several improvements were made to the process of releasing our downstream distributions for Android and Windows. This should result in improved delivery and availability for these downstream products.
-
-As usual, we recommend that you update to this release. The best way to maintain security and help the network is to run the latest release.
+This release updates the embedded I2P router to I2P 2.7.0.

i2pversion

@@ -14,22 +14,26 @@ if [ -z "$VERSIONBUILD" ]; then
     VERSIONBUILD=$(echo "$GITHUB_TAG" | cut -d . -f 3)
 fi
 if [ -z "$VERSIONMAJOR" ]; then
-    VERSIONMAJOR=2
-fi
-if [ -z "$VERSIONMINOR" ]; then
-    VERSIONMINOR=5
-fi
-if [ -z "$VERSIONBUILD" ]; then
-    VERSIONBUILD=1
-fi
+    I2P_VERSION="master"
+    export I2P_VERSION="master"
+    VERSION="master"
+    export VERSION="master"
+    I2PFIREFOX_VERSION="2.7.0"
+    export I2PFIREFOX_VERSION="2.7.0"
+else
     I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
     export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
+    VERSION="i2p-$I2P_VERSION"
+    export VERSION="i2p-$I2P_VERSION"
+    I2PFIREFOX_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
+    export I2PFIREFOX_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
+fi
+
 # Comment this out to build from an alternate branch or
 # the tip of the master branch.
 #VERSION=i2p-2.4.0
 #export VERSION=i2p-2.4.0
-VERSION=master
-export VERSION=master
 
-I2PFIREFOX_VERSION=$I2P_VERSION
-export I2PFIREFOX_VERSION=$I2P_VERSION
+echo "I2P version $I2P_VERSION"
+echo "Tag $VERSION"
+echo "I2P Firefox Profile version $I2PFIREFOX_VERSION"

java/net/i2p/router/CopyConfigDir.java

@@ -1,150 +0,0 @@
-package net.i2p.router;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.logging.FileHandler;
-import java.util.logging.SimpleFormatter;
-import net.i2p.util.Log;
-
-public class CopyConfigDir extends I2PAppUtil {
-  final Log logger;
-
-  public CopyConfigDir(RouterContext ctx) {
-    logger = ctx.logManager().getLog(CopyConfigDir.class);
-  }
-
-  public boolean copyDirectory(String baseDir, String workDir) {
-    File baseFile = new File(baseDir);
-    File workFile = new File(workDir);
-    return copyDirectory(baseFile, workFile);
-  }
-
-  public boolean copyDirectory(File baseDir, File workDir) {
-    for (File file : baseDir.listFiles()) {
-      String fPath = file.getAbsolutePath().replace(
-          file.getParentFile().getAbsolutePath(), "");
-      String newPath = workDir.toString() + fPath;
-      if (file.isDirectory())
-        if (copyDirectory(file, new File(newPath)))
-          return false;
-      if (file.isFile())
-        if (0 == copyFile(file, new File(newPath), true))
-          return false;
-    }
-    return true;
-  }
-
-  public boolean copyConfigDirectory(File baseDir, File workDir) {
-    for (File file : baseDir.listFiles()) {
-      // System.out.println(file.getAbsolutePath());
-      String fPath = file.getAbsolutePath().replace(
-          file.getParentFile().getAbsolutePath(), "");
-      String newPath = workDir.toString() + fPath;
-      if (file.isDirectory())
-        if (!copyConfigDirectory(file, new File(newPath)))
-          return false;
-      if (file.isFile()) {
-        int cnr = copyFileNeverOverwrite(file, new File(newPath));
-        if (0 == cnr)
-          return false;
-        if (1 == cnr) {
-          logger.info(
-              "using jpackaged configs in a jpackaged install, creating jpackaged file");
-          File jpackagedConfigsInUse = new File(appImageHome(), "jpackaged");
-          if (!jpackagedConfigsInUse.exists()) {
-            try {
-              jpackagedConfigsInUse.createNewFile();
-            } catch (IOException e) {
-              logger.warn(
-                  "Error creating jpackaged file, delete config files manually when uninstalling");
-            }
-          }
-        }
-        if (-1 == cnr) {
-          logger.info(
-              "not overwriting existing config file, not creating jpackaged file");
-        }
-      }
-    }
-    return true;
-  }
-
-  public int copyFileNeverOverwrite(String basePath, String workPath) {
-    File baseFile = new File(basePath);
-    File workFile = new File(workPath);
-    return copyFileNeverOverwrite(baseFile, workFile);
-  }
-
-  public int copyFileNeverOverwrite(File basePath, File workPath) {
-    return copyFile(basePath, workPath, false);
-  }
-
-  public int copyFile(File basePath, File workPath, boolean overWrite) {
-    if (!basePath.exists()) {
-      logger.info(basePath.getAbsolutePath() + " doesn't exist, not copying");
-      return 0;
-    }
-
-    if (!overWrite && workPath.exists()) {
-      logger.info(workPath.getAbsolutePath() +
-                  " already exists, not overwriting");
-      return -1;
-    }
-
-    File workDir = workPath.getParentFile();
-    if (!workDir.exists()) {
-      workDir.mkdirs();
-    }
-    try (InputStream in =
-             new BufferedInputStream(new FileInputStream(basePath));
-         OutputStream out =
-             new BufferedOutputStream(new FileOutputStream(workPath))) {
-
-      byte[] buffer = new byte[1024];
-      int lengthRead;
-      while ((lengthRead = in.read(buffer)) > 0) {
-        out.write(buffer, 0, lengthRead);
-        out.flush();
-      }
-      in.close();
-      out.close();
-      return 1;
-    } catch (Throwable e) {
-      logger.warn(e.toString());
-      logger.warn("failed to copy " + basePath.getAbsolutePath() + " to " +
-                  workPath.getAbsolutePath());
-      return 0;
-    }
-  }
-
-  protected boolean copyConfigDir() {
-    File appImageConfigDir = appImageConfig();
-    File appImageHomeDir = selectHome();
-    return copyConfigDirectory(appImageConfigDir, appImageHomeDir);
-  }
-
-  /**
-   * set up the path to the log file
-   *
-   * @return
-   */
-  protected File logFile() { return logFile("launcher.log"); }
-
-  /**
-   * set up the path to the log file
-   *
-   * @return
-   */
-  protected File logFile(String p) {
-    File log = new File(selectHome(), "logs");
-    if (!log.exists())
-      log.mkdirs();
-    return new File(log, p);
-  }
-}

java/net/i2p/router/I2PAppUtil.java

@@ -3,8 +3,10 @@ package net.i2p.router;
 import java.io.File;
 import java.io.IOException;
 import javax.swing.JOptionPane;
+import net.i2p.router.RouterContext;
 
 public class I2PAppUtil extends WindowsAppUtil {
+
   public String ServiceUpdaterString() {
     return "http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/news.su3";
   }
@@ -78,29 +80,4 @@ public class I2PAppUtil extends WindowsAppUtil {
     }
     return true;
   }
-
-  /**
-   * get the path to the binary of the app-image root by getting the path to
-   * java.home and the OS, and traversing up to the app-image root based on that
-   * information, then getting the binary path on a per-platform basis. The path
-   * returned will be relative to the root.
-   *
-   * @return the app-image root
-   */
-  protected String appImageExe() {
-    File aih = appImageHome();
-    if (aih != null) {
-      // get the name of the aih directory itself, which will be the default
-      // name of the executable as well
-      String baseName = "I2P";
-      switch (osName()) {
-      case "windows":
-        return baseName + ".exe";
-      case "mac":
-      case "linux":
-        return "./bin/" + baseName;
-      }
-    }
-    return null;
-  }
 }

java/net/i2p/router/WinLauncher.java

@@ -25,18 +25,18 @@ import net.i2p.util.Log;
  * router.pid - the pid of the java process.
  */
 public class WinLauncher extends I2PAppUtil {
-  private final CopyConfigDir copyConfigDir;
+  // private final CopyConfigDir copyConfigDir;
   WinUpdatePostProcessor wupp = null;
   private Router i2pRouter;
   private final Log logger;
+
   public WinLauncher() {
     File programs = programFile();
-    File home = homeDir();
 
     System.setProperty(
         "i2p.dir.base",
-        new File(programs.getAbsolutePath(), "config").getAbsolutePath());
-    System.setProperty("i2p.dir.config", home.getAbsolutePath());
+        appImageConfig().getAbsolutePath());
+    System.setProperty("i2p.dir.config", appImageConfig().getAbsolutePath());
     System.setProperty("router.pid",
         String.valueOf(ProcessHandle.current().pid()));
     /**
@@ -48,7 +48,8 @@ public class WinLauncher extends I2PAppUtil {
     System.setProperty("user.dir", programs.getAbsolutePath());
 
     i2pRouter = new Router(routerConfig(), System.getProperties());
-    copyConfigDir = new CopyConfigDir(i2pRouter.getContext());
+    this.setLog(i2pRouter.getContext().logManager().getLog(WindowsAppUtil.class));
+    // copyConfigDir = new CopyConfigDir(i2pRouter.getContext());
     logger = i2pRouter.getContext().logManager().getLog(WinLauncher.class);
   }
 
@@ -75,10 +76,12 @@ public class WinLauncher extends I2PAppUtil {
 
     // This actually does most of what we use NSIS for if NSIS hasn't
     // already done it, which essentially makes this whole thing portable.
-    if (!launcher.copyConfigDir.copyConfigDir()) {
-      launcher.logger.error("Cannot copy the configuration directory");
-      System.exit(1);
-    }
+    /*
+     * if (!launcher.copyConfigDir.copyConfigDir()) {
+     * launcher.logger.error("Cannot copy the configuration directory");
+     * System.exit(1);
+     * }
+     */
 
     if (!launcher.isInstalled("i2p")) {
       if (launcher.i2pRouter.saveConfig("routerconsole.browser", "NUL")) {
@@ -116,19 +119,6 @@ public class WinLauncher extends I2PAppUtil {
     return programs;
   }
 
-  private File homeDir() {
-    File home = selectHome();
-    if (!home.exists())
-      home.mkdirs();
-    else if (!home.isDirectory()) {
-      logger.warn(
-          home +
-          " exists but is not a directory. Please get it out of the way");
-      System.exit(1);
-    }
-    return home;
-  }
-
   // see
   // https://stackoverflow.com/questions/434718/sockets-discover-port-availability-using-java
   private boolean isAvailable(int portNr) {
@@ -152,8 +142,7 @@ public class WinLauncher extends I2PAppUtil {
       sleep(1000);
     }
     UpdateManager um;
-    while ((um = (UpdateManager)cam.getRegisteredApp(UpdateManager.APP_NAME)) ==
-           null) {
+    while ((um = (UpdateManager) cam.getRegisteredApp(UpdateManager.APP_NAME)) == null) {
       sleep(1000);
     }
     WinUpdatePostProcessor wupp = new WinUpdatePostProcessor(ctx);

java/net/i2p/router/WinUpdatePostProcessor.java

@@ -31,9 +31,13 @@ public class WinUpdatePostProcessor implements UpdatePostProcessor {
     this._log = ctx.logManager().getLog(WinUpdatePostProcessor.class);
   }
 
-  public String getVersion() { return version; }
+  public String getVersion() {
+    return version;
+  }
 
-  public File getFile() { return positionedFile; }
+  public File getFile() {
+    return positionedFile;
+  }
 
   public void updateDownloadedandVerified(UpdateType type, int fileType,
       String version, File file)
@@ -97,8 +101,7 @@ public class WinUpdatePostProcessor implements UpdatePostProcessor {
 
   private File workDir() throws IOException {
     if (this.ctx != null) {
-      File workDir =
-          new File(this.ctx.getConfigDir().getAbsolutePath(), "i2p_update_win");
+      File workDir = new File(this.ctx.getConfigDir().getAbsolutePath(), "i2p_update_win");
       if (workDir.exists()) {
         if (workDir.isFile())
           throw new IOException(workDir +

java/net/i2p/router/WinUpdateProcess.java

@@ -23,8 +23,7 @@ class WinUpdateProcess implements Runnable {
 
   private File workDir() throws IOException {
     if (ctx != null) {
-      File workDir =
-          new File(ctx.getConfigDir().getAbsolutePath(), "i2p_update_win");
+      File workDir = new File(ctx.getConfigDir().getAbsolutePath(), "i2p_update_win");
       if (workDir.exists()) {
         if (workDir.isFile())
           throw new IOException(workDir +

java/net/i2p/router/WindowsAppUtil.java

@@ -2,8 +2,15 @@ package net.i2p.router;
 
 import java.io.File;
 import net.i2p.util.Log;
+import net.i2p.router.RouterContext;
 
 public class WindowsAppUtil extends WindowsServiceUtil {
+  private Log _log;
+
+  public void setLog(Log log) {
+    this._log = log;
+  }
+
   private File checkPathEnvironmentVariable(String name) {
     String path_override = System.getenv(name);
     if (path_override != null) {
@@ -77,7 +84,7 @@ public class WindowsAppUtil extends WindowsServiceUtil {
    * information, then getting the binary path on a per-platform basis. The path
    * returned will be relative to the root.
    *
-   * @return the app-image root
+   * @return the app-image root + the path to the executable
    */
   protected String appImageExe() {
     File aih = appImageHome();
@@ -123,6 +130,14 @@ public class WindowsAppUtil extends WindowsServiceUtil {
         File linConfigDir = new File(aih, "lib/config");
         if (linConfigDir != null) {
           if (linConfigDir.exists()) {
+            File cfg = new File(linConfigDir, "router.config");
+            if (cfg.canWrite())
+              return linConfigDir;
+            else {
+              String home = System.getenv("HOME");
+              if (home != null)
+                linConfigDir = new File(home,"i2p-config");
+            }
             return linConfigDir;
           }
         }

java/net/i2p/router/WindowsServiceUtil.java

@@ -30,7 +30,9 @@ import javax.swing.JOptionPane;
  */
 
 public class WindowsServiceUtil {
-  public WindowsServiceUtil() {}
+  public WindowsServiceUtil() {
+  }
+
   public String queryService(String serviceName) {
     String result = "";
     String line;
@@ -39,8 +41,7 @@ public class WindowsServiceUtil {
       Process p = pb.start();
       try {
         p.waitFor(); // wait for process to finish then continue.
-        BufferedReader bri =
-            new BufferedReader(new InputStreamReader(p.getInputStream()));
+        BufferedReader bri = new BufferedReader(new InputStreamReader(p.getInputStream()));
         while ((line = bri.readLine()) != null) {
           result += line;
         }
@@ -54,6 +55,7 @@ public class WindowsServiceUtil {
     }
     return result;
   }
+
   public String getStatePrefix(String qResult) {
     String statePrefix = "STATE              : ";
     // get the first occurrence of "STATE", then find the
@@ -70,6 +72,7 @@ public class WindowsServiceUtil {
     }
     return statePrefix;
   }
+
   public int getServiceStateInt(String serviceName) {
     // String statePrefix = "STATE : ";
     String qResult = queryService(serviceName);
@@ -113,12 +116,9 @@ public class WindowsServiceUtil {
     if (isInstalled(serviceName)) {
       if (!isStart(serviceName)) {
         int a;
-        String message =
-            "It appears you have an existing I2P service installed.\n";
-        message +=
-            "However, it is not running yet. Please start it through `services.msc`.\n";
-        message +=
-            "If you click \"No\", the jpackage router will be launched instead.\n";
+        String message = "It appears you have an existing I2P service installed.\n";
+        message += "However, it is not running yet. Please start it through `services.msc`.\n";
+        message += "If you click \"No\", the jpackage router will be launched instead.\n";
         a = JOptionPane.showConfirmDialog(null, message,
             "I2P Service detected not running",
             JOptionPane.YES_NO_OPTION);
@@ -131,8 +131,7 @@ public class WindowsServiceUtil {
           // user can start the service themselves. OR maybe we ask for
           // elevation here? May need to refactor Elevator and Shell32X to
           // achieve it though
-          ProcessBuilder pb =
-              new ProcessBuilder("C:\\Windows\\System32\\services.msc");
+          ProcessBuilder pb = new ProcessBuilder("C:\\Windows\\System32\\services.msc");
           try {
             Process p = pb.start();
             int exitCode = p.waitFor();
@@ -194,6 +193,7 @@ public class WindowsServiceUtil {
       return "mac";
     return "linux";
   }
+
   public static void main(String args[]) {
     WindowsServiceUtil wsu = new WindowsServiceUtil();
     // when querying the I2P router service installed by the IzPack installer

java/net/i2p/router/ZipUpdateProcess.java

@@ -29,8 +29,7 @@ public class ZipUpdateProcess implements Runnable {
 
   private File workDir() throws IOException {
     if (ctx != null) {
-      File workDir =
-          new File(ctx.getConfigDir().getAbsolutePath(), "i2p_update_zip");
+      File workDir = new File(ctx.getConfigDir().getAbsolutePath(), "i2p_update_zip");
       if (workDir.exists()) {
         if (workDir.isFile())
           throw new IOException(workDir +

src/nsis/i2pbrowser-version.nsi

@@ -1,3 +1,3 @@
 !define VERSIONMAJOR 2
-!define VERSIONMINOR 5
-!define VERSIONBUILD 1
+!define VERSIONMINOR 6
+!define VERSIONBUILD 0

src/unix/torbrowser.sh

@@ -1,9 +1,11 @@
 #!/bin/bash
 
+if [ -z "$NO_TORSOCKS" ]; then
     TORSOCKS=$(which torsocks)
     if [ -f "${TORSOCKS}" ]; then
         . "${TORSOCKS}" on
     fi
+fi
 
 version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
 locale="en-US" # mention your locale. default = en-US