[gentoo-commits] gentoo-x86 commit in net-p2p/freenet/files: strip-openjdk-check.patch build.xml 0.7.5_p1302-ext.patch

[gentoo-commits] gentoo-x86 commit in net-p2p/freenet/files: strip-openjdk-check.patch build.xml 0.7.5_p1302-ext.patch

[Thomas Sachau (tommy)]

tommy       10/11/10 21:08:56

  Modified:             strip-openjdk-check.patch build.xml
  Added:                0.7.5_p1302-ext.patch
  Log:
  Version bump, drop old versions
  
  (Portage version: 2.2.0_alpha2-r1/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  net-p2p/freenet/files/strip-openjdk-check.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/files/strip-openjdk-check.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/files/strip-openjdk-check.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/files/strip-openjdk-check.patch?r1=1.1&r2=1.2

Index: strip-openjdk-check.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/freenet/files/strip-openjdk-check.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- strip-openjdk-check.patch	17 Jul 2010 01:16:40 -0000	1.1
+++ strip-openjdk-check.patch	10 Nov 2010 21:08:56 -0000	1.2
@@ -1,6 +1,6 @@
---- src/freenet/node/Node.java	2010-07-17 02:53:39.633185065 +0200
-+++ src/freenet/node/Node.java.new	2010-07-17 02:58:31.246061950 +0200
-@@ -3726,43 +3726,6 @@
+--- src/freenet/node/Node.java	2010-11-10 21:58:45.000000000 +0100
++++ src/freenet/node/Node.java.new	2010-11-10 21:59:53.000000000 +0100
+@@ -3792,42 +3792,42 @@
  
  		boolean isOpenJDK = false;
  
@@ -40,7 +40,42 @@
 -				}
 -			}
 -		}
--
++//		if(jvmName.startsWith("OpenJDK ")) {
++//			isOpenJDK = true;
++//			if(javaVersion.startsWith("1.6.0")) {
++//				String subverString;
++//				if(jvmVersion.startsWith("14.0-b"))
++//					subverString = jvmVersion.substring("14.0-b".length());
++//				else if(jvmVersion.startsWith("1.6.0_0-b"))
++//					subverString = jvmVersion.substring("1.6.0_0-b".length());
++//				else
++//					subverString = null;
++//				if(subverString != null) {
++//					int subver;
++//					try {
++//						subver = Integer.parseInt(subverString);
++//					} catch (NumberFormatException e) {
++//						subver = -1;
++//					}
++//				if(subver > -1 && subver < 15) {
++//					File javaDir = new File(System.getProperty("java.home"));
++//
++//					// Assume that if the java home dir has been updated since August 11th, we have the fix.
++//
++//					final Calendar _cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
++//					_cal.set(2009, Calendar.AUGUST, 11, 0, 0, 0);
++//					if(javaDir.exists() && javaDir.isDirectory() && javaDir.lastModified() > _cal.getTimeInMillis()) {
++//						System.err.println("Your Java appears to have been updated, we probably do not have the XML bug (http://www.cert.fi/en/reports/2009/vulnerability2009085.html).");
++//					} else {
++//						System.err.println("Old version of OpenJDK detected. It is possible that your Java may be vulnerable to a remote code execution vulnerability. Please update your operating system ASAP. We will not disable plugins because we cannot be sure whether there is a problem.");
++//						System.err.println("See here: http://www.cert.fi/en/reports/2009/vulnerability2009085.html");
++//						clientCore.alerts.register(new SimpleUserAlert(false, l10n("openJDKMightBeVulnerableXML"), l10n("openJDKMightBeVulnerableXML"), l10n("openJDKMightBeVulnerableXML"), UserAlert.ERROR));
++//					}
++//
++//				}
++//				}
++//			}
++//		}
+ 
  		if(logMINOR) Logger.minor(this, "JVM vendor: "+jvmVendor+", JVM name: "+jvmName+", JVM version: "+javaVersion+", OS name: "+osName+", OS version: "+osVersion);
  
- 		if((!isOpenJDK) && (jvmVendor.startsWith("Sun ") || (jvmVendor.startsWith("The FreeBSD Foundation") && jvmSpecVendor.startsWith("Sun ")) || (jvmVendor.startsWith("Apple ")))) {



1.2                  net-p2p/freenet/files/build.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/files/build.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/files/build.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/files/build.xml?r1=1.1&r2=1.2

Index: build.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/freenet/files/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml	31 Oct 2010 21:24:41 -0000	1.1
+++ build.xml	10 Nov 2010 21:08:56 -0000	1.2
@@ -121,7 +121,7 @@
 
 		
 		<javac target="1.5" destdir="${build}" source="1.5" debug="on" srcdir="${src}" optimize="on" classpath="${gentoo.classpath}" >
-			<compilerarg value="-Xlint" ></compilerarg>
+<!--			<compilerarg value="-Xlint" ></compilerarg> -->
 			
 			<sourcepath >
 				<pathelement path="${build}" ></pathelement>



1.1                  net-p2p/freenet/files/0.7.5_p1302-ext.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/files/0.7.5_p1302-ext.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/files/0.7.5_p1302-ext.patch?rev=1.1&content-type=text/plain

Index: 0.7.5_p1302-ext.patch
===================================================================
--- src/freenet/node/NodeStarter.java	2010-11-10 21:46:10.000000000 +0100
+++ src/freenet/node/NodeStarter.java.new	2010-11-10 21:50:12.000000000 +0100
@@ -49,8 +49,8 @@
 	public static final String extRevisionNumber;
 	
 	static {
-		extBuildNumber = ExtVersion.extBuildNumber();
-		extRevisionNumber = ExtVersion.extRevisionNumber();
+		extBuildNumber = RECOMMENDED_EXT_BUILD_NUMBER;
+		extRevisionNumber = "";
 	}
 
 	private FreenetFilePersistentConfig cfg;
@@ -86,7 +86,7 @@
 			return Integer.valueOf(-1);
 		}
 
-		String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + ExtVersion.buildNumber + " r" + ExtVersion.cvsRevision+" running with ext build "+extBuildNumber+" r" + extRevisionNumber;
+		String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + extBuildNumber + " running with ext build "+extBuildNumber;
 		Logger.normal(this, builtWithMessage);
 		System.out.println(builtWithMessage);