Debian: Files for 0.9.48

refresh patches
update release docs

debian-alt/bionic/changelog

@@ -1,3 +1,9 @@
+i2p (0.9.48-1~bionic+1) bionic; urgency=medium
+
+  * New upstream version 0.9.48
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org>  Wed, 02 Dec 2020 12:12:12 +0000
+
 i2p (0.9.47-1~bionic+1) bionic; urgency=medium
 
   * New upstream version 0.9.47

debian-alt/doc/launchpad.txt

@@ -14,14 +14,16 @@ Versions are as follows:
 
 Min version	Max version	Uses src pkg	Copied to Debian
 -----------	-----------	------------	----------------
-xenial		yakkety		xenial		--
 bionic		cosmic		bionic		--
-focal		groovy		bionic		buster, sid
+focal		hirsute		bionic		buster, sid
 
 Unsupported (Java 7):
 precise		saucy   	precise		wheezy
 trusty		wily		precise		jessie, stretch
 
+Unsupported (ant < 1.9.8)
+xenial		yakkety		xenial		--
+
 
 Prep (first time only)
 ----------------------
@@ -151,7 +153,7 @@ Release
 -------
 
 Then copy from your PPA to the i2p-maintainers PPA.
-Then in the i2p-maintainers PPA, copy focal to groovy.
+Then in the i2p-maintainers PPA, copy focal to groovy and hirsute.
 Did a new series open up since the last time you did this? Copy to the new one also.
   (select "copy existing binaries")
   Copy xenial first and wait for it to be published in i2p-maintainers or the others will fail.
@@ -182,7 +184,7 @@ At your milestone, 'release now'
     Release notes: empty
     Changelog: empty
 Click 'create release'
-Now you on the page for that milestone
+Now you are on the page for that milestone
 Click 'add download file'
 For each of the four files
     i2psource_0.9.xx.tar.bz2

debian-alt/focal/changelog

@@ -1,3 +1,9 @@
+i2p (0.9.48-1ubuntu1) focal; urgency=medium
+
+  * New upstream version 0.9.48
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org>  Wed, 02 Dec 2020 12:12:12 +0000
+
 i2p (0.9.47-1ubuntu1) focal; urgency=medium
 
   * New upstream version 0.9.47

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

debian/patches/0001-path-substitution.patch

@@ -531,7 +531,7 @@ Index: b/installer/resources/locale/po/messages_ru.po
 ===================================================================
 --- a/installer/resources/locale/po/messages_ru.po
 +++ b/installer/resources/locale/po/messages_ru.po
-@@ -192,13 +192,13 @@ msgid "Request a Java thread dump if run
+@@ -193,13 +193,13 @@ msgid "Request a Java thread dump if run
  msgstr "Запросить дамп нитей Java, если запущено."
  
  #: ../i2prouter:1874

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;
-@@ -973,6 +975,8 @@
+@@ -989,6 +991,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};
-@@ -980,7 +984,7 @@
+@@ -996,7 +1000,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();
-@@ -1000,7 +1004,7 @@
+@@ -1016,7 +1020,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();
-@@ -1011,7 +1015,7 @@
+@@ -1027,7 +1031,7 @@
                              // each UTF-8 byte as a char
                              // this is what chrome does
                              String user3 = new String(b1, "ISO-8859-1");
@@ -71,7 +71,7 @@
                              cm = new ConstraintMapping();
 --- a/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java
 +++ b/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java
-@@ -85,9 +85,9 @@
+@@ -87,9 +87,9 @@
                      String testPath = pathInContext.substring(0, len - 4) + '_' + lang + ".jsp";
                      // Do we have a servlet for the new path that isn't the catchall *.jsp?
                      @SuppressWarnings("rawtypes")

installer/resources/checklist.md

@@ -98,7 +98,7 @@
     release.gpg.keyid=0xnnnnnnnn
     release.signer.su3=xxx@mail.i2p
     build.built-by=xxx
-    javac.compilerargs=-bootclasspath /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rt.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jce.jar
+    javac.compilerargs=-bootclasspath /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/rt.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/jce.jar
     ```
 
 5. Copy latest trust list _MTN/monotonerc from website or some other workspace
@@ -145,7 +145,7 @@
   - Run rh.bat to edit the resources
   - Sign the windows installer:
     Open Visual Studio developer prompt
-    signtool sign /debug /fd SHA256 i2pinstall_${release.number}_windows.exe
+    signtool sign /a /debug /fd SHA256 i2pinstall_${release.number}_windows.exe
   - GPG sign the signed windows installer: gpg -u keyid -b i2pinstall_${release.number}_windows.exe
   - sha256sum i2pinstall_${release.number}_windows.exe