Debian: Fix patch offsets

debian-alt/xenial/patches/0002-jetty-old-api.patch

@@ -50,7 +50,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
-@@ -1085,8 +1085,8 @@ public class RouterConsoleRunner impleme
+@@ -1086,8 +1086,8 @@ public class RouterConsoleRunner impleme
          }
  
          @Override

debian/patches/0002-jetty-compatibility.patch

@@ -33,7 +33,7 @@
  import org.eclipse.jetty.security.authentication.DigestAuthenticator;
  import org.eclipse.jetty.server.AbstractConnector;
  import org.eclipse.jetty.server.ConnectionFactory;
-@@ -972,6 +974,8 @@
+@@ -973,6 +975,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};
-@@ -979,7 +983,7 @@
+@@ -980,7 +984,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();
-@@ -999,7 +1003,7 @@
+@@ -1000,7 +1004,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();
-@@ -1010,7 +1014,7 @@
+@@ -1011,7 +1015,7 @@
                              // each UTF-8 byte as a char
                              // this is what chrome does
                              String user3 = new String(b1, "ISO-8859-1");

history.txt

@@ -1,8 +1,22 @@
+2020-08-01 zzz
+ * Debian: Support libjson-simple-java 3 for bullseye
+ * I2NP: Locking for message ID
+ * NetDB: Track client that requested LS
+ * OCMOSJ: Don't send to a RAP LS
+ * Router: Logging fix for client start failures
+ * Util:
+   - More efficient use of random data
+   - Add KeyStore and SHA256 to CLI
+
+2020-07-28 zzz
+ * Data: Don't check LS1 revocation signature
+
 2020-07-22 zzz
  * i2ptunnel:
    - Change default encType to both for new tunnels, http client,
      shared clients, and all tunnels for new installs (ticket #2751)
    - Change IRC tunnel sigType to EdDSA for new installs (ticket #2749)
+   - Change CONNECT tunnel default sigType to EdDSA (ticket #2749)
 
 2020-07-19 zzz
  * i2psnark: Increase max pipeline, negotiate actual value (ticket #2280)

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 9;
+    public final static long BUILD = 10;
 
     /** for example "-test" */
     public final static String EXTRA = "";