diff --git a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java
index cb678e8d84..af3c828b57 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java
@@ -240,12 +240,14 @@ class NewsFetcher extends UpdateRunner {
_mgr.notifyVersionConstraint(this, _currentURI, ROUTER_SIGNED, "", ver, msg);
return;
}
+/*
if (!FileUtil.isPack200Supported()) {
String msg = _mgr._t("No Pack200 support in Java runtime.");
_log.logAlways(Log.WARN, "Cannot update to version " + ver + ": " + msg);
_mgr.notifyVersionConstraint(this, _currentURI, ROUTER_SIGNED, "", ver, msg);
return;
}
+*/
if (!ConfigUpdateHandler.USE_SU3_UPDATE) {
String msg = _mgr._t("No update certificates installed.");
_log.logAlways(Log.WARN, "Cannot update to version " + ver + ": " + msg);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
index 097bd5c9a3..37567a8eab 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
@@ -85,6 +85,8 @@ public class ConfigUpdateHandler extends FormHandler {
* Changed as of release 0.8 to support both .sud and .su2
* Some JVMs (IcedTea) don't have pack200
* Update hosts must maintain both
+ *
+ * These versions have not been released since 0.9.22, 2015.
*/
private static final String PACK200_URLS =
"http://echelon.i2p/i2p/i2pupdate.su2\r\n" +
@@ -121,13 +123,13 @@ public class ConfigUpdateHandler extends FormHandler {
private static final String SU3_CERT_DIR = "certificates/router";
/**
- * Only enabled if we have pack200 and trusted public key certificates installed
+ * Only enabled if we have trusted public key certificates installed
* @since 0.9.9
*/
public static final boolean USE_SU3_UPDATE;
static {
String[] files = (new File(I2PAppContext.getGlobalContext().getBaseDir(), SU3_CERT_DIR)).list();
- USE_SU3_UPDATE = FileUtil.isPack200Supported() && files != null && files.length > 0;
+ USE_SU3_UPDATE = files != null && files.length > 0;
}
private static final String DEFAULT_SU3_UPDATE_URLS =
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
index e76394339f..06daf11991 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
@@ -345,8 +345,9 @@ public class RouterConsoleRunner implements RouterApp {
/** @since 0.9.17 */
private void checkJavaVersion() {
boolean noJava8 = !SystemVersion.isJava8();
- boolean noPack200 = (PluginStarter.pluginsEnabled(_context) || !NewsHelper.isUpdateDisabled(_context)) &&
- !FileUtil.isPack200Supported();
+ //boolean noPack200 = (PluginStarter.pluginsEnabled(_context) || !NewsHelper.isUpdateDisabled(_context)) &&
+ // !FileUtil.isPack200Supported();
+ boolean noPack200 = false;
boolean openARM = SystemVersion.isARM() && SystemVersion.isOpenJDK() && !SystemVersion.isJava9();
boolean isZero = SystemVersion.isZeroVM();
boolean isJava11 = false; // SystemVersion.isJava11();
diff --git a/build.xml b/build.xml
index 3007eb5e37..c23e984a9c 100644
--- a/build.xml
+++ b/build.xml
@@ -1569,6 +1569,8 @@
+
+
@@ -2178,11 +2180,19 @@
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/history.txt b/history.txt
index 784516ac11..f1e1687faf 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,22 @@
+2020-02-20 zzz
+ * Build: Add non-pack200 release targets (ticket #2693)
+ * GeoIP (ticket #2692):
+ - Add unknown and Kosovo country codes for db-ip.com
+ - Change GeoIP update script to use db-ip.com
+ - Prefer more recent of mmdb or Debian files if we have both
+ * Update: Don't require pack200 for in-net update (ticket #2693)
+
+2020-02-18 zzz
+ * Util: Improve LookupDest CLI, add to CommandLine
+
+2020-02-17 zzz
+ * Debian: Remove GzipFilter in base-context.xml,
+ does nothing with Jetty 9.4 (ticket #2599)
+ * Install: Remove commented-out GzipFilter in cgi-context.xml
+ * i2psnark: Revert API changes that broke i2psnark-rpc plugin
+
2020-02-15 zzz
+ * Console: Fix jump-to-section on /stats
* NTCP: Remove closed connections from write queue (ticket #2686)
2020-02-12 zzz
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 74605163f6..47667df539 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/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 = 8;
+ public final static long BUILD = 9;
/** for example "-test" */
public final static String EXTRA = "-rc";