diff --git a/build.xml b/build.xml
index d3aacb2cbf51b62b99fdde6e2975dc7c69ad5e9d..542927201e5bc85ddcc9f06fed251e36214805a2 100644
--- a/build.xml
+++ b/build.xml
@@ -2405,8 +2405,7 @@
<echo message="Don't forget to sign i2pinstall_${release.number}_windows.exe on Windows and then:" />
<echo message=" ${gpg} -u ${release.gpg.keyid} -b i2pinstall_${release.number}_windows.exe" />
<echo message=" sha256sum i2pinstall_${release.number}_windows.exe" />
- <echo message="Don't forget to mtn tag w: i2p-${release.number}" />
- <echo message="... and mtn cert t:i2p-${release.number} branch i2p.i2p.release" />
+ <echo message="Don't forget to git tag -s i2p-${release.number}" />
</target>
<target name="forceJava7">
diff --git a/debian-alt/xenial/patches/0002-jetty-old-api.patch b/debian-alt/xenial/patches/0002-jetty-old-api.patch
index 4dfe8d2887981ee8db2ed5d4830cc82eacc97658..a74fb81664588b1b103667cfc7ca7bfc5336f8b6 100644
--- a/debian-alt/xenial/patches/0002-jetty-old-api.patch
+++ b/debian-alt/xenial/patches/0002-jetty-old-api.patch
@@ -1,16 +1,3 @@
-Index: b/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
-============================================================
---- a/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
-+++ b/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
-@@ -317,7 +317,7 @@ public class I2PRequestLog extends Abstr
- buf.append(request.getMethod());
- buf.append(' ');
-
-- u8buf.append(request.getHttpURI().toString());
-+ request.getUri().writeTo(u8buf);
-
- buf.append(' ');
- buf.append(request.getProtocol());
Index: b/apps/routerconsole/java/src/net/i2p/router/web/HostCheckHandler.java
===================================================================
--- a/apps/routerconsole/java/src/net/i2p/router/web/HostCheckHandler.java
@@ -50,7 +37,7 @@ Index: b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
============================================================
--- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
-@@ -1102,8 +1102,8 @@ public class RouterConsoleRunner impleme
+@@ -1093,8 +1093,8 @@ public class RouterConsoleRunner impleme
}
@Override
diff --git a/debian/patches/0002-jetty-compatibility.patch b/debian/patches/0002-jetty-compatibility.patch
index 63991190b5b45c3a55eccbaa8cf3aa5043f831d5..cc4ae8dd3de372e510ef0dd57ad3c1600ddbc7c9 100644
--- a/debian/patches/0002-jetty-compatibility.patch
+++ b/debian/patches/0002-jetty-compatibility.patch
@@ -25,7 +25,7 @@
Resource resource,
--- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
-@@ -49,6 +50,7 @@
+@@ -48,6 +49,7 @@
import org.eclipse.jetty.security.HashLoginService;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
@@ -33,7 +33,7 @@
import org.eclipse.jetty.security.authentication.DigestAuthenticator;
import org.eclipse.jetty.server.AbstractConnector;
import org.eclipse.jetty.server.ConnectionFactory;
-@@ -989,6 +991,8 @@
+@@ -980,6 +982,8 @@
} else {
HashLoginService realm = new CustomHashLoginService(JETTY_REALM, context.getContextPath(),
ctx.logManager().getLog(RouterConsoleRunner.class));
@@ -42,7 +42,7 @@
sec.setLoginService(realm);
sec.setAuthenticator(authenticator);
String[] role = new String[] {JETTY_ROLE};
-@@ -996,7 +1000,7 @@
+@@ -987,7 +991,7 @@
String user = e.getKey();
String pw = e.getValue();
Credential cred = Credential.getCredential(MD5_CREDENTIAL_TYPE + pw);
@@ -51,7 +51,7 @@
Constraint constraint = new Constraint(user, JETTY_ROLE);
constraint.setAuthenticate(true);
ConstraintMapping cm = new ConstraintMapping();
-@@ -1016,7 +1020,7 @@
+@@ -1007,7 +1011,7 @@
try {
// each char truncated to 8 bytes
String user2 = new String(b2, "ISO-8859-1");
@@ -60,7 +60,7 @@
constraint = new Constraint(user2, JETTY_ROLE);
constraint.setAuthenticate(true);
cm = new ConstraintMapping();
-@@ -1027,7 +1031,7 @@
+@@ -1018,7 +1022,7 @@
// each UTF-8 byte as a char
// this is what chrome does
String user3 = new String(b1, "ISO-8859-1");
diff --git a/installer/resources/checklist.md b/installer/resources/checklist.md
index 64fc12b529cfe5d951e542b3167abdc1d1f2f513..6d00706b24e47f6f32434a4004f28c943cb9cbe8 100644
--- a/installer/resources/checklist.md
+++ b/installer/resources/checklist.md
@@ -17,7 +17,7 @@
- GeoIP: db-ip.com update is usually first of the month, time accordingly
- installer/resources/makegeoip.sh
-- mtn ci installer/resources/GeoLite2-Country.mmdb.gz
+- git commit installer/resources/GeoLite2-Country.mmdb.gz
- BuildTime: Don't have to do this every release, but update the
EARLIEST and EARLIEST_LONG values in core/java/src/net/i2p/time/BuildTime.java
@@ -28,8 +28,8 @@
- Initial review: Review the complete diff from the last release, fix any issues
-- Trial Debian build: Build and test a preliminary Debian build
- with 'ant debian' and fix any issues
+- Trial Debian build: Run 'ant debcheckpatch' and fix any issues.
+ Build and test a preliminary Debian build with 'ant debian' and fix any issues
- Javadoc test: 'ant javadoc' and 'ant mavenCentral.deps'
with a recent Oracle JDK (12+), and fix any issues.
@@ -45,7 +45,7 @@
- `./create_new_entry.sh`
- Entry href should be the in-net link to the release blog post
- `tx push -s`
- - `mtn ci`
+ - `git commit`
2. Write the draft blog post and push to Transifex:
@@ -53,7 +53,7 @@
- Write draft release announcement - see i2p2www/blog/README for instructions
- Top content should be the same as the news entry
- `tx push -s -r I2P.website_blog`
- - `mtn ci`
+ - `git commit`
3. Make announcement on Transifex asking for news translation
@@ -78,15 +78,15 @@
See instructions in .tx/config for fixing up getopt properties files.
- `installer/resources/poupdate-man.sh` to generate new man page translations
(requires po4a package)
- - `mtn add` for any new po files
- - `mtn ci` all changed po files, and .tx/config if changed
+ - `git add` for any new po files
+ - `git commit` all changed po files, and .tx/config if changed
-2. Sync with mtn.i2p2.i2p
+2. Sync with git.idk.i2p
3. Start with a clean checkout:
```
- mtn -d i2p.mtn co --branch=i2p.i2p /path/to/releasedir
+ git clone -l . /path/to/releasedir
```
- You must build with Java 8 or higher.
@@ -103,7 +103,7 @@
5. Copy latest trust list _MTN/monotonerc from website or some other workspace
-6. Verify that no untrusted revisions were inadvertently blessed by a trusted party:
+6. Verify that no untrusted revisions were included:
```
ant revisions
@@ -112,7 +112,7 @@
7. Review the complete diff from the last release:
```
- mtn diff -r t:i2p-0.9.(xx-1) > out.diff
+ git diff i2p-0.9.(xx-1)..HEAD > out.diff
vi out.diff
```
@@ -124,7 +124,7 @@
- `router/java/src/net/i2p/router/RouterVersion.java`
- (change to BUILD = 0 and EXTRA = "")
-9. `mtn ci`
+9. `git commit`
### Build and test
@@ -179,9 +179,8 @@
3. If all goes well, tag and push the release:
```
- mtn tag h: i2p-0.x.xx
- mtn cert t:i2p-0.x.xx branch i2p.i2p.release
- mtn push
+ git tag -s i2p-0.x.xx
+ git push
```
### Distribute updates
@@ -239,14 +238,14 @@
Verify at http://download.i2p2.no/releases/
3. Website files to change:
- - Sync with mtn.i2p-projekt.i2p
- - `i2p2www/static/hosts.txt` if it changed (copy from i2p.i2p mtn branch)
+ - Sync with git.idk.i2p
+ - `i2p2www/static/hosts.txt` if it changed (copy from i2p.i2p git branch)
- `i2p2www/__init__.py` (release number)
- `i2p2www/pages/downloads/list.html` (release signer, if changed)
- `i2p2www/pages/downloads/macros` (checksums)
- `i2p2www/pages/site/get-involved/roadmap.html` (release date, actual release contents)
- `i2p2www/static/news/news.xml` (no longer necessary)
- - Sync with mtn.i2p-projekt.i2p
+ - Sync with git.idk.i2p
4. Announce on:
- #i2p, #i2p-dev (also on Freenode side)
@@ -268,4 +267,4 @@
- `tx pull -r I2P.website_blog`
Do NOT forget this step!
- `./update-existing-po.sh`
- - `mtn ci i2p2www/translations/ -m "Updated translations"`
+ - `git commit i2p2www/translations/ -m "Updated translations"`