jvanek pushed to java-1.8.0-openjdk (f20). "updated to security u45 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 15 07:16:09 UTC 2015
>From 26fff425e00609326569d02da09ffa3834a238ac Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek at redhat.com>
Date: Wed, 15 Apr 2015 09:15:51 +0200
Subject: updated to security u45 - deleted hotspot-build-j-directive.patch -
adapted generate_source_tarball.sh, removeSunEcProvider-RH1154143.patch,
repackReproduciblePolycies.sh
diff --git a/.gitignore b/.gitignore
index 36a09bd..3d3bb75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,12 +29,13 @@
/jdk8u-jdk8u40-b01.tar.xz
/jdk8u-jdk8u40-b02.tar.xz
/jdk8u-jdk8u20-b26.tar.xz
+/jdk8u-jdk8u25-b17.tar.xz
/aarch64-hotspot-jdk8u40-b02.tar.xz
/aarch64-hotspot-jdk8u40-b02-c6375c27cbfa.tar.xz
/aarch64-hotspot-jdk8u40-b04-a6df78e590bb.tar.xz
-/jdk8u-jdk8u25-b18.tar.xz
-/jdk8-jdk8u40-b12-aarch64.tar.xz
-/jdk8u-jdk8u40-b12.tar.xz
+/aarch64-hotspot-jdk8u40-b04-d0ea7bcfcd8c.tar.xz
/jdk8-jdk8u40-b12-aarch64-1263.tar.xz
-/jdk8u-jdk8u31-b13.tar.xz
/jdk8-jdk8u40-b12-aarch64-hs3135441ed942.tar.xz
+/jdk8u-jdk8u31-b13.tar.xz
+/jdk8-jdk8u45-b13-aarch64-jdk8u45-b13.tar.xz
+/jdk8u45-jdk8u45-b13.tar.xz
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 72914fe..6011bbd 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -5,6 +5,7 @@
# Usage: generate_source_tarball.sh project_name repo_name tag
#
# Examples:
+# sh generate_source_tarball.sh jdk8u jdk8u40 jdk8u40-b25
# ./generate_source_tarball.sh jdk8 jdk8 jdk8-b79
# ./generate_source_tarball.sh jdk8u jdk8u jdk8u5-b13
# ./generate_source_tarball.sh aarch64-port jdk8 aarch64-${DATE}
diff --git a/hotspot-build-j-directive.patch b/hotspot-build-j-directive.patch
deleted file mode 100644
index 0ab9d60..0000000
--- a/hotspot-build-j-directive.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1398183426 -3600
-# Node ID b4ea3a87f707e674a144e805084bda0f72ad4e38
-# Parent 00aa9f5a26b9e2c7bdca547201106f76e23a8c01
-Don't substitute 'j' for '-j' inside -I directives
-
---- jdk8/hotspot/make/linux/makefiles/adjust-mflags.sh Tue Apr 22 17:15:43 2014 +0100
-+++ jdk8/hotspot/make/linux/makefiles/adjust-mflags.sh Tue Apr 22 17:17:06 2014 +0100
-@@ -64,7 +64,7 @@
- echo "$MFLAGS" \
- | sed '
- s/^-/ -/
-- s/ -\([^ ][^ ]*\)j/ -\1 -j/
-+ s/ -\([^ I][^ ]*\)j/ -\1 -j/
- s/ -j[0-9][0-9]*/ -j/
- s/ -j\([^ ]\)/ -j -\1/
- s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/
-
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 5a35bb4..69279f6 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -81,11 +81,11 @@
# Standard JPackage naming and versioning defines.
%global origin openjdk
-%global updatever 31
+%global updatever 45
%global buildver b13
-%global aarch64_updatever 40
-%global aarch64_buildver b12
-%global aarch64_changesetid aarch64-hs3135441ed942
+%global aarch64_updatever 45
+%global aarch64_buildver b13
+%global aarch64_changesetid aarch64-jdk8u45-b13
# priority must be 7 digits in total
%global priority 0000000
%global javaver 1.8.0
@@ -128,7 +128,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}
-Release: 4.%{buildver}%{?dist}
+Release: 31.%{buildver}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -138,6 +138,7 @@ Release: 4.%{buildver}%{?dist}
# satisfied by the 1:1.5.0 packages. Thus we need to set the epoch in
# JDK package >= 1.6.0 to 1, and packages referring to JDK virtual
# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
+
Epoch: 1
Summary: OpenJDK Runtime Environment
Group: Development/Languages
@@ -148,7 +149,7 @@ URL: http://openjdk.java.net/
# Source from upstrem OpenJDK8 project. To regenerate, use
# ./generate_source_tarball.sh jdk8u jdk8u jdk8u%%{updatever}-%%{buildver}
# ./generate_source_tarball.sh aarch64-port jdk8 %%{aarch64_hg_tag}
-Source0: jdk8u-jdk8u%{updatever}-%{buildver}.tar.xz
+Source0: jdk8u45-jdk8u%{updatever}-%{buildver}.tar.xz
Source1: jdk8-jdk8u%{aarch64_updatever}-%{aarch64_buildver}-%{aarch64_changesetid}.tar.xz
# Custom README for -src subpackage
@@ -195,7 +196,6 @@ Patch6: disable-doclint-by-default.patch
# Include all sources in src.zip
Patch7: include-all-srcs.patch
# Problem discovered with make 4.0
-Patch11: hotspot-build-j-directive.patch
Patch12: removeSunEcProvider-RH1154143.patch
#
@@ -444,7 +444,6 @@ sh %{SOURCE12}
%patch5
%patch6
%patch7
-%patch11
%patch12
%patch99
@@ -1148,6 +1147,16 @@ exit 0
%{_jvmdir}/%{jredir}/lib/accessibility.properties
%changelog
+* Fri Apr 10 2015 Jiri Vanek <jvanek at redhat.com> - 1:1.8.0.45-31.b13
+- repacked sources
+
+* Tue Apr 07 2015 Jiri Vanek <jvanek at redhat.com> - 1:1.8.0.45-30.b13
+- updated to security u45
+- deleted hotspot-build-j-directive.patch
+- adapted generate_source_tarball.sh, removeSunEcProvider-RH1154143.patch,
+ repackReproduciblePolycies.sh
+
+
* Thu Feb 12 2015 Jiri Vanek <jvanek at redhat.com> - 1:1.8.0.25-4.b12
- policies repacked to stop spamming yum update
- added and used source20 repackReproduciblePolycies.sh
diff --git a/removeSunEcProvider-RH1154143.patch b/removeSunEcProvider-RH1154143.patch
index 8b9ced9..9f8802d 100644
--- a/removeSunEcProvider-RH1154143.patch
+++ b/removeSunEcProvider-RH1154143.patch
@@ -21,3 +21,9 @@
#
# Sun Provider SecureRandom seed source.
+@@ -504,4 +504,4 @@
+ #
+ # Example:
+ # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048
+-jdk.tls.disabledAlgorithms=SSLv3
++jdk.tls.disabledAlgorithms=SSLv3,EC,ECDHE,ECDH
diff --git a/repackReproduciblePolycies.sh b/repackReproduciblePolycies.sh
index 12b5ff6..33a46b8 100644
--- a/repackReproduciblePolycies.sh
+++ b/repackReproduciblePolycies.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# https://bugzilla.redhat.com/show_bug.cgi?id=1142153
M=META-INF/MANIFEST.MF
#P=/usr/lib/jvm/java/jre/lib/security
P=$1/lib/security
diff --git a/sources b/sources
index 2986194..5858f22 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
e1d19c1a7e103b9b3c35a94628ded3b5 desktop-files.tar.gz
-10be98f014ee6c280f41a54b6824fce6 jdk8u-jdk8u31-b13.tar.xz
94ca5a45c3cb3b85c4577d0891166007 systemtap-tapset.tar.gz
-ea497b7a37fa2cf4e4e68fafda059c49 jdk8-jdk8u40-b12-aarch64-hs3135441ed942.tar.xz
+753feced879e36b1250fb37aa45cea75 jdk8-jdk8u45-b13-aarch64-jdk8u45-b13.tar.xz
+44789f3467fc8df3c82946dd0db097a6 jdk8u45-jdk8u45-b13.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/java-1.8.0-openjdk.git/commit/?h=f20&id=26fff425e00609326569d02da09ffa3834a238ac
More information about the scm-commits
mailing list