diff --git a/.gitignore b/.gitignore index 01a5736..3068d9a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/class-rewriter.tar.gz -SOURCES/openjdk-icedtea-2.6.1.tar.xz +SOURCES/openjdk-icedtea-2.6.2.tar.xz SOURCES/pulseaudio.tar.gz SOURCES/systemtap-tapset-2014-03-19.tar.xz diff --git a/.java-1.7.0-openjdk.metadata b/.java-1.7.0-openjdk.metadata index 0abe120..d6e16b8 100644 --- a/.java-1.7.0-openjdk.metadata +++ b/.java-1.7.0-openjdk.metadata @@ -1,4 +1,4 @@ fcc167de17354efb6e52cb387eb3e7dbb0316b53 SOURCES/class-rewriter.tar.gz -504c0744a7be09bf618e2a0719eda3c3182f8844 SOURCES/openjdk-icedtea-2.6.1.tar.xz +c81a0c6165fab2c5fbb80b63a818a50ec5c436d3 SOURCES/openjdk-icedtea-2.6.2.tar.xz fb72b6b1f4735ad9b5799d0b5058b0b1dec67b17 SOURCES/pulseaudio.tar.gz becc037bf0eb13b5f0ebcdd94b58ebfe6336b7a0 SOURCES/systemtap-tapset-2014-03-19.tar.xz diff --git a/SOURCES/8072932or8074489.patch b/SOURCES/8072932or8074489.patch new file mode 100644 index 0000000..5941153 --- /dev/null +++ b/SOURCES/8072932or8074489.patch @@ -0,0 +1,22 @@ + +# HG changeset patch +# User kevinw +# Date 1425476514 0 +# Node ID 444ae429c77be53df0b35483d9cf6ce17118e197 +# Parent 569ad82d3904f66d372edfd58532f4e1b1b0b20a +8072932: Test fails with java.security.AccessControlException: access denied ("java.security.SecurityPermission" "getDomainCombiner") +Reviewed-by: jbachorik + +diff -r 569ad82d3904 -r 444ae429c77b src/share/classes/java/security/ProtectionDomain.java +--- openjdk/jdk/src/share/classes/java/security/ProtectionDomain.java Mon Mar 02 18:38:00 2015 +0000 ++++ openjdk/jdk/src/share/classes/java/security/ProtectionDomain.java Wed Mar 04 13:41:54 2015 +0000 +@@ -88,7 +88,7 @@ + } + + private static AccessControlContext getCombinedACC(AccessControlContext context, AccessControlContext stack) { +- AccessControlContext acc = new AccessControlContext(context, stack.getDomainCombiner(), true); ++ AccessControlContext acc = new AccessControlContext(context, stack.getCombiner(), true); + + return new AccessControlContext(stack.getContext(), acc).optimize(); + } + diff --git a/SOURCES/remove-intree-libraries.sh b/SOURCES/remove-intree-libraries.sh index 20f0352..84d693e 100644 --- a/SOURCES/remove-intree-libraries.sh +++ b/SOURCES/remove-intree-libraries.sh @@ -38,6 +38,8 @@ if [ ! -d ${PNG_SRC} ]; then fi rm -rvf ${PNG_SRC} +# LCMS 2 is disabled until security issues are resolved +if [ ! true ]; then echo "Removing lcms" if [ ! -d ${LCMS_SRC} ]; then echo "${LCMS_SRC} does not exist. Refusing to proceed." @@ -70,6 +72,7 @@ rm -vf ${LCMS_SRC}/cmsxform.c rm -vf ${LCMS_SRC}/lcms2.h rm -vf ${LCMS_SRC}/lcms2_internal.h rm -vf ${LCMS_SRC}/lcms2_plugin.h +fi echo "Removing libpcsc headers" if [ ! -d ${PCSC_SRC} ]; then diff --git a/SPECS/java-1.7.0-openjdk.spec b/SPECS/java-1.7.0-openjdk.spec index 8b61cf3..cdd8e1d 100644 --- a/SPECS/java-1.7.0-openjdk.spec +++ b/SPECS/java-1.7.0-openjdk.spec @@ -5,7 +5,7 @@ # conflicting) files in the -debuginfo package %undefine _missing_build_ids_terminate_build -%global icedtea_version 2.6.1 +%global icedtea_version 2.6.2 %global hg_tag icedtea-{icedtea_version} %global aarch64 aarch64 arm64 armv8 @@ -125,8 +125,8 @@ # Standard JPackage naming and versioning defines. %global origin openjdk -%global updatever 85 -%global buildver 01 +%global updatever 91 +%global buildver 00 # Keep priority on 7digits in case updatever>9 %global priority 17000%{updatever} %global javaver 1.7.0 @@ -167,7 +167,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: %{icedtea_version}.2%{?dist} +Release: %{icedtea_version}.1%{?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 @@ -281,7 +281,7 @@ Patch300: pulse-soundproperties.patch Patch400: rh1022017.patch # Temporary patches - +Patch500: 8072932or8074489.patch # End of tmp patches BuildRequires: autoconf @@ -291,7 +291,8 @@ BuildRequires: alsa-lib-devel BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: giflib-devel -BuildRequires: lcms2-devel >= 2.5 +# LCMS 2 is disabled until security issues are resolved +#BuildRequires: lcms2-devel >= 2.5 BuildRequires: libX11-devel BuildRequires: libXi-devel BuildRequires: libXp-devel @@ -303,8 +304,9 @@ BuildRequires: wget BuildRequires: xorg-x11-proto-devel BuildRequires: ant BuildRequires: libXinerama-devel -BuildRequires: rhino +# Provides lsb_release for generating distro id in jdk_generic_profile.sh BuildRequires: redhat-lsb-core +BuildRequires: rhino BuildRequires: zip BuildRequires: fontconfig BuildRequires: xorg-x11-fonts-Type1 @@ -378,7 +380,8 @@ The OpenJDK runtime environment. Summary: The OpenJDK runtime environment without audio and video support Group: Development/Languages -Requires: lcms2 >= 2.5 +# LCMS 2 is disabled until security issues are resolved +#Requires: lcms2 >= 2.5 Requires: libjpeg = 6b # Require /etc/pki/java/cacerts. Requires: ca-certificates @@ -512,6 +515,8 @@ cp %{SOURCE2} . %if %{with_systemtap} %endif +%patch500 + # Remove libraries that are linked sh %{SOURCE10} @@ -665,11 +670,19 @@ oldumask=`umask` %ifnarch %{jit_arches} export ZERO_BUILD=true %endif +# LCMS 2 is disabled until security issues are resolved +export LCMS_CFLAGS="disabled" +export LCMS_LIBS="disabled" +export PKGVERSION="rhel-%{release}-%{_arch} u%{updatever}-b%{buildver}" + source jdk/make/jdk_generic_profile.sh # Restore old umask umask $oldumask +# LCMS 2 is disabled until security issues are resolved +export SYSTEM_LCMS=false + %if %{hsbootstrap} mkdir bootstrap @@ -679,7 +692,7 @@ make \ UNLIMITED_CRYPTO=true \ ANT="/usr/bin/ant" \ DISTRO_NAME="Red Hat Enterprise Linux 7" \ - DISTRO_PACKAGE_VERSION="rhel-%{release}-%{_arch} u%{updatever}-b%{buildver}" \ + DISTRO_PACKAGE_VERSION="${PKGVERSION}" \ JDK_UPDATE_VERSION=`printf "%02d" %{updatever}` \ JDK_BUILD_NUMBER=b`printf "%02d" %{buildver}` \ JRE_RELEASE_VERSION=%{javaver}_`printf "%02d" %{updatever}`-b`printf "%02d" %{buildver}` \ @@ -789,11 +802,9 @@ sh %{SOURCE11} ${JAVA_HOME} rm -rf $RPM_BUILD_ROOT STRIP_KEEP_SYMTAB=libjvm* -# Install symlink to default soundfont -install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/audio -pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/audio -ln -s %{_datadir}/soundfonts/default.sf2 -popd +# there used to be and link to soundfont +# will be replaced by fix of http://mail.openjdk.java.net/pipermail/sound-dev/2015-October/000352.html +# once done, and have to go to fedora first. Removed from rhel7 for now pushd %{buildoutputdir}/j2sdk-image @@ -1450,7 +1461,8 @@ exit 0 %{_mandir}/man1/tnameserv-%{uniquesuffix}.1* %{_mandir}/man1/unpack200-%{uniquesuffix}.1* %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/nss.cfg -%{_jvmdir}/%{jredir}/lib/audio/ +# removed %%{_jvmdir}/%%{jredir}/lib/audio/ +# see soundfont in %%install %ifarch %{jit_arches} %attr(664, root, root) %ghost %{_jvmdir}/%{jredir}/lib/%{archinstall}/server/classes.jsa %attr(664, root, root) %ghost %{_jvmdir}/%{jredir}/lib/%{archinstall}/client/classes.jsa @@ -1536,6 +1548,24 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Tue Oct 20 2015 Jiri Vanek - 1:1.7.0.91-2.6.2.1 +- added and applied patch500 8072932or8074489.patch to fix tck failure +- Resolves: rhbz#1271921 + +* Mon Oct 19 2015 Andrew Hughes - 1:1.7.0.91-2.6.2.0 +- Turn off deletion of in-tree LCMS sources as we now need them. +- Resolves: rhbz#1271921 + +* Mon Oct 19 2015 Andrew Hughes - 1:1.7.0.91-2.6.2.0 +- Bump to 2.6.2 and u91b00. +- Disable system LCMS 2 for now until security of it can be verified. +- Sync minor changes from RHEL 6 spec file. +- Resolves: rhbz#1271921 + +* Wed Oct 14 2015 Jiri Vanek - 1:1.7.0.85-2.6.1.3 +- removed link to soundfont. Unused in rhel7 and will be fixed upstream +- Resolves: rhbz#1257653 + * Sat Jul 11 2015 Andrew Hughes - 1:1.7.0.85-2.6.1.2 - Bump upstream tarball to u25b01 to fix issue with 8075374 backport. - Resolves: rhbz#1235158