diff --git a/history.txt b/history.txt index 6deb67428..164f11c83 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,19 @@ +2016-04-29 zzz + * Debian: + - Add runtime dependency on gettext-base, + link to /usr/share/java/libintl.jar + - Add runtime dependency on libgetopt-java, + link to /usr/share/java/gnu-getopt.jar + * SysTray: + - Remove systray4j.jar from linux installers + - Move SysTray.java to SysTrayImpl.java + - New SysTray.java that instantiates SysTrayImpl + by reflection, so the SysTrayImpl.java source is optional + - Remove systray4j.jar, systray4j.dll, and SysTrayImpl.java + from Debian source packages + - Remove systray4j.jar from Debian binary packages + * Update: Enable libjbigi update for ARM + 2016-04-28 zzz * News: Parse and store CRLs in news feed diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index fecba78d6..a6204817e 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 = 7; + public final static long BUILD = 8; /** for example "-test" */ public final static String EXTRA = ""; diff --git a/router/java/src/net/i2p/router/tasks/InstallUpdate.java b/router/java/src/net/i2p/router/tasks/InstallUpdate.java index b4bea6770..91456e8dd 100644 --- a/router/java/src/net/i2p/router/tasks/InstallUpdate.java +++ b/router/java/src/net/i2p/router/tasks/InstallUpdate.java @@ -135,36 +135,39 @@ public class InstallUpdate { boolean goodOS = isWin || isMac || osName.contains("linux") || osName.contains("freebsd"); - // only do this on these x86 File jbigiJar = new File(context.getBaseDir(), "lib/jbigi.jar"); - if (isX86 && goodOS && jbigiJar.exists()) { + if (goodOS && jbigiJar.exists()) { String libPrefix = (isWin ? "" : "lib"); String libSuffix = (isWin ? ".dll" : isMac ? ".jnilib" : ".so"); - File jcpuidLib = new File(context.getBaseDir(), libPrefix + "jcpuid" + libSuffix); - if (jcpuidLib.canWrite() && jbigiJar.lastModified() > jcpuidLib.lastModified()) { - String path = jcpuidLib.getAbsolutePath(); - boolean success = FileUtil.copy(path, path + ".bak", true, true); - if (success) { - boolean success2 = jcpuidLib.delete(); - if (success2) { - System.out.println("New jbigi.jar detected, moved jcpuid library to " + - path + ".bak"); - System.out.println("Check logs for successful installation of new library"); + if (isX86) { + File jcpuidLib = new File(context.getBaseDir(), libPrefix + "jcpuid" + libSuffix); + if (jcpuidLib.canWrite() && jbigiJar.lastModified() > jcpuidLib.lastModified()) { + String path = jcpuidLib.getAbsolutePath(); + boolean success = FileUtil.copy(path, path + ".bak", true, true); + if (success) { + boolean success2 = jcpuidLib.delete(); + if (success2) { + System.out.println("New jbigi.jar detected, moved jcpuid library to " + + path + ".bak"); + System.out.println("Check logs for successful installation of new library"); + } } } } - File jbigiLib = new File(context.getBaseDir(), libPrefix + "jbigi" + libSuffix); - if (jbigiLib.canWrite() && jbigiJar.lastModified() > jbigiLib.lastModified()) { - String path = jbigiLib.getAbsolutePath(); - boolean success = FileUtil.copy(path, path + ".bak", true, true); - if (success) { - boolean success2 = jbigiLib.delete(); - if (success2) { - System.out.println("New jbigi.jar detected, moved jbigi library to " + - path + ".bak"); - System.out.println("Check logs for successful installation of new library"); + if (isX86 || SystemVersion.isARM()) { + File jbigiLib = new File(context.getBaseDir(), libPrefix + "jbigi" + libSuffix); + if (jbigiLib.canWrite() && jbigiJar.lastModified() > jbigiLib.lastModified()) { + String path = jbigiLib.getAbsolutePath(); + boolean success = FileUtil.copy(path, path + ".bak", true, true); + if (success) { + boolean success2 = jbigiLib.delete(); + if (success2) { + System.out.println("New jbigi.jar detected, moved jbigi library to " + + path + ".bak"); + System.out.println("Check logs for successful installation of new library"); + } } } }