Merge branch 'master' into master

i2p2www/__init__.py

@@ -22,8 +22,8 @@ except ImportError:
 ###########
 # Constants
 
-CURRENT_I2P_VERSION = '2.2.0'
-CURRENT_I2P_FIREFOX_PROFILE_VERSION = '2.1.0'
+CURRENT_I2P_VERSION = '2.2.1'
+CURRENT_I2P_FIREFOX_PROFILE_VERSION = '2.2.0'
 CURRENT_I2P_OSX_VERSION = '1.9.0'
 
 CANONICAL_DOMAIN = 'geti2p.net'

i2p2www/blog/2023/4/12/new_release_2.2.1.rst

@@ -0,0 +1,40 @@
+{% trans -%}
+=================
+I2P Release 2.2.1
+=================
+{%- endtrans %}
+.. meta::
+    :author: idk
+    :date: 2023-04-12
+    :category: release
+    :excerpt: {% trans %}{% endtrans %}
+
+{% trans -%}
+After the I2P 2.2.0 release, which was moved forward to accelerate mitigations for the DDOS attacks, we learned about a few developing issues which made it necessary to build and release new packages.
+This release fixes an issue within Ubuntu Lunar and Debian Sid where the router console was inaccessible using an updated version of the jakarta package.
+Docker packages were not reading arguments correctly, resulting in inaccessible configuration files.
+This issue has also been resolved.
+The docker container is now also compatible with Podman.
+{%- endtrans %}
+
+{% trans -%}
+This release syncs translations with transifex and updates the GeoIP database.
+{%- endtrans %}
+
+{% trans -%}
+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.
+{%- endtrans %}
+
+**DETAILS**
+
+*Changes*
+
+- {% trans %}Fix missing Java options in docker/rootfs/startapp.sh{% endtrans %}
+- {% trans %}Detect when running in Podman instead of regular Docker{% endtrans %}
+- {% trans %}Update Tor Browser User-Agent String{% endtrans %}
+- {% trans %}Update local GeoIP database{% endtrans %}
+- {% trans %}Remove invalid signing keys from old installs{% endtrans %}
+- {% trans %}Update Tomcat version in Ubuntu Lunar and Debian Sid{% endtrans %}
+
+Full list of fixed bugs: http://git.idk.i2p/i2p-hackers/i2p.i2p/-/issues?scope=all&state=closed&milestone_title=2.2.1

i2p2www/pages/downloads/easyinstall.html

@@ -60,7 +60,7 @@ special configuration. You don't even need to close existing Firefox windows.
 {%- set name     = 'Windows' -%}
 {%- set icon     = 'images/download/windows.png' -%}
 {%- set filename = 'I2P-Easy-Install-Bundle-%s.exe' -%}
-{%- set hash     = 'be3b178b745720b16c8ccd6911d3c35143eb59da4be318198d84f35ec23e494c' -%}
+{%- set hash     = '5ebfb374bcf70f80080e628401f5310f3882853b880d5c8a041705096e063bb5' -%}
 
 {% call package_outer('windows', name, icon) %}
     <div class = "file">

i2p2www/pages/downloads/firefox.html

@@ -45,7 +45,7 @@ start an installer, "double-click" the downloaded .exe file.
 {%- set name     = 'Windows' -%}
 {%- set icon     = 'images/download/windows.png' -%}
 {%- set filename = 'I2P-Easy-Install-Bundle-%s.exe' -%}
-{%- set hash     = '862de2f2e05cfc46c2f612656b93dd9c94b6bc7a034912d732dd0ade2ad477f6' -%}
+{%- set hash     = '5ebfb374bcf70f80080e628401f5310f3882853b880d5c8a041705096e063bb5' -%}
 
 {% call package_outer('windows', name, icon) %}
     <div class = "file">

i2p2www/pages/downloads/macros

@@ -1,16 +1,16 @@
-{% set i2pinstall_windows_hash = 'ab7efbcc5288d6df9161347277f5d5bad8a5601f70fa12c77ab518e0c0314537' %}
-{% set i2pinstall_jar_hash     = '008b38611865b2ccc9aa81cfe737ff6758babb7fd30b20bcb9f90026e466f514' %}
-{% set i2psource_hash          = 'e4ba06a6e2935a17990f057a72b8d79e452a2556a6cefe5012d5dd63466feebf' %}
-{% set i2pupdate_hash          = '4364bd0ea6d9cc35328629c3cd177d41843d0a160a5fd59d65527cf8487497a0' %}
-{% set i2p_android_hash        = '06a12f772075e3ae0cc510d8285e231d9f024967baeecca1c07e6b3ef5361752' %}
+{% set i2pinstall_windows_hash = '9e25abed16c783ed964f504f72069d07da148850471b8250ecf2f4ea5da710bd' %}
+{% set i2pinstall_jar_hash     = 'c9879b8f69ea13c758672c2fa083dc2e0abb289e0fc9a55af98f9f1795f82659' %}
+{% set i2psource_hash          = 'f53f34fbe23a8762e3786572751b301befb28288efb6b1042d4fc64c6610784f' %}
+{% set i2pupdate_hash          = '5d46d3029327aedcf6b1828082ecad725a92d0b2dc540dc0005912ed894774c6' %}
+{% set i2p_android_hash        = '272acf543c4489dc3775c07c42eb91710b4ed377c78aff605e3d44e73fad5110' %}
 {% set i2p_macnative_hash      = '18cb22cfcc3cbe0cec150e89a394d1a35703cb508ed627ef48084b7ba7c90dde' %}
 
 {% set i2p_windows_subver = '' %}
 {% set i2p_macosx_launcher_version = '1.9.0' %}
 
-{% set i2p_android_version = '2.2.0' %}
+{% set i2p_android_version = '2.2.1' %}
 {% set i2p_android_version_kytv = '0.9.22' %}
-{% set i2p_android_version_fdroid = '2.0.1' %}
+{% set i2p_android_version_fdroid = '2.2.1' %}
 
 
 {% macro package_outer(type, name, icon) -%}

i2p2www/pages/site/contact.html

@@ -279,6 +279,10 @@ GPG Key fingerprint: <tt>EA27 06D6 14F5 28DB 764B  F47E CFCD C461 75E6 694A</tt>
 	<td valign="top">mihi</td>
 	<td valign="top"><i>{{ _('I2PTunnel development, ministreaming library') }}</i></td>
 </tr>
+<tr>
+	<td valign="top">zzz</td>
+	<td valign="top"><i>{{ _('Project lead, Lead Developer, Lead Maintainer, Forum Administrator, many other roles') }}</i></td>
+</tr>
 <tr>
 	<td valign="top">jrandom</td>
 	<td valign="top"><i>{{ _('Project lead, Syndie lead') }}</i></td>