forked from vmware/photon
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Change-Id: Ib3d6601e6290aa923470fb57087ffb776f63fe99 Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1908 Tested-by: gerrit-photon <[email protected]> Reviewed-by: Sharath George
- Loading branch information
Priyesh Padmavilasom
authored and
Sharath George
committed
Dec 22, 2016
1 parent
4be6cc4
commit fe7a4fa
Showing
6 changed files
with
29 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
Summary: Ant contrib | ||
Name: ant-contrib | ||
Version: 1.0b3 | ||
Release: 8%{?dist} | ||
Release: 9%{?dist} | ||
License: Apache | ||
URL: http://ant-contrib.sourceforget.net | ||
Group: Applications/System | ||
|
@@ -10,7 +10,7 @@ Distribution: Photon | |
BuildArch: noarch | ||
Source0: http://dl.bintray.com/vmware/photon_release_1.0_TP1_x86_64/%{name}-%{version}-src.tar.gz | ||
%define sha1 ant-contrib=b28d2bf18656b263611187fa9fbb95cec93d47c8 | ||
Requires: openjre >= 1.8.0.102, apache-ant >= 1.9.6 | ||
Requires: openjre >= 1.8.0.112, apache-ant >= 1.9.6 | ||
BuildRequires: openjre >= 1.8.0.45, apache-ant >= 1.9.6 | ||
BuildRequires: openjdk >= 1.8.0.45 | ||
%define _prefix /var/opt/ant-contrib | ||
|
@@ -23,7 +23,7 @@ The Ant Contrib project is a collection of tasks for Apache Ant. | |
%setup -n %{name} | ||
%build | ||
ANT_HOME=/var/opt/apache-ant-1.9.6 | ||
export JAVA_HOME=/var/opt/OpenJDK-1.8.0.102-bin | ||
export JAVA_HOME=/var/opt/OpenJDK-1.8.0.112-bin | ||
mkdir -p -m 700 %{_prefix} | ||
$ANT_HOME/bin/ant -Ddist.dir="%{_prefix}" -Dproject.version="1.0b3" dist | ||
%install | ||
|
@@ -38,6 +38,8 @@ cd %{buildroot}/var/opt && tar xvzf %{_prefix}/ant-contrib-1.0b3-bin.tar.gz --wi | |
%{_prefix}/lib/*.jar | ||
|
||
%changelog | ||
* Wed Dec 21 2016 Priyesh Padmavilasom <[email protected]> 1.0b3-9 | ||
- Updated JAVA_HOME path to point to latest. | ||
* Tue Oct 04 2016 Priyesh Padmavilasom <[email protected]> 1.0b3-8 | ||
- Updated JAVA_HOME path to point to latest. | ||
* Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 1.0b3-7 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
Summary: Apache Ant | ||
Name: apache-ant | ||
Version: 1.9.6 | ||
Release: 4%{?dist} | ||
Release: 5%{?dist} | ||
License: Apache | ||
URL: http://ant.apache.org | ||
Group: Applications/System | ||
|
@@ -14,7 +14,7 @@ Source1: http://hamcrest.googlecode.com/files/hamcrest-1.3.tar.gz | |
%define sha1 hamcrest=f0ab4d66186b894a06d89d103c5225cf53697db3 | ||
Source2: http://dl.bintray.com/vmware/photon_sources/1.0/maven-ant-tasks-2.1.3.tar.gz | ||
%define sha1 maven-ant-tasks=f38c0cc7b38007b09638366dbaa4ee902d9c255b | ||
Requires: openjre >= 1.8.0.102, python2 | ||
Requires: openjre >= 1.8.0.112, python2 | ||
BuildRequires: openjre >= 1.8.0.45 | ||
BuildRequires: openjdk >= 1.8.0.45 | ||
%define _prefix /var/opt/apache-ant-%{version} | ||
|
@@ -36,7 +36,7 @@ cp -v ./hamcrest-1.3/hamcrest-core-1.3.jar ./lib/optional | |
|
||
mkdir -p -m 700 $ANT_DIST_DIR | ||
|
||
export JAVA_HOME=/var/opt/OpenJDK-1.8.0.102-bin | ||
export JAVA_HOME=/var/opt/OpenJDK-1.8.0.112-bin | ||
|
||
./bootstrap.sh && ./build.sh -Ddist.dir=$ANT_DIST_DIR | ||
|
||
|
@@ -66,6 +66,8 @@ chmod 644 $MAVEN_ANT_TASKS_DIR/* | |
%{_prefix}/maven-ant-tasks/* | ||
|
||
%changelog | ||
* Wed Dec 21 2016 Priyesh Padmavilasom <[email protected]> 1.9.6-5 | ||
- Updated JAVA_HOME path to point to latest JDK. | ||
* Tue Oct 04 2016 Priyesh Padmavilasom <[email protected]> 1.9.6-4 | ||
- Updated JAVA_HOME path to point to latest JDK. | ||
* Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 1.9.6-3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
Summary: Apache Maven | ||
Name: apache-maven | ||
Version: 3.3.9 | ||
Release: 6%{?dist} | ||
Release: 7%{?dist} | ||
License: Apache | ||
URL: http://maven.apache.org | ||
Group: Applications/System | ||
|
@@ -10,7 +10,7 @@ Distribution: Photon | |
BuildArch: noarch | ||
Source0: http://apache.mirrors.lucidnetworks.net//maven/source/%{name}-%{version}-src.tar.gz | ||
%define sha1 apache-maven=1912316078f1f7041dd8cd2580f210d30f898162 | ||
Requires: openjre >= 1.8.0.102 | ||
Requires: openjre >= 1.8.0.112 | ||
BuildRequires: openjre >= 1.8.0.45, openjdk >= 1.8.0.45, apache-ant >= 1.9.6, wget >= 1.15 | ||
|
||
%define _prefix /var/opt/apache-maven-3.3.9 | ||
|
@@ -28,7 +28,7 @@ find . -name build.xml | xargs sed -i 's/timeout="600000"/timeout="1200000"/g' | |
%build | ||
MAVEN_DIST_DIR=/var/opt/apache-maven-3.3.9 | ||
|
||
export JAVA_HOME=/var/opt/OpenJDK-1.8.0.102-bin | ||
export JAVA_HOME=/var/opt/OpenJDK-1.8.0.112-bin | ||
export ANT_HOME=/var/opt/apache-ant-1.9.6 | ||
export PATH=$PATH:$ANT_HOME/bin | ||
|
||
|
@@ -63,6 +63,8 @@ echo 'export MAVEN_OPTS=-Xms256m' >> %{buildroot}/etc/profile.d/%{name}.sh | |
%{_prefix}/conf/toolchains.xml | ||
|
||
%changelog | ||
* Wed Dec 21 2016 Priyesh Padmavilasom <[email protected]> 3.3.9-7 | ||
- Updated JAVA_HOME path to point to latest JDK. | ||
* Thu Oct 27 2016 Alexey Makhalov <[email protected]> 3.3.9-6 | ||
- Fix build issue - unable to fetch opensource.org/.../mit-license.php | ||
* Tue Oct 04 2016 Priyesh Padmavilasom <[email protected]> 3.3.9-5 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
Summary: Apache Commons Daemon | ||
Name: commons-daemon | ||
Version: 1.0.15 | ||
Release: 7%{?dist} | ||
Release: 8%{?dist} | ||
License: Apache | ||
URL: http://commons.apache.org/proper/commons-daemon | ||
Group: Applications/System | ||
|
@@ -10,7 +10,7 @@ Distribution: Photon | |
BuildArch: x86_64 | ||
Source0: http://apache.mesi.com.ar//commons/daemon/source/commons-daemon-1.0.15-src.tar.gz | ||
%define sha1 commons-daemon=ca6a448d1d214f714e214b35809a2117568970e3 | ||
Requires: openjre >= 1.8.0.102 | ||
Requires: openjre >= 1.8.0.112 | ||
BuildRequires: openjre >= 1.8.0.45, openjdk >= 1.8.0.45, apache-ant >= 1.9.6 | ||
|
||
%define _prefix /var/opt/%{name}-%{version} | ||
|
@@ -24,7 +24,7 @@ The JNA package contains libraries for interop from Java to native libraries. | |
%setup -q -n %{name}-%{version}-src | ||
%build | ||
ANT_HOME=/var/opt/apache-ant-1.9.6 | ||
export JAVA_HOME=/var/opt/OpenJDK-1.8.0.102-bin | ||
export JAVA_HOME=/var/opt/OpenJDK-1.8.0.112-bin | ||
|
||
$ANT_HOME/bin/ant dist | ||
|
||
|
@@ -58,6 +58,8 @@ chmod -R 755 $DIST_DIR | |
%{_prefix}/*.jar | ||
|
||
%changelog | ||
* Wed Dec 21 2016 Priyesh Padmavilasom <[email protected]> 1.0.15-8 | ||
- Updated JAVA_HOME path to point to latest JDK. | ||
* Tue Oct 04 2016 Priyesh Padmavilasom <[email protected]> 1.0.15-7 | ||
- Updated JAVA_HOME path to point to latest JDK. | ||
* Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 1.0.15-6 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
Summary: Java Native Access | ||
Name: jna | ||
Version: 4.2.1 | ||
Release: 5%{?dist} | ||
Release: 6%{?dist} | ||
License: Apache | ||
URL: http://github.com/twall/jna | ||
Group: Applications/System | ||
|
@@ -10,7 +10,7 @@ Distribution: Photon | |
BuildArch: x86_64 | ||
Source0: http://dl.bintray.com/vmware/photon_release_1.0_TP1_x86_64/%{name}-%{version}.tar.gz | ||
%define sha1 jna=30a1132f9ca6b3222eccd380a3f4149aa7df3f59 | ||
Requires: openjre >= 1.8.0.102 | ||
Requires: openjre >= 1.8.0.112 | ||
BuildRequires: openjre >= 1.8.0.45, openjdk >= 1.8.0.45, apache-ant >= 1.9.6 | ||
|
||
%define _prefix /var/opt/jna-4.2.1 | ||
|
@@ -31,7 +31,7 @@ Sources for JNA | |
%setup -q | ||
%build | ||
ANT_HOME=/var/opt/apache-ant-1.9.6 | ||
export JAVA_HOME=/var/opt/OpenJDK-1.8.0.102-bin | ||
export JAVA_HOME=/var/opt/OpenJDK-1.8.0.112-bin | ||
|
||
#disabling all tests | ||
$ANT_HOME/bin/ant -Dcflags_extra.native=-DNO_JAWT -Dtests.exclude-patterns="**/*.java" -Drelease=true | ||
|
@@ -65,6 +65,8 @@ $ANT_HOME/bin/ant -Ddist=$JNA_DIST_DIR dist -Drelease=true | |
%{_prefix}/*sources.jar | ||
|
||
%changelog | ||
* Wed Dec 21 2016 Priyesh Padmavilasom <[email protected]> 4.2.1-6 | ||
- Updated JAVA_HOME path to point to latest JDK. | ||
* Tue Oct 04 2016 Priyesh Padmavilasom <[email protected]> 4.2.1-5 | ||
- Updated JAVA_HOME path to point to latest JDK. | ||
* Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 4.2.1-4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
%define _use_internal_dependency_generator 0 | ||
Summary: OpenJDK | ||
Name: openjdk | ||
Version: 1.8.0.102 | ||
Version: 1.8.0.112 | ||
Release: 1%{?dist} | ||
License: GNU GPL | ||
URL: https://openjdk.java.net | ||
Group: Development/Tools | ||
Vendor: VMware, Inc. | ||
Distribution: Photon | ||
Source0: http://anduin.linuxfromscratch.org/files/BLFS/OpenJDK/OpenJDK-%{version}-x86_64-bin.tar.xz | ||
%define sha1 OpenJDK=86e9d71f2ce36f54c9f80c7649cbc9ccaadb487a | ||
%define sha1 OpenJDK=c14a20158e16a8877940cfa6dbdf0900d4099a4a | ||
Requires: openjre = %{version}-%{release} | ||
AutoReqProv: no | ||
%description | ||
|
@@ -136,6 +136,8 @@ rm -rf %{buildroot}/* | |
/var/opt/OpenJDK-%{version}-bin/src.zip | ||
|
||
%changelog | ||
* Wed Dec 21 2016 Priyesh Padmavilasom <[email protected]> 1.8.0.112-1 | ||
- Update to 1.8.0.112. addresses CVE-2016-5582 CVE-2016-5573 | ||
* Tue Oct 04 2016 Priyesh Padmavilasom <[email protected]> 1.8.0.102-1 | ||
- Update to 1.8.0.102, minor fixes in url, spelling. | ||
- addresses CVE-2016-3598, CVE-2016-3606, CVE-2016-3610 | ||
|