Browse code
Bug 1940044: [CVE-2017-5645] lib/clover.jar bundled in jna-devel package
Change-Id: I4560a426df4b8fd19fac977bc0fca95d5288137a
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3560
Reviewed-by: Sharath George
Tested-by: Sharath George
harishspqr authored on 2017/08/18 04:28:06Showing 2 changed files
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
Summary: Java Native Access |
| 5 | 5 |
Name: jna |
| 6 | 6 |
Version: 4.4.0 |
| 7 |
-Release: 5%{?dist}
|
|
| 7 |
+Release: 6%{?dist}
|
|
| 8 | 8 |
License: Apache |
| 9 | 9 |
URL: http://github.com/twall/jna |
| 10 | 10 |
Group: Applications/System |
| ... | ... |
@@ -13,6 +13,7 @@ Distribution: Photon |
| 13 | 13 |
BuildArch: x86_64 |
| 14 | 14 |
Source0: https://github.com/java-native-access/jna/archive/%{version}/%{name}-%{version}.tar.gz
|
| 15 | 15 |
%define sha1 jna=d9b54e98393a696f458468bc8f3167f701a9ea9f |
| 16 |
+Patch0: jna_remove_clover_jar.patch |
|
| 16 | 17 |
BuildRequires: openjre8 |
| 17 | 18 |
BuildRequires: openjdk8 |
| 18 | 19 |
BuildRequires: apache-ant |
| ... | ... |
@@ -32,8 +33,8 @@ Requires: jna = %{version}-%{release}
|
| 32 | 32 |
Sources for JNA |
| 33 | 33 |
|
| 34 | 34 |
%prep |
| 35 |
- |
|
| 36 | 35 |
%setup -q |
| 36 |
+%patch0 -p1 |
|
| 37 | 37 |
|
| 38 | 38 |
%clean |
| 39 | 39 |
rm -rf %{buildroot}
|
| ... | ... |
@@ -71,6 +72,8 @@ ant -Ddist=$JNA_DIST_DIR dist -Drelease=true |
| 71 | 71 |
%{_prefix}/*.aar
|
| 72 | 72 |
|
| 73 | 73 |
%changelog |
| 74 |
+* Thu Aug 17 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.4.0-6 |
|
| 75 |
+- Removed clover.jar from jna-devel source-full.zip file |
|
| 74 | 76 |
* Mon Jun 19 2017 Divya Thaluru <dthaluru@vmware.com> 4.4.0-5 |
| 75 | 77 |
- Removed dependency on ANT_HOME |
| 76 | 78 |
* Thu May 18 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.4.0-4 |
| 77 | 79 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,80 @@ |
| 0 |
+--- a/build.xml 2017-03-14 12:31:03.000000000 -0700 |
|
| 1 |
+@@ -345,7 +345,6 @@ |
|
| 2 |
+ <pathelement path="${build}/${jar}"/>
|
|
| 3 |
+ <pathelement path="${test.classes}"/>
|
|
| 4 |
+ <pathelement path="${build}/${testjar}"/>
|
|
| 5 |
+- <pathelement path="lib/clover.jar"/> |
|
| 6 |
+ <path refid="test.libs"/> |
|
| 7 |
+ </path> |
|
| 8 |
+ </target> |
|
| 9 |
+@@ -995,7 +994,6 @@ |
|
| 10 |
+ <copy todir="${build}/jws" file="${build}/${jar}"/>
|
|
| 11 |
+ <copy todir="${build}/jws" file="${build}/${testjar}"/>
|
|
| 12 |
+ <copy todir="${build}/jws" file="lib/junit.jar"/>
|
|
| 13 |
+- <copy todir="${build}/jws" file="lib/clover.jar"/>
|
|
| 14 |
+ <jar jarfile="${build}/jws/jnidispatch.jar">
|
|
| 15 |
+ <fileset dir="${build.native}" includes="*jnidispatch.*"/>
|
|
| 16 |
+ </jar> |
|
| 17 |
+@@ -1004,7 +1002,7 @@ |
|
| 18 |
+ <!-- javaws -viewer (security tab, import CSR as CA--> |
|
| 19 |
+ <!-- |
|
| 20 |
+ <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true"> |
|
| 21 |
+- <fileset dir="${build}/jws" includes="${jar},${testjar},junit.jar,jnidispatch.jar,clover.jar"/>
|
|
| 22 |
++ <fileset dir="${build}/jws" includes="${jar},${testjar},junit.jar,jnidispatch.jar"/>
|
|
| 23 |
+ </signjar> |
|
| 24 |
+ --> |
|
| 25 |
+ </target> |
|
| 26 |
+@@ -1121,27 +1119,6 @@ |
|
| 27 |
+ </subant> |
|
| 28 |
+ </target> |
|
| 29 |
+ |
|
| 30 |
+- <target name="with.clover" description="Enable code coverage for tests"> |
|
| 31 |
+- <taskdef resource="cloverlib.xml" classpath="lib/clover.jar"/> |
|
| 32 |
+- <property name="clover" value="true"/> |
|
| 33 |
+- <property name="build" value="build.clover"/> |
|
| 34 |
+- <clover-setup/> |
|
| 35 |
+- </target> |
|
| 36 |
+- |
|
| 37 |
+- <target name="clover" depends="with.clover,test" |
|
| 38 |
+- description="Generate test code coverage reports"> |
|
| 39 |
+- <property name="reports.clover" value="${reports}/clover"/>
|
|
| 40 |
+- <mkdir dir="${reports.clover}"/>
|
|
| 41 |
+- <clover-report> |
|
| 42 |
+- <current outfile="${reports.clover}" title="clover">
|
|
| 43 |
+- <fileset dir="." includes="**/*.java" /> |
|
| 44 |
+- <testresults dir="${results.junit}" includes="TEST-*.xml"/>
|
|
| 45 |
+- <format type="html"/> |
|
| 46 |
+- </current> |
|
| 47 |
+- </clover-report> |
|
| 48 |
+- <echo>Reports generated in ${reports.clover}</echo>
|
|
| 49 |
+- </target> |
|
| 50 |
+- |
|
| 51 |
+ <target name="javadoc" depends="-setup"> |
|
| 52 |
+ <path id="javadoc.src.path"> |
|
| 53 |
+ <path refid="src.path"/> |
|
| 54 |
+@@ -1232,7 +1209,7 @@ |
|
| 55 |
+ <!-- Full sources required to build and test everything --> |
|
| 56 |
+ <zip zipfile="${dist}/src-full.zip">
|
|
| 57 |
+ <zipfileset src="${dist}/src.zip"/>
|
|
| 58 |
+- <zipfileset dir="lib" includes="junit.jar,clover.jar" prefix="lib"/> |
|
| 59 |
++ <zipfileset dir="lib" includes="junit.jar" prefix="lib"/> |
|
| 60 |
+ <zipfileset dir="." includes=".classpath,.project"/> |
|
| 61 |
+ <zipfileset dir="${native}" includes="libffi,libffi/**/*" prefix="native"/>
|
|
| 62 |
+ </zip> |
|
| 63 |
+@@ -1247,8 +1224,6 @@ |
|
| 64 |
+ <fileset dir="${build}"/>
|
|
| 65 |
+ </delete> |
|
| 66 |
+ <delete quiet="true" includeEmptyDirs="true"> |
|
| 67 |
+- <fileset dir=".clover"/> |
|
| 68 |
+- <fileset dir="build.clover" /> |
|
| 69 |
+ <fileset dir="${javadoc}"/>
|
|
| 70 |
+ <fileset dir="." includes="*~,**/*~,build.number,native/libffi/configure"/> |
|
| 71 |
+ </delete> |
|
| 72 |
+@@ -1343,4 +1318,4 @@ |
|
| 73 |
+ <arg value="-Dgpg.useagent=true"/> |
|
| 74 |
+ </artifact:mvn> |
|
| 75 |
+ </target> |
|
| 76 |
+-</project> |
|
| 77 |
+\ No newline at end of file |
|
| 78 |
++</project> |