Gentoo Archives: gentoo-commits

From: "Ralph Sennhauser (sera)" <sera@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/xerces/files: xerces-2.11.0-build.xml.patch
Date: Sat, 26 May 2012 11:20:20
Message-Id: 20120526111959.0EAEA2004C@flycatcher.gentoo.org
sera        12/05/26 11:19:59

  Added:                xerces-2.11.0-build.xml.patch
  Log:
  Security bump. #280611
  Don't let taskdef point to non-existent jar. #351394
  
  (Portage version: 2.1.10.62/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-java/xerces/files/xerces-2.11.0-build.xml.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/xerces/files/xerces-2.11.0-build.xml.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/xerces/files/xerces-2.11.0-build.xml.patch?rev=1.1&content-type=text/plain

Index: xerces-2.11.0-build.xml.patch
===================================================================
Author: Ralph Sennhauser <sera@g.o>

Don't reference non existing jar in taskdef. #351394
Don't let user properties leak into build env.
Don't bundle stuff from xml-commons-external.

--- a/build.xml
+++ b/build.xml
@@ -39,18 +39,13 @@ Authors:
   <property name="tools.dir" value="./tools"/>
 
   <!-- enable compilation under JDK 1.4 and above -->
-  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac">
-    <classpath>
-      <pathelement location="${tools.dir}/bin/xjavac.jar"/>
-    </classpath>
-  </taskdef>
+  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/>
 
   <!-- Allow properties following these statements to be overridden -->
   <!-- Note that all of these don't have to exist.  They've just been defined
        incase they are used. -->
   <property file="build.properties"/>
   <property file=".ant.properties"/>
-  <property file="${user.home}/.ant.properties"/>
   <property file="default.properties"/>  
  
   <target name="init">
@@ -247,7 +242,7 @@ Authors:
     <copy file="${src.dir}/org/apache/xerces/impl/xpath/regex/message.properties"
       tofile="${build.src}/org/apache/xerces/impl/xpath/regex/message_en.properties"/>
 
-    <!-- now deal with API's:  -->
+    <!-- now deal with API's:
     <unzip src="${src.apis.zip}" dest="${build.src}">
         <patternset
             includes="org/xml/sax/** 
@@ -269,7 +264,7 @@ Authors:
                 org/w3c/dom/views/**
                 org/w3c/dom/xpath/**"
         />
-    </unzip>
+    </unzip>  -->
     
     <!-- substitute tokens as needed -->
     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"