Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
List overview
Download
Arch-excludes
July 2019
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
arch-excludes@lists.fedoraproject.org
2 participants
323 discussions
Start a n
N
ew thread
Architecture specific change in rpms/cfdg.git
by githook-noreply@fedoraproject.org
31 Jul '19
31 Jul '19
The package rpms/cfdg.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cfdg.git/commit/?id=188daffb942b7c0…
. Change: +%ifarch ppc64le Thanks. Full change: ============ commit 188daffb942b7c04e0f440af50ec9fff57116ddc Author: Gwyn Ciesla <gwync(a)protonmail.com> Date: Wed Jul 31 16:40:16 2019 -0500 Patch for ppc64le diff --git a/cfdg-gcc.patch b/cfdg-gcc.patch new file mode 100644 index 0000000..eee1ab2 --- /dev/null +++ b/cfdg-gcc.patch @@ -0,0 +1,11 @@ +--- Makefile~ 2019-07-31 16:25:31.000000000 -0500 ++++ Makefile 2019-07-31 16:26:03.828996069 -0500 +@@ -195,7 +195,7 @@ + # + + CXXFLAGS += $(patsubst %,-I%,$(INC_DIRS)) +-CXXFLAGS += -O2 -Wall -Wextra -march=native -Wno-parentheses -std=c++14 ++CXXFLAGS += -O2 -Wall -Wextra -mcpu=native -Wno-parentheses -std=c++14 + CXXFLAGS += -g -D_GLIBCXX_USE_C99_MATH=1 + CPPFLAGS += -DNDEBUG + diff --git a/cfdg.spec b/cfdg.spec index d783dd9..525c0c4 100644 --- a/cfdg.spec +++ b/cfdg.spec @@ -10,6 +10,7 @@ Source0:
http://www.contextfreeart.org/download/ContextFreeSource3.1.tgz
BuildRequires: gcc-c++ libatomic libicu-devel BuildRequires: libpng-devel bison flex Patch0: cfdg-nostrip.patch +Patch1: cfdg-gcc.patch %description Context Free is a program that generates images from written instructions @@ -20,6 +21,9 @@ create images that can contain millions of shapes. %setup -qcn ContextFreeSource3.1 %patch0 -p0 +%ifarch ppc64le +%patch1 -p0 +%endif %build
1
0
0
0
Architecture specific change in rpms/freewrl.git
by githook-noreply@fedoraproject.org
31 Jul '19
31 Jul '19
The package rpms/freewrl.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/freewrl.git/commit/?id=68d62c0319d1…
. Change: +%ifnarch armv7hl s390x Thanks. Full change: ============ commit 68d62c0319d19801c5e0c516fd2f92b915a97f7e Author: Tom Callaway <spot(a)fedoraproject.org> Date: Wed Jul 31 15:55:32 2019 -0400 no firefox on s390x diff --git a/freewrl.spec b/freewrl.spec index dfef4ad..da7bf1d 100644 --- a/freewrl.spec +++ b/freewrl.spec @@ -33,7 +33,7 @@ BuildRequires: libjpeg-devel, libpng-devel, java-devel, unzip, wget BuildRequires: ImageMagick, desktop-file-utils, chrpath BuildRequires: libXaw-devel, libXmu-devel, freealut-devel BuildRequires: liblo-devel, libcurl-devel, openal-soft-devel -%ifnarch armv7hl +%ifnarch armv7hl s390x BuildRequires: firefox %endif BuildRequires: sox, doxygen, /usr/bin/latex, /usr/bin/mf @@ -88,7 +88,7 @@ Requires: libEAI%{?_isa} = %{version}-%{release} %description -n libEAI-devel Development libraries and headers for libEAI. -%ifnarch armv7hl +%ifnarch armv7hl s390x %package plugin Summary: Browser plugin for FreeWRL Requires: freewrl%{?_isa} = %{version}-%{release} @@ -132,8 +132,8 @@ make install DESTDIR=%{buildroot} mkdir -p %{buildroot}%{_datadir}/%{name}/ install -p src/java/java.policy %{buildroot}%{_datadir}/%{name}/ -# no firefox on armv7hl -%ifarch armv7hl +# no firefox on armv7hl | s390x +%ifarch armv7hl s390x rm -rf %{buildroot}%{_libdir}/mozilla/plugins/libFreeWRLplugin.so %endif @@ -185,7 +185,7 @@ chrpath --delete %{buildroot}%{_libdir}/libFreeWRLEAI.so.* # Plugin is dead and gone, thanks to Mozilla. %if 0 -%ifnarch armv7hl +%ifnarch armv7hl s390x %files plugin %{_libdir}/mozilla/plugins/libFreeWRLplugin.so %endif
1
0
0
0
Architecture specific change in rpms/libmodulemd1.git
by githook-noreply@fedoraproject.org
31 Jul '19
31 Jul '19
The package rpms/libmodulemd1.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libmodulemd1.git/commit/?id=4f9e7c2…
. Change: +%ifnarch %{arm} aarch64 Thanks. Full change: ============ commit 4f9e7c2722a8e8cee9f224bdbdcbbe88302d8e6d Author: Stephen Gallagher <sgallagh(a)redhat.com> Date: Wed Jul 31 15:04:34 2019 -0400 Import SRPM Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com> diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2e32d1c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/modulemd-1.8.15.tar.xz diff --git a/libmodulemd1.spec b/libmodulemd1.spec new file mode 100644 index 0000000..87352e0 --- /dev/null +++ b/libmodulemd1.spec @@ -0,0 +1,123 @@ +Name: libmodulemd1 +Version: 1.8.15 +Release: 3%{?dist} +Summary: Module metadata manipulation library + +License: MIT +URL:
https://github.com/fedora-modularity/libmodulemd
+Source0: %{url}/releases/download/libmodulemd-%{version}/modulemd-%{version}.tar.xz + +BuildRequires: meson >= 0.47 +BuildRequires: pkgconfig +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: glib2-doc +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(yaml-0.1) +BuildRequires: pkgconfig(gtk-doc) +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-gobject-base +%ifarch %{valgrind_arches} +BuildRequires: valgrind +%endif + +Obsoletes: libmodulemd < 1.8.15 +Provides: libmodulemd = %{version}-%{release} +Provides: libmodulemd%{?_isa} = %{version}-%{release} + +# Patches + + +%description +C Library for manipulating module metadata files. +See
https://github.com/fedora-modularity/libmodulemd/blob/master/README.md
for +more details. + + +%package -n python%{python3_pkgversion}-%{name} +Summary: Python 3.6 bindings for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: python%{python3_pkgversion}-gobject-base +Obsoletes: python3-modulemd < 1.3.4 +Obsoletes: python2-%{name} < 1.8.15-3 + +%description -n python%{python3_pkgversion}-%{name} +Python 3 bindings for %{name} + + +%package devel +Summary: Development files for libmodulemd +Requires: %{name}%{?_isa} = %{version}-%{release} +Conflicts: libmodulemd-devel + +%description devel +Development files for libmodulemd. + + +%prep +%autosetup -p1 -n modulemd-%{version} + + +%build +%meson -Ddeveloper_build=false +%meson_build + + +%check + +export LC_CTYPE=C.utf8 + +%ifarch %{power64} s390x +# Valgrind is broken on ppc64[le] with GCC7: +#
https://bugs.kde.org/show_bug.cgi?id=386945
+export MMD_SKIP_VALGRIND=1 +%endif +%ifnarch %{valgrind_arches} +export MMD_SKIP_VALGRIND=1 +%endif + +# Don't run tests on ARM for now. There are problems with +# performance on the builders and often these time out. +%ifnarch %{arm} aarch64 +%meson_test +%endif + + +%install +%meson_install + + +%files +%license COPYING +%doc README.md +%{_bindir}/modulemd-validator-v1 +%{_libdir}/libmodulemd.so.1* +%dir %{_libdir}/girepository-1.0 +%{_libdir}/girepository-1.0/Modulemd-1.0.typelib + + +%files devel +%{_libdir}/libmodulemd.so +%{_libdir}/pkgconfig/modulemd.pc +%{_includedir}/modulemd/ +%dir %{_datadir}/gir-1.0 +%{_datadir}/gir-1.0/Modulemd-1.0.gir +%dir %{_datadir}/gtk-doc +%dir %{_datadir}/gtk-doc/html +%{_datadir}/gtk-doc/html/modulemd-1.0/ + + +%files -n python%{python3_pkgversion}-%{name} + + +%changelog +* Tue Jul 30 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1.8.15-3 +- Drop python2 subpackage + +* Thu Jul 25 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1.8.15-2 +- Fix Obsoletes + +* Wed Jul 24 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1.8.15-1 +- First separate release of libmodulemd1 + diff --git a/sources b/sources new file mode 100644 index 0000000..6feb42f --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (modulemd-1.8.15.tar.xz) = 57f69eca50451f954dbab3021f2b4a9de84999a35994fff2eae076f1c89cccfc60da789e5bf423a930dd44eda76ee5a5053f41d4d12b9126b88b953965ba7d84
1
0
0
0
Architecture specific change in rpms/libmodulemd1.git
by githook-noreply@fedoraproject.org
31 Jul '19
31 Jul '19
The package rpms/libmodulemd1.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libmodulemd1.git/commit/?id=4f9e7c2…
. Change: +%ifnarch %{arm} aarch64 Thanks. Full change: ============ commit 4f9e7c2722a8e8cee9f224bdbdcbbe88302d8e6d Author: Stephen Gallagher <sgallagh(a)redhat.com> Date: Wed Jul 31 15:04:34 2019 -0400 Import SRPM Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com> diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2e32d1c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/modulemd-1.8.15.tar.xz diff --git a/libmodulemd1.spec b/libmodulemd1.spec new file mode 100644 index 0000000..87352e0 --- /dev/null +++ b/libmodulemd1.spec @@ -0,0 +1,123 @@ +Name: libmodulemd1 +Version: 1.8.15 +Release: 3%{?dist} +Summary: Module metadata manipulation library + +License: MIT +URL:
https://github.com/fedora-modularity/libmodulemd
+Source0: %{url}/releases/download/libmodulemd-%{version}/modulemd-%{version}.tar.xz + +BuildRequires: meson >= 0.47 +BuildRequires: pkgconfig +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: glib2-doc +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(yaml-0.1) +BuildRequires: pkgconfig(gtk-doc) +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-gobject-base +%ifarch %{valgrind_arches} +BuildRequires: valgrind +%endif + +Obsoletes: libmodulemd < 1.8.15 +Provides: libmodulemd = %{version}-%{release} +Provides: libmodulemd%{?_isa} = %{version}-%{release} + +# Patches + + +%description +C Library for manipulating module metadata files. +See
https://github.com/fedora-modularity/libmodulemd/blob/master/README.md
for +more details. + + +%package -n python%{python3_pkgversion}-%{name} +Summary: Python 3.6 bindings for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: python%{python3_pkgversion}-gobject-base +Obsoletes: python3-modulemd < 1.3.4 +Obsoletes: python2-%{name} < 1.8.15-3 + +%description -n python%{python3_pkgversion}-%{name} +Python 3 bindings for %{name} + + +%package devel +Summary: Development files for libmodulemd +Requires: %{name}%{?_isa} = %{version}-%{release} +Conflicts: libmodulemd-devel + +%description devel +Development files for libmodulemd. + + +%prep +%autosetup -p1 -n modulemd-%{version} + + +%build +%meson -Ddeveloper_build=false +%meson_build + + +%check + +export LC_CTYPE=C.utf8 + +%ifarch %{power64} s390x +# Valgrind is broken on ppc64[le] with GCC7: +#
https://bugs.kde.org/show_bug.cgi?id=386945
+export MMD_SKIP_VALGRIND=1 +%endif +%ifnarch %{valgrind_arches} +export MMD_SKIP_VALGRIND=1 +%endif + +# Don't run tests on ARM for now. There are problems with +# performance on the builders and often these time out. +%ifnarch %{arm} aarch64 +%meson_test +%endif + + +%install +%meson_install + + +%files +%license COPYING +%doc README.md +%{_bindir}/modulemd-validator-v1 +%{_libdir}/libmodulemd.so.1* +%dir %{_libdir}/girepository-1.0 +%{_libdir}/girepository-1.0/Modulemd-1.0.typelib + + +%files devel +%{_libdir}/libmodulemd.so +%{_libdir}/pkgconfig/modulemd.pc +%{_includedir}/modulemd/ +%dir %{_datadir}/gir-1.0 +%{_datadir}/gir-1.0/Modulemd-1.0.gir +%dir %{_datadir}/gtk-doc +%dir %{_datadir}/gtk-doc/html +%{_datadir}/gtk-doc/html/modulemd-1.0/ + + +%files -n python%{python3_pkgversion}-%{name} + + +%changelog +* Tue Jul 30 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1.8.15-3 +- Drop python2 subpackage + +* Thu Jul 25 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1.8.15-2 +- Fix Obsoletes + +* Wed Jul 24 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1.8.15-1 +- First separate release of libmodulemd1 + diff --git a/sources b/sources new file mode 100644 index 0000000..6feb42f --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (modulemd-1.8.15.tar.xz) = 57f69eca50451f954dbab3021f2b4a9de84999a35994fff2eae076f1c89cccfc60da789e5bf423a930dd44eda76ee5a5053f41d4d12b9126b88b953965ba7d84
1
0
0
0
Architecture specific change in rpms/libmodulemd1.git
by githook-noreply@fedoraproject.org
31 Jul '19
31 Jul '19
The package rpms/libmodulemd1.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libmodulemd1.git/commit/?id=4f9e7c2…
. Change: +%ifnarch %{arm} aarch64 Thanks. Full change: ============ commit 4f9e7c2722a8e8cee9f224bdbdcbbe88302d8e6d Author: Stephen Gallagher <sgallagh(a)redhat.com> Date: Wed Jul 31 15:04:34 2019 -0400 Import SRPM Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com> diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2e32d1c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/modulemd-1.8.15.tar.xz diff --git a/libmodulemd1.spec b/libmodulemd1.spec new file mode 100644 index 0000000..87352e0 --- /dev/null +++ b/libmodulemd1.spec @@ -0,0 +1,123 @@ +Name: libmodulemd1 +Version: 1.8.15 +Release: 3%{?dist} +Summary: Module metadata manipulation library + +License: MIT +URL:
https://github.com/fedora-modularity/libmodulemd
+Source0: %{url}/releases/download/libmodulemd-%{version}/modulemd-%{version}.tar.xz + +BuildRequires: meson >= 0.47 +BuildRequires: pkgconfig +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: glib2-doc +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(yaml-0.1) +BuildRequires: pkgconfig(gtk-doc) +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-gobject-base +%ifarch %{valgrind_arches} +BuildRequires: valgrind +%endif + +Obsoletes: libmodulemd < 1.8.15 +Provides: libmodulemd = %{version}-%{release} +Provides: libmodulemd%{?_isa} = %{version}-%{release} + +# Patches + + +%description +C Library for manipulating module metadata files. +See
https://github.com/fedora-modularity/libmodulemd/blob/master/README.md
for +more details. + + +%package -n python%{python3_pkgversion}-%{name} +Summary: Python 3.6 bindings for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: python%{python3_pkgversion}-gobject-base +Obsoletes: python3-modulemd < 1.3.4 +Obsoletes: python2-%{name} < 1.8.15-3 + +%description -n python%{python3_pkgversion}-%{name} +Python 3 bindings for %{name} + + +%package devel +Summary: Development files for libmodulemd +Requires: %{name}%{?_isa} = %{version}-%{release} +Conflicts: libmodulemd-devel + +%description devel +Development files for libmodulemd. + + +%prep +%autosetup -p1 -n modulemd-%{version} + + +%build +%meson -Ddeveloper_build=false +%meson_build + + +%check + +export LC_CTYPE=C.utf8 + +%ifarch %{power64} s390x +# Valgrind is broken on ppc64[le] with GCC7: +#
https://bugs.kde.org/show_bug.cgi?id=386945
+export MMD_SKIP_VALGRIND=1 +%endif +%ifnarch %{valgrind_arches} +export MMD_SKIP_VALGRIND=1 +%endif + +# Don't run tests on ARM for now. There are problems with +# performance on the builders and often these time out. +%ifnarch %{arm} aarch64 +%meson_test +%endif + + +%install +%meson_install + + +%files +%license COPYING +%doc README.md +%{_bindir}/modulemd-validator-v1 +%{_libdir}/libmodulemd.so.1* +%dir %{_libdir}/girepository-1.0 +%{_libdir}/girepository-1.0/Modulemd-1.0.typelib + + +%files devel +%{_libdir}/libmodulemd.so +%{_libdir}/pkgconfig/modulemd.pc +%{_includedir}/modulemd/ +%dir %{_datadir}/gir-1.0 +%{_datadir}/gir-1.0/Modulemd-1.0.gir +%dir %{_datadir}/gtk-doc +%dir %{_datadir}/gtk-doc/html +%{_datadir}/gtk-doc/html/modulemd-1.0/ + + +%files -n python%{python3_pkgversion}-%{name} + + +%changelog +* Tue Jul 30 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1.8.15-3 +- Drop python2 subpackage + +* Thu Jul 25 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1.8.15-2 +- Fix Obsoletes + +* Wed Jul 24 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1.8.15-1 +- First separate release of libmodulemd1 + diff --git a/sources b/sources new file mode 100644 index 0000000..6feb42f --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (modulemd-1.8.15.tar.xz) = 57f69eca50451f954dbab3021f2b4a9de84999a35994fff2eae076f1c89cccfc60da789e5bf423a930dd44eda76ee5a5053f41d4d12b9126b88b953965ba7d84
1
0
0
0
Architecture specific change in rpms/java-1.8.0-openjdk.git
by githook-noreply@fedoraproject.org
31 Jul '19
31 Jul '19
The package rpms/java-1.8.0-openjdk.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk.git/commit/?id=7…
https://src.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk.git/commit/?id=a…
. Change: -%ifarch %{ix86} -%ifarch x86_64 %{aarch64} Thanks. Full change: ============ commit d304a2f11060a21a89434944caf758329118b105 Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Wed Jul 31 16:34:14 2019 +0100 Update to aarch64-shenandoah-jdk8u222-b10. Adjust PR3083/RH134640 to apply after JDK-8182999 Switch to GA mode for final release. diff --git a/.gitignore b/.gitignore index 0eb9e5a..4db088b 100644 --- a/.gitignore +++ b/.gitignore @@ -145,3 +145,6 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b05.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b06.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b07.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b08.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b09.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b10.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 919aaa6..0831345 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -217,7 +217,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global shenandoah_project aarch64-port %global shenandoah_repo jdk8u-shenandoah -%global shenandoah_revision aarch64-shenandoah-jdk8u222-b07 +%global shenandoah_revision aarch64-shenandoah-jdk8u222-b10 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -238,7 +238,7 @@ # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, # - N%%{?extraver}{?dist} for GA releases -%global is_ga 0 +%global is_ga 1 %if %{is_ga} %global milestone fcs %global milestone_version %{nil} @@ -2284,6 +2284,11 @@ require "copy_jdk_configs.lua" %endif %changelog +* Thu Jul 11 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b10-0 +- Update to aarch64-shenandoah-jdk8u222-b10. +- Adjust PR3083/RH134640 to apply after JDK-8182999 +- Switch to GA mode for final release. + * Mon Jul 08 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b07-0.0.ea - Update to aarch64-shenandoah-jdk8u222-b07 and Shenandoah merge 2019-06-13. - Drop remaining JDK-8210425/RH1632174 patch now AArch64 part is upstream. diff --git a/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch b/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch index d44ed1d..b52c087 100644 --- a/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch +++ b/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch @@ -7,9 +7,21 @@ PR3083, RH1346460: Regression in SSL debug output without an ECC provider Summary: Return null rather than throwing an exception when there's no ECC provider. -diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/Debug.java ---- openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 17:08:12 2016 +0100 -+++ openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 18:21:29 2016 +0100 +diff --git openjdk.orig/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java openjdk/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java +--- openjdk.orig/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java ++++ openjdk/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java +@@ -121,7 +121,7 @@ + private static void ensureCurveIsSupported(ECParameterSpec ecSpec) + throws InvalidAlgorithmParameterException { + +- AlgorithmParameters ecParams = ECUtil.getECParameters(null); ++ AlgorithmParameters ecParams = ECUtil.getECParameters(null, true); + byte[] encodedParams; + try { + ecParams.init(ecSpec); +diff --git openjdk.orig/jdk/src/share/classes/sun/security/util/Debug.java openjdk/jdk/src/share/classes/sun/security/util/Debug.java +--- openjdk.orig/jdk/src/share/classes/sun/security/util/Debug.java ++++ openjdk/jdk/src/share/classes/sun/security/util/Debug.java @@ -73,6 +73,7 @@ System.err.println("certpath PKIX CertPathBuilder and"); System.err.println(" CertPathValidator debugging"); @@ -18,9 +30,9 @@ diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/Debug.j System.err.println("gssloginconfig"); System.err.println(" GSS LoginConfigImpl debugging"); System.err.println("configfile JAAS ConfigFile loading"); -diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/ECUtil.java ---- openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 17:08:12 2016 +0100 -+++ openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 18:21:29 2016 +0100 +diff --git openjdk.orig/jdk/src/share/classes/sun/security/util/ECUtil.java openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java +--- openjdk.orig/jdk/src/share/classes/sun/security/util/ECUtil.java ++++ openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java @@ -41,6 +41,9 @@ public class ECUtil { @@ -34,11 +46,11 @@ diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/ECUtil. @@ -90,6 +93,10 @@ } - private static AlgorithmParameters getECParameters(Provider p) { + public static AlgorithmParameters getECParameters(Provider p) { + return getECParameters(p, false); + } + -+ private static AlgorithmParameters getECParameters(Provider p, boolean throwException) { ++ public static AlgorithmParameters getECParameters(Provider p, boolean throwException) { try { if (p != null) { return AlgorithmParameters.getInstance("EC", p); diff --git a/sources b/sources index 5671c4a..eaffa07 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b07.tar.xz) = f58e5ac864cd66a39f4e479982ff236c8fa560c4108a1e13e11f3dcee1d1c3cbcb8383c8f144bea0c7059eb77f80f0628eb91e93b77a86f75bd84a28382be66c +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b10.tar.xz) = 8e8379260a0f896c41b79e41e51609f3363f734b47cd412d20a4fe18079f73cdeefefdfa62b22f83743d289f8f622201f6650343ee6741163c57d1c5797dcc58 commit 584e2215c0afad8756c5a59b0f2afa351adc9400 Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Wed Jul 31 15:54:20 2019 +0100 Update to aarch64-shenandoah-jdk8u222-b07 and Shenandoah merge 2019-06-13. Drop remaining JDK-8210425/RH1632174 patch now AArch64 part is upstream. diff --git a/.gitignore b/.gitignore index d8def8d..0eb9e5a 100644 --- a/.gitignore +++ b/.gitignore @@ -141,3 +141,7 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b02.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b03.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b04.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b05.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b06.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b07.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index ade741c..919aaa6 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -217,7 +217,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global shenandoah_project aarch64-port %global shenandoah_repo jdk8u-shenandoah -%global shenandoah_revision aarch64-shenandoah-jdk8u222-b03 +%global shenandoah_revision aarch64-shenandoah-jdk8u222-b07 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -1203,9 +1203,6 @@ Patch202: jdk8035341-allow_using_system_installed_libpng.patch Patch203: jdk8042159-allow_using_system_installed_lcms2.patch # 8210761: libjsig is being compiled without optimization Patch620: jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch -# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization -# Aarch64-port 8u local part -Patch624: jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch # JDK-8223219: Backport of JDK-8199552 to OpenJDK 8 leads to duplicate -fstack-protector flags, # overriding --with-extra-cflags Patch626: jdk8223219-fstack-protector-root.patch @@ -1626,7 +1623,6 @@ sh %{SOURCE12} %patch575 %patch577 %patch620 -%patch624 %patch626 %patch627 %patch110 @@ -2288,6 +2284,10 @@ require "copy_jdk_configs.lua" %endif %changelog +* Mon Jul 08 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b07-0.0.ea +- Update to aarch64-shenandoah-jdk8u222-b07 and Shenandoah merge 2019-06-13. +- Drop remaining JDK-8210425/RH1632174 patch now AArch64 part is upstream. + * Mon Jul 08 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b03-0.0.ea - Update to aarch64-shenandoah-jdk8u222-b03. - Drop 8210425 patches applied upstream. Still need to add AArch64 version in aarch64/shenandoah-jdk8u. diff --git a/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch b/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch deleted file mode 100644 index cf1b40b..0000000 --- a/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git openjdk.orig/hotspot/make/linux/makefiles/aarch64.make openjdk/hotspot/make/linux/makefiles/aarch64.make -index 3d17326..7cdb498 100644 ---- openjdk.orig/hotspot/make/linux/makefiles/aarch64.make -+++ openjdk/hotspot/make/linux/makefiles/aarch64.make -@@ -22,10 +22,13 @@ - # - # - --# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized --OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) --# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized --OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) -+ifeq ($(OPT_CFLAGS_NO_FMA),) -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) -+else -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+endif - # Must also specify if CPU is little endian - CFLAGS += -DVM_LITTLE_ENDIAN - diff --git a/sources b/sources index 9e15789..5671c4a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b03.tar.xz) = d7ca2c2b92ca21384c1a4f2f1f9a0335a941de4c24c6a54ce8a323ae0b61eb1ef9cb9d399cd9299841a1e9a2484375acb26db29fbd8b9b982b45d21442b88026 +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b07.tar.xz) = f58e5ac864cd66a39f4e479982ff236c8fa560c4108a1e13e11f3dcee1d1c3cbcb8383c8f144bea0c7059eb77f80f0628eb91e93b77a86f75bd84a28382be66c commit a9aae2a8745bc7b48a68721ba556c35bbaed1b57 Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Wed Jul 31 13:58:09 2019 +0100 Update to aarch64-shenandoah-jdk8u222-b03. Drop 8210425 patches applied upstream. Still need to add AArch64 version in aarch64/shenandoah-jdk8u. Re-generate JDK-8141570 & JDK-8143245 patches due to 8210425 zeroshark.make changes. diff --git a/.gitignore b/.gitignore index f382ea2..d8def8d 100644 --- a/.gitignore +++ b/.gitignore @@ -140,3 +140,4 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b02.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b03.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index ef56e23..ade741c 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -217,7 +217,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global shenandoah_project aarch64-port %global shenandoah_repo jdk8u-shenandoah -%global shenandoah_revision aarch64-shenandoah-jdk8u222-b02 +%global shenandoah_revision aarch64-shenandoah-jdk8u222-b03 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -1204,14 +1204,8 @@ Patch203: jdk8042159-allow_using_system_installed_lcms2.patch # 8210761: libjsig is being compiled without optimization Patch620: jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch # 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization -# Upstream 8u part. -Patch623: jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch -# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization # Aarch64-port 8u local part Patch624: jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch -# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization -# Zero part of the fix for (arm/s390 arches) -Patch625: jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch # JDK-8223219: Backport of JDK-8199552 to OpenJDK 8 leads to duplicate -fstack-protector flags, # overriding --with-extra-cflags Patch626: jdk8223219-fstack-protector-root.patch @@ -1632,9 +1626,7 @@ sh %{SOURCE12} %patch575 %patch577 %patch620 -%patch623 %patch624 -%patch625 %patch626 %patch627 %patch110 @@ -2296,6 +2288,11 @@ require "copy_jdk_configs.lua" %endif %changelog +* Mon Jul 08 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b03-0.0.ea +- Update to aarch64-shenandoah-jdk8u222-b03. +- Drop 8210425 patches applied upstream. Still need to add AArch64 version in aarch64/shenandoah-jdk8u. +- Re-generate JDK-8141570 & JDK-8143245 patches due to 8210425 zeroshark.make changes. + * Mon Jul 08 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b02-0.0.ea - Update to aarch64-shenandoah-jdk8u222-b02. - Drop 8064786/PR3599 & 8210416/RH1632174 as applied upstream (8064786 silently in 8176100). diff --git a/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch b/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch index f1e3215..c9ef36b 100644 --- a/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch +++ b/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch @@ -34,9 +34,9 @@ diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hots + -Wno-format-nonliteral -Wno-format-security \ + -Wno-maybe-uninitialized - # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized - OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) -@@ -42,5 +49,3 @@ + # If FDLIBM_CFLAGS is non-empty it holds CFLAGS needed to be passed to + # the compiler so as to be able to produce optimized objects +@@ -48,5 +55,3 @@ ifeq ($(ARCH_DATA_MODEL), 64) CFLAGS += -D_LP64=1 endif diff --git a/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch b/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch index b0a88ea..792b04a 100644 --- a/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch +++ b/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch @@ -8,6 +8,7 @@ Reviewed-by: dholmes, coleenp diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make +diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make --- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make +++ openjdk/hotspot/make/linux/makefiles/zeroshark.make @@ -1,5 +1,5 @@ @@ -27,8 +28,8 @@ diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hots - -Wno-format-nonliteral -Wno-format-security \ - -Wno-maybe-uninitialized - # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized - OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) + # If FDLIBM_CFLAGS is non-empty it holds CFLAGS needed to be passed to + # the compiler so as to be able to produce optimized objects diff --git openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp --- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp +++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp @@ -60,7 +61,7 @@ diff --git openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp openjdk/h switch (type) { case T_VOID: ftype = &ffi_type_void; -diff --git a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp +diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp --- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp +++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp @@ -1,6 +1,6 @@ diff --git a/jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch b/jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch deleted file mode 100644 index 0b05ba6..0000000 --- a/jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git openjdk.orig/hotspot/make/linux/makefiles/amd64.make openjdk/hotspot/make/linux/makefiles/amd64.make ---- openjdk.orig/hotspot/make/linux/makefiles/amd64.make -+++ openjdk/hotspot/make/linux/makefiles/amd64.make -@@ -22,10 +22,13 @@ - # - # - --# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized --OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) --# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized --OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) -+ifeq ($(OPT_CFLAGS_NO_FMA),) -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) -+else -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+endif - # Must also specify if CPU is little endian - CFLAGS += -DVM_LITTLE_ENDIAN - -diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make ---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make -+++ openjdk/hotspot/make/linux/makefiles/gcc.make -@@ -225,6 +225,16 @@ - OPT_CFLAGS/SIZE=-Os - OPT_CFLAGS/SPEED=-O3 - -+ifeq ($(USE_CLANG),) -+ # Only GCC 4.6 and better have machine independent -ffp-contract=off. -+ # For other versions we need to explicitly set arch specific machine -+ # flags or keep optimization off for them. -+ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 6 \) \))" "1" -+ OPT_CFLAGS_NO_FMA = -ffp-contract=off -+ endif -+endif -+ -+ - # Hotspot uses very unstrict aliasing turn this optimization off - # This option is added to CFLAGS rather than OPT_CFLAGS - # so that OPT_CFLAGS overrides get this option too. -diff --git openjdk.orig/hotspot/make/linux/makefiles/i486.make openjdk/hotspot/make/linux/makefiles/i486.make ---- openjdk.orig/hotspot/make/linux/makefiles/i486.make -+++ openjdk/hotspot/make/linux/makefiles/i486.make -@@ -24,10 +24,13 @@ - - # TLS helper, assembled from .s file - --# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized --OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) --# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized --OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) -+ifeq ($(OPT_CFLAGS_NO_FMA),) -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) -+else -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+endif - # Must also specify if CPU is little endian - CFLAGS += -DVM_LITTLE_ENDIAN - -diff --git openjdk.orig/hotspot/make/linux/makefiles/ppc64.make openjdk/hotspot/make/linux/makefiles/ppc64.make ---- openjdk.orig/hotspot/make/linux/makefiles/ppc64.make -+++ openjdk/hotspot/make/linux/makefiles/ppc64.make -@@ -49,3 +49,17 @@ - # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI. - CFLAGS += -mcpu=power7 -mtune=power8 -minsert-sched-nops=regroup_exact -mno-multiple -mno-string - endif -+ -+ifeq ($(OPT_CFLAGS_NO_FMA),) -+ ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),big) -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) -mno-fused-madd -fno-strict-aliasing -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) -mno-fused-madd -fno-strict-aliasing -+ else -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) -+ endif -+else -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+endif -+ diff --git a/jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch b/jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch deleted file mode 100644 index 6c1ebad..0000000 --- a/jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- openjdk/hotspot/make/linux/makefiles/zeroshark.make -+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make -@@ -30,10 +30,13 @@ ifeq ($(USE_CLANG), true) - WARNING_FLAGS += -Wno-undef - endif - --# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized --OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) --# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized --OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) -+ifeq ($(OPT_CFLAGS_NO_FMA),) -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) -+else -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+endif - - # Specify that the CPU is little endian, if necessary - ifeq ($(ZERO_ENDIANNESS), little) diff --git a/sources b/sources index 8e4f7c0..9e15789 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b02.tar.xz) = f30a5e1b7dd3fb3d7648d7871889f3f859946e4889649662aa7d051f02c101747e13d3b1311f14a68b5952f9745e577ef57cef44f7b73f9ccb0341c74d4068ac +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b03.tar.xz) = d7ca2c2b92ca21384c1a4f2f1f9a0335a941de4c24c6a54ce8a323ae0b61eb1ef9cb9d399cd9299841a1e9a2484375acb26db29fbd8b9b982b45d21442b88026 commit cc57cbccebc52e230e1d332bba65ea07c0a0b331 Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Wed Jul 31 04:19:52 2019 +0100 Update to aarch64-shenandoah-jdk8u222-b02. Drop 8064786/PR3599 & 8210416/RH1632174 as applied upstream (8064786 silently in 8176100). diff --git a/.gitignore b/.gitignore index 5c6e85f..f382ea2 100644 --- a/.gitignore +++ b/.gitignore @@ -139,3 +139,4 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b02.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 3752b5a..ef56e23 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -217,7 +217,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global shenandoah_project aarch64-port %global shenandoah_repo jdk8u-shenandoah -%global shenandoah_revision aarch64-shenandoah-jdk8u222-b01 +%global shenandoah_revision aarch64-shenandoah-jdk8u222-b02 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -233,7 +233,7 @@ %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) -%global rpmrelease 2 +%global rpmrelease 0 # Define milestone (EA for pre-releases, GA ("fcs") for releases) # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, @@ -1193,8 +1193,6 @@ Patch573: jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_h Patch574: jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch # 8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8 Patch575: jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch -# 8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning -Patch576: jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch # 8062808, PR3548: Turn on the -Wreturn-type warning Patch577: jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch # s390: JDK-8203030, Type fixing for s390 @@ -1205,8 +1203,6 @@ Patch202: jdk8035341-allow_using_system_installed_libpng.patch Patch203: jdk8042159-allow_using_system_installed_lcms2.patch # 8210761: libjsig is being compiled without optimization Patch620: jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch -# 8210416: [linux] Poor StrictMath performance due to non-optimized compilation -Patch622: jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch # 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization # Upstream 8u part. Patch623: jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch @@ -1634,10 +1630,8 @@ sh %{SOURCE12} %patch573 %patch574 %patch575 -%patch576 %patch577 %patch620 -%patch622 %patch623 %patch624 %patch625 @@ -2302,6 +2296,10 @@ require "copy_jdk_configs.lua" %endif %changelog +* Mon Jul 08 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b02-0.0.ea +- Update to aarch64-shenandoah-jdk8u222-b02. +- Drop 8064786/PR3599 & 8210416/RH1632174 as applied upstream (8064786 silently in 8176100). + * Sun Jul 07 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b01-0.2.ea - Make use of Recommends and Suggests dependent on Fedora or RHEL 8+ environment. diff --git a/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch b/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch deleted file mode 100644 index 790ee0d..0000000 --- a/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch +++ /dev/null @@ -1,28 +0,0 @@ -# HG changeset patch -# User goetz -# Date 1415873641 -3600 -# Thu Nov 13 11:14:01 2014 +0100 -# Node ID 1878c4c1d04e1f3c6f67a19d36c35863d6b5f906 -# Parent 533473c67de6ff767710594639033c8e83523fe5 -8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning -Reviewed-by: stefank, tschatzl - -diff --git openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/share/vm/prims/jni.cpp ---- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp -+++ openjdk/hotspot/src/share/vm/prims/jni.cpp -@@ -708,6 +708,7 @@ - - THROW_OOP_(JNIHandles::resolve(obj), JNI_OK); - ShouldNotReachHere(); -+ return 0; // Mute compiler. - JNI_END - - #ifndef USDT2 -@@ -734,6 +735,7 @@ - Handle protection_domain (THREAD, k->protection_domain()); - THROW_MSG_LOADER_(name, (char *)message, class_loader, protection_domain, JNI_OK); - ShouldNotReachHere(); -+ return 0; // Mute compiler. - JNI_END - - diff --git a/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch b/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch deleted file mode 100644 index 98bbad0..0000000 --- a/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git openjdk.orig/jdk/make/lib/CoreLibraries.gmk openjdk/jdk/make/lib/CoreLibraries.gmk ---- openjdk.orig/jdk/make/lib/CoreLibraries.gmk -+++ openjdk/jdk/make/lib/CoreLibraries.gmk -@@ -37,21 +37,32 @@ ifeq ($(OPENJDK_TARGET_OS), solaris) - endif - - ifeq ($(OPENJDK_TARGET_OS), linux) -- ifeq ($(OPENJDK_TARGET_CPU), ppc64) -- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH -- else ifeq ($(OPENJDK_TARGET_CPU), ppc64le) -- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH -- else ifeq ($(OPENJDK_TARGET_CPU), aarch64) -- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH -- endif --endif -- --ifneq ($(OPENJDK_TARGET_OS), macosx) -+ BUILD_LIBFDLIBM_OPTIMIZATION := HIGH -+ LIBFDLIBM_CFLAGS_LINUX := -ffp-contract=off - # Unfortunately, '-ffp-contract' is only available since gcc 4.6. For ppc64le - # that's no problem since ppc64le support only appeared in gcc 4.8.3. But on - # ppc64 (big endian) we traditionally compiled with gcc 4.3 which only knows - # '-mno-fused-madd'. However, that's still not enough to get the float - # computations right - we additionally have to supply '-fno-strict-aliasing'. -+ # -+ # -+ ifeq ($(TOOLCHAIN_TYPE), gcc) -+ CC_VER_MAJOR := $(shell $(CC) -dumpversion | cut -d'.' -f1) -+ CC_VER_MINOR := $(shell $(CC) -dumpversion | cut -d'.' -f2) -+ endif -+ # Only GCC 4.6 and better have machine independent -ffp-contract=off. -+ # For other versions we need to explicitly set arch specific machine -+ # flags or keep optimization off. -+ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 6 \) \))" "0" -+ ifeq ($(OPENJDK_TARGET_CPU), ppc64) -+ LIBFDLIBM_CFLAGS_LINUX := -mno-fused-madd -fno-strict-aliasing -+ else -+ BUILD_LIBFDLIBM_OPTIMIZATION := NONE -+ endif -+ endif -+endif -+ -+ifneq ($(OPENJDK_TARGET_OS), macosx) - $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM, \ - STATIC_LIBRARY := fdlibm, \ - OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \ -@@ -62,9 +73,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) - -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \ - CFLAGS_windows_debug := -DLOGGING, \ - CFLAGS_aix := -qfloat=nomaf, \ -- CFLAGS_linux_ppc64 := -mno-fused-madd -fno-strict-aliasing, \ -- CFLAGS_linux_ppc64le := -ffp-contract=off, \ -- CFLAGS_linux_aarch64 := -ffp-contract=off, \ -+ CFLAGS_linux := $(LIBFDLIBM_CFLAGS_LINUX), \ - ARFLAGS := $(ARFLAGS), \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) diff --git a/sources b/sources index 8c0edda..8e4f7c0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz) = 1d120a52dc4a6ac77189fb8f8b27244aad2de7e1fa71c41e89280339fb5f0255761171159fb5b0ab0b4ba185d8462205574679219f9bd218843618f3dc575dd2 +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b02.tar.xz) = f30a5e1b7dd3fb3d7648d7871889f3f859946e4889649662aa7d051f02c101747e13d3b1311f14a68b5952f9745e577ef57cef44f7b73f9ccb0341c74d4068ac commit 85a907b56c9fdf23545f2cabebc3b613298623f8 Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Wed Jul 24 17:58:37 2019 +0100 Make use of Recommends and Suggests dependent on Fedora or RHEL 8+ environment. diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 145aa18..3752b5a 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -233,7 +233,7 @@ %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) -%global rpmrelease 1 +%global rpmrelease 2 # Define milestone (EA for pre-releases, GA ("fcs") for releases) # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, @@ -871,7 +871,9 @@ Requires: libXcomposite%{?_isa} Requires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} # for java-X-openjdk package's desktop binding +%if 0%{?fedora} || 0%{?rhel} >= 8 Recommends: gtk2%{?_isa} +%endif Provides: java-%{javaver}-%{origin} = %{epoch}:%{version}-%{release} @@ -913,7 +915,9 @@ Requires(postun): %{_sbindir}/alternatives # in version 1.7 and higher for --family switch Requires(postun): chkconfig >= 1.7 # for optional support of kernel stream control, card reader and printing bindings +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: lksctp-tools%{?_isa}, pcsc-lite-devel%{?_isa} +%endif # Standard JPackage base provides Provides: jre-headless%{?1} = %{epoch}:%{javaver} @@ -2298,6 +2302,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Sun Jul 07 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b01-0.2.ea +- Make use of Recommends and Suggests dependent on Fedora or RHEL 8+ environment. + * Sun Jul 07 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b01-0.1.ea - Update to aarch64-shenandoah-jdk8u222-b01. - Refactor PR2888 after inclusion of 8129988 upstream. Now includes PR3575. commit 260536c34db4cfa5e09df5e3a5c4c2ff08d678fd Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Wed Jul 24 05:07:05 2019 +0100 Update to aarch64-shenandoah-jdk8u222-b01. Refactor PR2888 after inclusion of 8129988 upstream. Now includes PR3575. Drop 8171000 & 8197546 as applied upstream. diff --git a/.gitignore b/.gitignore index faa17a0..5c6e85f 100644 --- a/.gitignore +++ b/.gitignore @@ -138,3 +138,4 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b03.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index e187680..145aa18 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -217,7 +217,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global shenandoah_project aarch64-port %global shenandoah_repo jdk8u-shenandoah -%global shenandoah_revision aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 +%global shenandoah_revision aarch64-shenandoah-jdk8u222-b01 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -226,19 +226,19 @@ %global icedteaver 3.11.0 # e.g. aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 -> aarch64-shenandoah-jdk8u212-b04 -%global version_tag %(VERSION=%{revision}; echo ${VERSION%%-shenandoah*}) +%global version_tag %(VERSION=%{revision}; echo ${VERSION%%-shenandoah-merge*}) # eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont forget spec escape % by %%) %global whole_update %(VERSION=%{version_tag}; echo ${VERSION%%-*}) # eg jdk8u60 -> 60 or aarch64-jdk8u60 -> 60 %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) -%global rpmrelease 6 +%global rpmrelease 1 # Define milestone (EA for pre-releases, GA ("fcs") for releases) # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, # - N%%{?extraver}{?dist} for GA releases -%global is_ga 1 +%global is_ga 0 %if %{is_ga} %global milestone fcs %global milestone_version %{nil} @@ -1138,9 +1138,8 @@ Patch517: pr2899-dont_use_withseed_versions_of_nss_functions_as_they_dont_fully_ Patch518: pr2934-sunec_provider_throwing_keyexception_withine.separator_current_nss_thus_initialise_the_random_number_generator_and_feed_the_seed_to_it.patch Patch519: pr3479-rh1486025-sunec_provider_can_have_multiple_instances_leading_to_premature_nss_shutdown.patch # PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts) -Patch539: pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch # PR3575, RH1567204: System cacerts database handling should not affect jssecacerts -Patch540: pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch +Patch539: pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch # PR3183, RH1340845: Support Fedora/RHEL8 system crypto policy Patch300: pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch # PR3655: Allow use of system crypto policy to be disabled by the user @@ -1182,10 +1181,6 @@ Patch107: s390-8214206_fix.patch Patch502: pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch # S8154313: Generated javadoc scattered all over the place Patch400: jdk8154313-generated_javadoc_scattered_all_over_the_place.patch -# 8171000, PR3542, RH1402819: Robot.createScreenCapture() crashes in wayland mode -Patch563: jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch -# 8197546, PR3542, RH1402819: Fix for 8171000 breaks Solaris + Linux builds -Patch564: jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch # PR3591: Fix for bug 3533 doesn't add -mstackrealign to JDK code Patch571: jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch # 8141570, PR3548: Fix Zero interpreter build for --disable-precompiled-headers @@ -1631,8 +1626,6 @@ sh %{SOURCE12} %patch529 %patch531 %patch530 -%patch563 -%patch564 %patch571 %patch573 %patch574 @@ -1651,7 +1644,7 @@ sh %{SOURCE12} # RPM-only fixes %patch525 %patch539 -%patch540 +%patch1000 # RHEL-only patches %if ! 0%{?fedora} && 0%{?rhel} <= 7 @@ -1660,8 +1653,6 @@ sh %{SOURCE12} # Shenandoah patches -%patch1000 - # Extract systemtap tapsets %if %{with_systemtap} tar --strip-components=1 -x -I xz -f %{SOURCE8} @@ -2307,6 +2298,11 @@ require "copy_jdk_configs.lua" %endif %changelog +* Sun Jul 07 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b01-0.1.ea +- Update to aarch64-shenandoah-jdk8u222-b01. +- Refactor PR2888 after inclusion of 8129988 upstream. Now includes PR3575. +- Drop 8171000 & 8197546 as applied upstream. + * Wed Jul 03 2019 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:1.8.0.212.b04-6 - Include 'ea' designator in Release when appropriate. diff --git a/jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch b/jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch deleted file mode 100644 index d831aa9..0000000 --- a/jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch +++ /dev/null @@ -1,121 +0,0 @@ -# HG changeset patch -# User kaddepalli -# Date 1517818481 -19800 -# Mon Feb 05 13:44:41 2018 +0530 -# Node ID b77308735540644d4710244e3c88865067f2905a -# Parent 39bfc94b1f4265b645c2970a58389acc779dafe9 -8171000, PR3542, RH1402819: Robot.createScreenCapture() crashes in wayland mode -Reviewed-by: serb, mhalder - -diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c openjdk/jdk/src/solaris/native/sun/awt/multiVis.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c -+++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c -@@ -394,77 +394,48 @@ - XRectangle bbox; /* bounding box of grabbed area */ - list_ptr regions;/* list of regions to read from */ - { -- image_region_type *reg; -- int32_t dst_x, dst_y; /* where in pixmap to write (UL) */ -- int32_t diff; -- -- XImage *reg_image,*ximage ; -- int32_t srcRect_x,srcRect_y,srcRect_width,srcRect_height ; -- int32_t rem ; -- int32_t bytes_per_line; -- int32_t bitmap_unit; -- -- bitmap_unit = sizeof (long); -- if (format == ZPixmap) -- bytes_per_line = width*depth/8; -- else -- bytes_per_line = width/8; -- -- -- /* Find out how many more bytes are required for padding so that -- ** bytes per scan line will be multiples of bitmap_unit bits */ -- if (format == ZPixmap) { -- rem = (bytes_per_line*8)%bitmap_unit; -- if (rem) -- bytes_per_line += (rem/8 + 1); -- } -+ XImage *ximage ; - - ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL, - (uint32_t)width,(uint32_t)height,8,0); - -- bytes_per_line = ximage->bytes_per_line; -- -- if (format == ZPixmap) -- ximage->data = malloc(height*bytes_per_line); -- else -- ximage->data = malloc(height*bytes_per_line*depth); -- -+ ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 : depth), sizeof(char)); - ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/ - -- for (reg = (image_region_type *) first_in_list( regions); reg; -+ for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg; - reg = (image_region_type *) next_in_list( regions)) - { -- int32_t rect; -- struct my_XRegion *vis_reg; -- vis_reg = (struct my_XRegion *)(reg->visible_region); -- for (rect = 0; -- rect < vis_reg->numRects; -- rect++) -+ struct my_XRegion *vis_reg = (struct my_XRegion *)(reg->visible_region); -+ for (int32_t rect = 0; rect < vis_reg->numRects; rect++) - { -- /** ------------------------------------------------------------------------ -- Intersect bbox with visible part of region giving src rect & output -- location. Width is the min right side minus the max left side. -- Similar for height. Offset src rect so x,y are relative to -- origin of win, not the root-relative visible rect of win. -- ------------------------------------------------------------------------ **/ -- srcRect_width = MIN( vis_reg->rects[rect].x2, bbox.width + bbox.x) -- - MAX( vis_reg->rects[rect].x1, bbox.x); -+ /** ------------------------------------------------------------------------ -+ Intersect bbox with visible part of region giving src rect & output -+ location. Width is the min right side minus the max left side. -+ Similar for height. Offset src rect so x,y are relative to -+ origin of win, not the root-relative visible rect of win. -+ ------------------------------------------------------------------------ **/ -+ int32_t srcRect_width = MIN( vis_reg->rects[rect].x2, bbox.width + bbox.x) -+ - MAX( vis_reg->rects[rect].x1, bbox.x); -+ -+ int32_t srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height + bbox.y) -+ - MAX( vis_reg->rects[rect].y1, bbox.y); - -- srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height + bbox.y) -- - MAX( vis_reg->rects[rect].y1, bbox.y); -+ int32_t diff = bbox.x - vis_reg->rects[rect].x1; -+ int32_t srcRect_x = MAX( 0, diff) + (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border); -+ int32_t dst_x = MAX( 0, -diff) ; - -- diff = bbox.x - vis_reg->rects[rect].x1; -- srcRect_x = MAX( 0, diff) + (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border); -- dst_x = MAX( 0, -diff) ; -- diff = bbox.y - vis_reg->rects[rect].y1; -- srcRect_y = MAX( 0, diff) + (vis_reg->rects[rect].y1 - reg->y_rootrel - reg->border); -- dst_y = MAX( 0, -diff) ; -- reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y, -- (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ; -- TransferImage(disp,reg_image,srcRect_width, -- srcRect_height,reg,ximage,dst_x,dst_y) ; -- XDestroyImage(reg_image); -- } -+ diff = bbox.y - vis_reg->rects[rect].y1; -+ int32_t srcRect_y = MAX( 0, diff) + (vis_reg->rects[rect].y1 - reg->y_rootrel - reg->border); -+ int32_t dst_y = MAX( 0, -diff) ; -+ XImage* reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y, -+ (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ; -+ -+ if (reg_image) { -+ TransferImage(disp,reg_image,srcRect_width, -+ srcRect_height,reg,ximage,dst_x,dst_y) ; -+ XDestroyImage(reg_image); -+ } -+ } - } - return ximage ; - } diff --git a/jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch b/jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch deleted file mode 100644 index ba712ad..0000000 --- a/jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch +++ /dev/null @@ -1,35 +0,0 @@ -# HG changeset patch -# User prr -# Date 1518454604 28800 -# Mon Feb 12 08:56:44 2018 -0800 -# Node ID 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c -# Parent b77308735540644d4710244e3c88865067f2905a -8197546: Fix for 8171000 breaks Solaris + Linux builds -Reviewed-by: serb, jdv - -diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c openjdk/jdk/src/solaris/native/sun/awt/multiVis.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c -+++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c -@@ -395,6 +395,8 @@ - list_ptr regions;/* list of regions to read from */ - { - XImage *ximage ; -+ image_region_type* reg; -+ int32_t rect; - - ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL, - (uint32_t)width,(uint32_t)height,8,0); -@@ -402,11 +404,11 @@ - ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 : depth), sizeof(char)); - ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/ - -- for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg; -+ for (reg = (image_region_type *) first_in_list( regions); reg; - reg = (image_region_type *) next_in_list( regions)) - { - struct my_XRegion *vis_reg = (struct my_XRegion *)(reg->visible_region); -- for (int32_t rect = 0; rect < vis_reg->numRects; rect++) -+ for (rect = 0; rect < vis_reg->numRects; rect++) - { - /** ------------------------------------------------------------------------ - Intersect bbox with visible part of region giving src rect & output diff --git a/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch b/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch index fc8f981..a42688d 100644 --- a/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch +++ b/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch @@ -5,42 +5,45 @@ # Node ID 3334efeacd8327a14b7d2f392f4546e3c29c594b # Parent 6b81fd2227d14226f2121f2d51b464536925686e PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts) +PR3575: System cacerts database handling should not affect jssecacerts -diff --git a/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java b/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java ---- openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java -+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java -@@ -174,15 +174,20 @@ - storeFile = new File(storeFileName); - fis = getFileInputStream(storeFile); - } else { -- String javaHome = props.get("javaHome"); -- storeFile = new File(javaHome + sep + "lib" + sep -- + "security" + sep + -- "jssecacerts"); -+ /* Check system cacerts DB first; /etc/pki/java/cacerts */ -+ storeFile = new File(sep + "etc" + sep + "pki" + sep -+ + "java" + sep + "cacerts"); - if ((fis = getFileInputStream(storeFile)) == null) { -+ String javaHome = props.get("javaHome"); - storeFile = new File(javaHome + sep + "lib" + sep -- + "security" + sep + -- "cacerts"); -- fis = getFileInputStream(storeFile); -+ + "security" + sep + -+ "jssecacerts"); -+ if ((fis = getFileInputStream(storeFile)) == null) { -+ storeFile = new File(javaHome + sep + "lib" + sep -+ + "security" + sep + -+ "cacerts"); -+ fis = getFileInputStream(storeFile); -+ } - } - } +diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java openjdk/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java +--- openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java ++++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java +@@ -72,7 +72,7 @@ + * The preference of the default trusted KeyStore is: + * javax.net.ssl.trustStore + * jssecacerts +- * cacerts ++ * cacerts (system and local) + */ + private static final class TrustStoreDescriptor { + private static final String fileSep = File.separator; +@@ -83,6 +83,10 @@ + defaultStorePath + fileSep + "cacerts"; + private static final String jsseDefaultStore = + defaultStorePath + fileSep + "jssecacerts"; ++ /* Check system cacerts DB: /etc/pki/java/cacerts */ ++ private static final String systemStore = ++ fileSep + "etc" + fileSep + "pki" + ++ fileSep + "java" + fileSep + "cacerts"; -diff --git a/src/share/classes/sun/security/tools/KeyStoreUtil.java b/src/share/classes/sun/security/tools/KeyStoreUtil.java ---- openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java + // the trust store name + private final String storeName; +@@ -146,7 +150,8 @@ + long temporaryTime = 0L; + if (!"NONE".equals(storePropName)) { + String[] fileNames = +- new String[] {storePropName, defaultStore}; ++ new String[] {storePropName, ++ systemStore, defaultStore}; + for (String fileName : fileNames) { + File f = new File(fileName); + if (f.isFile() && f.canRead()) { +diff --git openjdk.orig/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java +--- openjdk.orig/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java +++ openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java -@@ -87,9 +87,14 @@ +@@ -108,9 +108,14 @@ throws Exception { String sep = File.separator; diff --git a/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch b/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch deleted file mode 100644 index ce24c59..0000000 --- a/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch +++ /dev/null @@ -1,42 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1525111445 -3600 -# Mon Apr 30 19:04:05 2018 +0100 -# Node ID 388fc8da23044317c160678ffa8ff541c216a255 -# Parent 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c -PR3575: System cacerts database handling should not affect jssecacerts - -diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java ---- openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java -+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java -@@ -162,7 +162,7 @@ - * Try: - * javax.net.ssl.trustStore (if this variable exists, stop) - * jssecacerts -- * cacerts -+ * cacerts (system and local) - * - * If none exists, we use an empty keystore. - */ -@@ -174,14 +174,14 @@ - storeFile = new File(storeFileName); - fis = getFileInputStream(storeFile); - } else { -- /* Check system cacerts DB first; /etc/pki/java/cacerts */ -- storeFile = new File(sep + "etc" + sep + "pki" + sep -- + "java" + sep + "cacerts"); -+ String javaHome = props.get("javaHome"); -+ storeFile = new File(javaHome + sep + "lib" + sep -+ + "security" + sep + -+ "jssecacerts"); - if ((fis = getFileInputStream(storeFile)) == null) { -- String javaHome = props.get("javaHome"); -- storeFile = new File(javaHome + sep + "lib" + sep -- + "security" + sep + -- "jssecacerts"); -+ /* Check system cacerts DB first; /etc/pki/java/cacerts */ -+ storeFile = new File(sep + "etc" + sep + "pki" + sep -+ + "java" + sep + "cacerts"); - if ((fis = getFileInputStream(storeFile)) == null) { - storeFile = new File(javaHome + sep + "lib" + sep - + "security" + sep + diff --git a/sources b/sources index 2064a52..8c0edda 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz) = 8ef6029cfa053fce7e0f73aab72b287a4505b06d6e2f1153e5c903a48ba89147fc187987f58d6eb737ede9d5c76a8925f22c34a4f5c3d757674c06fccf77c21b +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz) = 1d120a52dc4a6ac77189fb8f8b27244aad2de7e1fa71c41e89280339fb5f0255761171159fb5b0ab0b4ba185d8462205574679219f9bd218843618f3dc575dd2 commit a7f82eacb0bc57c5c30c564ac689788ec509e46b Author: Andrew John Hughes <gnu_andrew(a)member.fsf.org> Date: Tue Jul 23 11:24:34 2019 +0100 Handle milestone as variables so we can alter it easily and set the docs zip filename appropriately. Drop unused use_shenandoah_hotspot variable. Include 'ea' designator in Release when appropriate. diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 2ce7fd1..e187680 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -76,13 +76,6 @@ %global include_debug_build 0 %endif -# Shenandoah HotSpot used everywhere, but built only on x86_64 and AArch64 -%ifarch x86_64 %{aarch64} -%global use_shenandoah_hotspot 1 -%else -%global use_shenandoah_hotspot 0 -%endif - %if %{include_debug_build} %global build_loop2 %{debug_suffix} %else @@ -188,8 +181,6 @@ %global archinstall %{_arch} %endif - - %ifarch %{jit_arches} %global with_systemtap 1 %else @@ -242,6 +233,23 @@ %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) +%global rpmrelease 6 +# Define milestone (EA for pre-releases, GA ("fcs") for releases) +# Release will be (where N is usually a number starting at 1): +# - 0.N%%{?extraver}%%{?dist} for EA releases, +# - N%%{?extraver}{?dist} for GA releases +%global is_ga 1 +%if %{is_ga} +%global milestone fcs +%global milestone_version %{nil} +%global extraver %{nil} +%global eaprefix %{nil} +%else +%global milestone ea +%global milestone_version "-ea" +%global extraver .%{milestone} +%global eaprefix 0. +%endif # priority must be 7 digits in total. The expression is workarounding tip %global priority %(TIP=1800%{updatever}; echo ${TIP/tip/999}) @@ -1000,7 +1008,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 5%{?dist} +Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?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 @@ -1554,6 +1562,10 @@ if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 ] ; then echo "You have disabled both include_debug_build and include_normal_build. That is a no go." exit 13 fi + +echo "Update version: %{updatever}" +echo "Build number: %{buildver}" +echo "Milestone: %{milestone}" %setup -q -c -n %{uniquesuffix ""} -T -a 0 #
https://bugzilla.redhat.com/show_bug.cgi?id=1189084
prioritylength=`expr length %{priority}` @@ -1753,7 +1765,7 @@ bash ../../configure \ --with-jvm-variants=zero \ %endif --with-native-debug-symbols=internal \ - --with-milestone="fcs" \ + --with-milestone=%{milestone} \ --with-update-version=%{updatever} \ --with-build-number=%{buildver} \ --with-boot-jdk=/usr/lib/jvm/java-openjdk \ @@ -1984,7 +1996,7 @@ popd # Install Javadoc documentation install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir} cp -a %{buildoutputdir -- $suffix}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix} -built_doc_archive=`echo "jdk-%{javaver}_%{updatever}$suffix-%{buildver}-docs.zip" | sed s/slowdebug/debug/` +built_doc_archive=`echo "jdk-%{javaver}_%{updatever}%{milestone_version}$suffix-%{buildver}-docs.zip" | sed s/slowdebug/debug/` cp -a %{buildoutputdir -- $suffix}/bundles/$built_doc_archive $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip # Install icons and menu entries @@ -2295,6 +2307,13 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed Jul 03 2019 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:1.8.0.212.b04-6 +- Include 'ea' designator in Release when appropriate. + +* Wed Jul 03 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-6 +- Handle milestone as variables so we can alter it easily and set the docs zip filename appropriately. +- Drop unused use_shenandoah_hotspot variable. + * Fri Jun 14 2019 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-5 - Update to aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30. - Update version logic to handle -shenandoah* tag suffix. commit 574dfb4ddb15b98eb1047d45e0fdc2553b3e4581 Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Mon Jun 24 15:23:59 2019 +0100 Update to aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30. Update version logic to handle -shenandoah* tag suffix. Drop PR3634 as applied upstream. Adjust 8214206 fix for S390 as BinaryMagnitudeSeq moved to shenandoahNumberSeq.cpp Update 8214206 to use log2_long rather than casting to intptr_t, which may be smaller than size_t. diff --git a/.gitignore b/.gitignore index d1072b7..faa17a0 100644 --- a/.gitignore +++ b/.gitignore @@ -137,3 +137,4 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b02.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b03.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 528602a..2ce7fd1 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -226,7 +226,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global shenandoah_project aarch64-port %global shenandoah_repo jdk8u-shenandoah -%global shenandoah_revision aarch64-shenandoah-jdk8u212-b04 +%global shenandoah_revision aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -234,12 +234,14 @@ # Define IcedTea version used for SystemTap tapsets and desktop files %global icedteaver 3.11.0 +# e.g. aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 -> aarch64-shenandoah-jdk8u212-b04 +%global version_tag %(VERSION=%{revision}; echo ${VERSION%%-shenandoah*}) # eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont forget spec escape % by %%) -%global whole_update %(VERSION=%{revision}; echo ${VERSION%%-*}) +%global whole_update %(VERSION=%{version_tag}; echo ${VERSION%%-*}) # eg jdk8u60 -> 60 or aarch64-jdk8u60 -> 60 %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 -%global buildver %(VERSION=%{revision}; echo ${VERSION##*-}) +%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) # priority must be 7 digits in total. The expression is workarounding tip %global priority %(TIP=1800%{updatever}; echo ${TIP/tip/999}) @@ -998,7 +1000,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 4%{?dist} +Release: 5%{?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 @@ -1241,8 +1243,6 @@ Patch201: jdk8043805-allow_using_system_installed_libjpeg.patch # and should be upstreamed to the appropriate # trees. ############################################# -# PR3634: Shenandoah still broken on s390 with aarch64-shenandoah-jdk8u181-b16 -Patch582: pr3634-fix_shenandoah_for_size_t_on_s390.patch ############################################# # @@ -1647,7 +1647,6 @@ sh %{SOURCE12} %endif # Shenandoah patches -%patch582 %patch1000 @@ -2296,6 +2295,13 @@ require "copy_jdk_configs.lua" %endif %changelog +* Fri Jun 14 2019 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-5 +- Update to aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30. +- Update version logic to handle -shenandoah* tag suffix. +- Drop PR3634 as applied upstream. +- Adjust 8214206 fix for S390 as BinaryMagnitudeSeq moved to shenandoahNumberSeq.cpp +- Update 8214206 to use log2_long rather than casting to intptr_t, which may be smaller than size_t. + * Wed May 22 2019 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-4 - Remove additions to EXTRA_CFLAGS and EXTRA_CPP_FLAGS which are now made by upstream. - Remove -mstackrealign addition which is handled by PR3533 & PR3591 patches. diff --git a/pr3634-fix_shenandoah_for_size_t_on_s390.patch b/pr3634-fix_shenandoah_for_size_t_on_s390.patch deleted file mode 100644 index 20a4625..0000000 --- a/pr3634-fix_shenandoah_for_size_t_on_s390.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp -@@ -524,8 +524,8 @@ - region_size = max_heap_size / ShenandoahTargetNumRegions; - - // Now make sure that we don't go over or under our limits. -- region_size = MAX2(ShenandoahMinRegionSize, region_size); -- region_size = MIN2(ShenandoahMaxRegionSize, region_size); -+ region_size = MAX2<size_t>(ShenandoahMinRegionSize, region_size); -+ region_size = MIN2<size_t>(ShenandoahMaxRegionSize, region_size); - - } else { - if (ShenandoahHeapRegionSize > initial_heap_size / MIN_NUM_REGIONS) { diff --git a/s390-8214206_fix.patch b/s390-8214206_fix.patch index 93f12de..42902cf 100644 --- a/s390-8214206_fix.patch +++ b/s390-8214206_fix.patch @@ -7,10 +7,22 @@ diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1BiasedArray. address base = create_new_base_array(num_target_elems, target_elem_size_in_bytes); - initialize_base(base, num_target_elems, bias, target_elem_size_in_bytes, log2_intptr(mapping_granularity_in_bytes)); + initialize_base(base, num_target_elems, bias, target_elem_size_in_bytes, -+ log2_intptr((uintptr_t) mapping_granularity_in_bytes)); ++ log2_long(mapping_granularity_in_bytes)); } size_t bias() const { return _bias; } +diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp ++++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp +@@ -135,7 +135,7 @@ + void BinaryMagnitudeSeq::add(size_t val) { + Atomic::add(val, &_sum); + +- int mag = log2_intptr(val) + 1; ++ int mag = log2_long(val) + 1; + + // Defensively saturate for product bits: + if (mag < 0) { diff --git openjdk.orig/hotspot/src/share/vm/runtime/os.cpp openjdk/hotspot/src/share/vm/runtime/os.cpp --- openjdk.orig/hotspot/src/share/vm/runtime/os.cpp +++ openjdk/hotspot/src/share/vm/runtime/os.cpp @@ -19,19 +31,7 @@ diff --git openjdk.orig/hotspot/src/share/vm/runtime/os.cpp openjdk/hotspot/src/ void os::set_memory_serialize_page(address page) { - int count = log2_intptr(sizeof(class JavaThread)) - log2_int(64); -+ int count = log2_intptr((uintptr_t) sizeof(class JavaThread)) - log2_int(64); ++ int count = log2_long(sizeof(class JavaThread)) - log2_int(64); _mem_serialize_page = (volatile int32_t *)page; // We initialize the serialization page shift count here // We assume a cache line size of 64 bytes -diff --git openjdk.orig/hotspot/src/share/vm/utilities/numberSeq.cpp openjdk/hotspot/src/share/vm/utilities/numberSeq.cpp ---- openjdk.orig/hotspot/src/share/vm/utilities/numberSeq.cpp -+++ openjdk/hotspot/src/share/vm/utilities/numberSeq.cpp -@@ -369,7 +369,7 @@ - void BinaryMagnitudeSeq::add(size_t val) { - Atomic::add(val, &_sum); - -- int mag = log2_intptr(val) + 1; -+ int mag = log2_intptr((uintptr_t) val) + 1; - - // Defensively saturate for product bits: - if (mag < 0) { diff --git a/sources b/sources index bc68672..2064a52 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04.tar.xz) = ebcb028fdbcd414bc13d8dc5e331b4a6be2026e19eed5c903eecc02929fde8829fca8aa430220319df7f772f5c4d9689739d5f41ce35c4e542641ab2bfcd6c51 +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz) = 8ef6029cfa053fce7e0f73aab72b287a4505b06d6e2f1153e5c903a48ba89147fc187987f58d6eb737ede9d5c76a8925f22c34a4f5c3d757674c06fccf77c21b commit 7ab68b2b83f6bfb0a387cdc729b2d06f30006edb Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Wed May 22 20:00:06 2019 +0100 Remove additions to EXTRA_CFLAGS and EXTRA_CPP_FLAGS which are now made by upstream. Remove -mstackrealign addition which is handled by PR3533 & PR3591 patches. diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index cf39ca8..528602a 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -998,7 +998,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 3%{?dist} +Release: 4%{?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 @@ -1717,9 +1717,8 @@ export CFLAGS="$CFLAGS -mieee" # We use ourcppflags because the OpenJDK build seems to # pass EXTRA_CFLAGS to the HotSpot C++ compiler... -# Explicitly set the C++ standard as the default has changed on GCC >= 6 -EXTRA_CFLAGS="%ourcppflags -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse" -EXTRA_CPP_FLAGS="%ourcppflags -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse" +EXTRA_CFLAGS="%ourcppflags -Wno-error" +EXTRA_CPP_FLAGS="%ourcppflags" # Fixes annocheck warnings in assembler files due to missing build notes EXTRA_CPP_FLAGS="$EXTRA_CPP_FLAGS -Wa,--generate-missing-build-notes=yes" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wa,--generate-missing-build-notes=yes" @@ -1768,13 +1767,8 @@ bash ../../configure \ --with-libpng=system \ --with-lcms=system \ --with-stdc++lib=dynamic \ -%ifarch %{ix86} - --with-extra-cxxflags="-mstackrealign $EXTRA_CPP_FLAGS" \ - --with-extra-cflags="-mstackrealign $EXTRA_CFLAGS" \ -%else --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \ --with-extra-cflags="$EXTRA_CFLAGS" \ -%endif --with-extra-ldflags="%{ourldflags}" \ --with-num-cores="$NUM_PROC" @@ -2302,6 +2296,10 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed May 22 2019 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-4 +- Remove additions to EXTRA_CFLAGS and EXTRA_CPP_FLAGS which are now made by upstream. +- Remove -mstackrealign addition which is handled by PR3533 & PR3591 patches. + * Wed May 22 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-3 - Add JDK-8223219 to avoid -fstack-protector overriding -fstack-protector-strong commit 2c52e1ff0ebb6438dce25522e611840a9ac35205 Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Mon May 13 16:02:54 2019 +0100 Add JDK-8223219 to avoid -fstack-protector overriding -fstack-protector-strong diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 618a058..cf39ca8 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -998,7 +998,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 2%{?dist} +Release: 3%{?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 @@ -1207,6 +1207,10 @@ Patch624: jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fd # 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization # Zero part of the fix for (arm/s390 arches) Patch625: jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch +# JDK-8223219: Backport of JDK-8199552 to OpenJDK 8 leads to duplicate -fstack-protector flags, +# overriding --with-extra-cflags +Patch626: jdk8223219-fstack-protector-root.patch +Patch627: jdk8223219-fstack-protector-hotspot.patch ############################################# # @@ -1628,6 +1632,8 @@ sh %{SOURCE12} %patch623 %patch624 %patch625 +%patch626 +%patch627 %patch110 # RPM-only fixes @@ -2296,6 +2302,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed May 22 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-3 +- Add JDK-8223219 to avoid -fstack-protector overriding -fstack-protector-strong + * Wed May 15 2019 James Cassell <cyberpear(a)fedoraproject.org> - 1:1.8.0.212.b04-2 - mark net.properties as a config file diff --git a/jdk8223219-fstack-protector-hotspot.patch b/jdk8223219-fstack-protector-hotspot.patch new file mode 100644 index 0000000..ec69944 --- /dev/null +++ b/jdk8223219-fstack-protector-hotspot.patch @@ -0,0 +1,35 @@ +diff --git openjdk.orig/hotspot/make/bsd/makefiles/gcc.make openjdk/hotspot/make/bsd/makefiles/gcc.make +--- openjdk.orig/hotspot/make/bsd/makefiles/gcc.make ++++ openjdk/hotspot/make/bsd/makefiles/gcc.make +@@ -190,7 +190,7 @@ + CFLAGS += -fno-exceptions + ifeq ($(USE_CLANG),) + CFLAGS += -pthread +- CFLAGS += -fcheck-new -fstack-protector ++ CFLAGS += -fcheck-new + # version 4 and above support fvisibility=hidden (matches jni_x86.h file) + # except 4.1.2 gives pointless warnings that can't be disabled (afaik) + ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" +diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make +--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make ++++ openjdk/hotspot/make/linux/makefiles/gcc.make +@@ -150,7 +150,7 @@ + CFLAGS += -fno-exceptions + CFLAGS += -D_REENTRANT + ifeq ($(USE_CLANG),) +- CFLAGS += -fcheck-new -fstack-protector ++ CFLAGS += -fcheck-new + # version 4 and above support fvisibility=hidden (matches jni_x86.h file) + # except 4.1.2 gives pointless warnings that can't be disabled (afaik) + ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" +diff --git openjdk.orig/hotspot/make/solaris/makefiles/gcc.make openjdk/hotspot/make/solaris/makefiles/gcc.make +--- openjdk.orig/hotspot/make/solaris/makefiles/gcc.make ++++ openjdk/hotspot/make/solaris/makefiles/gcc.make +@@ -75,7 +75,6 @@ + CFLAGS += -fno-exceptions + CFLAGS += -D_REENTRANT + CFLAGS += -fcheck-new +-CFLAGS += -fstack-protector + + ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) + diff --git a/jdk8223219-fstack-protector-root.patch b/jdk8223219-fstack-protector-root.patch new file mode 100644 index 0000000..a73761c --- /dev/null +++ b/jdk8223219-fstack-protector-root.patch @@ -0,0 +1,33 @@ +diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 +--- openjdk.orig/common/autoconf/flags.m4 ++++ openjdk/common/autoconf/flags.m4 +@@ -388,16 +388,8 @@ + CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" + CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" + elif test "x$TOOLCHAIN_TYPE" = xgcc; then +- case $OPENJDK_TARGET_CPU_ARCH in +- x86 ) +- LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" +- LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" +- ;; +- x86_64 ) +- LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" +- LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" +- ;; +- esac ++ LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" ++ LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" + if test "x$OPENJDK_TARGET_OS" != xmacosx; then + LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro" + LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" +@@ -464,10 +456,6 @@ + ppc ) + # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing + ;; +- x86 ) +- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector" +- CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector" +- ;; + * ) + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer" + CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing" commit 3ea4f13b20c9d1d8f4e2e6c18020bc8334d5b929 Author: James Cassell <code(a)james.cassell.me> Date: Tue May 14 15:31:54 2019 -0400 mark net.properties as a config file diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index f7e9162..618a058 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -689,6 +689,7 @@ exit 0 %{_jvmdir}/%{jredir -- %{?1}}/lib/jvm.hprof.txt %{_jvmdir}/%{jredir -- %{?1}}/lib/meta-index %{_jvmdir}/%{jredir -- %{?1}}/lib/net.properties +%config(noreplace) %{etcjavadir -- %{?1}}/lib/net.properties %{_jvmdir}/%{jredir -- %{?1}}/lib/psfont.properties.ja %{_jvmdir}/%{jredir -- %{?1}}/lib/psfontj2d.properties %{_jvmdir}/%{jredir -- %{?1}}/lib/resources.jar @@ -997,7 +998,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 1%{?dist} +Release: 2%{?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 @@ -2084,7 +2085,7 @@ touch -t 201401010000 $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/lib/securi # moving config files to /etc mkdir -p $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}/lib/security/policy/unlimited/ mkdir -p $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}/lib/security/policy/limited/ -for file in lib/security/cacerts lib/security/policy/unlimited/US_export_policy.jar lib/security/policy/unlimited/local_policy.jar lib/security/policy/limited/US_export_policy.jar lib/security/policy/limited/local_policy.jar lib/security/java.policy lib/security/java.security lib/security/blacklisted.certs lib/logging.properties lib/calendars.properties lib/security/nss.cfg ; do +for file in lib/security/cacerts lib/security/policy/unlimited/US_export_policy.jar lib/security/policy/unlimited/local_policy.jar lib/security/policy/limited/US_export_policy.jar lib/security/policy/limited/local_policy.jar lib/security/java.policy lib/security/java.security lib/security/blacklisted.certs lib/logging.properties lib/calendars.properties lib/security/nss.cfg lib/net.properties ; do mv $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/$file $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}/$file ln -sf %{etcjavadir -- $suffix}/$file $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/$file done @@ -2295,6 +2296,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed May 15 2019 James Cassell <cyberpear(a)fedoraproject.org> - 1:1.8.0.212.b04-2 +- mark net.properties as a config file + * Mon May 13 2019 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:1.8.0.212.b04-1 - Update patch for RH1566890. - Renamed rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639 to commit ff8c15a8aa2350bf2a3c1933952c30c2d5bf0286 Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Mon May 13 04:59:45 2019 +0100 Update patch for RH1566890. Renamed rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639 to rh1566890-CVE_2018_3639-speculative_store_bypass.patch Added dependent patch, rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index dc42966..f7e9162 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -997,7 +997,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 0%{?dist} +Release: 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 @@ -1108,7 +1108,8 @@ Patch523: pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_ # PR3083, RH1346460: Regression in SSL debug output without an ECC provider Patch528: pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch # RH1566890: CVE-2018-3639 -Patch529: rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch +Patch529: rh1566890-CVE_2018_3639-speculative_store_bypass.patch +Patch531: rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch # PR3601: Fix additional -Wreturn-type issues introduced by 8061651 Patch530: pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch # Support for building the SunEC provider with the system NSS installation @@ -1611,6 +1612,7 @@ sh %{SOURCE12} %patch523 %patch528 %patch529 +%patch531 %patch530 %patch563 %patch564 @@ -2293,6 +2295,13 @@ require "copy_jdk_configs.lua" %endif %changelog +* Mon May 13 2019 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:1.8.0.212.b04-1 +- Update patch for RH1566890. + - Renamed rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639 to + rh1566890-CVE_2018_3639-speculative_store_bypass.patch + - Added dependent patch, + rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch + * Thu Apr 11 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-0 - Update to aarch64-shenandoah-jdk8u212-b04. diff --git a/rh1566890-CVE_2018_3639-speculative_store_bypass.patch b/rh1566890-CVE_2018_3639-speculative_store_bypass.patch new file mode 100644 index 0000000..d8f3a5a --- /dev/null +++ b/rh1566890-CVE_2018_3639-speculative_store_bypass.patch @@ -0,0 +1,44 @@ +diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp +@@ -103,6 +103,8 @@ + # include <inttypes.h> + # include <sys/ioctl.h> + ++#include <sys/prctl.h> ++ + PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC + + #ifndef _GNU_SOURCE +@@ -4997,6 +4999,31 @@ + } + } + ++/* Per task speculation control */ ++#ifndef PR_GET_SPECULATION_CTRL ++#define PR_GET_SPECULATION_CTRL 52 ++#endif ++#ifndef PR_SET_SPECULATION_CTRL ++#define PR_SET_SPECULATION_CTRL 53 ++#endif ++/* Speculation control variants */ ++# undef PR_SPEC_STORE_BYPASS ++# define PR_SPEC_STORE_BYPASS 0 ++/* Return and control values for PR_SET/GET_SPECULATION_CTRL */ ++# undef PR_SPEC_NOT_AFFECTED ++# undef PR_SPEC_PRCTL ++# undef PR_SPEC_ENABLE ++# undef PR_SPEC_DISABLE ++# define PR_SPEC_NOT_AFFECTED 0 ++# define PR_SPEC_PRCTL (1UL << 0) ++# define PR_SPEC_ENABLE (1UL << 1) ++# define PR_SPEC_DISABLE (1UL << 2) ++ ++static void set_speculation() __attribute__((constructor)); ++static void set_speculation() { ++ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0); ++} ++ + // this is called _before_ most of the global arguments have been parsed + void os::init(void) { + char dummy; /* used to get a guess on initial stack address */ diff --git a/rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch b/rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch new file mode 100644 index 0000000..94ef9d4 --- /dev/null +++ b/rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch @@ -0,0 +1,54 @@ +diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp +@@ -5001,26 +5001,43 @@ + + /* Per task speculation control */ + #ifndef PR_GET_SPECULATION_CTRL +-#define PR_GET_SPECULATION_CTRL 52 ++# define PR_GET_SPECULATION_CTRL 52 + #endif + #ifndef PR_SET_SPECULATION_CTRL +-#define PR_SET_SPECULATION_CTRL 53 ++# define PR_SET_SPECULATION_CTRL 53 + #endif + /* Speculation control variants */ +-# undef PR_SPEC_STORE_BYPASS ++#ifndef PR_SPEC_STORE_BYPASS + # define PR_SPEC_STORE_BYPASS 0 ++#endif + /* Return and control values for PR_SET/GET_SPECULATION_CTRL */ +-# undef PR_SPEC_NOT_AFFECTED +-# undef PR_SPEC_PRCTL +-# undef PR_SPEC_ENABLE +-# undef PR_SPEC_DISABLE ++ ++#ifndef PR_SPEC_NOT_AFFECTED + # define PR_SPEC_NOT_AFFECTED 0 ++#endif ++#ifndef PR_SPEC_PRCTL + # define PR_SPEC_PRCTL (1UL << 0) ++#endif ++#ifndef PR_SPEC_ENABLE + # define PR_SPEC_ENABLE (1UL << 1) ++#endif ++#ifndef PR_SPEC_DISABLE + # define PR_SPEC_DISABLE (1UL << 2) ++#endif ++#ifndef PR_SPEC_FORCE_DISABLE ++# define PR_SPEC_FORCE_DISABLE (1UL << 3) ++#endif ++#ifndef PR_SPEC_DISABLE_NOEXEC ++# define PR_SPEC_DISABLE_NOEXEC (1UL << 4) ++#endif + + static void set_speculation() __attribute__((constructor)); + static void set_speculation() { ++ if ( prctl(PR_SET_SPECULATION_CTRL, ++ PR_SPEC_STORE_BYPASS, ++ PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) { ++ return; ++ } + prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0); + } + diff --git a/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch b/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch deleted file mode 100644 index d8f3a5a..0000000 --- a/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp ---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp -@@ -103,6 +103,8 @@ - # include <inttypes.h> - # include <sys/ioctl.h> - -+#include <sys/prctl.h> -+ - PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC - - #ifndef _GNU_SOURCE -@@ -4997,6 +4999,31 @@ - } - } - -+/* Per task speculation control */ -+#ifndef PR_GET_SPECULATION_CTRL -+#define PR_GET_SPECULATION_CTRL 52 -+#endif -+#ifndef PR_SET_SPECULATION_CTRL -+#define PR_SET_SPECULATION_CTRL 53 -+#endif -+/* Speculation control variants */ -+# undef PR_SPEC_STORE_BYPASS -+# define PR_SPEC_STORE_BYPASS 0 -+/* Return and control values for PR_SET/GET_SPECULATION_CTRL */ -+# undef PR_SPEC_NOT_AFFECTED -+# undef PR_SPEC_PRCTL -+# undef PR_SPEC_ENABLE -+# undef PR_SPEC_DISABLE -+# define PR_SPEC_NOT_AFFECTED 0 -+# define PR_SPEC_PRCTL (1UL << 0) -+# define PR_SPEC_ENABLE (1UL << 1) -+# define PR_SPEC_DISABLE (1UL << 2) -+ -+static void set_speculation() __attribute__((constructor)); -+static void set_speculation() { -+ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0); -+} -+ - // this is called _before_ most of the global arguments have been parsed - void os::init(void) { - char dummy; /* used to get a guess on initial stack address */
1
0
0
0
Architecture specific change in rpms/java-1.8.0-openjdk.git
by githook-noreply@fedoraproject.org
31 Jul '19
31 Jul '19
The package rpms/java-1.8.0-openjdk.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk.git/commit/?id=a…
https://src.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk.git/commit/?id=c…
. Change: -%ifarch %{ix86} -%ifarch x86_64 %{aarch64} Thanks. Full change: ============ commit 353d5f0c03046b81c8137f9e35ad0de5fd1bff24 Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Wed Jul 31 16:34:14 2019 +0100 Update to aarch64-shenandoah-jdk8u222-b10. Adjust PR3083/RH134640 to apply after JDK-8182999 Switch to GA mode for final release. diff --git a/.gitignore b/.gitignore index 0eb9e5a..4db088b 100644 --- a/.gitignore +++ b/.gitignore @@ -145,3 +145,6 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b05.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b06.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b07.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b08.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b09.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b10.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 3d4ddff..b09d352 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -217,7 +217,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global shenandoah_project aarch64-port %global shenandoah_repo jdk8u-shenandoah -%global shenandoah_revision aarch64-shenandoah-jdk8u222-b07 +%global shenandoah_revision aarch64-shenandoah-jdk8u222-b10 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -238,7 +238,7 @@ # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, # - N%%{?extraver}{?dist} for GA releases -%global is_ga 0 +%global is_ga 1 %if %{is_ga} %global milestone fcs %global milestone_version %{nil} @@ -2270,6 +2270,11 @@ require "copy_jdk_configs.lua" %endif %changelog +* Thu Jul 11 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b10-0 +- Update to aarch64-shenandoah-jdk8u222-b10. +- Adjust PR3083/RH134640 to apply after JDK-8182999 +- Switch to GA mode for final release. + * Mon Jul 08 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b07-0.0.ea - Update to aarch64-shenandoah-jdk8u222-b07 and Shenandoah merge 2019-06-13. - Drop remaining JDK-8210425/RH1632174 patch now AArch64 part is upstream. diff --git a/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch b/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch index d44ed1d..b52c087 100644 --- a/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch +++ b/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch @@ -7,9 +7,21 @@ PR3083, RH1346460: Regression in SSL debug output without an ECC provider Summary: Return null rather than throwing an exception when there's no ECC provider. -diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/Debug.java ---- openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 17:08:12 2016 +0100 -+++ openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 18:21:29 2016 +0100 +diff --git openjdk.orig/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java openjdk/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java +--- openjdk.orig/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java ++++ openjdk/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java +@@ -121,7 +121,7 @@ + private static void ensureCurveIsSupported(ECParameterSpec ecSpec) + throws InvalidAlgorithmParameterException { + +- AlgorithmParameters ecParams = ECUtil.getECParameters(null); ++ AlgorithmParameters ecParams = ECUtil.getECParameters(null, true); + byte[] encodedParams; + try { + ecParams.init(ecSpec); +diff --git openjdk.orig/jdk/src/share/classes/sun/security/util/Debug.java openjdk/jdk/src/share/classes/sun/security/util/Debug.java +--- openjdk.orig/jdk/src/share/classes/sun/security/util/Debug.java ++++ openjdk/jdk/src/share/classes/sun/security/util/Debug.java @@ -73,6 +73,7 @@ System.err.println("certpath PKIX CertPathBuilder and"); System.err.println(" CertPathValidator debugging"); @@ -18,9 +30,9 @@ diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/Debug.j System.err.println("gssloginconfig"); System.err.println(" GSS LoginConfigImpl debugging"); System.err.println("configfile JAAS ConfigFile loading"); -diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/ECUtil.java ---- openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 17:08:12 2016 +0100 -+++ openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 18:21:29 2016 +0100 +diff --git openjdk.orig/jdk/src/share/classes/sun/security/util/ECUtil.java openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java +--- openjdk.orig/jdk/src/share/classes/sun/security/util/ECUtil.java ++++ openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java @@ -41,6 +41,9 @@ public class ECUtil { @@ -34,11 +46,11 @@ diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/ECUtil. @@ -90,6 +93,10 @@ } - private static AlgorithmParameters getECParameters(Provider p) { + public static AlgorithmParameters getECParameters(Provider p) { + return getECParameters(p, false); + } + -+ private static AlgorithmParameters getECParameters(Provider p, boolean throwException) { ++ public static AlgorithmParameters getECParameters(Provider p, boolean throwException) { try { if (p != null) { return AlgorithmParameters.getInstance("EC", p); diff --git a/sources b/sources index 5671c4a..eaffa07 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b07.tar.xz) = f58e5ac864cd66a39f4e479982ff236c8fa560c4108a1e13e11f3dcee1d1c3cbcb8383c8f144bea0c7059eb77f80f0628eb91e93b77a86f75bd84a28382be66c +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b10.tar.xz) = 8e8379260a0f896c41b79e41e51609f3363f734b47cd412d20a4fe18079f73cdeefefdfa62b22f83743d289f8f622201f6650343ee6741163c57d1c5797dcc58 commit d5d25360c55f199fe481e606ef375a5e7b7de7bf Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Wed Jul 31 15:54:20 2019 +0100 Update to aarch64-shenandoah-jdk8u222-b07 and Shenandoah merge 2019-06-13. Drop remaining JDK-8210425/RH1632174 patch now AArch64 part is upstream. diff --git a/.gitignore b/.gitignore index d8def8d..0eb9e5a 100644 --- a/.gitignore +++ b/.gitignore @@ -141,3 +141,7 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b02.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b03.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b04.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b05.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b06.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b07.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 8b39c08..3d4ddff 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -217,7 +217,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global shenandoah_project aarch64-port %global shenandoah_repo jdk8u-shenandoah -%global shenandoah_revision aarch64-shenandoah-jdk8u222-b03 +%global shenandoah_revision aarch64-shenandoah-jdk8u222-b07 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -1202,9 +1202,6 @@ Patch202: jdk8035341-allow_using_system_installed_libpng.patch Patch203: jdk8042159-allow_using_system_installed_lcms2.patch # 8210761: libjsig is being compiled without optimization Patch620: jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch -# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization -# Aarch64-port 8u local part -Patch624: jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch # JDK-8223219: Backport of JDK-8199552 to OpenJDK 8 leads to duplicate -fstack-protector flags, # overriding --with-extra-cflags Patch626: jdk8223219-fstack-protector-root.patch @@ -1612,7 +1609,6 @@ sh %{SOURCE12} %patch575 %patch577 %patch620 -%patch624 %patch626 %patch627 %patch110 @@ -2274,6 +2270,10 @@ require "copy_jdk_configs.lua" %endif %changelog +* Mon Jul 08 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b07-0.0.ea +- Update to aarch64-shenandoah-jdk8u222-b07 and Shenandoah merge 2019-06-13. +- Drop remaining JDK-8210425/RH1632174 patch now AArch64 part is upstream. + * Mon Jul 08 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b03-0.0.ea - Update to aarch64-shenandoah-jdk8u222-b03. - Drop 8210425 patches applied upstream. Still need to add AArch64 version in aarch64/shenandoah-jdk8u. diff --git a/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch b/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch deleted file mode 100644 index cf1b40b..0000000 --- a/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git openjdk.orig/hotspot/make/linux/makefiles/aarch64.make openjdk/hotspot/make/linux/makefiles/aarch64.make -index 3d17326..7cdb498 100644 ---- openjdk.orig/hotspot/make/linux/makefiles/aarch64.make -+++ openjdk/hotspot/make/linux/makefiles/aarch64.make -@@ -22,10 +22,13 @@ - # - # - --# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized --OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) --# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized --OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) -+ifeq ($(OPT_CFLAGS_NO_FMA),) -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) -+else -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+endif - # Must also specify if CPU is little endian - CFLAGS += -DVM_LITTLE_ENDIAN - diff --git a/sources b/sources index 9e15789..5671c4a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b03.tar.xz) = d7ca2c2b92ca21384c1a4f2f1f9a0335a941de4c24c6a54ce8a323ae0b61eb1ef9cb9d399cd9299841a1e9a2484375acb26db29fbd8b9b982b45d21442b88026 +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b07.tar.xz) = f58e5ac864cd66a39f4e479982ff236c8fa560c4108a1e13e11f3dcee1d1c3cbcb8383c8f144bea0c7059eb77f80f0628eb91e93b77a86f75bd84a28382be66c commit 3e8a52e6791b636b9d321d80680df98a694e4bb0 Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Wed Jul 31 13:58:09 2019 +0100 Update to aarch64-shenandoah-jdk8u222-b03. Drop 8210425 patches applied upstream. Still need to add AArch64 version in aarch64/shenandoah-jdk8u. Re-generate JDK-8141570 & JDK-8143245 patches due to 8210425 zeroshark.make changes. diff --git a/.gitignore b/.gitignore index f382ea2..d8def8d 100644 --- a/.gitignore +++ b/.gitignore @@ -140,3 +140,4 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b02.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b03.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 884a0c6..8b39c08 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -217,7 +217,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global shenandoah_project aarch64-port %global shenandoah_repo jdk8u-shenandoah -%global shenandoah_revision aarch64-shenandoah-jdk8u222-b02 +%global shenandoah_revision aarch64-shenandoah-jdk8u222-b03 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -1203,14 +1203,8 @@ Patch203: jdk8042159-allow_using_system_installed_lcms2.patch # 8210761: libjsig is being compiled without optimization Patch620: jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch # 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization -# Upstream 8u part. -Patch623: jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch -# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization # Aarch64-port 8u local part Patch624: jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch -# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization -# Zero part of the fix for (arm/s390 arches) -Patch625: jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch # JDK-8223219: Backport of JDK-8199552 to OpenJDK 8 leads to duplicate -fstack-protector flags, # overriding --with-extra-cflags Patch626: jdk8223219-fstack-protector-root.patch @@ -1618,9 +1612,7 @@ sh %{SOURCE12} %patch575 %patch577 %patch620 -%patch623 %patch624 -%patch625 %patch626 %patch627 %patch110 @@ -2282,6 +2274,11 @@ require "copy_jdk_configs.lua" %endif %changelog +* Mon Jul 08 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b03-0.0.ea +- Update to aarch64-shenandoah-jdk8u222-b03. +- Drop 8210425 patches applied upstream. Still need to add AArch64 version in aarch64/shenandoah-jdk8u. +- Re-generate JDK-8141570 & JDK-8143245 patches due to 8210425 zeroshark.make changes. + * Mon Jul 08 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b02-0.0.ea - Update to aarch64-shenandoah-jdk8u222-b02. - Drop 8064786/PR3599 & 8210416/RH1632174 as applied upstream (8064786 silently in 8176100). diff --git a/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch b/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch index f1e3215..c9ef36b 100644 --- a/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch +++ b/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch @@ -34,9 +34,9 @@ diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hots + -Wno-format-nonliteral -Wno-format-security \ + -Wno-maybe-uninitialized - # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized - OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) -@@ -42,5 +49,3 @@ + # If FDLIBM_CFLAGS is non-empty it holds CFLAGS needed to be passed to + # the compiler so as to be able to produce optimized objects +@@ -48,5 +55,3 @@ ifeq ($(ARCH_DATA_MODEL), 64) CFLAGS += -D_LP64=1 endif diff --git a/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch b/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch index b0a88ea..792b04a 100644 --- a/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch +++ b/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch @@ -8,6 +8,7 @@ Reviewed-by: dholmes, coleenp diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make +diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make --- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make +++ openjdk/hotspot/make/linux/makefiles/zeroshark.make @@ -1,5 +1,5 @@ @@ -27,8 +28,8 @@ diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hots - -Wno-format-nonliteral -Wno-format-security \ - -Wno-maybe-uninitialized - # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized - OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) + # If FDLIBM_CFLAGS is non-empty it holds CFLAGS needed to be passed to + # the compiler so as to be able to produce optimized objects diff --git openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp --- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp +++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp @@ -60,7 +61,7 @@ diff --git openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp openjdk/h switch (type) { case T_VOID: ftype = &ffi_type_void; -diff --git a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp +diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp --- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp +++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp @@ -1,6 +1,6 @@ diff --git a/jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch b/jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch deleted file mode 100644 index 0b05ba6..0000000 --- a/jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git openjdk.orig/hotspot/make/linux/makefiles/amd64.make openjdk/hotspot/make/linux/makefiles/amd64.make ---- openjdk.orig/hotspot/make/linux/makefiles/amd64.make -+++ openjdk/hotspot/make/linux/makefiles/amd64.make -@@ -22,10 +22,13 @@ - # - # - --# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized --OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) --# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized --OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) -+ifeq ($(OPT_CFLAGS_NO_FMA),) -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) -+else -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+endif - # Must also specify if CPU is little endian - CFLAGS += -DVM_LITTLE_ENDIAN - -diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make ---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make -+++ openjdk/hotspot/make/linux/makefiles/gcc.make -@@ -225,6 +225,16 @@ - OPT_CFLAGS/SIZE=-Os - OPT_CFLAGS/SPEED=-O3 - -+ifeq ($(USE_CLANG),) -+ # Only GCC 4.6 and better have machine independent -ffp-contract=off. -+ # For other versions we need to explicitly set arch specific machine -+ # flags or keep optimization off for them. -+ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 6 \) \))" "1" -+ OPT_CFLAGS_NO_FMA = -ffp-contract=off -+ endif -+endif -+ -+ - # Hotspot uses very unstrict aliasing turn this optimization off - # This option is added to CFLAGS rather than OPT_CFLAGS - # so that OPT_CFLAGS overrides get this option too. -diff --git openjdk.orig/hotspot/make/linux/makefiles/i486.make openjdk/hotspot/make/linux/makefiles/i486.make ---- openjdk.orig/hotspot/make/linux/makefiles/i486.make -+++ openjdk/hotspot/make/linux/makefiles/i486.make -@@ -24,10 +24,13 @@ - - # TLS helper, assembled from .s file - --# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized --OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) --# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized --OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) -+ifeq ($(OPT_CFLAGS_NO_FMA),) -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) -+else -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+endif - # Must also specify if CPU is little endian - CFLAGS += -DVM_LITTLE_ENDIAN - -diff --git openjdk.orig/hotspot/make/linux/makefiles/ppc64.make openjdk/hotspot/make/linux/makefiles/ppc64.make ---- openjdk.orig/hotspot/make/linux/makefiles/ppc64.make -+++ openjdk/hotspot/make/linux/makefiles/ppc64.make -@@ -49,3 +49,17 @@ - # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI. - CFLAGS += -mcpu=power7 -mtune=power8 -minsert-sched-nops=regroup_exact -mno-multiple -mno-string - endif -+ -+ifeq ($(OPT_CFLAGS_NO_FMA),) -+ ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),big) -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) -mno-fused-madd -fno-strict-aliasing -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) -mno-fused-madd -fno-strict-aliasing -+ else -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) -+ endif -+else -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+endif -+ diff --git a/jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch b/jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch deleted file mode 100644 index 6c1ebad..0000000 --- a/jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- openjdk/hotspot/make/linux/makefiles/zeroshark.make -+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make -@@ -30,10 +30,13 @@ ifeq ($(USE_CLANG), true) - WARNING_FLAGS += -Wno-undef - endif - --# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized --OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) --# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized --OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) -+ifeq ($(OPT_CFLAGS_NO_FMA),) -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) -+else -+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA) -+endif - - # Specify that the CPU is little endian, if necessary - ifeq ($(ZERO_ENDIANNESS), little) diff --git a/sources b/sources index 8e4f7c0..9e15789 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b02.tar.xz) = f30a5e1b7dd3fb3d7648d7871889f3f859946e4889649662aa7d051f02c101747e13d3b1311f14a68b5952f9745e577ef57cef44f7b73f9ccb0341c74d4068ac +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b03.tar.xz) = d7ca2c2b92ca21384c1a4f2f1f9a0335a941de4c24c6a54ce8a323ae0b61eb1ef9cb9d399cd9299841a1e9a2484375acb26db29fbd8b9b982b45d21442b88026 commit 12963ac34bad7cb677367cf8590a20855a71056c Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Wed Jul 31 04:19:52 2019 +0100 Update to aarch64-shenandoah-jdk8u222-b02. Drop 8064786/PR3599 & 8210416/RH1632174 as applied upstream (8064786 silently in 8176100). diff --git a/.gitignore b/.gitignore index 5c6e85f..f382ea2 100644 --- a/.gitignore +++ b/.gitignore @@ -139,3 +139,4 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b02.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 7a75e9f..884a0c6 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -217,7 +217,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global shenandoah_project aarch64-port %global shenandoah_repo jdk8u-shenandoah -%global shenandoah_revision aarch64-shenandoah-jdk8u222-b01 +%global shenandoah_revision aarch64-shenandoah-jdk8u222-b02 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -233,7 +233,7 @@ %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) -%global rpmrelease 2 +%global rpmrelease 0 # Define milestone (EA for pre-releases, GA ("fcs") for releases) # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, @@ -1192,8 +1192,6 @@ Patch573: jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_h Patch574: jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch # 8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8 Patch575: jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch -# 8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning -Patch576: jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch # 8062808, PR3548: Turn on the -Wreturn-type warning Patch577: jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch # s390: JDK-8203030, Type fixing for s390 @@ -1204,8 +1202,6 @@ Patch202: jdk8035341-allow_using_system_installed_libpng.patch Patch203: jdk8042159-allow_using_system_installed_lcms2.patch # 8210761: libjsig is being compiled without optimization Patch620: jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch -# 8210416: [linux] Poor StrictMath performance due to non-optimized compilation -Patch622: jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch # 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization # Upstream 8u part. Patch623: jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch @@ -1620,10 +1616,8 @@ sh %{SOURCE12} %patch573 %patch574 %patch575 -%patch576 %patch577 %patch620 -%patch622 %patch623 %patch624 %patch625 @@ -2288,6 +2282,10 @@ require "copy_jdk_configs.lua" %endif %changelog +* Mon Jul 08 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b02-0.0.ea +- Update to aarch64-shenandoah-jdk8u222-b02. +- Drop 8064786/PR3599 & 8210416/RH1632174 as applied upstream (8064786 silently in 8176100). + * Sun Jul 07 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b01-0.2.ea - Make use of Recommends and Suggests dependent on Fedora or RHEL 8+ environment. diff --git a/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch b/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch deleted file mode 100644 index 790ee0d..0000000 --- a/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch +++ /dev/null @@ -1,28 +0,0 @@ -# HG changeset patch -# User goetz -# Date 1415873641 -3600 -# Thu Nov 13 11:14:01 2014 +0100 -# Node ID 1878c4c1d04e1f3c6f67a19d36c35863d6b5f906 -# Parent 533473c67de6ff767710594639033c8e83523fe5 -8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning -Reviewed-by: stefank, tschatzl - -diff --git openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/share/vm/prims/jni.cpp ---- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp -+++ openjdk/hotspot/src/share/vm/prims/jni.cpp -@@ -708,6 +708,7 @@ - - THROW_OOP_(JNIHandles::resolve(obj), JNI_OK); - ShouldNotReachHere(); -+ return 0; // Mute compiler. - JNI_END - - #ifndef USDT2 -@@ -734,6 +735,7 @@ - Handle protection_domain (THREAD, k->protection_domain()); - THROW_MSG_LOADER_(name, (char *)message, class_loader, protection_domain, JNI_OK); - ShouldNotReachHere(); -+ return 0; // Mute compiler. - JNI_END - - diff --git a/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch b/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch deleted file mode 100644 index 98bbad0..0000000 --- a/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git openjdk.orig/jdk/make/lib/CoreLibraries.gmk openjdk/jdk/make/lib/CoreLibraries.gmk ---- openjdk.orig/jdk/make/lib/CoreLibraries.gmk -+++ openjdk/jdk/make/lib/CoreLibraries.gmk -@@ -37,21 +37,32 @@ ifeq ($(OPENJDK_TARGET_OS), solaris) - endif - - ifeq ($(OPENJDK_TARGET_OS), linux) -- ifeq ($(OPENJDK_TARGET_CPU), ppc64) -- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH -- else ifeq ($(OPENJDK_TARGET_CPU), ppc64le) -- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH -- else ifeq ($(OPENJDK_TARGET_CPU), aarch64) -- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH -- endif --endif -- --ifneq ($(OPENJDK_TARGET_OS), macosx) -+ BUILD_LIBFDLIBM_OPTIMIZATION := HIGH -+ LIBFDLIBM_CFLAGS_LINUX := -ffp-contract=off - # Unfortunately, '-ffp-contract' is only available since gcc 4.6. For ppc64le - # that's no problem since ppc64le support only appeared in gcc 4.8.3. But on - # ppc64 (big endian) we traditionally compiled with gcc 4.3 which only knows - # '-mno-fused-madd'. However, that's still not enough to get the float - # computations right - we additionally have to supply '-fno-strict-aliasing'. -+ # -+ # -+ ifeq ($(TOOLCHAIN_TYPE), gcc) -+ CC_VER_MAJOR := $(shell $(CC) -dumpversion | cut -d'.' -f1) -+ CC_VER_MINOR := $(shell $(CC) -dumpversion | cut -d'.' -f2) -+ endif -+ # Only GCC 4.6 and better have machine independent -ffp-contract=off. -+ # For other versions we need to explicitly set arch specific machine -+ # flags or keep optimization off. -+ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 6 \) \))" "0" -+ ifeq ($(OPENJDK_TARGET_CPU), ppc64) -+ LIBFDLIBM_CFLAGS_LINUX := -mno-fused-madd -fno-strict-aliasing -+ else -+ BUILD_LIBFDLIBM_OPTIMIZATION := NONE -+ endif -+ endif -+endif -+ -+ifneq ($(OPENJDK_TARGET_OS), macosx) - $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM, \ - STATIC_LIBRARY := fdlibm, \ - OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \ -@@ -62,9 +73,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) - -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \ - CFLAGS_windows_debug := -DLOGGING, \ - CFLAGS_aix := -qfloat=nomaf, \ -- CFLAGS_linux_ppc64 := -mno-fused-madd -fno-strict-aliasing, \ -- CFLAGS_linux_ppc64le := -ffp-contract=off, \ -- CFLAGS_linux_aarch64 := -ffp-contract=off, \ -+ CFLAGS_linux := $(LIBFDLIBM_CFLAGS_LINUX), \ - ARFLAGS := $(ARFLAGS), \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) diff --git a/sources b/sources index 8c0edda..8e4f7c0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz) = 1d120a52dc4a6ac77189fb8f8b27244aad2de7e1fa71c41e89280339fb5f0255761171159fb5b0ab0b4ba185d8462205574679219f9bd218843618f3dc575dd2 +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b02.tar.xz) = f30a5e1b7dd3fb3d7648d7871889f3f859946e4889649662aa7d051f02c101747e13d3b1311f14a68b5952f9745e577ef57cef44f7b73f9ccb0341c74d4068ac commit 7ea900ad8594fcb86c58ad7abaebb439725aa7a3 Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Wed Jul 24 17:58:37 2019 +0100 Make use of Recommends and Suggests dependent on Fedora or RHEL 8+ environment. diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 4a6a47f..7a75e9f 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -233,7 +233,7 @@ %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) -%global rpmrelease 1 +%global rpmrelease 2 # Define milestone (EA for pre-releases, GA ("fcs") for releases) # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, @@ -871,7 +871,9 @@ Requires: libXcomposite%{?_isa} Requires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} # for java-X-openjdk package's desktop binding +%if 0%{?fedora} || 0%{?rhel} >= 8 Recommends: gtk2%{?_isa} +%endif Provides: java-%{javaver}-%{origin} = %{epoch}:%{version}-%{release} @@ -913,7 +915,9 @@ Requires(postun): %{_sbindir}/alternatives # in version 1.7 and higher for --family switch Requires(postun): chkconfig >= 1.7 # for optional support of kernel stream control, card reader and printing bindings +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: lksctp-tools%{?_isa}, pcsc-lite-devel%{?_isa} +%endif # Standard JPackage base provides Provides: jre-headless%{?1} = %{epoch}:%{javaver} @@ -2284,6 +2288,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Sun Jul 07 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b01-0.2.ea +- Make use of Recommends and Suggests dependent on Fedora or RHEL 8+ environment. + * Sun Jul 07 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b01-0.1.ea - Update to aarch64-shenandoah-jdk8u222-b01. - Refactor PR2888 after inclusion of 8129988 upstream. Now includes PR3575. commit 702ae85b28241af401f394221dade934abf474c6 Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Wed Jul 24 05:07:05 2019 +0100 Update to aarch64-shenandoah-jdk8u222-b01. Refactor PR2888 after inclusion of 8129988 upstream. Now includes PR3575. Drop 8171000 & 8197546 as applied upstream. diff --git a/.gitignore b/.gitignore index faa17a0..5c6e85f 100644 --- a/.gitignore +++ b/.gitignore @@ -138,3 +138,4 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b03.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 09d9e55..4a6a47f 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -217,7 +217,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global shenandoah_project aarch64-port %global shenandoah_repo jdk8u-shenandoah -%global shenandoah_revision aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 +%global shenandoah_revision aarch64-shenandoah-jdk8u222-b01 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -226,19 +226,19 @@ %global icedteaver 3.11.0 # e.g. aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 -> aarch64-shenandoah-jdk8u212-b04 -%global version_tag %(VERSION=%{revision}; echo ${VERSION%%-shenandoah*}) +%global version_tag %(VERSION=%{revision}; echo ${VERSION%%-shenandoah-merge*}) # eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont forget spec escape % by %%) %global whole_update %(VERSION=%{version_tag}; echo ${VERSION%%-*}) # eg jdk8u60 -> 60 or aarch64-jdk8u60 -> 60 %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) -%global rpmrelease 6 +%global rpmrelease 1 # Define milestone (EA for pre-releases, GA ("fcs") for releases) # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, # - N%%{?extraver}{?dist} for GA releases -%global is_ga 1 +%global is_ga 0 %if %{is_ga} %global milestone fcs %global milestone_version %{nil} @@ -1137,9 +1137,8 @@ Patch517: pr2899-dont_use_withseed_versions_of_nss_functions_as_they_dont_fully_ Patch518: pr2934-sunec_provider_throwing_keyexception_withine.separator_current_nss_thus_initialise_the_random_number_generator_and_feed_the_seed_to_it.patch Patch519: pr3479-rh1486025-sunec_provider_can_have_multiple_instances_leading_to_premature_nss_shutdown.patch # PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts) -Patch539: pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch # PR3575, RH1567204: System cacerts database handling should not affect jssecacerts -Patch540: pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch +Patch539: pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch # PR3183, RH1340845: Support Fedora/RHEL8 system crypto policy Patch300: pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch # PR3655: Allow use of system crypto policy to be disabled by the user @@ -1181,10 +1180,6 @@ Patch107: s390-8214206_fix.patch Patch502: pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch # S8154313: Generated javadoc scattered all over the place Patch400: jdk8154313-generated_javadoc_scattered_all_over_the_place.patch -# 8171000, PR3542, RH1402819: Robot.createScreenCapture() crashes in wayland mode -Patch563: jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch -# 8197546, PR3542, RH1402819: Fix for 8171000 breaks Solaris + Linux builds -Patch564: jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch # PR3591: Fix for bug 3533 doesn't add -mstackrealign to JDK code Patch571: jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch # 8141570, PR3548: Fix Zero interpreter build for --disable-precompiled-headers @@ -1617,8 +1612,6 @@ sh %{SOURCE12} %patch529 %patch531 %patch530 -%patch563 -%patch564 %patch571 %patch573 %patch574 @@ -1637,7 +1630,7 @@ sh %{SOURCE12} # RPM-only fixes %patch525 %patch539 -%patch540 +%patch1000 # RHEL-only patches %if ! 0%{?fedora} && 0%{?rhel} <= 7 @@ -1646,8 +1639,6 @@ sh %{SOURCE12} # Shenandoah patches -%patch1000 - # Extract systemtap tapsets %if %{with_systemtap} tar --strip-components=1 -x -I xz -f %{SOURCE8} @@ -2293,6 +2284,11 @@ require "copy_jdk_configs.lua" %endif %changelog +* Sun Jul 07 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b01-0.1.ea +- Update to aarch64-shenandoah-jdk8u222-b01. +- Refactor PR2888 after inclusion of 8129988 upstream. Now includes PR3575. +- Drop 8171000 & 8197546 as applied upstream. + * Wed Jul 03 2019 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:1.8.0.212.b04-6 - Include 'ea' designator in Release when appropriate. diff --git a/jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch b/jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch deleted file mode 100644 index d831aa9..0000000 --- a/jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch +++ /dev/null @@ -1,121 +0,0 @@ -# HG changeset patch -# User kaddepalli -# Date 1517818481 -19800 -# Mon Feb 05 13:44:41 2018 +0530 -# Node ID b77308735540644d4710244e3c88865067f2905a -# Parent 39bfc94b1f4265b645c2970a58389acc779dafe9 -8171000, PR3542, RH1402819: Robot.createScreenCapture() crashes in wayland mode -Reviewed-by: serb, mhalder - -diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c openjdk/jdk/src/solaris/native/sun/awt/multiVis.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c -+++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c -@@ -394,77 +394,48 @@ - XRectangle bbox; /* bounding box of grabbed area */ - list_ptr regions;/* list of regions to read from */ - { -- image_region_type *reg; -- int32_t dst_x, dst_y; /* where in pixmap to write (UL) */ -- int32_t diff; -- -- XImage *reg_image,*ximage ; -- int32_t srcRect_x,srcRect_y,srcRect_width,srcRect_height ; -- int32_t rem ; -- int32_t bytes_per_line; -- int32_t bitmap_unit; -- -- bitmap_unit = sizeof (long); -- if (format == ZPixmap) -- bytes_per_line = width*depth/8; -- else -- bytes_per_line = width/8; -- -- -- /* Find out how many more bytes are required for padding so that -- ** bytes per scan line will be multiples of bitmap_unit bits */ -- if (format == ZPixmap) { -- rem = (bytes_per_line*8)%bitmap_unit; -- if (rem) -- bytes_per_line += (rem/8 + 1); -- } -+ XImage *ximage ; - - ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL, - (uint32_t)width,(uint32_t)height,8,0); - -- bytes_per_line = ximage->bytes_per_line; -- -- if (format == ZPixmap) -- ximage->data = malloc(height*bytes_per_line); -- else -- ximage->data = malloc(height*bytes_per_line*depth); -- -+ ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 : depth), sizeof(char)); - ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/ - -- for (reg = (image_region_type *) first_in_list( regions); reg; -+ for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg; - reg = (image_region_type *) next_in_list( regions)) - { -- int32_t rect; -- struct my_XRegion *vis_reg; -- vis_reg = (struct my_XRegion *)(reg->visible_region); -- for (rect = 0; -- rect < vis_reg->numRects; -- rect++) -+ struct my_XRegion *vis_reg = (struct my_XRegion *)(reg->visible_region); -+ for (int32_t rect = 0; rect < vis_reg->numRects; rect++) - { -- /** ------------------------------------------------------------------------ -- Intersect bbox with visible part of region giving src rect & output -- location. Width is the min right side minus the max left side. -- Similar for height. Offset src rect so x,y are relative to -- origin of win, not the root-relative visible rect of win. -- ------------------------------------------------------------------------ **/ -- srcRect_width = MIN( vis_reg->rects[rect].x2, bbox.width + bbox.x) -- - MAX( vis_reg->rects[rect].x1, bbox.x); -+ /** ------------------------------------------------------------------------ -+ Intersect bbox with visible part of region giving src rect & output -+ location. Width is the min right side minus the max left side. -+ Similar for height. Offset src rect so x,y are relative to -+ origin of win, not the root-relative visible rect of win. -+ ------------------------------------------------------------------------ **/ -+ int32_t srcRect_width = MIN( vis_reg->rects[rect].x2, bbox.width + bbox.x) -+ - MAX( vis_reg->rects[rect].x1, bbox.x); -+ -+ int32_t srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height + bbox.y) -+ - MAX( vis_reg->rects[rect].y1, bbox.y); - -- srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height + bbox.y) -- - MAX( vis_reg->rects[rect].y1, bbox.y); -+ int32_t diff = bbox.x - vis_reg->rects[rect].x1; -+ int32_t srcRect_x = MAX( 0, diff) + (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border); -+ int32_t dst_x = MAX( 0, -diff) ; - -- diff = bbox.x - vis_reg->rects[rect].x1; -- srcRect_x = MAX( 0, diff) + (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border); -- dst_x = MAX( 0, -diff) ; -- diff = bbox.y - vis_reg->rects[rect].y1; -- srcRect_y = MAX( 0, diff) + (vis_reg->rects[rect].y1 - reg->y_rootrel - reg->border); -- dst_y = MAX( 0, -diff) ; -- reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y, -- (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ; -- TransferImage(disp,reg_image,srcRect_width, -- srcRect_height,reg,ximage,dst_x,dst_y) ; -- XDestroyImage(reg_image); -- } -+ diff = bbox.y - vis_reg->rects[rect].y1; -+ int32_t srcRect_y = MAX( 0, diff) + (vis_reg->rects[rect].y1 - reg->y_rootrel - reg->border); -+ int32_t dst_y = MAX( 0, -diff) ; -+ XImage* reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y, -+ (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ; -+ -+ if (reg_image) { -+ TransferImage(disp,reg_image,srcRect_width, -+ srcRect_height,reg,ximage,dst_x,dst_y) ; -+ XDestroyImage(reg_image); -+ } -+ } - } - return ximage ; - } diff --git a/jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch b/jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch deleted file mode 100644 index ba712ad..0000000 --- a/jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch +++ /dev/null @@ -1,35 +0,0 @@ -# HG changeset patch -# User prr -# Date 1518454604 28800 -# Mon Feb 12 08:56:44 2018 -0800 -# Node ID 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c -# Parent b77308735540644d4710244e3c88865067f2905a -8197546: Fix for 8171000 breaks Solaris + Linux builds -Reviewed-by: serb, jdv - -diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c openjdk/jdk/src/solaris/native/sun/awt/multiVis.c ---- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c -+++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c -@@ -395,6 +395,8 @@ - list_ptr regions;/* list of regions to read from */ - { - XImage *ximage ; -+ image_region_type* reg; -+ int32_t rect; - - ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL, - (uint32_t)width,(uint32_t)height,8,0); -@@ -402,11 +404,11 @@ - ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 : depth), sizeof(char)); - ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/ - -- for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg; -+ for (reg = (image_region_type *) first_in_list( regions); reg; - reg = (image_region_type *) next_in_list( regions)) - { - struct my_XRegion *vis_reg = (struct my_XRegion *)(reg->visible_region); -- for (int32_t rect = 0; rect < vis_reg->numRects; rect++) -+ for (rect = 0; rect < vis_reg->numRects; rect++) - { - /** ------------------------------------------------------------------------ - Intersect bbox with visible part of region giving src rect & output diff --git a/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch b/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch index fc8f981..a42688d 100644 --- a/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch +++ b/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch @@ -5,42 +5,45 @@ # Node ID 3334efeacd8327a14b7d2f392f4546e3c29c594b # Parent 6b81fd2227d14226f2121f2d51b464536925686e PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts) +PR3575: System cacerts database handling should not affect jssecacerts -diff --git a/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java b/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java ---- openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java -+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java -@@ -174,15 +174,20 @@ - storeFile = new File(storeFileName); - fis = getFileInputStream(storeFile); - } else { -- String javaHome = props.get("javaHome"); -- storeFile = new File(javaHome + sep + "lib" + sep -- + "security" + sep + -- "jssecacerts"); -+ /* Check system cacerts DB first; /etc/pki/java/cacerts */ -+ storeFile = new File(sep + "etc" + sep + "pki" + sep -+ + "java" + sep + "cacerts"); - if ((fis = getFileInputStream(storeFile)) == null) { -+ String javaHome = props.get("javaHome"); - storeFile = new File(javaHome + sep + "lib" + sep -- + "security" + sep + -- "cacerts"); -- fis = getFileInputStream(storeFile); -+ + "security" + sep + -+ "jssecacerts"); -+ if ((fis = getFileInputStream(storeFile)) == null) { -+ storeFile = new File(javaHome + sep + "lib" + sep -+ + "security" + sep + -+ "cacerts"); -+ fis = getFileInputStream(storeFile); -+ } - } - } +diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java openjdk/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java +--- openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java ++++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java +@@ -72,7 +72,7 @@ + * The preference of the default trusted KeyStore is: + * javax.net.ssl.trustStore + * jssecacerts +- * cacerts ++ * cacerts (system and local) + */ + private static final class TrustStoreDescriptor { + private static final String fileSep = File.separator; +@@ -83,6 +83,10 @@ + defaultStorePath + fileSep + "cacerts"; + private static final String jsseDefaultStore = + defaultStorePath + fileSep + "jssecacerts"; ++ /* Check system cacerts DB: /etc/pki/java/cacerts */ ++ private static final String systemStore = ++ fileSep + "etc" + fileSep + "pki" + ++ fileSep + "java" + fileSep + "cacerts"; -diff --git a/src/share/classes/sun/security/tools/KeyStoreUtil.java b/src/share/classes/sun/security/tools/KeyStoreUtil.java ---- openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java + // the trust store name + private final String storeName; +@@ -146,7 +150,8 @@ + long temporaryTime = 0L; + if (!"NONE".equals(storePropName)) { + String[] fileNames = +- new String[] {storePropName, defaultStore}; ++ new String[] {storePropName, ++ systemStore, defaultStore}; + for (String fileName : fileNames) { + File f = new File(fileName); + if (f.isFile() && f.canRead()) { +diff --git openjdk.orig/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java +--- openjdk.orig/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java +++ openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java -@@ -87,9 +87,14 @@ +@@ -108,9 +108,14 @@ throws Exception { String sep = File.separator; diff --git a/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch b/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch deleted file mode 100644 index ce24c59..0000000 --- a/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch +++ /dev/null @@ -1,42 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1525111445 -3600 -# Mon Apr 30 19:04:05 2018 +0100 -# Node ID 388fc8da23044317c160678ffa8ff541c216a255 -# Parent 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c -PR3575: System cacerts database handling should not affect jssecacerts - -diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java ---- openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java -+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java -@@ -162,7 +162,7 @@ - * Try: - * javax.net.ssl.trustStore (if this variable exists, stop) - * jssecacerts -- * cacerts -+ * cacerts (system and local) - * - * If none exists, we use an empty keystore. - */ -@@ -174,14 +174,14 @@ - storeFile = new File(storeFileName); - fis = getFileInputStream(storeFile); - } else { -- /* Check system cacerts DB first; /etc/pki/java/cacerts */ -- storeFile = new File(sep + "etc" + sep + "pki" + sep -- + "java" + sep + "cacerts"); -+ String javaHome = props.get("javaHome"); -+ storeFile = new File(javaHome + sep + "lib" + sep -+ + "security" + sep + -+ "jssecacerts"); - if ((fis = getFileInputStream(storeFile)) == null) { -- String javaHome = props.get("javaHome"); -- storeFile = new File(javaHome + sep + "lib" + sep -- + "security" + sep + -- "jssecacerts"); -+ /* Check system cacerts DB first; /etc/pki/java/cacerts */ -+ storeFile = new File(sep + "etc" + sep + "pki" + sep -+ + "java" + sep + "cacerts"); - if ((fis = getFileInputStream(storeFile)) == null) { - storeFile = new File(javaHome + sep + "lib" + sep - + "security" + sep + diff --git a/sources b/sources index 2064a52..8c0edda 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz) = 8ef6029cfa053fce7e0f73aab72b287a4505b06d6e2f1153e5c903a48ba89147fc187987f58d6eb737ede9d5c76a8925f22c34a4f5c3d757674c06fccf77c21b +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz) = 1d120a52dc4a6ac77189fb8f8b27244aad2de7e1fa71c41e89280339fb5f0255761171159fb5b0ab0b4ba185d8462205574679219f9bd218843618f3dc575dd2 commit cc77ed77f383d564ceeada1e199ae68f3fda8f37 Author: Andrew John Hughes <gnu_andrew(a)member.fsf.org> Date: Tue Jul 23 11:24:34 2019 +0100 Handle milestone as variables so we can alter it easily and set the docs zip filename appropriately. Drop unused use_shenandoah_hotspot variable. Include 'ea' designator in Release when appropriate. diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 4cfaca4..09d9e55 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -76,13 +76,6 @@ %global include_debug_build 0 %endif -# Shenandoah HotSpot used everywhere, but built only on x86_64 and AArch64 -%ifarch x86_64 %{aarch64} -%global use_shenandoah_hotspot 1 -%else -%global use_shenandoah_hotspot 0 -%endif - %if %{include_debug_build} %global build_loop2 %{debug_suffix} %else @@ -188,8 +181,6 @@ %global archinstall %{_arch} %endif - - %ifarch %{jit_arches} %global with_systemtap 1 %else @@ -242,6 +233,23 @@ %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) +%global rpmrelease 6 +# Define milestone (EA for pre-releases, GA ("fcs") for releases) +# Release will be (where N is usually a number starting at 1): +# - 0.N%%{?extraver}%%{?dist} for EA releases, +# - N%%{?extraver}{?dist} for GA releases +%global is_ga 1 +%if %{is_ga} +%global milestone fcs +%global milestone_version %{nil} +%global extraver %{nil} +%global eaprefix %{nil} +%else +%global milestone ea +%global milestone_version "-ea" +%global extraver .%{milestone} +%global eaprefix 0. +%endif # priority must be 7 digits in total. The expression is workarounding tip %global priority %(TIP=1800%{updatever}; echo ${TIP/tip/999}) @@ -1000,7 +1008,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 5%{?dist} +Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?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 @@ -1540,6 +1548,10 @@ if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 ] ; then echo "You have disabled both include_debug_build and include_normal_build. That is a no go." exit 13 fi + +echo "Update version: %{updatever}" +echo "Build number: %{buildver}" +echo "Milestone: %{milestone}" %setup -q -c -n %{uniquesuffix ""} -T -a 0 #
https://bugzilla.redhat.com/show_bug.cgi?id=1189084
prioritylength=`expr length %{priority}` @@ -1739,7 +1751,7 @@ bash ../../configure \ --with-jvm-variants=zero \ %endif --with-native-debug-symbols=internal \ - --with-milestone="fcs" \ + --with-milestone=%{milestone} \ --with-update-version=%{updatever} \ --with-build-number=%{buildver} \ --with-boot-jdk=/usr/lib/jvm/java-openjdk \ @@ -1970,7 +1982,7 @@ popd # Install Javadoc documentation install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir} cp -a %{buildoutputdir -- $suffix}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix} -built_doc_archive=`echo "jdk-%{javaver}_%{updatever}$suffix-%{buildver}-docs.zip" | sed s/slowdebug/debug/` +built_doc_archive=`echo "jdk-%{javaver}_%{updatever}%{milestone_version}$suffix-%{buildver}-docs.zip" | sed s/slowdebug/debug/` cp -a %{buildoutputdir -- $suffix}/bundles/$built_doc_archive $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip # Install icons and menu entries @@ -2281,6 +2293,13 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed Jul 03 2019 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:1.8.0.212.b04-6 +- Include 'ea' designator in Release when appropriate. + +* Wed Jul 03 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-6 +- Handle milestone as variables so we can alter it easily and set the docs zip filename appropriately. +- Drop unused use_shenandoah_hotspot variable. + * Fri Jun 14 2019 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-5 - Update to aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30. - Update version logic to handle -shenandoah* tag suffix. commit b6267eae6d5a13c8a6a4ee355e7cf964edcab989 Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Mon Jun 24 15:23:59 2019 +0100 Update to aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30. Update version logic to handle -shenandoah* tag suffix. Drop PR3634 as applied upstream. Adjust 8214206 fix for S390 as BinaryMagnitudeSeq moved to shenandoahNumberSeq.cpp Update 8214206 to use log2_long rather than casting to intptr_t, which may be smaller than size_t. diff --git a/.gitignore b/.gitignore index d1072b7..faa17a0 100644 --- a/.gitignore +++ b/.gitignore @@ -137,3 +137,4 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b02.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b03.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 5b1486a..4cfaca4 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -226,7 +226,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global shenandoah_project aarch64-port %global shenandoah_repo jdk8u-shenandoah -%global shenandoah_revision aarch64-shenandoah-jdk8u212-b04 +%global shenandoah_revision aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -234,12 +234,14 @@ # Define IcedTea version used for SystemTap tapsets and desktop files %global icedteaver 3.11.0 +# e.g. aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 -> aarch64-shenandoah-jdk8u212-b04 +%global version_tag %(VERSION=%{revision}; echo ${VERSION%%-shenandoah*}) # eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont forget spec escape % by %%) -%global whole_update %(VERSION=%{revision}; echo ${VERSION%%-*}) +%global whole_update %(VERSION=%{version_tag}; echo ${VERSION%%-*}) # eg jdk8u60 -> 60 or aarch64-jdk8u60 -> 60 %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 -%global buildver %(VERSION=%{revision}; echo ${VERSION##*-}) +%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) # priority must be 7 digits in total. The expression is workarounding tip %global priority %(TIP=1800%{updatever}; echo ${TIP/tip/999}) @@ -998,7 +1000,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 4%{?dist} +Release: 5%{?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 @@ -1240,8 +1242,6 @@ Patch201: jdk8043805-allow_using_system_installed_libjpeg.patch # and should be upstreamed to the appropriate # trees. ############################################# -# PR3634: Shenandoah still broken on s390 with aarch64-shenandoah-jdk8u181-b16 -Patch582: pr3634-fix_shenandoah_for_size_t_on_s390.patch ############################################# # @@ -1633,7 +1633,6 @@ sh %{SOURCE12} %endif # Shenandoah patches -%patch582 %patch1000 @@ -2282,6 +2281,13 @@ require "copy_jdk_configs.lua" %endif %changelog +* Fri Jun 14 2019 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-5 +- Update to aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30. +- Update version logic to handle -shenandoah* tag suffix. +- Drop PR3634 as applied upstream. +- Adjust 8214206 fix for S390 as BinaryMagnitudeSeq moved to shenandoahNumberSeq.cpp +- Update 8214206 to use log2_long rather than casting to intptr_t, which may be smaller than size_t. + * Wed May 22 2019 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-4 - Remove additions to EXTRA_CFLAGS and EXTRA_CPP_FLAGS which are now made by upstream. - Remove -mstackrealign addition which is handled by PR3533 & PR3591 patches. diff --git a/pr3634-fix_shenandoah_for_size_t_on_s390.patch b/pr3634-fix_shenandoah_for_size_t_on_s390.patch deleted file mode 100644 index 20a4625..0000000 --- a/pr3634-fix_shenandoah_for_size_t_on_s390.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp -@@ -524,8 +524,8 @@ - region_size = max_heap_size / ShenandoahTargetNumRegions; - - // Now make sure that we don't go over or under our limits. -- region_size = MAX2(ShenandoahMinRegionSize, region_size); -- region_size = MIN2(ShenandoahMaxRegionSize, region_size); -+ region_size = MAX2<size_t>(ShenandoahMinRegionSize, region_size); -+ region_size = MIN2<size_t>(ShenandoahMaxRegionSize, region_size); - - } else { - if (ShenandoahHeapRegionSize > initial_heap_size / MIN_NUM_REGIONS) { diff --git a/s390-8214206_fix.patch b/s390-8214206_fix.patch index 93f12de..42902cf 100644 --- a/s390-8214206_fix.patch +++ b/s390-8214206_fix.patch @@ -7,10 +7,22 @@ diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1BiasedArray. address base = create_new_base_array(num_target_elems, target_elem_size_in_bytes); - initialize_base(base, num_target_elems, bias, target_elem_size_in_bytes, log2_intptr(mapping_granularity_in_bytes)); + initialize_base(base, num_target_elems, bias, target_elem_size_in_bytes, -+ log2_intptr((uintptr_t) mapping_granularity_in_bytes)); ++ log2_long(mapping_granularity_in_bytes)); } size_t bias() const { return _bias; } +diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp ++++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp +@@ -135,7 +135,7 @@ + void BinaryMagnitudeSeq::add(size_t val) { + Atomic::add(val, &_sum); + +- int mag = log2_intptr(val) + 1; ++ int mag = log2_long(val) + 1; + + // Defensively saturate for product bits: + if (mag < 0) { diff --git openjdk.orig/hotspot/src/share/vm/runtime/os.cpp openjdk/hotspot/src/share/vm/runtime/os.cpp --- openjdk.orig/hotspot/src/share/vm/runtime/os.cpp +++ openjdk/hotspot/src/share/vm/runtime/os.cpp @@ -19,19 +31,7 @@ diff --git openjdk.orig/hotspot/src/share/vm/runtime/os.cpp openjdk/hotspot/src/ void os::set_memory_serialize_page(address page) { - int count = log2_intptr(sizeof(class JavaThread)) - log2_int(64); -+ int count = log2_intptr((uintptr_t) sizeof(class JavaThread)) - log2_int(64); ++ int count = log2_long(sizeof(class JavaThread)) - log2_int(64); _mem_serialize_page = (volatile int32_t *)page; // We initialize the serialization page shift count here // We assume a cache line size of 64 bytes -diff --git openjdk.orig/hotspot/src/share/vm/utilities/numberSeq.cpp openjdk/hotspot/src/share/vm/utilities/numberSeq.cpp ---- openjdk.orig/hotspot/src/share/vm/utilities/numberSeq.cpp -+++ openjdk/hotspot/src/share/vm/utilities/numberSeq.cpp -@@ -369,7 +369,7 @@ - void BinaryMagnitudeSeq::add(size_t val) { - Atomic::add(val, &_sum); - -- int mag = log2_intptr(val) + 1; -+ int mag = log2_intptr((uintptr_t) val) + 1; - - // Defensively saturate for product bits: - if (mag < 0) { diff --git a/sources b/sources index bc68672..2064a52 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04.tar.xz) = ebcb028fdbcd414bc13d8dc5e331b4a6be2026e19eed5c903eecc02929fde8829fca8aa430220319df7f772f5c4d9689739d5f41ce35c4e542641ab2bfcd6c51 +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz) = 8ef6029cfa053fce7e0f73aab72b287a4505b06d6e2f1153e5c903a48ba89147fc187987f58d6eb737ede9d5c76a8925f22c34a4f5c3d757674c06fccf77c21b commit ab4a3ecd9dc0919eeb45240fad4e87a762bfe1e7 Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Wed May 22 20:00:06 2019 +0100 Remove additions to EXTRA_CFLAGS and EXTRA_CPP_FLAGS which are now made by upstream. Remove -mstackrealign addition which is handled by PR3533 & PR3591 patches. diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 254a1f5..5b1486a 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -998,7 +998,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 3%{?dist} +Release: 4%{?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 @@ -1703,9 +1703,8 @@ export CFLAGS="$CFLAGS -mieee" # We use ourcppflags because the OpenJDK build seems to # pass EXTRA_CFLAGS to the HotSpot C++ compiler... -# Explicitly set the C++ standard as the default has changed on GCC >= 6 -EXTRA_CFLAGS="%ourcppflags -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse" -EXTRA_CPP_FLAGS="%ourcppflags -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse" +EXTRA_CFLAGS="%ourcppflags -Wno-error" +EXTRA_CPP_FLAGS="%ourcppflags" # Fixes annocheck warnings in assembler files due to missing build notes EXTRA_CPP_FLAGS="$EXTRA_CPP_FLAGS -Wa,--generate-missing-build-notes=yes" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wa,--generate-missing-build-notes=yes" @@ -1754,13 +1753,8 @@ bash ../../configure \ --with-libpng=system \ --with-lcms=system \ --with-stdc++lib=dynamic \ -%ifarch %{ix86} - --with-extra-cxxflags="-mstackrealign $EXTRA_CPP_FLAGS" \ - --with-extra-cflags="-mstackrealign $EXTRA_CFLAGS" \ -%else --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \ --with-extra-cflags="$EXTRA_CFLAGS" \ -%endif --with-extra-ldflags="%{ourldflags}" \ --with-num-cores="$NUM_PROC" @@ -2288,6 +2282,10 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed May 22 2019 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-4 +- Remove additions to EXTRA_CFLAGS and EXTRA_CPP_FLAGS which are now made by upstream. +- Remove -mstackrealign addition which is handled by PR3533 & PR3591 patches. + * Wed May 22 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-3 - Add JDK-8223219 to avoid -fstack-protector overriding -fstack-protector-strong commit d71489473a696f08aefcad8d2ba5b1e585cf3fcc Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Mon May 13 16:02:54 2019 +0100 Add JDK-8223219 to avoid -fstack-protector overriding -fstack-protector-strong diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 696907b..254a1f5 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -998,7 +998,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 2%{?dist} +Release: 3%{?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 @@ -1206,6 +1206,10 @@ Patch624: jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fd # 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization # Zero part of the fix for (arm/s390 arches) Patch625: jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch +# JDK-8223219: Backport of JDK-8199552 to OpenJDK 8 leads to duplicate -fstack-protector flags, +# overriding --with-extra-cflags +Patch626: jdk8223219-fstack-protector-root.patch +Patch627: jdk8223219-fstack-protector-hotspot.patch ############################################# # @@ -1614,6 +1618,8 @@ sh %{SOURCE12} %patch623 %patch624 %patch625 +%patch626 +%patch627 %patch110 # RPM-only fixes @@ -2282,6 +2288,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed May 22 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-3 +- Add JDK-8223219 to avoid -fstack-protector overriding -fstack-protector-strong + * Wed May 15 2019 James Cassell <cyberpear(a)fedoraproject.org> - 1:1.8.0.212.b04-2 - mark net.properties as a config file diff --git a/jdk8223219-fstack-protector-hotspot.patch b/jdk8223219-fstack-protector-hotspot.patch new file mode 100644 index 0000000..ec69944 --- /dev/null +++ b/jdk8223219-fstack-protector-hotspot.patch @@ -0,0 +1,35 @@ +diff --git openjdk.orig/hotspot/make/bsd/makefiles/gcc.make openjdk/hotspot/make/bsd/makefiles/gcc.make +--- openjdk.orig/hotspot/make/bsd/makefiles/gcc.make ++++ openjdk/hotspot/make/bsd/makefiles/gcc.make +@@ -190,7 +190,7 @@ + CFLAGS += -fno-exceptions + ifeq ($(USE_CLANG),) + CFLAGS += -pthread +- CFLAGS += -fcheck-new -fstack-protector ++ CFLAGS += -fcheck-new + # version 4 and above support fvisibility=hidden (matches jni_x86.h file) + # except 4.1.2 gives pointless warnings that can't be disabled (afaik) + ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" +diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make +--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make ++++ openjdk/hotspot/make/linux/makefiles/gcc.make +@@ -150,7 +150,7 @@ + CFLAGS += -fno-exceptions + CFLAGS += -D_REENTRANT + ifeq ($(USE_CLANG),) +- CFLAGS += -fcheck-new -fstack-protector ++ CFLAGS += -fcheck-new + # version 4 and above support fvisibility=hidden (matches jni_x86.h file) + # except 4.1.2 gives pointless warnings that can't be disabled (afaik) + ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" +diff --git openjdk.orig/hotspot/make/solaris/makefiles/gcc.make openjdk/hotspot/make/solaris/makefiles/gcc.make +--- openjdk.orig/hotspot/make/solaris/makefiles/gcc.make ++++ openjdk/hotspot/make/solaris/makefiles/gcc.make +@@ -75,7 +75,6 @@ + CFLAGS += -fno-exceptions + CFLAGS += -D_REENTRANT + CFLAGS += -fcheck-new +-CFLAGS += -fstack-protector + + ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) + diff --git a/jdk8223219-fstack-protector-root.patch b/jdk8223219-fstack-protector-root.patch new file mode 100644 index 0000000..a73761c --- /dev/null +++ b/jdk8223219-fstack-protector-root.patch @@ -0,0 +1,33 @@ +diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 +--- openjdk.orig/common/autoconf/flags.m4 ++++ openjdk/common/autoconf/flags.m4 +@@ -388,16 +388,8 @@ + CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" + CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" + elif test "x$TOOLCHAIN_TYPE" = xgcc; then +- case $OPENJDK_TARGET_CPU_ARCH in +- x86 ) +- LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" +- LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" +- ;; +- x86_64 ) +- LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" +- LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" +- ;; +- esac ++ LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" ++ LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" + if test "x$OPENJDK_TARGET_OS" != xmacosx; then + LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro" + LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" +@@ -464,10 +456,6 @@ + ppc ) + # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing + ;; +- x86 ) +- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector" +- CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector" +- ;; + * ) + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer" + CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing" commit 11a96951b11221069b935a28efc97c2e91898c22 Author: James Cassell <code(a)james.cassell.me> Date: Tue May 14 15:31:54 2019 -0400 mark net.properties as a config file diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index f10965d..696907b 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -689,6 +689,7 @@ exit 0 %{_jvmdir}/%{jredir -- %{?1}}/lib/jvm.hprof.txt %{_jvmdir}/%{jredir -- %{?1}}/lib/meta-index %{_jvmdir}/%{jredir -- %{?1}}/lib/net.properties +%config(noreplace) %{etcjavadir -- %{?1}}/lib/net.properties %{_jvmdir}/%{jredir -- %{?1}}/lib/psfont.properties.ja %{_jvmdir}/%{jredir -- %{?1}}/lib/psfontj2d.properties %{_jvmdir}/%{jredir -- %{?1}}/lib/resources.jar @@ -997,7 +998,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 1%{?dist} +Release: 2%{?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 @@ -2070,7 +2071,7 @@ touch -t 201401010000 $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/lib/securi # moving config files to /etc mkdir -p $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}/lib/security/policy/unlimited/ mkdir -p $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}/lib/security/policy/limited/ -for file in lib/security/cacerts lib/security/policy/unlimited/US_export_policy.jar lib/security/policy/unlimited/local_policy.jar lib/security/policy/limited/US_export_policy.jar lib/security/policy/limited/local_policy.jar lib/security/java.policy lib/security/java.security lib/security/blacklisted.certs lib/logging.properties lib/calendars.properties lib/security/nss.cfg ; do +for file in lib/security/cacerts lib/security/policy/unlimited/US_export_policy.jar lib/security/policy/unlimited/local_policy.jar lib/security/policy/limited/US_export_policy.jar lib/security/policy/limited/local_policy.jar lib/security/java.policy lib/security/java.security lib/security/blacklisted.certs lib/logging.properties lib/calendars.properties lib/security/nss.cfg lib/net.properties ; do mv $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/$file $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}/$file ln -sf %{etcjavadir -- $suffix}/$file $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/$file done @@ -2281,6 +2282,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed May 15 2019 James Cassell <cyberpear(a)fedoraproject.org> - 1:1.8.0.212.b04-2 +- mark net.properties as a config file + * Mon May 13 2019 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:1.8.0.212.b04-1 - Update patch for RH1566890. - Renamed rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639 to commit f9946cfadc2b61b2d43a4695b1b9d45346a0c215 Author: Andrew Hughes <gnu.andrew(a)redhat.com> Date: Mon May 13 04:59:45 2019 +0100 Update patch for RH1566890. Renamed rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639 to rh1566890-CVE_2018_3639-speculative_store_bypass.patch Added dependent patch, rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index b578089..f10965d 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -997,7 +997,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 0%{?dist} +Release: 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 @@ -1107,7 +1107,8 @@ Patch523: pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_ # PR3083, RH1346460: Regression in SSL debug output without an ECC provider Patch528: pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch # RH1566890: CVE-2018-3639 -Patch529: rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch +Patch529: rh1566890-CVE_2018_3639-speculative_store_bypass.patch +Patch531: rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch # PR3601: Fix additional -Wreturn-type issues introduced by 8061651 Patch530: pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch # Support for building the SunEC provider with the system NSS installation @@ -1597,6 +1598,7 @@ sh %{SOURCE12} %patch523 %patch528 %patch529 +%patch531 %patch530 %patch563 %patch564 @@ -2279,6 +2281,13 @@ require "copy_jdk_configs.lua" %endif %changelog +* Mon May 13 2019 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:1.8.0.212.b04-1 +- Update patch for RH1566890. + - Renamed rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639 to + rh1566890-CVE_2018_3639-speculative_store_bypass.patch + - Added dependent patch, + rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch + * Thu Apr 11 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-0 - Update to aarch64-shenandoah-jdk8u212-b04. diff --git a/rh1566890-CVE_2018_3639-speculative_store_bypass.patch b/rh1566890-CVE_2018_3639-speculative_store_bypass.patch new file mode 100644 index 0000000..d8f3a5a --- /dev/null +++ b/rh1566890-CVE_2018_3639-speculative_store_bypass.patch @@ -0,0 +1,44 @@ +diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp +@@ -103,6 +103,8 @@ + # include <inttypes.h> + # include <sys/ioctl.h> + ++#include <sys/prctl.h> ++ + PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC + + #ifndef _GNU_SOURCE +@@ -4997,6 +4999,31 @@ + } + } + ++/* Per task speculation control */ ++#ifndef PR_GET_SPECULATION_CTRL ++#define PR_GET_SPECULATION_CTRL 52 ++#endif ++#ifndef PR_SET_SPECULATION_CTRL ++#define PR_SET_SPECULATION_CTRL 53 ++#endif ++/* Speculation control variants */ ++# undef PR_SPEC_STORE_BYPASS ++# define PR_SPEC_STORE_BYPASS 0 ++/* Return and control values for PR_SET/GET_SPECULATION_CTRL */ ++# undef PR_SPEC_NOT_AFFECTED ++# undef PR_SPEC_PRCTL ++# undef PR_SPEC_ENABLE ++# undef PR_SPEC_DISABLE ++# define PR_SPEC_NOT_AFFECTED 0 ++# define PR_SPEC_PRCTL (1UL << 0) ++# define PR_SPEC_ENABLE (1UL << 1) ++# define PR_SPEC_DISABLE (1UL << 2) ++ ++static void set_speculation() __attribute__((constructor)); ++static void set_speculation() { ++ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0); ++} ++ + // this is called _before_ most of the global arguments have been parsed + void os::init(void) { + char dummy; /* used to get a guess on initial stack address */ diff --git a/rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch b/rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch new file mode 100644 index 0000000..94ef9d4 --- /dev/null +++ b/rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch @@ -0,0 +1,54 @@ +diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp +@@ -5001,26 +5001,43 @@ + + /* Per task speculation control */ + #ifndef PR_GET_SPECULATION_CTRL +-#define PR_GET_SPECULATION_CTRL 52 ++# define PR_GET_SPECULATION_CTRL 52 + #endif + #ifndef PR_SET_SPECULATION_CTRL +-#define PR_SET_SPECULATION_CTRL 53 ++# define PR_SET_SPECULATION_CTRL 53 + #endif + /* Speculation control variants */ +-# undef PR_SPEC_STORE_BYPASS ++#ifndef PR_SPEC_STORE_BYPASS + # define PR_SPEC_STORE_BYPASS 0 ++#endif + /* Return and control values for PR_SET/GET_SPECULATION_CTRL */ +-# undef PR_SPEC_NOT_AFFECTED +-# undef PR_SPEC_PRCTL +-# undef PR_SPEC_ENABLE +-# undef PR_SPEC_DISABLE ++ ++#ifndef PR_SPEC_NOT_AFFECTED + # define PR_SPEC_NOT_AFFECTED 0 ++#endif ++#ifndef PR_SPEC_PRCTL + # define PR_SPEC_PRCTL (1UL << 0) ++#endif ++#ifndef PR_SPEC_ENABLE + # define PR_SPEC_ENABLE (1UL << 1) ++#endif ++#ifndef PR_SPEC_DISABLE + # define PR_SPEC_DISABLE (1UL << 2) ++#endif ++#ifndef PR_SPEC_FORCE_DISABLE ++# define PR_SPEC_FORCE_DISABLE (1UL << 3) ++#endif ++#ifndef PR_SPEC_DISABLE_NOEXEC ++# define PR_SPEC_DISABLE_NOEXEC (1UL << 4) ++#endif + + static void set_speculation() __attribute__((constructor)); + static void set_speculation() { ++ if ( prctl(PR_SET_SPECULATION_CTRL, ++ PR_SPEC_STORE_BYPASS, ++ PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) { ++ return; ++ } + prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0); + } + diff --git a/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch b/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch deleted file mode 100644 index d8f3a5a..0000000 --- a/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp ---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp -@@ -103,6 +103,8 @@ - # include <inttypes.h> - # include <sys/ioctl.h> - -+#include <sys/prctl.h> -+ - PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC - - #ifndef _GNU_SOURCE -@@ -4997,6 +4999,31 @@ - } - } - -+/* Per task speculation control */ -+#ifndef PR_GET_SPECULATION_CTRL -+#define PR_GET_SPECULATION_CTRL 52 -+#endif -+#ifndef PR_SET_SPECULATION_CTRL -+#define PR_SET_SPECULATION_CTRL 53 -+#endif -+/* Speculation control variants */ -+# undef PR_SPEC_STORE_BYPASS -+# define PR_SPEC_STORE_BYPASS 0 -+/* Return and control values for PR_SET/GET_SPECULATION_CTRL */ -+# undef PR_SPEC_NOT_AFFECTED -+# undef PR_SPEC_PRCTL -+# undef PR_SPEC_ENABLE -+# undef PR_SPEC_DISABLE -+# define PR_SPEC_NOT_AFFECTED 0 -+# define PR_SPEC_PRCTL (1UL << 0) -+# define PR_SPEC_ENABLE (1UL << 1) -+# define PR_SPEC_DISABLE (1UL << 2) -+ -+static void set_speculation() __attribute__((constructor)); -+static void set_speculation() { -+ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0); -+} -+ - // this is called _before_ most of the global arguments have been parsed - void os::init(void) { - char dummy; /* used to get a guess on initial stack address */
1
0
0
0
Architecture specific change in rpms/supermin.git
by githook-noreply@fedoraproject.org
31 Jul '19
31 Jul '19
The package rpms/supermin.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/supermin.git/commit/?id=0496c3feb9a…
. Change: -%ifnarch %{no_test_arches} Thanks. Full change: ============ commit 0496c3feb9a7e3c221163dc66432648eda878759 Author: Richard W.M. Jones <rjones(a)redhat.com> Date: Wed Jul 31 18:38:03 2019 +0100 Revert "Skip tests on armv7, mke2fs is broken there." This reverts commit 37fd86cc25a5088633c531f9874793670d4fbc7d. diff --git a/supermin.spec b/supermin.spec index ad51634..18e663b 100644 --- a/supermin.spec +++ b/supermin.spec @@ -20,10 +20,6 @@ %bcond_with dietlibc %endif -# Architectures that cannot run the tests. -# armv7:
https://bugzilla.redhat.com/show_bug.cgi?id=1733743
-%global no_test_arches %{arm} - # Whether we should verify tarball signature with GPGv2. %global verify_tarball_signature 1 @@ -150,7 +146,6 @@ install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_rpmconfigdir}/ %check -%ifnarch %{no_test_arches} # Skip execstack test where it is known to fail. %if 0%{?fedora} <= 20 @@ -164,7 +159,6 @@ make check || { exit 1 } -%endif %files %doc COPYING README examples/build-basic-vm.sh
1
0
0
0
Architecture specific change in rpms/numpy.git
by githook-noreply@fedoraproject.org
31 Jul '19
31 Jul '19
The package rpms/numpy.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/numpy.git/commit/?id=b63f9bb0a68d24…
. Change: -%ifarch %{openblas_arches} Thanks. Full change: ============ commit b63f9bb0a68d24728aa551166ccd0133eb79e57b Author: Gwyn Ciesla <gwync(a)protonmail.com> Date: Wed Jul 31 10:41:56 2019 -0500 1.17.0, split out python2-numpy. diff --git a/.gitignore b/.gitignore index 342daf1..9ab994c 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ numpy-1.4.1.tar.gz /numpy-1.16.3.tar.gz /numpy-html-1.16.1.zip /numpy-1.16.4.tar.gz +/numpy-html-1.17.0.zip diff --git a/numpy.spec b/numpy.spec index f2cc197..84b2c6b 100644 --- a/numpy.spec +++ b/numpy.spec @@ -1,33 +1,19 @@ -%if 0%{?fedora} || 0%{?rhel} > 7 -%global with_python3 1 -%else -%{!?python2_sitearch: %global python2_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%endif - #uncomment next line for a release candidate or a beta #%%global relc rc1 %global modname numpy Name: numpy -Version: 1.16.4 -Release: 3%{?dist} +Version: 1.17.0 +Release: 1%{?dist} Epoch: 1 Summary: A fast multidimensional array facility for Python # Everything is BSD except for class SafeEval in numpy/lib/utils.py which is Python -License: BSD and Python +License: BSD and Python and ASL 2.0 URL:
http://www.numpy.org/
Source0:
https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{…
-Source1:
https://docs.scipy.org/doc/numpy/numpy-html-1.16.1.zip
- -BuildRequires: python2-devel lapack-devel python2-setuptools gcc-gfortran python2-nose -BuildRequires: Cython python2-pytest -%ifarch %{openblas_arches} -BuildRequires: openblas-devel -%else -BuildRequires: atlas-devel -%endif +Source1:
https://docs.scipy.org/doc/numpy/numpy-html-1.17.0.zip
%description @@ -43,50 +29,6 @@ basic linear algebra and random number generation. Also included in this package is a version of f2py that works properly with NumPy. -%package -n python2-numpy -Summary: A fast multidimensional array facility for Python -Requires: python2-nose -%{?python_provide:%python_provide python2-%{modname}} -# General provides of plain 'numpy' that is in use by 1 package as of F24 -Provides: numpy = %{epoch}:%{version}-%{release} -Provides: numpy%{?_isa} = %{epoch}:%{version}-%{release} -Obsoletes: numpy < 1:1.10.1-3 -%description -n python2-numpy -NumPy is a general-purpose array-processing package designed to -efficiently manipulate large multi-dimensional arrays of arbitrary -records without sacrificing too much speed for small multi-dimensional -arrays. NumPy is built on the Numeric code base and adds features -introduced by numarray as well as an extended C-API and the ability to -create arrays of arbitrary type. - -There are also basic facilities for discrete fourier transform, -basic linear algebra and random number generation. Also included in -this package is a version of f2py that works properly with NumPy. - - -%package -n python2-numpy-f2py -Summary: f2py for numpy -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: python2-devel -Provides: f2py = %{epoch}:%{version}-%{release} -Provides: numpy-f2py = %{epoch}:%{version}-%{release} -Obsoletes: numpy-f2py < 1:1.10.1-3 -%{?python_provide:%python_provide python2-numpy-f2py} - - -%description -n python2-numpy-f2py -This package includes a version of f2py that works properly with NumPy. - - -%package -n python2-numpy-doc -Summary: Documentation for numpy -Requires: %{name} = %{epoch}:%{version}-%{release} -BuildArch: noarch - -%description -n python2-numpy-doc -This package provides the complete documentation for NumPy. - -%if 0%{?with_python3} %package -n python3-numpy Summary: A fast multidimensional array facility for Python @@ -95,6 +37,14 @@ License: BSD BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-pytest +BuildRequires: python3-Cython +BuildRequires: gcc-gfortran gcc +BuildRequires: lapack-devel +%ifarch %{openblas_arches} +BuildRequires: openblas-devel +%else +BuildRequires: atlas-devel +%endif %description -n python3-numpy NumPy is a general-purpose array-processing package designed to @@ -110,7 +60,7 @@ this package is a version of f2py that works properly with NumPy. %package -n python3-numpy-f2py Summary: f2py for numpy -Requires: python3-numpy = %{epoch}:%{version}-%{release} +Requires: python3-numpy%{?_isa} = %{epoch}:%{version}-%{release} Requires: python3-devel Provides: python3-f2py = %{version}-%{release} Obsoletes: python3-f2py <= 2.45.241_1927 @@ -127,7 +77,6 @@ BuildArch: noarch %description -n python3-numpy-doc This package provides the complete documentation for NumPy. -%endif %prep %autosetup -n %{name}-%{version}%{?relc} -p1 @@ -153,16 +102,9 @@ EOF %endif %endif -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif - %build %set_build_flags -%if 0%{?with_python3} -pushd %{py3dir} %ifarch %{openblas_arches} env OPENBLAS=%{_libdir} \ %else @@ -171,17 +113,6 @@ env ATLAS=%{_libdir} \ BLAS=%{_libdir} \ LAPACK=%{_libdir} CFLAGS="%{optflags}" \ %{__python3} setup.py build -popd -%endif - -%ifarch %{openblas_arches} -env OPENBLAS=%{_libdir} \ -%else -env ATLAS=%{_libdir} \ -%endif - BLAS=%{_libdir} \ - LAPACK=%{_libdir} CFLAGS="%{optflags}" \ - %{__python2} setup.py build %install mkdir docs @@ -189,9 +120,6 @@ pushd docs unzip %{SOURCE1} popd -# first install python3 so the binaries are overwritten by the python2 ones -%if 0%{?with_python3} -pushd %{py3dir} #%%{__python3} setup.py install -O1 --skip-build --root %%{buildroot} # skip-build currently broken, this works around it for now %ifarch %{openblas_arches} @@ -203,89 +131,25 @@ env ATLAS=%{_libdir} \ LAPACK=%{_libdir} CFLAGS="%{optflags}" \ %{__python3} setup.py install --root %{buildroot} pushd %{buildroot}%{_bindir} &> /dev/null +ln -s f2py3 f2py.numpy popd &> /dev/null -popd - -%endif +# Drop static lib. +rm -f %{buildroot}%{python3_sitearch}/%{modname}/core/lib/libnpymath.a -#%%{__python2} setup.py install -O1 --skip-build --root %%{buildroot} -# skip-build currently broken, this works around it for now -%ifarch %{openblas_arches} -env OPENBLAS=%{_libdir} \ -%else -env ATLAS=%{_libdir} \ -%endif - FFTW=%{_libdir} BLAS=%{_libdir} \ - LAPACK=%{_libdir} CFLAGS="%{optflags}" \ - %{__python2} setup.py install --root %{buildroot} -pushd %{buildroot}%{_bindir} &> /dev/null -# symlink for anyone who was using f2py.numpy -ln -s f2py2 f2py.numpy -#ln -s f2py2 f2py -popd &> /dev/null -#install -D -p -m 0644 docs/f2py/f2py.1 %{buildroot}%{_mandir}/man1/f2py.1 #symlink for includes, BZ 185079 mkdir -p %{buildroot}%{_includedir} -ln -s %{python2_sitearch}/%{name}/core/include/numpy/ %{buildroot}%{_includedir}/numpy - +ln -s %{python3_sitearch}/%{name}/core/include/numpy/ %{buildroot}%{_includedir}/numpy %check %if %{_arch} != s390x && %{_arch} != ppc64le -#pushd doc &> /dev/null -#PYTHONPATH="%{buildroot}%{python2_sitearch}" PATH="%{buildroot}%{_bindir}:$PATH" PYTHONDONTWRITEBYTECODE=1 \ -# %{__python2} -m pytest -v --pyargs numpy -#popd &> /dev/null -python2 runtests.py - -%if 0%{?with_python3} -#pushd doc &> /dev/null -#PYTHONPATH="%{buildroot}%{python3_sitearch}" PATH="%{buildroot}%{_bindir}:$PATH" PYTHONDONTWRITEBYTECODE=1 \ -# %{__python3} -m pytest -v --pyargs numpy -#popd &> /dev/null python3 runtests.py -%endif %endif -%files -n python2-numpy -%license LICENSE.txt -%doc THANKS.txt site.cfg.example -%dir %{python2_sitearch}/%{name} -%{python2_sitearch}/%{name}/*.py* -%{python2_sitearch}/%{name}/core -%{python2_sitearch}/%{name}/distutils -%{python2_sitearch}/%{name}/doc -%{python2_sitearch}/%{name}/fft -%{python2_sitearch}/%{name}/lib -%{python2_sitearch}/%{name}/linalg -%{python2_sitearch}/%{name}/ma -%{python2_sitearch}/%{name}/random -%{python2_sitearch}/%{name}/testing -%{python2_sitearch}/%{name}/tests -%{python2_sitearch}/%{name}/compat -%{python2_sitearch}/%{name}/matrixlib -%{python2_sitearch}/%{name}/polynomial -%{python2_sitearch}/%{name}-*.egg-info -%{_includedir}/numpy -%exclude %{python2_sitearch}/%{name}/LICENSE.txt - -%files -n python2-numpy-f2py -%doc docs/f2py/*.html -#%%{_mandir}/man*/* -%{_bindir}/f2py -%{_bindir}/f2py2 -%{_bindir}/f2py%{python2_version} -%{_bindir}/f2py.numpy -%{python2_sitearch}/%{name}/f2py - -%files -n python2-numpy-doc -%doc docs/* - -%if 0%{?with_python3} %files -n python3-numpy %license LICENSE.txt %doc THANKS.txt site.cfg.example @@ -307,19 +171,23 @@ python3 runtests.py %{python3_sitearch}/%{name}/polynomial %{python3_sitearch}/%{name}-*.egg-info %exclude %{python3_sitearch}/%{name}/LICENSE.txt +%{_includedir}/numpy %files -n python3-numpy-f2py +%{_bindir}/f2py %{_bindir}/f2py3 +%{_bindir}/f2py.numpy %{_bindir}/f2py%{python3_version} %{python3_sitearch}/%{name}/f2py %files -n python3-numpy-doc %doc docs/* -%endif - %changelog +* Tue Jul 30 2019 Gwyn Ciesla <gwync(a)protonmail.com> 1:1.17.0-1 +- 1.17.0, split out Python 2. + * Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.16.4-3 - Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources index 92da382..c1a1f5d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (numpy-1.16.4.tar.gz) = 427897a9e28a7e7648ebb0df8897a31c358fc5941773a120a534af6375d5963298f283185f36a7ac1c1e2b3511d2ba03d0779438acc849e1cf654f1454fc3c02 -SHA512 (numpy-html-1.16.1.zip) = 5af356313363e00f05db560902cc7578162c7d2ab9c1ef0f3713854682b63d76297d55eb9aac0dfc7f4b687ccea93a53462e2082ef1270e29e19680e1222b34d +SHA512 (numpy-html-1.17.0.zip) = 83b0a780d87d1dbf2c32a5359a8b2251d4636d35f7398cb5f72159317943906684cfb7fc26f95a26872f0216ee1b66772ce83674f87a7a6faa4d5829c5e5cfe7
1
0
0
0
Architecture specific change in rpms/python2-numpy.git
by githook-noreply@fedoraproject.org
31 Jul '19
31 Jul '19
The package rpms/python2-numpy.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/python2-numpy.git/commit/?id=388a2f…
. Change: +%ifnarch s390x ppc64le Thanks. Full change: ============ commit 388a2ff30b59de13f7571a0f52764d3dae25e573 Author: Gwyn Ciesla <gwync(a)protonmail.com> Date: Wed Jul 31 10:40:15 2019 -0500 Initial import. diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..533bf61 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/numpy-1.16.4.tar.gz +/numpy-html-1.16.1.zip diff --git a/python2-numpy.spec b/python2-numpy.spec new file mode 100644 index 0000000..1e0c6c7 --- /dev/null +++ b/python2-numpy.spec @@ -0,0 +1,681 @@ +#uncomment next line for a release candidate or a beta +#%%global relc rc1 + +%global modname numpy + +Name: python2-numpy +Version: 1.16.4 +Release: 4%{?dist} +Epoch: 1 +Summary: A fast multidimensional array facility for Python 2 + +# Everything is BSD except for class SafeEval in numpy/lib/utils.py which is Python +License: BSD and Python +URL:
http://www.numpy.org/
+Source0:
https://github.com/%{modname}/%{modname}/releases/download/v%{version}/%{mo…
+Source1:
https://docs.scipy.org/doc/numpy/numpy-html-1.16.1.zip
+ +BuildRequires: python2-devel lapack-devel python2-setuptools gcc-gfortran python2-nose gcc +BuildRequires: Cython python2-pytest +%ifarch %{openblas_arches} +BuildRequires: openblas-devel +%else +BuildRequires: atlas-devel +%endif +%{?python_provide:%python_provide python2-%{modname}} +# General provides of plain 'numpy' that is in use by 1 package as of F24 +Provides: numpy = %{epoch}:%{version}-%{release} +Provides: numpy%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: numpy < 1:1.10.1-3 + + +%description +NumPy is a general-purpose array-processing package designed to +efficiently manipulate large multi-dimensional arrays of arbitrary +records without sacrificing too much speed for small multi-dimensional +arrays. NumPy is built on the Numeric code base and adds features +introduced by numarray as well as an extended C-API and the ability to +create arrays of arbitrary type. + +There are also basic facilities for discrete fourier transform, +basic linear algebra and random number generation. Also included in +this package is a version of f2py that works properly with NumPy. + + +%package -n python2-numpy-f2py +Summary: f2py for numpy +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +Requires: python2-devel +Provides: f2py = %{epoch}:%{version}-%{release} +Provides: numpy-f2py = %{epoch}:%{version}-%{release} +Obsoletes: numpy-f2py < 1:1.10.1-3 +%{?python_provide:%python_provide python2-numpy-f2py} + + +%description -n python2-numpy-f2py +This package includes a version of f2py that works properly with NumPy. + + +%package -n python2-numpy-doc +Summary: Documentation for numpy +License: BSD and ASL 2.0 +Requires: %{name} = %{epoch}:%{version}-%{release} +BuildArch: noarch + +%description -n python2-numpy-doc +This package provides the complete documentation for NumPy. + + +%prep +%autosetup -n %{modname}-%{version}%{?relc} -p1 + +# Force re-cythonization (ifed for PKG-INFO presence in setup.py) +rm PKG-INFO + +%ifarch %{openblas_arches} +# Use openblas pthreads as recommended by upstream (see comment in site.cfg.example) +cat >> site.cfg <<EOF +[openblas] +libraries = openblasp +library_dirs = %{_libdir} +EOF +%else +# Atlas 3.10 library names +%if 0%{?fedora} || 0%{?rhel} > 7 +cat >> site.cfg <<EOF +[atlas] +library_dirs = %{_libdir}/atlas +atlas_libs = satlas +EOF +%endif +%endif + +%build +%set_build_flags + +%ifarch %{openblas_arches} +env OPENBLAS=%{_libdir} \ +%else +env ATLAS=%{_libdir} \ +%endif + BLAS=%{_libdir} \ + LAPACK=%{_libdir} CFLAGS="%{optflags}" \ + %{__python2} setup.py build + +%install +mkdir docs +pushd docs +unzip %{SOURCE1} +popd + +#%%{__python2} setup.py install -O1 --skip-build --root %%{buildroot} +# skip-build currently broken, this works around it for now +%ifarch %{openblas_arches} +env OPENBLAS=%{_libdir} \ +%else +env ATLAS=%{_libdir} \ +%endif + FFTW=%{_libdir} BLAS=%{_libdir} \ + LAPACK=%{_libdir} CFLAGS="%{optflags}" \ + %{__python2} setup.py install --root %{buildroot} +pushd %{buildroot}%{_bindir} &> /dev/null +rm -f %{buildroot}%{_bindir}/f2py +popd &> /dev/null + +# Drop static lib. +rm -f %{buildroot}%{python2_sitearch}/%{modname}/core/lib/libnpymath.a + +%check +%ifnarch s390x ppc64le +python2 runtests.py +%endif + + +%files -n python2-numpy +%license LICENSE.txt +%doc THANKS.txt site.cfg.example +%dir %{python2_sitearch}/%{modname} +%{python2_sitearch}/%{modname}/*.py* +%{python2_sitearch}/%{modname}/core +%{python2_sitearch}/%{modname}/distutils +%{python2_sitearch}/%{modname}/doc +%{python2_sitearch}/%{modname}/fft +%{python2_sitearch}/%{modname}/lib +%{python2_sitearch}/%{modname}/linalg +%{python2_sitearch}/%{modname}/ma +%{python2_sitearch}/%{modname}/random +%{python2_sitearch}/%{modname}/testing +%{python2_sitearch}/%{modname}/tests +%{python2_sitearch}/%{modname}/compat +%{python2_sitearch}/%{modname}/matrixlib +%{python2_sitearch}/%{modname}/polynomial +%{python2_sitearch}/%{modname}-*.egg-info +%exclude %{python2_sitearch}/%{modname}/LICENSE.txt + +%files -n python2-numpy-f2py +%doc docs/f2py/*.html +%{_bindir}/f2py2 +%{_bindir}/f2py%{python2_version} +%{python2_sitearch}/%{modname}/f2py + +%files -n python2-numpy-doc +%doc docs/* + + +%changelog +* Tue Jul 30 2019 Gwyn Ciesla <gwync(a)protonmail.com> - 1:1.16.4-4 +- Split out from main numpy SRPM. + +* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.16.4-3 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+ +* Thu Jun 20 2019 Kalev Lember <klember(a)redhat.com> - 1:1.16.4-2 +- Avoid hardcoding /usr prefix + +* Tue May 28 2019 Gwyn Ciesla <gwync(a)protonmail.com> - 1:1.16.4-1 +- 1.16.4 + +* Thu May 16 2019 Orion Poplawski <orion(a)nwra.com> - 1:1.16.3-2 +- Build only with openblasp (bugz#1709161) + +* Mon Apr 22 2019 Gwyn Ciesla <gwync(a)protonmail.com> - 1:1.16.3-1 +- 1.16.3. + +* Tue Feb 26 2019 Gwyn Ciesla <gwync(a)protonmail.com> - 1:1.16.2-1 +- 1.16.2. + +* Fri Feb 01 2019 Gwyn Ciesla <limburgher(a)gmail.com> - 1:1.16.1-1 +- 1.16.1. + +* Tue Jan 22 2019 Gwyn Ciesla <limburgher(a)gmail.com> - 1:1.16.0-1 +- 1.16.0. + +* Wed Aug 29 2018 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 1:1.15.1-2 +- Switch to pytest for running tests during check +- Stop ignoring failures when running tests +- Set PATH in check so that f2py tests work +- Update docs to match release +- Remove outdated workaround from rhbz#849713 + +* Wed Aug 22 2018 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 1:1.15.1-1 +- Update to latest version + +* Sat Aug 11 2018 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 1:1.15.0-2 +- Fix broken build on s390x +- Remove bytecode produced by pytest +- Re-enable tests on s390x + +* Tue Jul 24 2018 Gwyn Ciesla <limburgher(a)gmail.com> - 1:1.15.0-1 +- 1.15.0 + +* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.14.5-3 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+ +* Fri Jun 15 2018 Miro Hronok <mhroncok(a)redhat.com> - 1:1.14.5-2 +- Rebuilt for Python 3.7 + +* Wed Jun 13 2018 Gwyn Ciesla <limburgher(a)gmail.com> - 1:1.14.5-1 +- 1.14.5 + +* Tue May 01 2018 Gwyn Ciesla <limburgher(a)gmail.com> - 1:1.14.3-1 +- 1.14.3 + +* Mon Mar 12 2018 Gwyn Ciesla <limburgher(a)gmail.com> - 1:1.14.2-1 +- 1.14.2 + +* Wed Feb 21 2018 Gwyn Ciesla <limburgher(a)gmail.com> - 1:1.14.1-1 +- 1.14.1 + +* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.14.0-0.rc1.1 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+ +* Wed Dec 13 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 1:1.14.0-0.rc1 +- 1.14.0 rc1 + +* Mon Dec 11 2017 Iryna Shcherbina <ishcherb(a)redhat.com> - 1:1.13.3-5 +- Fix ambiguous Python 2 dependency declarations + (See
https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
) + +* Thu Nov 16 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 1:1.13.3-4 +- Split out doc subpackage. + +* Mon Nov 06 2017 Merlin Mathesius <mmathesi(a)redhat.com> - 1:1.13.3-3 +- Cleanup spec file conditionals + +* Tue Oct 31 2017 Christian Dersch <lupinix(a)mailbox.org> - 1:1.13.3-2 +- set proper environment variables for openblas + +* Wed Oct 04 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 1:1.13.3-1 +- 1.13.3 + +* Thu Sep 28 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 1:1.13.2-1 +- 1.13.2 + +* Tue Aug 08 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 1:1.13.1-4 +- Use openblas where available, BZ 1472318. + +* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.13.1-3 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+ +* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.13.1-2 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+ +* Fri Jul 07 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 1:1.13.1-1 +- 1.13.1 final + +* Fri Jun 09 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 1:1.13.0-1 +- 1.13.0 final + +* Fri May 19 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 1:1.13.0-0.rc2 +- 1.13.0 rc2 + +* Thu May 11 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 1:1.13.0-0.rc1 +- 1.13.0 rc1 + +* Wed Mar 29 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 1:1.12.1-1 +- 1.12.1 + +* Tue Jan 31 2017 Simone Caronni <negativo17(a)gmail.com> - 1:1.12.0-1 +- Update to 1.12.0, build with gcc 7.0. + +* Mon Dec 12 2016 Charalampos Stratakis <cstratak(a)redhat.com> - 1:1.11.2-2 +- Rebuild for Python 3.6 + +* Mon Oct 3 2016 Orion Poplawski <orion(a)cora.nwra.com> - 1:1.11.2-1 +- Update to 1.11.2 final + +* Thu Sep 15 2016 Jon Ciesla <limburgher(a)gmail.com> - 1:1.11.2-0.rc1 +- Update to 1.11.2rc1, BZ 1340440. + +* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:1.11.1-2 +-
https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Pa…
+ +* Tue Jun 28 2016 Orion Poplawski <orion(a)cora.nwra.com> - 1:1.11.1-1 +- Update to 1.11.1 final + +* Tue Jun 07 2016 Jon Ciesla <limburgher(a)gmail.com> - 1:1.11.1-0.rc1 +- Update to 1.11.1rc1, BZ 1340440. + +* Mon Mar 28 2016 Orion Poplawski <orion(a)cora.nwra.com> - 1:1.11.0-4 +- Update to 1.11.0 final + +* Wed Mar 23 2016 Orion Poplawski <orion(a)cora.nwra.com> - 1:1.11.0-3.rc2 +- Update to 1.11.0rc2 + +* Sun Mar 6 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 1:1.11.0-2.b3 +- Bump Release. 1b2 is higher than 0b3 + +* Wed Feb 10 2016 Jon Ciesla <limburgher(a)gmail.com> - 1:1.11.0-0.b3 +- Update to 1.11.0b2, BZ 1306249. + +* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.11.0-1b2 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+ +* Sun Jan 31 2016 Jon Ciesla <limburgher(a)gmail.com> - 1:1.11.0-0.b2 +- Update to 1.11.0b2, BZ 1303387. + +* Tue Jan 26 2016 Jon Ciesla <limburgher(a)gmail.com> - 1:1.11.0-020161016.cc2b04git +- Update to git snapshot (due to build issue) after 1.11.0b1, BZ 1301943. + +* Thu Jan 07 2016 Jon Ciesla <limburgher(a)gmail.com> - 1:1.10.4-1 +- Update to 1.10.4, BZ 1296509. + +* Tue Dec 15 2015 Jon Ciesla <limburgher(a)gmail.com> - 1:1.10.2-1 +- Update to 1.10.2, BZ 1291674. + +* Tue Dec 08 2015 Jon Ciesla <limburgher(a)gmail.com> - 1:1.10.2-0.2.rc2 +- Update to 1.10.2rc1, BZ 1289550. + +* Fri Nov 13 2015 Orion Poplawski <orion(a)cora.nwra.com> - 1:1.10.2-0.1.rc1 +- Update to 1.10.2rc1 +- Drop opt-flags patch applied upstream + +* Fri Nov 13 2015 Kalev Lember <klember(a)redhat.com> - 1:1.10.1-6 +- Add provides to satisfy numpy%%{_isa} requires in other packages + +* Thu Nov 12 2015 Orion Poplawski <orion(a)nwra.com> - 1:1.10.1-5 +- Re-add provides f2py + +* Thu Nov 12 2015 Kalev Lember <klember(a)redhat.com> - 1:1.10.1-4 +- Fix obsoletes / provides for numpy -> python2-numpy rename + +* Wed Oct 14 2015 Thomas Spura <tomspur(a)fedoraproject.org> - 1:1.10.1-3 +- Remove fortran flags or arm would build with -march=x86-64 + +* Wed Oct 14 2015 Thomas Spura <tomspur(a)fedoraproject.org> - 1:1.10.1-2 +- Provide python2-* packages +- Run tests with verbose=2 + +* Tue Oct 13 2015 Jon Ciesla <limburgher(a)gmail.com> - 1:1.10.1-1 +- Update to 1.10.1, BZ 1271022. + +* Tue Oct 13 2015 Robert Kuska <rkuska(a)redhat.com> - 1:1.10.0-2 +- Rebuilt for Python3.5 rebuild + +* Tue Oct 06 2015 Jon Ciesla <limburgher(a)gmail.com> - 1:1.10.0-1 +- Update to 1.10.0 final. + +* Wed Sep 02 2015 Jon Ciesla <limburgher(a)gmail.com> - 1:1.10.0-0.b1 +- Update to 1.10.0b1, BZ 1252641. + +* Thu Aug 13 2015 Orion Poplawski <orion(a)nwra.com> - 1:1.9.2-3 +- Add python2-numpy provides (bug #1249423) +- Spec cleanup + +* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:1.9.2-2 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+ +* Sun Mar 1 2015 Orion Poplawski <orion(a)nwra.com> - 1:1.9.2-1 +- Update to 1.9.2 + +* Tue Jan 6 2015 Orion Poplawski <orion(a)nwra.com> - 1:1.9.1-2 +- Add upstream patch to fix xerbla linkage (bug #1172834) + +* Tue Nov 04 2014 Jon Ciesla <limburgher(a)gmail.com> - 1:1.9.1-1 +- Update to 1.9.1, BZ 1160273. + +* Sun Sep 7 2014 Orion Poplawski <orion(a)nwra.com> - 1:1.9.0-1 +- Update to 1.9.0 + +* Wed Aug 27 2014 Orion Poplawski <orion(a)nwra.com> - 1:1.9.0-0.1.rc1 +- Update to 1.9.0rc1 + +* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:1.8.2-2 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ +* Sun Aug 10 2014 Orion Poplawski <orion(a)nwra.com> - 1:1.8.2-1 +- Update to 1.8.2 + +* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:1.8.1-4 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ +* Fri May 9 2014 Orion Poplawski <orion(a)nwra.com> - 1:1.8.1-3 +- Rebuild for Python 3.4 + +* Wed May 07 2014 Jaromir Capik <jcapik(a)redhat.com> - 1:1.8.1-2 +- Fixing FTBFS on ppc64le (#1078354) + +* Tue Mar 25 2014 Orion Poplawski <orion(a)nwra.com> - 1:1.8.1-1 +- Update to 1.8.1 + +* Tue Mar 4 2014 Orion Poplawski <orion(a)nwra.com> - 1:1.8.0-5 +- Fix __pycache__ ownership (bug #1072467) + +* Mon Feb 10 2014 Thomas Spura <tomspur(a)fedoraproject.org> - 1:1.8.0-4 +- Fix CVE-2014-1858, CVE-2014-1859: #1062009, #1062359 + +* Mon Nov 25 2013 Orion Poplawski <orion(a)nwra.com> - 1:1.8.0-3 +- Ship doc module (bug #1034357) + +* Wed Nov 6 2013 Orion Poplawski <orion(a)nwra.com> - 1:1.8.0-2 +- Move f2py documentation to f2py package (bug #1027394) + +* Wed Oct 30 2013 Orion Poplawski <orion(a)nwra.com> - 1:1.8.0-1 +- Update to 1.8.0 final + +* Mon Oct 14 2013 Orion Poplawski <orion(a)nwra.com> - 1:1.8.0-0.7.rc2 +- Update to 1.8.0rc2 +- Create clean site.cfg +- Use serial atlas + +* Mon Sep 23 2013 Orion Poplawski <orion(a)nwra.com> - 1:1.8.0-0.6.b2 +- Add [atlas] to site.cfg for new atlas library names + +* Sun Sep 22 2013 Orion Poplawski <orion(a)nwra.com> - 1:1.8.0-0.5.b2 +- Update site.cfg for new atlas library names + +* Sat Sep 21 2013 David Tardon <dtardon(a)redhat.com> - 1:1.8.0-0.4.b2 +- rebuild for atlas 3.10 + +* Tue Sep 10 2013 Jon Ciesla <limburgher(a)gmail.com> - 1:1.8.0-0.3.b2 +- Fix libdir path in site.cfg, BZ 1006242. + +* Sun Sep 8 2013 Orion Poplawski <orion(a)nwra.com> - 1:1.8.0-0.2.b2 +- Update to 1.8.0b2 + +* Wed Sep 4 2013 Orion Poplawski <orion(a)nwra.com> - 1:1.8.0-0.1.b1 +- Update to 1.8.0b1 +- Drop f2py patch applied upstream + +* Tue Aug 27 2013 Jon Ciesla <limburgher(a)gmail.com> - 1:1.7.1-5 +- URL Fix, BZ 1001337 + +* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:1.7.1-4 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ +* Tue Jul 30 2013 Tomas Tomecek <ttomecek(a)redhat.com> - 1:1.7.1-3 +- Fix rpmlint warnings +- Update License +- Apply patch: change shebang of f2py to use binary directly + +* Sun Jun 2 2013 Orion Poplawski <orion(a)nwra.com> - 1:1.7.1-2 +- Specfile cleanup (bug #969854) + +* Wed Apr 10 2013 Orion Poplawski <orion(a)nwra.com> - 1:1.7.1-1 +- Update to 1.7.1 + +* Sat Feb 9 2013 Orion Poplawski <orion(a)nwra.com> - 1:1.7.0-1 +- Update to 1.7.0 final + +* Sun Dec 30 2012 Orion Poplawski <orion(a)nwra.com> - 1:1.7.0-0.5.rc1 +- Update to 1.7.0rc1 + +* Thu Sep 20 2012 Orion Poplawski <orion(a)nwra.com> - 1:1.7.0-0.4.b2 +- Update to 1.7.0b2 +- Drop patches applied upstream + +* Wed Aug 22 2012 Orion Poplawski <orion(a)nwra.com> - 1:1.7.0-0.3.b1 +- Add patch from github pull 371 to fix python 3.3 pickle issue +- Remove cython .c source regeneration - fails now + +* Wed Aug 22 2012 Orion Poplawski <orion(a)nwra.com> - 1:1.7.0-0.2.b1 +- add workaround for rhbz#849713 (fixes FTBFS) + +* Tue Aug 21 2012 Orion Poplawski <orion(a)cora.nwra.com> - 1:1.7.0-0.1.b1 +- Update to 1.7.0b1 +- Rebase python 3.3 patchs to current git master +- Drop patches applied upstream + +* Sun Aug 5 2012 David Malcolm <dmalcolm(a)redhat.com> - 1:1.6.2-5 +- rework patches for 3.3 to more directly reflect upstream's commits +- re-enable test suite on python 3 +- forcibly regenerate Cython .c source to avoid import issues on Python 3.3 + +* Sun Aug 5 2012 Thomas Spura <tomspur(a)fedoraproject.org> - 1:1.6.2-4 +- rebuild for
https://fedoraproject.org/wiki/Features/Python_3.3
+- needs unicode patch + +* Fri Aug 3 2012 David Malcolm <dmalcolm(a)redhat.com> - 1:1.6.2-3 +- remove rhel logic from with_python3 conditional + +* Fri Jul 20 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:1.6.2-2 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ +* Sun May 20 2012 Orion Poplawski <orion(a)cora.nwra.com> - 1:1.6.2-1 +- Update to 1.6.2 final + +* Sat May 12 2012 Orion Poplawski <orion(a)cora.nwra.com> - 1:1.6.2rc1-0.1 +- Update to 1.6.2rc1 + +* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:1.6.1-2 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ +* Mon Nov 7 2011 Orion Poplawski <orion(a)cora.nwra.com> - 1:1.6.1-1 +- Update to 1.6.1 + +* Fri Jun 17 2011 Jon Ciesla <limb(a)jcomserv.net> - 1:1.6.0-2 +- Bump and rebuild for BZ 712251. + +* Mon May 16 2011 Orion Poplawski <orion(a)cora.nwra.com> - 1:1.6.0-1 +- Update to 1.6.0 final + +* Mon Apr 4 2011 Orion Poplawski <orion(a)cora.nwra.com> - 1:1.6.0-0.2.b2 +- Update to 1.6.0b2 +- Drop import patch fixed upstream + +* Thu Mar 31 2011 Orion Poplawski <orion(a)cora.nwra.com> - 1:1.6.0-0.1.b1 +- Update to 1.6.0b1 +- Build python3 module with python3 +- Add patch from upstream to fix build time import error + +* Wed Mar 30 2011 Orion Poplawski <orion(a)cora.nwra.com> - 1:1.5.1-1 +- Update to 1.5.1 final + +* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:1.5.1-0.4 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ +* Thu Jan 13 2011 Dan Hork <dan[at]danny.cz> - 1:1.5.1-0.3 +- fix the AttributeError during tests +- fix build on s390(x) + +* Wed Dec 29 2010 David Malcolm <dmalcolm(a)redhat.com> - 1:1.5.1-0.2 +- rebuild for newer python3 + +* Wed Oct 27 2010 Thomas Spura <tomspur(a)fedoraproject.org> - 1:1.5.1-0.1 +- update to 1.5.1rc1 +- add python3 subpackage +- some spec-cleanups + +* Thu Jul 22 2010 David Malcolm <dmalcolm(a)redhat.com> - 1:1.4.1-6 +- actually add the patch this time + +* Thu Jul 22 2010 David Malcolm <dmalcolm(a)redhat.com> - 1:1.4.1-5 +- fix segfault within %%check on 2.7 (patch 2) + +* Wed Jul 21 2010 David Malcolm <dmalcolm(a)redhat.com> - 1:1.4.1-4 +- Rebuilt for
https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+ +* Sun Jul 18 2010 Dan Hork <dan[at]danny.cz> 1.4.1-3 +- ignore the "Ticket #1299 second test" failure on s390(x) + +* Thu Jun 24 2010 Jef Spaleta <jspaleta(a)fedoraprject.org> 1.4.1-2 +- source commit fix + +* Thu Jun 24 2010 Jef Spaleta <jspaleta(a)fedoraprject.org> 1.4.1-1 +- New upstream release. Include backported doublefree patch + +* Mon Apr 26 2010 Jon Ciesla <limb(a)jcomserv.net> 1.3.0-8 +- Moved distutils back to the main package, BZ 572820. + +* Thu Apr 08 2010 Jon Ciesla <limb(a)jcomserv.net> 1.3.0-7 +- Reverted to 1.3.0 after upstream pulled 1.4.0, BZ 579065. + +* Tue Mar 02 2010 Jon Ciesla <limb(a)jcomserv.net> 1.4.0-5 +- Linking /usr/include/numpy to .h files, BZ 185079. + +* Tue Feb 16 2010 Jon Ciesla <limb(a)jcomserv.net> 1.4.0-4 +- Re-enabling atlas BR, dropping lapack Requires. + +* Wed Feb 10 2010 Jon Ciesla <limb(a)jcomserv.net> 1.4.0-3 +- Since the previous didn't work, Requiring lapack. + +* Tue Feb 09 2010 Jon Ciesla <limb(a)jcomserv.net> 1.4.0-2 +- Temporarily dropping atlas BR to work around 562577. + +* Fri Jan 22 2010 Jon Ciesla <limb(a)jcomserv.net> 1.4.0-1 +- 1.4.0. +- Dropped ARM patch, ARM support added upstream. + +* Tue Nov 17 2009 Jitesh Shah <jiteshs(a)marvell.com> - 1.3.0-6.fa1 +- Add ARM support + +* Sat Jul 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.0-6 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+ +* Thu Jun 11 2009 Jon Ciesla <limb(a)jcomserv.net> 1.3.0-5 +- Fixed atlas BR, BZ 505376. + +* Fri Apr 17 2009 Jon Ciesla <limb(a)jcomserv.net> 1.3.0-4 +- EVR bump for pygame chainbuild. + +* Fri Apr 17 2009 Jon Ciesla <limb(a)jcomserv.net> 1.3.0-3 +- Moved linalg, fft back to main package. + +* Tue Apr 14 2009 Jon Ciesla <limb(a)jcomserv.net> 1.3.0-2 +- Split out f2py into subpackage, thanks Peter Robinson pbrobinson(a)gmail.com. + +* Tue Apr 07 2009 Jon Ciesla <limb(a)jcomserv.net> 1.3.0-1 +- Update to latest upstream. +- Fixed Source0 URL. + +* Thu Apr 02 2009 Jon Ciesla <limb(a)jcomserv.net> 1.3.0-0.rc1 +- Update to latest upstream. + +* Thu Mar 05 2009 Jon Ciesla <limb(a)jcomserv.net> 1.2.1-3 +- Require python-devel, BZ 488464. + +* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.1-2 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+ +* Fri Dec 19 2008 Jon Ciesla <limb(a)jcomserv.net> 1.2.1-1 +- Update to 1.2.1. + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm(a)gmail.com> - 1.2.0-2 +- Rebuild for Python 2.6 + +* Tue Oct 07 2008 Jon Ciesla <limb(a)jcomserv.net> 1.2.0-1 +- New upstream release, added python-nose BR. BZ 465999. +- Using atlas blas, not blas-devel. BZ 461472. + +* Wed Aug 06 2008 Jon Ciesla <limb(a)jcomserv.net> 1.1.1-1 +- New upstream release + +* Thu May 29 2008 Jarod Wilson <jwilson(a)redhat.com> 1.1.0-1 +- New upstream release + +* Tue May 06 2008 Jarod Wilson <jwilson(a)redhat.com> 1.0.4-1 +- New upstream release + +* Mon Feb 11 2008 Jarod Wilson <jwilson(a)redhat.com> 1.0.3.1-2 +- Add python egg to %%files on f9+ + +* Wed Aug 22 2007 Jarod Wilson <jwilson(a)redhat.com> 1.0.3.1-1 +- New upstream release + +* Wed Jun 06 2007 Jarod Wilson <jwilson(a)redhat.com> 1.0.3-1 +- New upstream release + +* Mon May 14 2007 Jarod Wilson <jwilson(a)redhat.com> 1.0.2-2 +- Drop BR: atlas-devel, since it just provides binary-compat + blas and lapack libs. Atlas can still be optionally used + at runtime. (Note: this is all per the atlas maintainer). + +* Mon May 14 2007 Jarod Wilson <jwilson(a)redhat.com> 1.0.2-1 +- New upstream release + +* Tue Apr 17 2007 Jarod Wilson <jwilson(a)redhat.com> 1.0.1-4 +- Update gfortran patch to recognize latest gfortran f95 support +- Resolves rhbz#236444 + +* Fri Feb 23 2007 Jarod Wilson <jwilson(a)redhat.com> 1.0.1-3 +- Fix up cpuinfo bug (#229753). Upstream bug/change: +
http://projects.scipy.org/scipy/scipy/ticket/349
+ +* Thu Jan 04 2007 Jarod Wilson <jwilson(a)redhat.com> 1.0.1-2 +- Per discussion w/Jose Matos, Obsolete/Provide f2py, as the + stand-alone one is no longer supported/maintained upstream + +* Wed Dec 13 2006 Jarod Wilson <jwilson(a)redhat.com> 1.0.1-1 +- New upstream release + +* Tue Dec 12 2006 Jarod Wilson <jwilson(a)redhat.com> 1.0-2 +- Rebuild for python 2.5 + +* Wed Oct 25 2006 Jarod Wilson <jwilson(a)redhat.com> 1.0-1 +- New upstream release + +* Wed Sep 06 2006 Jarod Wilson <jwilson(a)redhat.com> 0.9.8-1 +- New upstream release + +* Wed Apr 26 2006 Ignacio Vazquez-Abrams <ivazquez(a)ivazquez.net> 0.9.6-1 +- Upstream update + +* Thu Feb 16 2006 Ignacio Vazquez-Abrams <ivazquez(a)ivazquez.net> 0.9.5-1 +- Upstream update + +* Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez(a)ivazquez.net> 0.9.4-2 +- Rebuild for Fedora Extras 5 + +* Thu Feb 2 2006 Ignacio Vazquez-Abrams <ivazquez(a)ivazquez.net> 0.9.4-1 +- Initial RPM release +- Added gfortran patch from Neal Becker diff --git a/sources b/sources new file mode 100644 index 0000000..92da382 --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (numpy-1.16.4.tar.gz) = 427897a9e28a7e7648ebb0df8897a31c358fc5941773a120a534af6375d5963298f283185f36a7ac1c1e2b3511d2ba03d0779438acc849e1cf654f1454fc3c02 +SHA512 (numpy-html-1.16.1.zip) = 5af356313363e00f05db560902cc7578162c7d2ab9c1ef0f3713854682b63d76297d55eb9aac0dfc7f4b687ccea93a53462e2082ef1270e29e19680e1222b34d
1
0
0
0
← Newer
1
2
3
4
...
33
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
Results per page:
10
25
50
100
200