Architecture specific change in rpms/plplot.git
by githook-noreply@fedoraproject.org
The package rpms/plplot.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/plplot.git/commit/?id=54b8b5ce8e0....
Change:
+%ifarch s390x
Thanks.
Full change:
============
commit 54b8b5ce8e0f5c2ce448d827b5612587c6f570af
Author: Orion Poplawski <orion(a)nwra.com>
Date: Thu Sep 19 21:38:20 2019 -0600
Drop octave and itcl for EPEL8
Drop perl dummy package
diff --git a/plplot.spec b/plplot.spec
index f12d6ab..3c8c30b 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -2,15 +2,13 @@
# Set to bcond_with or use --without doc to disable doc build
%bcond_without doc
# Set to bcond_with or use --without octave to disable octave support
-%if 0%{?el7}
+%if 0%{?el7}%{?el8}
# EL7 has too old of a swig - https://bugzilla.redhat.com/show_bug.cgi?id=1136487
+# EL8 has too old of a swig - https://bugzilla.redhat.com/show_bug.cgi?id=1753475
%bcond_with octave
%else
%bcond_without octave
%endif
-# Set to bcond_with or use --without pdl to disable pdl tests - needed to
-# bootstrap or for soname bumps in a plplot dependency
-%bcond_with pdl
# conditionalize Ada support
%ifnarch %{GNAT_arches}
@@ -31,11 +29,29 @@
%endif
%endif
+# Let's drop itcl for EPEL8
+%if 0%{?rhel} >= 8
+%bcond_with itcl
+%else
+%bcond_without itcl
+%endif
+
+#RHEL8 does not have X on s390x
+%ifarch s390x
+%if 0%{?el8}
+%bcond_with check
+%else
+%bcond_without check
+%endif
+%else
+%bcond_without check
+%endif
+
%global commit 48a56ee63d25d24eeb44f392025953a6e9cc6b3f
Name: plplot
Version: 5.14.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Library of functions for making scientific plots
License: LGPLv2+
@@ -72,23 +88,29 @@ Obsoletes: %{name}-octave < %{version}-%{release}
BuildRequires: java-devel
BuildRequires: freetype-devel, qhull-devel , ncurses-devel
BuildRequires: gd-devel, tcl-devel, tk-devel
+%if %{with itcl}
BuildRequires: itcl-devel, itk-devel
BuildRequires: iwidgets
+%endif
BuildRequires: python3-devel, python3-numpy
BuildRequires: perl(XML::DOM), lasi-devel, wxGTK3-devel
BuildRequires: gnu-free-mono-fonts
BuildRequires: gnu-free-sans-fonts
BuildRequires: gnu-free-serif-fonts
-%if %{with pdl}
-BuildRequires: perl(PDL::Graphics::PLplot)
-%endif
%if %{with doc}
BuildRequires: docbook2X
BuildRequires: doxygen
+%if 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} <= 7 )
BuildRequires: fop
+%endif
BuildRequires: texlive-xmltex
BuildRequires: tex(ulem.sty)
+# RHEL8 does not ship xmlto-tex
+%if 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} <= 7 )
BuildRequires: xmlto-tex
+%else
+BuildRequires: xmlto
+%endif
%endif
%if %{with ocaml}
BuildRequires: ocaml
@@ -96,7 +118,9 @@ BuildRequires: ocaml
# BuildRequires: ocaml-cairo-devel
BuildRequires: ocaml-camlidl-devel
BuildRequires: ocaml-findlib
+%if ! ( 0%{?rhel} >= 8 )
BuildRequires: ocaml-lablgtk-devel
+%endif
BuildRequires: ocaml-ocamldoc
%endif
BuildRequires: libharu-devel
@@ -106,8 +130,10 @@ BuildRequires: qt5-devel
BuildRequires: python3-qt5-devel
BuildRequires: shapelib-devel
# For %check
+%if %{with check}
BuildRequires: xorg-x11-drv-dummy
BuildRequires: mesa-dri-drivers
+%endif
BuildRequires: chrpath
Requires: gnu-free-mono-fonts
Requires: gnu-free-sans-fonts
@@ -143,6 +169,7 @@ the png and jpeg drivers that uses the Freetype library.
%package libs
Summary: Libraries for PLplot
Requires: %{name}-data = %{version}-%{release}
+Obsoletes: %{name}-perl < 5.14.0-8
%description libs
%{summary}.
@@ -273,18 +300,6 @@ Requires: octave(api) = %{octave_api}
%endif
-%package perl
-Summary: Examples for using plplot with PDL
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description perl
-%if %{with pdl}
-%{summary}.
-%else
-This is a dummy package, since pdl support was not enabled in the plplot build.
-%endif
-
-
%package pyqt
Summary: Functions for scientific plotting with PyQt
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -371,23 +386,30 @@ unset TERM
printenv
# We assume that tk version is the same as tcl, cannot check without DISPLAY
tkver=$(echo 'puts [info patchlevel]; exit' | tclsh)
+%if %{with itcl}
# Hacks to determine versions without DISPLAY
itclver=$(echo %{_libdir}/libitcl*.so | sed -e 's/.*itcl\([0-9.]*\)\.so/\1/')
itkver=$(echo %{_libdir}/libitk*.so | sed -e 's/.*itk\([0-9.]*\)\.so/\1/')
iwidgetsver=$(echo %{_datadir}/tcl*/iwidgets* | sed -e 's/.*iwidgets//')
+%endif
%cmake .. \
-DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
-DFORTRAN_MOD_DIR:PATH=%{_fmoddir} \
-DUSE_RPATH:BOOL=OFF \
-DENABLE_ada:BOOL=ON \
-DENABLE_d:BOOL=ON \
+%if %{with itcl}
-DENABLE_itcl:BOOL=ON \
-DENABLE_itk:BOOL=ON \
+ -DPLPLOT_ITCL_VERSION=$itclver \
+ -DPLPLOT_ITK_VERSION=$itkver \
+ -DIWIDGETS_VERSIONS_LIST:STRING="$iwidgetsver;$itkver;$itclver" \
+ -DUSE_INCRTCL_VERSION_4:BOOL=ON \
+%endif
-DENABLE_lua:BOOL=ON \
-DENABLE_ocaml:BOOL=ON \
-DOCAML_INSTALL_DIR:PATH=`ocamlc -where` \
%{build_octave} \
- -DENABLE_pdl:BOOL=ON \
-DENABLE_tk:BOOL=ON \
-DJAVAWRAPPER_DIR:PATH="%{_libdir}/plplot%{version}" \
-DNON_TRANSITIVE:BOOL=ON \
@@ -398,16 +420,11 @@ iwidgetsver=$(echo %{_datadir}/tcl*/iwidgets* | sed -e 's/.*iwidgets//')
-DPLD_svg:BOOL=ON \
-DPLD_wxwidgets:BOOL=ON \
-DPLPLOT_TK_VERSION=$tkver \
- -DPLPLOT_ITCL_VERSION=$itclver \
- -DPLPLOT_ITK_VERSION=$itkver \
- -DIWIDGETS_VERSIONS_LIST:STRING="$iwidgetsver;$itkver;$itclver" \
-DPLPLOT_USE_QT5=ON \
- -DUSE_INCRTCL_VERSION_4:BOOL=ON \
%if %{with doc}
-DXML_DECL:FILEPATH=/usr/share/sgml/xml.dcl \
-DBUILD_DOC:BOOL=ON \
-DBUILD_DOX_DOC:BOOL=ON \
- -DBUILD_DVI:BOOL=OFF \
%else
-DPREBUILT_DOC:BOOL=ON \
%endif
@@ -437,6 +454,7 @@ chrpath -d $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dllpl*_stubs.so
%endif
+%if %{with check}
%check
cd fedora
cp %SOURCE1 .
@@ -460,6 +478,7 @@ ctest -V -E 'octave'
ctest -V -R 'octave' || :
%endif
%endif
+%endif
%files
@@ -602,7 +621,7 @@ ctest -V -R 'octave' || :
%doc %{_datadir}/plplot%{version}/examples/test_java.sh
%files lua
-%if 0%{?fedora} >= 29
+%if 0%{?fedora} || 0%{?rhel} >= 8
%{_libdir}/lua/plplot/
%else
%{_libdir}/lua/*/plplot/
@@ -644,12 +663,6 @@ ctest -V -R 'octave' || :
%doc %{_datadir}/plplot%{version}/examples/test_octave_interactive.sh
%endif
-%files perl
-%if %{with pdl}
-%doc %{_datadir}/plplot%{version}/examples/perl/
-%doc %{_datadir}/plplot%{version}/examples/test_pdl.sh
-%endif
-
%files pyqt
%{python3_sitearch}/plplot_pyqt5.so
@@ -708,6 +721,10 @@ ctest -V -R 'octave' || :
%changelog
+* Thu Sep 19 2019 Orion Poplawski <orion(a)nwra.com> - 5.14.0-8
+- Drop octave and itcl for EPEL8
+- Drop perl dummy package
+
* Mon Aug 19 2019 Miro Hronok <mhroncok(a)redhat.com> - 5.14.0-7
- Rebuilt for Python 3.8
4 years, 7 months
Architecture specific change in rpms/llvm.git
by githook-noreply@fedoraproject.org
The package rpms/llvm.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/llvm.git/commit/?id=6f02bbba2fd09....
Change:
+%ifnarch s390 s390x
Thanks.
Full change:
============
commit 6f02bbba2fd097d743cd5d641e1fcfd4165cd1a6
Author: serge-sans-paille <sguelton(a)redhat.com>
Date: Thu Sep 19 00:37:59 2019 +0000
Support avr target, see rhbz#1718492
diff --git a/llvm.spec b/llvm.spec
index 47976e8..38b986a 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -14,7 +14,7 @@
%global min_ver 0
%global patch_ver 0
%global rc_ver 3
-%global baserelease 0.4
+%global baserelease 0.5
%if %{with compat_build}
@@ -201,6 +201,9 @@ cd _build
%if %{with gold}
-DLLVM_BINUTILS_INCDIR=%{_includedir} \
%endif
+%ifnarch s390 s390x
+ -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=AVR \
+%endif
\
-DLLVM_BUILD_RUNTIME:BOOL=ON \
\
@@ -474,6 +477,9 @@ fi
%endif
%changelog
+* Wed Sep 18 2019 sguelton(a)redhat.com - 9.0.0-0.5.rc3
+- Support avr target, see rhbz#1718492
+
* Tue Sep 10 2019 Tom Stellard <tstellar(a)redhat.com> - 9.0.0-0.4.rc3
- Split out test executables into their own export file
4 years, 7 months
Architecture specific change in rpms/monitor-edid.git
by githook-noreply@fedoraproject.org
The package rpms/monitor-edid.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/monitor-edid.git/commit/?id=68f12....
Change:
+%ifarch %{ix86} x86_64
Thanks.
Full change:
============
commit 68f1282870ab7603168439fded08cac117e08929
Author: Pat Riehecky <riehecky(a)fnal.gov>
Date: Thu Sep 19 11:23:03 2019 -0500
Add to Fedora 31
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 7d2c928..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: monitor-edid
-# $Id$
-NAME := monitor-edid
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/monitor-edid-Makefile.patch b/monitor-edid-Makefile.patch
new file mode 100644
index 0000000..6886a80
--- /dev/null
+++ b/monitor-edid-Makefile.patch
@@ -0,0 +1,13 @@
+--- a/Makefile 2019-08-20 14:22:17.158034121 -0500
++++ b/Makefile 2019-08-20 14:26:50.731987080 -0500
+@@ -26,8 +26,8 @@ ifdef HAS_VBE
+ TARGETS += monitor-get-edid-using-vbe
+ endif
+
+-CPPFLAGS = -I.
+-CFLAGS = -O -Wall -g
++CPPFLAGS := -I. $(CPPFLAGS)
++CFLAGS := -O -Wall -g $(CFLAGS)
+ OBJS = monitor-get-edid-using-vbe.c vbe.o
+
+ monitor-get-edid-using-vbe: LDFLAGS += -lx86
diff --git a/monitor-edid-uintptr_t.patch b/monitor-edid-uintptr_t.patch
new file mode 100644
index 0000000..aade472
--- /dev/null
+++ b/monitor-edid-uintptr_t.patch
@@ -0,0 +1,10 @@
+--- a/vbe.c 2019-08-20 08:24:00.010213898 -0500
++++ b/vbe.c 2019-08-20 08:24:15.793920339 -0500
+@@ -8,6 +8,7 @@
+ #include <string.h>
+ #include <stdarg.h>
+ #include <stdio.h>
++#include <stdint.h> /* for uintptr_t */
+ #include <assert.h>
+ #include <limits.h>
+ #include <ctype.h>
diff --git a/monitor-edid.spec b/monitor-edid.spec
new file mode 100644
index 0000000..9aa704a
--- /dev/null
+++ b/monitor-edid.spec
@@ -0,0 +1,259 @@
+Name: monitor-edid
+Summary: Tool for probing and parsing monitor EDID
+
+License: GPLv3+
+Url: http://gitweb.mageia.org/software/monitor-edid/
+
+Version: 3.2
+Release: 1%{?dist}
+
+Source0: https://gitweb.mageia.org/software/monitor-edid/snapshot/refs/tags/v%{ver...
+
+# Fix Makefile to permit RPM CFLAGS
+Patch000: monitor-edid-Makefile.patch
+
+# uintptr_t now in stdint.h, this patch is upstream.
+Patch001: monitor-edid-uintptr_t.patch
+
+BuildRequires: coreutils
+BuildRequires: make
+BuildRequires: sed
+
+BuildRequires: perl-generators
+
+# for tests
+BuildRequires: perl(Data::Dumper)
+BuildRequires: perl(Getopt::Long)
+BuildRequires: perl(Parse::EDID)
+
+%ifarch %{ix86} x86_64
+BuildRequires: libx86-devel
+BuildRequires: gcc
+%else
+# not binary on non x86 arches
+%global debug_package %{nil}
+%endif
+
+%description
+Monitor-edid is a tool for probing and parsing Extended display
+identification data (EDID) from monitors.
+
+For more information about EDID, see http://en.wikipedia.org/wiki/EDID
+
+
+%prep
+%autosetup -n refs/tags/v%{version}
+
+
+%build
+# Use default build flags
+%set_build_flags
+
+# Remove -Wl,--as-needed from LDFLAGS as that is not compatible with libx86
+LDFLAGS=$(echo ${LDFLAGS} | sed -e 's/-Wl,--as-needed//')
+export LDFLAGS
+
+%make_build
+
+
+%install
+%make_install
+
+
+%check
+cd test
+# see https://bugs.mageia.org/show_bug.cgi?id=25334
+#make new_MonitorsDB
+make all
+
+
+%files
+%doc README NEWS ChangeLog
+%license COPYING
+%{_bindir}/monitor-parse-edid
+%{_sbindir}/monitor-edid
+%{_sbindir}/monitor-get*
+
+# Mandriva specific scripts (requires lspcidrake)
+%exclude %{_sbindir}/monitor-probe*
+
+
+%changelog
+* Mon Aug 19 2019 Pat Riehecky <riehecky(a)fnal.gov - 3.2-1
+- Change URL from http://wiki.mandriva.com/en/Tools/monitor-edid
+- Update to v3.2
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Jul 18 2013 Petr Pisar <ppisar(a)redhat.com> - 3.0-7
+- Perl 5.18 rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Jan 06 2011 Remi Collet <Fedora(a)famillecollet.com> 3.0-2
+- remove mandriva specific scripts (#667568)
+
+* Sat Feb 13 2010 Remi Collet <Fedora(a)famillecollet.com> 3.0-1
+- update to new upstream version
+- switch from lrmi to libx86
+
+* Sun Oct 25 2009 Remi Collet <Fedora(a)famillecollet.com> 2.5-1
+- new version
+- bundle lrmi (not available on EL)
+
+* Sat Oct 17 2009 Remi Collet <Fedora(a)famillecollet.com> 2.4-1
+- new version
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Apr 08 2008 Remi Collet <Fedora(a)famillecollet.com> 2.0-1
+- new version
+
+* Mon Apr 07 2008 Remi Collet <Fedora(a)famillecollet.com> 1.16-5
+- lrmi not available on EL
+
+* Sun Apr 06 2008 Remi Collet <Fedora(a)famillecollet.com> 1.16-4
+- use system lrmi on ix86 (From Ville Skytt)
+
+* Mon Mar 17 2008 Remi Collet <Fedora(a)famillecollet.com> 1.16-3
+- fix license again
+
+* Sun Mar 16 2008 Remi Collet <Fedora(a)famillecollet.com> 1.16-2
+- From review : clean + fix license
+
+* Sun Mar 16 2008 Remi Collet <Fedora(a)famillecollet.com> 1.16-1
+- initial spec for Fedora review
+
+* Mon Mar 10 2008 Pixel <pixel(a)mandriva.com> 1.16-1mdv2008.1
++ Revision: 183268
+- update URL
+- 1.16:
+- do not install monitor-get-edid-using-vbe on archs where VBE is not
+ available (Remi Collet)
+
+* Sun Mar 9 2008 Remi Collet <rpms(a)famillecollet.com> 1.15-1.fc#.remi
+- build for Fedora
+
+* Wed Jan 23 2008 Pixel <pixel(a)mandriva.com> 1.15-1mdv2008.1
++ Revision: 157016
+- 1.15:
+- monitor-probe:
+ o probe "using DMI" before "using X"
+- monitor-probe-using-X:
+ o in last resort, get Intel BIOS mode when "BIOS panel mode is bigger than
+ probed programmed mode"
+
+* Thu Jan 10 2008 Pixel <pixel(a)mandriva.com> 1.14-1mdv2008.1
++ Revision: 147502
+- 1.14:
+- monitor-edid, monitor-get-edid:
+ o call monitor-get-edid-using-vbe with a range of ports, it stops on first
+ success (by default it tries port 0 then port 1)
+
+* Tue Jan 08 2008 Pixel <pixel(a)mandriva.com> 1.13-1mdv2008.1
++ Revision: 146846
+- 1.13:
+- monitor-get-edid:
+ o skip /proc/acpi/video/**/EDID files which can't be valid (#34417)
+ o minimal support for getting EDID from different DDC port
+ (experimental, need testing before using it in monitor-edid)
+
+ + Olivier Blin <oblin(a)mandriva.com>
+ - restore BuildRoot
+
+ + Thierry Vignaud <tvignaud(a)mandriva.com>
+ - kill re-definition of %%buildroot on Pixel's request
+
+* Sat Dec 15 2007 Remi Collet <rpms(a)famillecollet.com> 1.11-1.fc8.remi
+- build for Fedora 8
+
+* Wed Sep 26 2007 Pixel <pixel(a)mandriva.com> 1.12-1mdv2008.0
++ Revision: 93044
+- use make install
+- 1.12:
+- monitor-probe-using-X:
+ o when an EDID is found in Xorg.log, pass it to monitor-parse-edid
+ o handle --perl option (passed to monitor-parse-edid)
+
+* Fri Mar 30 2007 Remi Collet <rpms(a)famillecollet.com> 1.11-1
+- build for Fedora 3-6 and RedHat EL 2-5
+
+* Thu Aug 31 2006 Gwenole Beauchesne <gbeauchesne(a)mandriva.com> 1.11-1mdv2007.0
+- fix ballback to old get_edid() function
+- ignore VBIOS checksum failures, use CPU emulator in that case
+
+* Tue Jul 11 2006 Pixel <pixel(a)mandriva.com> 1.10-1mdv2007.0
+- use a fixed FontPath (do not default to unix:-1 in case xfs is not running)
+
+* Wed Jun 07 2006 Per yvind Karlsen <pkarlsen(a)mandriva.com> 1.9-5mdv2007.0
+- do not build on sparc
+- build with $RPM_OPT_FLAGS
+- do parallell build
+- cosmetics
+
+* Wed May 10 2006 Pixel <pixel(a)mandriva.com> 1.9-4mdk
+- fix a segfault occuring on some boxes in monitor-get-edid-using-vbe,
+ when using try-in-console
+
+* Fri Mar 10 2006 Pixel <pixel(a)mandriva.com> 1.9-3mdk
+- set url to wiki page instead of the cvs
+
+* Fri Jan 6 2006 Pixel <pixel(a)mandriva.com> 1.9-2mdk
+- add missing monitor-get-edid
+
+* Thu Jan 5 2006 Pixel <pixel(a)mandriva.com> 1.9-1mdk
+- monitor-get-edid is now a perl script able to probe /proc/acpi/video
+ (or /proc/device-tree on PPC)
+- binary monitor-get-edid is now monitor-get-edid-using-vbe
+- monitor-edid is able to get more than one head
+
+* Mon Aug 8 2005 Pixel <pixel(a)mandriva.com> 1.5-1mdk
+- add option --try-in-console when probing edid
+ since probing edid sometimes only work in console
+- use this option by default in monitor-probe
+
+* Wed Apr 6 2005 Pixel <pixel(a)mandrakesoft.com> 1.4-1mdk
+- default on old lrmi code to get ddc via int10
+- fix build on vesa-cvt
+
+* Fri Mar 25 2005 Pixel <pixel(a)mandrakesoft.com> 1.3-1mdk
+- added vesa-cvt (allowing to compute reduced-blanking timings)
+
+* Thu Mar 17 2005 Pixel <pixel(a)mandrakesoft.com> 1.2-1mdk
+- new release (added monitor-probe and monitor-probe-using-X)
+
+* Tue Mar 8 2005 Pixel <pixel(a)mandrakesoft.com> 1.1-1mdk
+- new release
+
+* Wed Feb 23 2005 Pixel <pixel(a)mandrakesoft.com> 1.0-1mdk
+- first package
diff --git a/sources b/sources
index e69de29..892418d 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (monitor-edid-3.2.tar.gz) = 9d4ab8fc80465ea9645d0769562f3997d8a1a4384c9a0252d955ee5f69f88aec525eea9d89b5453e562366160e751d5190758d205e6d8b030e6b19b536d48451
4 years, 7 months
Architecture specific change in rpms/python-cassandra-driver.git
by githook-noreply@fedoraproject.org
The package rpms/python-cassandra-driver.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/python-cassandra-driver.git/commi....
Change:
-%ifarch s390x
Thanks.
Full change:
============
commit 1d5a82c3f0155f292f037c63e4557df07a2f82c6
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Thu Sep 19 15:36:36 2019 +0200
Drop python2 test deps
diff --git a/python-cassandra-driver.spec b/python-cassandra-driver.spec
index 5259dd3..ab254a9 100644
--- a/python-cassandra-driver.spec
+++ b/python-cassandra-driver.spec
@@ -22,7 +22,7 @@ Cassandra's binary protocol and Cassandra Query Language v3.\
Name: python-%{pypi_name}
Version: 3.19.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Python driver for Apache Cassandra
License: ASL 2.0
URL: https://github.com/datastax/%{srcname}
@@ -32,14 +32,7 @@ BuildRequires: gcc
BuildRequires: libev
BuildRequires: libev-devel
-BuildRequires: python2-futures
BuildRequires: python2-devel
-BuildRequires: python2-scales
-BuildRequires: python2-blist
-BuildRequires: python2-mock
-BuildRequires: python2-sure
-BuildRequires: python2-packaging
-BuildRequires: python2-eventlet
%if 0%{?fedora}
BuildRequires: python2-Cython
@@ -144,17 +137,6 @@ chmod 0755 %{buildroot}%{python3_sitearch}/%{modname}/{io/,}*.so || :
# Just running the unit tests. Integration tests need ccm and cassandra
# running (neither shipped with Fedora)
%if 0%{?with_tests}
-%{__python2} -m nose tests/unit/ \
-%ifarch ppc64
--e test_murmur3_python
-%endif # ifarch
-%ifarch aarch64
--e test_nts_token_performance
-%endif # ifarch
-%ifarch s390x
--e test_murmur3_python -e test_multi_timer_validation -e test_nts_token_performance
-%endif # ifarch
-
%if 0%{?with_python3}
%{__python3} -m nose tests/unit/ \
%ifarch ppc64
@@ -192,6 +174,9 @@ chmod 0755 %{buildroot}%{python3_sitearch}/%{modname}/{io/,}*.so || :
%endif
%changelog
+* Thu Sep 19 2019 Miro Hronok <mhroncok(a)redhat.com> - 3.19.0-2
+- Drop python2 test deps
+
* Fri Aug 30 2019 Lumr Balhar <lbalhar(a)redhat.com> - 3.19.0-1
- New upstream version 3.19.0
4 years, 7 months
Architecture specific change in rpms/kata-osbuilder.git
by githook-noreply@fedoraproject.org
The package rpms/kata-osbuilder.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/kata-osbuilder.git/commit/?id=e34....
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit b90c1c4372094a8d06a89214a40c1fd741c60961
Author: Cole Robinson <crobinso(a)redhat.com>
Date: Thu Sep 19 08:41:11 2019 -0400
Drop unused local README.md
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
diff --git a/README.md b/README.md
deleted file mode 100644
index 6bb3104..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# kata-osbuilder
-
-The kata-osbuilder package
\ No newline at end of file
commit b9d56359cf4007a4a8fc152b51ad9957c90f5b05
Author: Cole Robinson <crobinso(a)redhat.com>
Date: Thu Sep 19 08:40:40 2019 -0400
sources: Drop old osbuilder archive
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
diff --git a/sources b/sources
index 6ebeec0..b9d2011 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (osbuilder-72c5f6a.tar.gz) = 856d621017e715107488a81b7cd67762f2f1d8db5984fdf4f799e3c154ca38bd1af47730e58a69614df9cd97bfab1a8f1ee085d28b71d5a5ca9e54aa0f079101
SHA512 (osbuilder-4287ba6.tar.gz) = 2b9a6079e2a2cc2fbfa6e25705353d45906e093780323cae00b61aadb6ab3c47c7d54751e2ef82d1b4be82ed8cfd7bd428c9a097de6a5c2957ac014f3a68a2c1
SHA512 (agent-8d682c4.tar.gz) = 16706946878923b7e772902ef1d1d02a59827717535066d8d174b9bea2fca9885e9baee9b578fe1cb4ca68f9fd1615870cd93d61b11b81fc2355cc70f104f0dc
commit 64292bc7265fa0d4cfc98792be906590aee54e17
Author: Cole Robinson <crobinso(a)redhat.com>
Date: Wed Sep 18 18:17:47 2019 -0400
Add changelog
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
diff --git a/kata-osbuilder.spec b/kata-osbuilder.spec
index 3372b1a..1e91876 100644
--- a/kata-osbuilder.spec
+++ b/kata-osbuilder.spec
@@ -148,6 +148,11 @@ fi
%changelog
+* Wed Sep 18 2019 Cole Robinson <aintdiscole(a)gmail.com> - 1.9.0-0.1.git8d682c4
+- Update to latest release 1.9.0alpha2
+- Use dracut as build method for initrd + image
+- Add fedora-kata-osbuilder.sh script that handls %post image building
+
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4.1-4.git72c5f6a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit e34d8c3d8debc962fb3110987b4a46119e9864b9
Author: Cole Robinson <crobinso(a)redhat.com>
Date: Wed Sep 18 18:16:33 2019 -0400
spec: Disable 32bit archs, to get something building
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
diff --git a/kata-osbuilder.spec b/kata-osbuilder.spec
index 6864d05..3372b1a 100644
--- a/kata-osbuilder.spec
+++ b/kata-osbuilder.spec
@@ -27,6 +27,11 @@ Release: 0.1.git%{shortcommit0}%{?dist}
License: ASL 2.0
Summary: Kata guest initrd and image build scripts
URL: %{git0}
+
+ExcludeArch: %{arm}
+# Installing requires a kernel package, which isn't available i686
+ExcludeArch: %{ix86}
+
Source0: %{git0}/archive/%{commit0}/osbuilder-%{shortcommit0}.tar.gz
Source1: %{git1}/archive/%{commit1}/agent-%{shortcommit1}.tar.gz
Source2: fedora-kata-osbuilder.sh
commit 9339734980cac9e84a8af00c701c4e506a0579d7
Author: Cole Robinson <crobinso(a)redhat.com>
Date: Wed Sep 18 18:13:55 2019 -0400
spec: Silence agent archive extraction, it's noisy
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
diff --git a/kata-osbuilder.spec b/kata-osbuilder.spec
index 3f65a8d..6864d05 100644
--- a/kata-osbuilder.spec
+++ b/kata-osbuilder.spec
@@ -90,7 +90,7 @@ Provides: bundled(golang(google.golang.org/grpc/status))
%prep
%autosetup -Sgit -n osbuilder-%{commit0}
-tar -xvf %{SOURCE1}
+tar -xvf %{SOURCE1} > /dev/null
%build
commit 99df63bbef511c6f2cd9ef1a5a37e8fde89cad82
Author: Cole Robinson <crobinso(a)redhat.com>
Date: Wed Sep 18 11:10:51 2019 -0400
Update to latest, rework to use dracut
* Update to the latest 1.9.0.alpha2 release
* Use the new upstream dracut support for building the initrd.
* Add fedora-kata-osbuilder.sh which handles the actual initrd/image
build invocations, repopulating /usr/share/kata-containers. Stuff
this script in /usr/libexec/kata-containers so it's easier to
manually trigger while this stuff is in flux. The upstream suggested
way to do this is to use their Makefile, but that implicitly
expects generating images at package build time, and we are currently
generating images at RPM install time, using the host kernel
* Stuff the kata-agent into this package, built it and drop the
relevant bits we need into
/usr/libexec/kata-containers/osbuilder/agent . This may want to be
its own package some day
* Misc tweaks and cleanups
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index 1f35979..28785c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
/osbuilder-72c5f6a.tar.gz
+/osbuilder-4287ba6.tar.gz
+/agent-8d682c4.tar.gz
diff --git a/fedora-kata-osbuilder.sh b/fedora-kata-osbuilder.sh
new file mode 100755
index 0000000..4e849a9
--- /dev/null
+++ b/fedora-kata-osbuilder.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# This script builds the kata appliance initrd and image. It is invoked
+# at RPM install %post time.
+
+set -e
+set -x
+
+cd /usr/libexec/kata-containers/osbuilder
+
+KVERSION=`uname -r`
+DRACUT_OVERLAY=`mktemp --directory -t kata-dracut-overlay-XXXXXX`
+DRACUT_ROOTFS=`mktemp --directory -t kata-dracut-rootfs-XXXXXX`
+DRACUT_IMAGES=`mktemp --directory -t kata-dracut-images-XXXXXX`
+trap "{ rm -rf ${DRACUT_OVERLAY} ${DRACUT_ROOTFS} ${DRACUT_IMAGES}; }" EXIT
+
+
+export AGENT_SOURCE_BIN="/usr/libexec/kata-containers/osbuilder/agent/kata-agent"
+TARGET_IMAGE="${DRACUT_IMAGES}/kata-containers.img" \
+TARGET_INITRD="${DRACUT_IMAGES}/kata-containers-initrd.img" \
+OSBUILDER_VERSION="fedora-osbuilder-version-unknown"
+DRACUT_CONF_DIR="./dracut/dracut.conf.d"
+DRACUT_KMODULES=`source ${DRACUT_CONF_DIR}/10-drivers.conf; echo "$drivers"`
+DRACUT_OPTIONS="--no-compress --conf /dev/null --confdir ./dracut/dracut.conf.d"
+
+# Build the dracut overlay fs
+./rootfs-builder/rootfs.sh -o ${OSBUILDER_VERSION} -r ${DRACUT_OVERLAY}
+mkdir -p ${DRACUT_OVERLAY}/etc/modules-load.d
+echo ${DRACUT_KMODULES} | tr " " "\n" > ${DRACUT_OVERLAY}/etc/modules-load.d/kata-modules.conf
+
+# Build the initrd
+dracut ${DRACUT_OPTIONS} \
+ --include ${DRACUT_OVERLAY} \
+ / ${TARGET_INITRD} ${KVERSION}
+
+# Extract initrd filesystem for image build
+cat ${TARGET_INITRD} | \
+ cpio --extract --preserve-modification-time --make-directories --directory=${DRACUT_ROOTFS}
+
+# Build the FS image
+./image-builder/image_builder.sh -o ${TARGET_IMAGE} ${DRACUT_ROOTFS}
+
+# Move images into place
+cd /usr/share/kata-containers
+# This is dangerous, but not sure what else to do...
+rm * || true
+
+KERNEL_NAME="vmlinuz-${KVERSION}"
+INITRD_NAME="fedora-kata-${KVERSION}.initrd"
+IMAGE_NAME="fedora-kata-${KVERSION}.img"
+
+cp /boot/${KERNEL_NAME} .
+ln -sf /boot/${KERNEL_NAME} vmlinuz.container
+
+mv ${TARGET_INITRD} ${INITRD_NAME}
+ln -sf ${INITRD_NAME} kata-containers-initrd.img
+
+mv ${TARGET_IMAGE} ${IMAGE_NAME}
+ln -sf ${IMAGE_NAME} kata-containers.img
diff --git a/kata-osbuilder.spec b/kata-osbuilder.spec
index 3e59a1d..3f65a8d 100644
--- a/kata-osbuilder.spec
+++ b/kata-osbuilder.spec
@@ -7,73 +7,140 @@
%global debug_package %{nil}
%endif
-%global katadir %{_datadir}/kata-containers
+%global katadatadir %{_datadir}/kata-containers
%global katalibexecdir %{_libexecdir}/kata-containers
+%global kataosbuilderdir %{katalibexecdir}/osbuilder
+%global kataagentdir %{kataosbuilderdir}/agent
%global git0 https://github.com/kata-containers/osbuilder
-%global commit0 72c5f6a223964e6c3dae220bb6cd08bd94be8c8b
+%global commit0 4287ba639bbec8f447295bb567636d939bcb4cfc
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%global git1 https://github.com/kata-containers/agent
+%global commit1 8d682c45840d8bd76675879c8bbfffd9ef078838
+%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
+
+
Name: kata-osbuilder
-Version: 1.4.1
-Release: 4.git%{shortcommit0}%{?dist}
+Version: 1.9.0
+Release: 0.1.git%{shortcommit0}%{?dist}
License: ASL 2.0
-Summary: Guest OS building scripts
+Summary: Kata guest initrd and image build scripts
URL: %{git0}
Source0: %{git0}/archive/%{commit0}/osbuilder-%{shortcommit0}.tar.gz
+Source1: %{git1}/archive/%{commit1}/agent-%{shortcommit1}.tar.gz
+Source2: fedora-kata-osbuilder.sh
+
+# Adjust rootfs.sh to pull more pieces from the kata-agent dir,
+# like systemd units. Not acceptable as is for upstream, we need
+# to find a nicer solution.
+Patch01: osbuilder-0001-rootfs-allow-using-systemd-units-from-AGENT_SOURCE_B.patch
+# Fix symlinks in the dracut_overlay to not clobber Fedora.
+# Needs to be submitted upstream
+Patch02: osbuilder-0002-rootfs-Fix-systemd-sbin-init-symlinking.patch
+# List of drivers needed in the initrd.
+# Needs to be submitted upstream
+Patch03: osbuilder-0003-dracut-Add-Fedora-virtio-kernel-modules-to-the-initr.patch
+
BuildRequires: git
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-Requires(post): %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-Requires(post): go-srpm-macros
+BuildRequires: compiler(go-compiler)
+BuildRequires: go-srpm-macros
+
Requires(post): qemu-img
+Requires(post): dracut
+Requires(post): cpio
+Requires(post): bash
+Requires(post): kernel
+# mkfs.ext4 and tune2fs needed for the image build step
+Requires(post): e2fsprogs
+# gcc is used for building a little dax tool in image_builder.sh
+Requires(post): gcc
+
+# Bundled kata-agent pieces
+Provides: bundled(golang(github.com/docker/docker/pkg/parsers))
+Provides: bundled(golang(github.com/gogo/protobuf/gogoproto))
+Provides: bundled(golang(github.com/gogo/protobuf/proto))
+Provides: bundled(golang(github.com/gogo/protobuf/types))
+Provides: bundled(golang(github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc))
+Provides: bundled(golang(github.com/hashicorp/yamux))
+Provides: bundled(golang(github.com/mdlayher/vsock))
+Provides: bundled(golang(github.com/opencontainers/runc/libcontainer))
+Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/configs))
+Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/nsenter))
+Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/seccomp))
+Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/specconv))
+Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/utils))
+Provides: bundled(golang(github.com/opencontainers/runtime-spec/specs-go))
+Provides: bundled(golang(github.com/opentracing/opentracing-go))
+Provides: bundled(golang(github.com/pkg/errors))
+Provides: bundled(golang(github.com/sirupsen/logrus))
+Provides: bundled(golang(github.com/uber/jaeger-client-go/config))
+Provides: bundled(golang(github.com/vishvananda/netlink))
+Provides: bundled(golang(golang.org/x/net/context))
+Provides: bundled(golang(golang.org/x/sys/unix))
+Provides: bundled(golang(google.golang.org/grpc))
+Provides: bundled(golang(google.golang.org/grpc/codes))
+Provides: bundled(golang(google.golang.org/grpc/status))
+
%description
%{summary}
+
+
%prep
%autosetup -Sgit -n osbuilder-%{commit0}
+tar -xvf %{SOURCE1}
+
%build
+# Build kata-agent
+pushd agent-%{commit1}
+mkdir _build
+pushd _build
+mkdir -p src/github.com/kata-containers
+ln -s $(dirs +1 -l) src/github.com/kata-containers/agent
+popd
+
+mv vendor src
+export GOPATH=$(pwd)/_build:$(pwd)
+%gobuild -o %{name}
+make
+popd
+
+
%install
-install -dp %{buildroot}%{katadir}
-install -dp %{buildroot}%{katalibexecdir}/{image-builder,initrd-builder,rootfs-builder,scripts}
-install -p -m 755 rootfs-builder/rootfs.sh %{buildroot}%{katalibexecdir}/rootfs-builder/kata-rootfs_builder
-install -p -m 644 rootfs-builder/versions.txt %{buildroot}%{katalibexecdir}/rootfs-builder/versions.txt
-install -p -m 755 image-builder/image_builder.sh %{buildroot}%{katalibexecdir}/image-builder/kata-image_builder
-install -p -m 755 initrd-builder/initrd_builder.sh %{buildroot}%{katalibexecdir}/initrd-builder/kata-initrd_builder
-install -p -m 755 scripts/lib.sh %{buildroot}%{katalibexecdir}/scripts/lib.sh
-
-for distro in alpine centos clearlinux euleros fedora
-do
- install -dp %{buildroot}%{katalibexecdir}/rootfs-builder/$distro
- install -p -m 644 rootfs-builder/$distro/config.sh %{buildroot}%{katalibexecdir}/rootfs-builder/$distro
-done
+mkdir -p %{buildroot}%{katadatadir}
+mkdir -p %{buildroot}%{kataosbuilderdir}
+mkdir -p %{buildroot}%{kataagentdir}
+cp -aR rootfs-builder %{buildroot}/%{kataosbuilderdir}
+cp -aR image-builder %{buildroot}/%{kataosbuilderdir}
+cp -aR scripts %{buildroot}%{kataosbuilderdir}
+cp -aR dracut %{buildroot}%{kataosbuilderdir}
+cp -a %{_sourcedir}/fedora-kata-osbuilder.sh %{buildroot}%{kataosbuilderdir}
+cp -a agent-%{commit1}/{kata-*.service,kata-*.target,kata-agent} %{buildroot}%{kataagentdir}
+
%post
-echo "Creating Fedora image..."
-GOPATH=%{gopath} OS_VERSION=%{?fedora} %{katalibexecdir}/rootfs-builder/kata-rootfs_builder fedora
-GOPATH=%{gopath} %{katalibexecdir}/image-builder/kata-image_builder %{katalibexecdir}/rootfs-builder/rootfs-Fedora
-GOPATH=%{gopath} %{katalibexecdir}/initrd-builder/kata-initrd_builder %{katalibexecdir}/rootfs-builder/rootfs-Fedora
-mv /kata-* %{katadir}
-rm -rf %{katalibexecdir}/rootfs-builder/rootfs-Fedora
+TMPOUT="$(mktemp -t kata-rpm-post-XXXXXX.log)"
+echo "Creating kata appliance initrd and filesystem image..."
+bash %{kataosbuilderdir}/fedora-kata-osbuilder.sh > ${TMPOUT} 2>&1
+if test "$?" != "0" ; then
+ echo "Building failed. See log for details: ${TMPOUT}"
+ exit 1
+fi
+
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
%files
%license LICENSE
%doc CODE_OF_CONDUCT.md CONTRIBUTING.md README.md
-%dir %{katadir}
-%dir %{katalibexecdir}
-%dir %{katalibexecdir}/rootfs-builder
-%dir %{katalibexecdir}/image-builder
-%dir %{katalibexecdir}/initrd-builder
-%dir %{katalibexecdir}/scripts
-%{katalibexecdir}/rootfs-builder/*
-%{katalibexecdir}/image-builder/*
-%{katalibexecdir}/initrd-builder/*
-%{katalibexecdir}/scripts/*
+%dir %{katadatadir}
+%dir %{kataosbuilderdir}
+%{kataosbuilderdir}/*
+
+
%changelog
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4.1-4.git72c5f6a
diff --git a/osbuilder-0001-rootfs-allow-using-systemd-units-from-AGENT_SOURCE_B.patch b/osbuilder-0001-rootfs-allow-using-systemd-units-from-AGENT_SOURCE_B.patch
new file mode 100644
index 0000000..e4a92eb
--- /dev/null
+++ b/osbuilder-0001-rootfs-allow-using-systemd-units-from-AGENT_SOURCE_B.patch
@@ -0,0 +1,33 @@
+>From ffc788c6f841f1dea9cbba761e0a15c6080747da Mon Sep 17 00:00:00 2001
+Message-Id: <ffc788c6f841f1dea9cbba761e0a15c6080747da.1567901440.git.crobinso(a)redhat.com>
+From: Cole Robinson <crobinso(a)redhat.com>
+Date: Sat, 7 Sep 2019 17:10:54 -0400
+Subject: [PATCH 1/3] rootfs: allow using systemd units from AGENT_SOURCE_BIN
+ dirname
+
+Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
+---
+ rootfs-builder/rootfs.sh | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/rootfs-builder/rootfs.sh b/rootfs-builder/rootfs.sh
+index 0b68764..4bdc10d 100755
+--- a/rootfs-builder/rootfs.sh
++++ b/rootfs-builder/rootfs.sh
+@@ -497,7 +497,13 @@ EOT
+ make install DESTDIR="${ROOTFS_DIR}" INIT=${AGENT_INIT} SECCOMP=${SECCOMP}
+ popd
+ else
++ AGENT_SOURCE_DIR=$(dirname "${AGENT_SOURCE_BIN}")
++ ROOTFS_SYSTEMD_DIR="${ROOTFS_DIR}"/usr/lib/systemd/system
++ mkdir -p "${AGENT_DIR}"
++ mkdir -p "${ROOTFS_SYSTEMD_DIR}"
+ cp ${AGENT_SOURCE_BIN} ${AGENT_DEST}
++ cp "${AGENT_SOURCE_DIR}"/kata-agent.service "${ROOTFS_SYSTEMD_DIR}"
++ cp "${AGENT_SOURCE_DIR}"/kata-containers.target "${ROOTFS_SYSTEMD_DIR}"
+ OK "cp ${AGENT_SOURCE_BIN} ${AGENT_DEST}"
+ fi
+
+--
+2.21.0
+
diff --git a/osbuilder-0002-rootfs-Fix-systemd-sbin-init-symlinking.patch b/osbuilder-0002-rootfs-Fix-systemd-sbin-init-symlinking.patch
new file mode 100644
index 0000000..78e0818
--- /dev/null
+++ b/osbuilder-0002-rootfs-Fix-systemd-sbin-init-symlinking.patch
@@ -0,0 +1,31 @@
+>From 183645ca57f466ac89eb018c72348c2a3a5b38a3 Mon Sep 17 00:00:00 2001
+Message-Id: <183645ca57f466ac89eb018c72348c2a3a5b38a3.1567901440.git.crobinso(a)redhat.com>
+In-Reply-To: <ffc788c6f841f1dea9cbba761e0a15c6080747da.1567901440.git.crobinso(a)redhat.com>
+References: <ffc788c6f841f1dea9cbba761e0a15c6080747da.1567901440.git.crobinso(a)redhat.com>
+From: Cole Robinson <crobinso(a)redhat.com>
+Date: Sat, 7 Sep 2019 15:53:08 -0400
+Subject: [PATCH 2/3] rootfs: Fix systemd /sbin/init symlinking
+
+Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
+---
+ rootfs-builder/rootfs.sh | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/rootfs-builder/rootfs.sh b/rootfs-builder/rootfs.sh
+index 4bdc10d..fb020c0 100755
+--- a/rootfs-builder/rootfs.sh
++++ b/rootfs-builder/rootfs.sh
+@@ -388,9 +388,7 @@ prepare_overlay()
+ {
+ pushd "${ROOTFS_DIR}" > /dev/null
+ mkdir -p ./etc ./lib/systemd ./sbin ./var
+- ln -sf ./usr/lib/systemd/systemd ./init
+- ln -sf ../../init ./lib/systemd/systemd
+- ln -sf ../init ./sbin/init
++ ln -sf ../lib/systemd/systemd ./sbin/init
+ # Kata sytemd unit file
+ mkdir -p ./etc/systemd/system/basic.target.wants/
+ ln -sf /usr/lib/systemd/system/kata-containers.target ./etc/systemd/system/basic.target.wants/kata-containers.target
+--
+2.21.0
+
diff --git a/osbuilder-0003-dracut-Add-Fedora-virtio-kernel-modules-to-the-initr.patch b/osbuilder-0003-dracut-Add-Fedora-virtio-kernel-modules-to-the-initr.patch
new file mode 100644
index 0000000..b595495
--- /dev/null
+++ b/osbuilder-0003-dracut-Add-Fedora-virtio-kernel-modules-to-the-initr.patch
@@ -0,0 +1,29 @@
+>From 01e83d4b3bb2478764671c10f0590507017f9d2c Mon Sep 17 00:00:00 2001
+Message-Id: <01e83d4b3bb2478764671c10f0590507017f9d2c.1567901440.git.crobinso(a)redhat.com>
+In-Reply-To: <ffc788c6f841f1dea9cbba761e0a15c6080747da.1567901440.git.crobinso(a)redhat.com>
+References: <ffc788c6f841f1dea9cbba761e0a15c6080747da.1567901440.git.crobinso(a)redhat.com>
+From: Cole Robinson <crobinso(a)redhat.com>
+Date: Sat, 7 Sep 2019 19:53:40 -0400
+Subject: [PATCH 3/3] dracut: Add Fedora virtio kernel modules to the initrd
+
+Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
+---
+ dracut/dracut.conf.d/10-drivers.conf | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/dracut/dracut.conf.d/10-drivers.conf b/dracut/dracut.conf.d/10-drivers.conf
+index 121e858..e45b75a 100644
+--- a/dracut/dracut.conf.d/10-drivers.conf
++++ b/dracut/dracut.conf.d/10-drivers.conf
+@@ -6,4 +6,7 @@
+ # Specify a space-separated set of kernel modules to copy from the host to
+ # the initramfs image. For example:
+ # drivers="9p 9pnet 9pnet_virtio"
+-drivers=""
++#drivers=""
++
++# Fedora: add kata virtio modules to the initrd.
++drivers="9p 9pnet_virtio vmw_vsock_virtio_transport virtio_console virtio_blk virtio_scsi virtio_net"
+--
+2.21.0
+
diff --git a/sources b/sources
index 4323dc5..6ebeec0 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
SHA512 (osbuilder-72c5f6a.tar.gz) = 856d621017e715107488a81b7cd67762f2f1d8db5984fdf4f799e3c154ca38bd1af47730e58a69614df9cd97bfab1a8f1ee085d28b71d5a5ca9e54aa0f079101
+SHA512 (osbuilder-4287ba6.tar.gz) = 2b9a6079e2a2cc2fbfa6e25705353d45906e093780323cae00b61aadb6ab3c47c7d54751e2ef82d1b4be82ed8cfd7bd428c9a097de6a5c2957ac014f3a68a2c1
+SHA512 (agent-8d682c4.tar.gz) = 16706946878923b7e772902ef1d1d02a59827717535066d8d174b9bea2fca9885e9baee9b578fe1cb4ca68f9fd1615870cd93d61b11b81fc2355cc70f104f0dc
4 years, 7 months
Architecture specific change in rpms/java-latest-openjdk.git
by githook-noreply@fedoraproject.org
The package rpms/java-latest-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-latest-openjdk.git/commit/?i....
Change:
+%ifarch %{aot_arches}
Thanks.
Full change:
============
commit 0c49acab9dd8916c894e5699ff7764213c974d5c
Author: Petra Mikova <pmikova(a)redhat.com>
Date: Wed Aug 14 13:06:39 2019 +0200
Updated to 13+33 sources
diff --git a/.gitignore b/.gitignore
index a77ce00..e1b049a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/jdk-updates-jdk12u-jdk-12.0.2+9.tar.xz
/jdk-jdk13-jdk-13+27.tar.xz
/jdk-jdk13-jdk-13+28.tar.xz
+/jdk-jdk13-jdk-13+33.tar.xz
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 9ade6b8..7c8e405 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -224,7 +224,7 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global minorver 0
-%global buildver 28
+%global buildver 33
%global rpmrelease 1
# priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
@@ -241,7 +241,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 ea_designator ""
%global ea_designator_zip ""
@@ -753,6 +753,10 @@ exit 0
%{_mandir}/man1/jlink-%{uniquesuffix -- %{?1}}.1.gz
%{_mandir}/man1/jmod-%{uniquesuffix -- %{?1}}.1.gz
%{_mandir}/man1/jshell-%{uniquesuffix -- %{?1}}.1.gz
+%{_mandir}/man1/jfr-%{uniquesuffix -- %{?1}}.1.gz
+%ifarch %{aot_arches}
+%{_mandir}/man1/jaotc-%{uniquesuffix -- %{?1}}.1.gz
+%endif
%if %{with_systemtap}
%dir %{tapsetroot}
@@ -1848,6 +1852,11 @@ require "copy_jdk_configs.lua"
%changelog
+* Wed Aug 14 2019 Petra Alice Mikova <pmikova(a)redhat.com> - 1:13.0.0.33-1.rolling
+- updated to 13+33 sources
+- added two manpages to file listings (jfr, jaotc)
+- set is_ga to 1 to match build from jdk.java.net
+
* Fri Jul 19 2019 Petra Alice Mikova <pmikova(a)redhat.com> - 1:13.0.0.28-0.1.ea.rolling
- updated to jdk 13
- adapted pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch
diff --git a/sources b/sources
index e6c12da..c3b1ea2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (jdk-jdk13-jdk-13+28.tar.xz) = 4efc6dba5e9e8f4d75aaced5b187d2d9ba74c00f0c1bce7645fcce8a92f697cb5c8f33209d00901f446eaef1f0e34ee51f22b5203fc90deda89a21bcdc980897
+SHA512 (jdk-jdk13-jdk-13+33.tar.xz) = a2d8f2d837c05e147a9d2e7afb90b3ab781760f287fe9d247f12927014524d7afc7a4654cb5432e34dbc55af387893175d04d36681b6d4f5441edff2660b4397
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
commit 8fb7d38ce96fa2ff4bcabc36983da464424f6f0f
Author: Petra Mikova <pmikova(a)redhat.com>
Date: Fri Jul 12 09:06:02 2019 +0200
Removed jhsdb manpage for s390x arch
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index b25636d..9ade6b8 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -707,6 +707,7 @@ exit 0
%ifarch %{jit_arches}
%ifnarch s390x
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jhsdb
+%{_mandir}/man1/jhsdb-%{uniquesuffix -- %{?1}}.1.gz
%endif
%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jinfo
@@ -749,7 +750,6 @@ exit 0
%{_mandir}/man1/rmic-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/jdeprscan-%{uniquesuffix -- %{?1}}.1.gz
-%{_mandir}/man1/jhsdb-%{uniquesuffix -- %{?1}}.1.gz
%{_mandir}/man1/jlink-%{uniquesuffix -- %{?1}}.1.gz
%{_mandir}/man1/jmod-%{uniquesuffix -- %{?1}}.1.gz
%{_mandir}/man1/jshell-%{uniquesuffix -- %{?1}}.1.gz
commit d351107f3d9ed6fb79122c9eb7eac5f09c7fe2b4
Author: Petra Mikova <pmikova(a)redhat.com>
Date: Thu Jul 11 13:33:16 2019 +0200
Update to 13+28 sources
diff --git a/.gitignore b/.gitignore
index 160bfc7..a77ce00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/jdk-updates-jdk12u-jdk-12.0.1+12.tar.xz
/jdk-updates-jdk12u-jdk-12.0.2+9.tar.xz
/jdk-jdk13-jdk-13+27.tar.xz
+/jdk-jdk13-jdk-13+28.tar.xz
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 04413a3..b25636d 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -224,7 +224,7 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global minorver 0
-%global buildver 27
+%global buildver 28
%global rpmrelease 1
# priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
@@ -1848,7 +1848,7 @@ require "copy_jdk_configs.lua"
%changelog
-* Fri Jul 19 2019 Petra Alice Mikova <pmikova(a)redhat.com> - 1:13.0.0.27-0.1.ea.rolling
+* Fri Jul 19 2019 Petra Alice Mikova <pmikova(a)redhat.com> - 1:13.0.0.28-0.1.ea.rolling
- updated to jdk 13
- adapted pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch
- adapted rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
diff --git a/sources b/sources
index 9bfbece..e6c12da 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (jdk-jdk13-jdk-13+27.tar.xz) = ff65b5cccf276a77046079a9da175a604f1702df6e39bb8b585345b358b786f091ac0c4907eaa19c8db3f0d152e296148845c18a1fc8ea52b26445e653d76fd2
+SHA512 (jdk-jdk13-jdk-13+28.tar.xz) = 4efc6dba5e9e8f4d75aaced5b187d2d9ba74c00f0c1bce7645fcce8a92f697cb5c8f33209d00901f446eaef1f0e34ee51f22b5203fc90deda89a21bcdc980897
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
commit bab43cc28d00e23b26d3de8197ba67efa398a60e
Author: Petra Mikova <pmikova(a)redhat.com>
Date: Thu Jul 11 11:50:53 2019 +0200
Backported patch related to ea designator from ojdk11
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 1ced500..04413a3 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -225,6 +225,7 @@
%global top_level_dir_name %{origin}
%global minorver 0
%global buildver 27
+%global rpmrelease 1
# priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
%global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
@@ -236,6 +237,23 @@
%global javaver %{majorver}
+# Define milestone (EA for pre-releases, GA 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 0
+%if %{is_ga}
+%global ea_designator ""
+%global ea_designator_zip ""
+%global extraver %{nil}
+%global eaprefix %{nil}
+%else
+%global ea_designator ea
+%global ea_designator_zip -%{ea_designator}
+%global extraver .%{ea_designator}
+%global eaprefix 0.
+%endif
+
# parametrized macros are order-sensitive
%global compatiblename java-%{majorver}-%{origin}
%global fullversion %{compatiblename}-%{version}-%{release}
@@ -956,7 +974,7 @@ Version: %{newjavaver}.%{buildver}
# This package needs `.rolling` as part of Release so as to not conflict on install with
# java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as
# java-X-openjdk. See: https://bugzilla.redhat.com/show_bug.cgi?id=1647298
-Release: 0.ea.1.rolling%{?dist}
+Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling%{?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
@@ -1377,7 +1395,7 @@ bash ../configure \
--with-jobs=1 \
%endif
--with-version-build=%{buildver} \
- --with-version-pre="" \
+ --with-version-pre="%{ea_designator}"\
--with-version-opt=%{lts_designator} \
--with-vendor-version-string="%{vendor_version_string}" \
--with-boot-jdk=/usr/lib/jvm/java-%{buildjdkver}-openjdk \
@@ -1600,7 +1618,7 @@ popd
# Install Javadoc documentation
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
-cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
+cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
# Install icons and menu entries
for s in 16 24 32 48 ; do
@@ -1830,11 +1848,14 @@ require "copy_jdk_configs.lua"
%changelog
-* Fri Jul 19 2019 Petra Alice Mikova <pmikova(a)redhat.com> - 1:13.0.0.27-0.ea.1.rolling
+* Fri Jul 19 2019 Petra Alice Mikova <pmikova(a)redhat.com> - 1:13.0.0.27-0.1.ea.rolling
- updated to jdk 13
- adapted pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch
- adapted rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
- fixed file listings
+- included https://src.fedoraproject.org/rpms/java-11-openjdk/pull-request/49:
+- Include 'ea' designator in Release when appropriate
+- Handle milestone as variables so we can alter it easily and set the docs zip filename appropriately
* Thu Jul 18 2019 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:12.0.2.9-1.rolling
- Update to July 2019 CPU update (tag jdk-12.0.2+9)
commit f02532f4a05561300364781026aedec69177fec0
Author: Petra Mikova <pmikova(a)redhat.com>
Date: Tue Jul 9 10:59:30 2019 +0200
Update of the package to OpenJDK 13
Adapted patches, spec and uploaded new sources
diff --git a/.gitignore b/.gitignore
index e821930..160bfc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
/jdk-updates-jdk12u-jdk-12.0.1+12.tar.xz
/jdk-updates-jdk12u-jdk-12.0.2+9.tar.xz
+/jdk-jdk13-jdk-13+27.tar.xz
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 094cefd..1ced500 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -205,12 +205,12 @@
%endif
# New Version-String scheme-style defines
-%global majorver 12
-%global securityver 2
+%global majorver 13
+%global securityver 0
# buildjdkver is usually same as %%{majorver},
# but in time of bootstrap of next jdk, it is majorver-1,
# and this it is better to change it here, on single place
-%global buildjdkver 11
+%global buildjdkver 12
# Used via new version scheme. JDK 11 was
# GA'ed in March 2019 => 19.3
%global vendor_version_string 19.3
@@ -224,7 +224,7 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global minorver 0
-%global buildver 9
+%global buildver 27
# priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
%global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
@@ -730,6 +730,12 @@ exit 0
%{_mandir}/man1/jstatd-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/rmic-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1*
+%{_mandir}/man1/jdeprscan-%{uniquesuffix -- %{?1}}.1.gz
+%{_mandir}/man1/jhsdb-%{uniquesuffix -- %{?1}}.1.gz
+%{_mandir}/man1/jlink-%{uniquesuffix -- %{?1}}.1.gz
+%{_mandir}/man1/jmod-%{uniquesuffix -- %{?1}}.1.gz
+%{_mandir}/man1/jshell-%{uniquesuffix -- %{?1}}.1.gz
+
%if %{with_systemtap}
%dir %{tapsetroot}
%dir %{tapsetdirttapset}
@@ -950,7 +956,7 @@ Version: %{newjavaver}.%{buildver}
# This package needs `.rolling` as part of Release so as to not conflict on install with
# java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as
# java-X-openjdk. See: https://bugzilla.redhat.com/show_bug.cgi?id=1647298
-Release: 1.rolling%{?dist}
+Release: 0.ea.1.rolling%{?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
@@ -984,7 +990,7 @@ URL: http://openjdk.java.net/
# to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh
# update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
-Source0: jdk-updates-jdk%{majorver}u-jdk-%{majorver}.%{minorver}.%{securityver}+%{buildver}.tar.xz
+Source0: jdk-jdk%{majorver}-jdk-%{majorver}+%{buildver}.tar.xz
Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
# Desktop files. Adapted from IcedTea
@@ -1053,7 +1059,7 @@ BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
BuildRequires: javapackages-filesystem
-BuildRequires: java-%{buildjdkver}-openjdk-devel
+BuildRequires: java-latest-openjdk-devel
# Zero-assembler build requirement
%ifnarch %{jit_arches}
BuildRequires: libffi-devel
@@ -1594,7 +1600,7 @@ popd
# Install Javadoc documentation
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
-cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}.%{minorver}.%{securityver}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
+cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
# Install icons and menu entries
for s in 16 24 32 48 ; do
@@ -1824,6 +1830,12 @@ require "copy_jdk_configs.lua"
%changelog
+* Fri Jul 19 2019 Petra Alice Mikova <pmikova(a)redhat.com> - 1:13.0.0.27-0.ea.1.rolling
+- updated to jdk 13
+- adapted pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch
+- adapted rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
+- fixed file listings
+
* Thu Jul 18 2019 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:12.0.2.9-1.rolling
- Update to July 2019 CPU update (tag jdk-12.0.2+9)
diff --git a/pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch b/pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch
index 6a1da4c..83bb34b 100644
--- a/pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch
+++ b/pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch
@@ -1,96 +1,112 @@
-diff --git a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
---- openjdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
-+++ openjdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
-@@ -180,72 +180,6 @@
- // Elliptic Curves (RFC 4492)
- //
- // See sun.security.util.CurveDB for the OIDs
-- // NIST K-163
-- SECT163_K1 (0x0001, "sect163k1", "1.3.132.0.1", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECT163_R1 (0x0002, "sect163r1", "1.3.132.0.2", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST B-163
-- SECT163_R2 (0x0003, "sect163r2", "1.3.132.0.15", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECT193_R1 (0x0004, "sect193r1", "1.3.132.0.24", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECT193_R2 (0x0005, "sect193r2", "1.3.132.0.25", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST K-233
-- SECT233_K1 (0x0006, "sect233k1", "1.3.132.0.26", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST B-233
-- SECT233_R1 (0x0007, "sect233r1", "1.3.132.0.27", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECT239_K1 (0x0008, "sect239k1", "1.3.132.0.3", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST K-283
-- SECT283_K1 (0x0009, "sect283k1", "1.3.132.0.16", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST B-283
-- SECT283_R1 (0x000A, "sect283r1", "1.3.132.0.17", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST K-409
-- SECT409_K1 (0x000B, "sect409k1", "1.3.132.0.36", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST B-409
-- SECT409_R1 (0x000C, "sect409r1", "1.3.132.0.37", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST K-571
-- SECT571_K1 (0x000D, "sect571k1", "1.3.132.0.38", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST B-571
-- SECT571_R1 (0x000E, "sect571r1", "1.3.132.0.39", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECP160_K1 (0x000F, "secp160k1", "1.3.132.0.9", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECP160_R1 (0x0010, "secp160r1", "1.3.132.0.8", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECP160_R2 (0x0011, "secp160r2", "1.3.132.0.30", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECP192_K1 (0x0012, "secp192k1", "1.3.132.0.31", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST P-192
-- SECP192_R1 (0x0013, "secp192r1", "1.2.840.10045.3.1.1", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECP224_K1 (0x0014, "secp224k1", "1.3.132.0.32", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- // NIST P-224
-- SECP224_R1 (0x0015, "secp224r1", "1.3.132.0.33", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECP256_K1 (0x0016, "secp256k1", "1.3.132.0.10", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
+diff -r b7f68ddec66f src/java.base/share/classes/sun/security/ssl/NamedGroup.java
+--- a/src/java.base/share/classes/sun/security/ssl/NamedGroup.java Tue Jun 25 10:50:59 2019 +0100
++++ b/src/java.base/share/classes/sun/security/ssl/NamedGroup.java Wed Jul 03 16:36:37 2019 +0200
+@@ -50,97 +50,6 @@
+ // Elliptic Curves (RFC 4492)
+ //
+ // See sun.security.util.CurveDB for the OIDs
+- // NIST K-163
+-
+- SECT163_K1(0x0001, "sect163k1", "1.3.132.0.1",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT163_R1(0x0002, "sect163r1", "1.3.132.0.2",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-163
+- SECT163_R2(0x0003, "sect163r2", "1.3.132.0.15",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT193_R1(0x0004, "sect193r1", "1.3.132.0.24",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT193_R2(0x0005, "sect193r2", "1.3.132.0.25",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-233
+- SECT233_K1(0x0006, "sect233k1", "1.3.132.0.26",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-233
+- SECT233_R1(0x0007, "sect233r1", "1.3.132.0.27",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT239_K1(0x0008, "sect239k1", "1.3.132.0.3",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-283
+- SECT283_K1(0x0009, "sect283k1", "1.3.132.0.16",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-283
+- SECT283_R1(0x000A, "sect283r1", "1.3.132.0.17",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-409
+- SECT409_K1(0x000B, "sect409k1", "1.3.132.0.36",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-409
+- SECT409_R1(0x000C, "sect409r1", "1.3.132.0.37",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-571
+- SECT571_K1(0x000D, "sect571k1", "1.3.132.0.38",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-571
+- SECT571_R1(0x000E, "sect571r1", "1.3.132.0.39",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP160_K1(0x000F, "secp160k1", "1.3.132.0.9",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP160_R1(0x0010, "secp160r1", "1.3.132.0.8",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP160_R2(0x0011, "secp160r2", "1.3.132.0.30",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP192_K1(0x0012, "secp192k1", "1.3.132.0.31",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST P-192
+- SECP192_R1(0x0013, "secp192r1", "1.2.840.10045.3.1.1",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP224_K1(0x0014, "secp224k1", "1.3.132.0.32",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST P-224
+- SECP224_R1(0x0015, "secp224r1", "1.3.132.0.33",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP256_K1(0x0016, "secp256k1", "1.3.132.0.10",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+ // NIST P-256
+ SECP256_R1(0x0017, "secp256r1", "1.2.840.10045.3.1.7",
+ NamedGroupType.NAMED_GROUP_ECDHE,
+diff -r b7f68ddec66f src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
+--- a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java Tue Jun 25 10:50:59 2019 +0100
++++ b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java Wed Jul 03 16:36:37 2019 +0200
+@@ -214,17 +214,6 @@
+ // Secondary XDH curves
+ NamedGroup.X448,
- // NIST P-256
- SECP256_R1 (0x0017, "secp256r1", "1.2.840.10045.3.1.7", true,
-@@ -116,12 +116,6 @@
- NamedGroup.SECP256_R1,
- NamedGroup.SECP384_R1,
- NamedGroup.SECP521_R1,
-- NamedGroup.SECT283_K1,
-- NamedGroup.SECT283_R1,
-- NamedGroup.SECT409_K1,
-- NamedGroup.SECT409_R1,
-- NamedGroup.SECT571_K1,
-- NamedGroup.SECT571_R1,
-
- // FFDHE 2048
- NamedGroup.FFDHE_2048,
-@@ -136,15 +130,6 @@
- NamedGroup.SECP256_R1,
- NamedGroup.SECP384_R1,
- NamedGroup.SECP521_R1,
+- // Secondary NIST curves
- NamedGroup.SECT283_K1,
- NamedGroup.SECT283_R1,
- NamedGroup.SECT409_K1,
@@ -100,12 +116,13 @@ diff --git a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtensi
-
- // non-NIST curves
- NamedGroup.SECP256_K1,
-
- // FFDHE 2048
+-
+ // FFDHE (RFC 7919)
NamedGroup.FFDHE_2048,
-diff --git a/src/java.base/share/classes/sun/security/util/CurveDB.java b/src/java.base/share/classes/sun/security/util/CurveDB.java
---- openjdk/src/java.base/share/classes/sun/security/util/CurveDB.java
-+++ openjdk/src/java.base/share/classes/sun/security/util/CurveDB.java
+ NamedGroup.FFDHE_3072,
+diff -r b7f68ddec66f src/java.base/share/classes/sun/security/util/CurveDB.java
+--- a/src/java.base/share/classes/sun/security/util/CurveDB.java Tue Jun 25 10:50:59 2019 +0100
++++ b/src/java.base/share/classes/sun/security/util/CurveDB.java Wed Jul 03 16:36:37 2019 +0200
@@ -168,114 +168,6 @@
Pattern nameSplitPattern = Pattern.compile(SPLIT_PATTERN);
@@ -657,12 +674,12 @@ diff --git a/src/java.base/share/classes/sun/security/util/CurveDB.java b/src/ja
specCollection = Collections.unmodifiableCollection(oidMap.values());
}
}
-diff --git a/test/jdk/sun/security/ec/TestEC.java b/test/jdk/sun/security/ec/TestEC.java
---- openjdk/test/jdk/sun/security/ec/TestEC.java
-+++ openjdk/test/jdk/sun/security/ec/TestEC.java
-@@ -35,8 +35,8 @@
- * @library ../pkcs11/sslecc
+diff -r b7f68ddec66f test/jdk/sun/security/ec/TestEC.java
+--- a/test/jdk/sun/security/ec/TestEC.java Tue Jun 25 10:50:59 2019 +0100
++++ b/test/jdk/sun/security/ec/TestEC.java Wed Jul 03 16:36:37 2019 +0200
+@@ -37,8 +37,8 @@
* @library ../../../java/security/testlibrary
+ * @library ../../../javax/net/ssl/TLSCommon
* @modules jdk.crypto.cryptoki/sun.security.pkcs11.wrapper
- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
- * @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
@@ -671,11 +688,11 @@ diff --git a/test/jdk/sun/security/ec/TestEC.java b/test/jdk/sun/security/ec/Tes
*/
import java.security.NoSuchProviderException;
-diff -r bd66ea2fdde3 test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
---- openjdk/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Thu Jul 27 18:04:48 2017 +0000
-+++ openjdk/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Fri Oct 06 13:18:47 2017 +0200
+diff -r b7f68ddec66f test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
+--- a/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Tue Jun 25 10:50:59 2019 +0100
++++ b/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Wed Jul 03 16:36:37 2019 +0200
@@ -34,9 +34,9 @@
- * @library ..
+ * @library /test/lib .. ../../../../javax/net/ssl/TLSCommon
* @library ../../../../java/security/testlibrary
* @modules jdk.crypto.cryptoki
- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
@@ -685,3 +702,4 @@ diff -r bd66ea2fdde3 test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.ja
+ * @run main/othervm -Djdk.tls.namedGroups="secp256r1"
* ClientJSSEServerJSSE sm policy
*/
+
diff --git a/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch b/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
index a877506..3042186 100644
--- a/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
+++ b/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
@@ -1,10 +1,9 @@
-diff -uNr openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java jdk8/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
---- openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java
-+++ openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java
-@@ -883,9 +883,13 @@
- return null;
- }
- });
+diff -r 618ad1237e73 src/java.desktop/share/classes/java/awt/Toolkit.java
+--- a/src/java.desktop/share/classes/java/awt/Toolkit.java Thu Jun 13 19:37:49 2019 +0200
++++ b/src/java.desktop/share/classes/java/awt/Toolkit.java Thu Jul 04 10:35:42 2019 +0200
+@@ -595,7 +595,11 @@
+ toolkit = new HeadlessToolkit(toolkit);
+ }
if (!GraphicsEnvironment.isHeadless()) {
- loadAssistiveTechnologies();
+ try {
@@ -15,4 +14,3 @@ diff -uNr openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java jdk8/jdk/
}
}
return toolkit;
- }
diff --git a/sources b/sources
index 20e442e..9bfbece 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (jdk-updates-jdk12u-jdk-12.0.2+9.tar.xz) = ed1b5dec108fb29f72a8a80faca22703d3d1378d5a3b535c9e41b8f73d51d6650dd72e0e4b2e79de61c9f85013b26f39f6a7b5292b646bd6f5b3a54c9922fbf9
+SHA512 (jdk-jdk13-jdk-13+27.tar.xz) = ff65b5cccf276a77046079a9da175a604f1702df6e39bb8b585345b358b786f091ac0c4907eaa19c8db3f0d152e296148845c18a1fc8ea52b26445e653d76fd2
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
4 years, 7 months
Architecture specific change in rpms/grizzly.git
by githook-noreply@fedoraproject.org
The package rpms/grizzly.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/grizzly.git/commit/?id=93bae29ffb....
Change:
+%ifarch %{arm}
Thanks.
Full change:
============
commit 93bae29ffb0d3c17a714a6d8e99f3c6c44f0cc50
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Thu Sep 19 10:52:41 2019 +0200
Unretirement request: https://pagure.io/releng/issue/8794
Signed-off-by: Tomas Hrcka <thrcka(a)redhat.com>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..de0dfc4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+/grizzly-2.3.1.tar.xz
+/grizzly-2.3.2.tar.xz
+/grizzly-2.3.3.tar.xz
+/grizzly-2.3.4.tar.xz
+/grizzly-2.3.6.tar.xz
+/2_3_19.tar.gz
+/2_3_21.tar.gz
+/2_3_23.tar.gz
+/2_3_24.tar.gz
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 5204a84..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-Orphaned for 6+ weeks
diff --git a/grizzly.spec b/grizzly.spec
new file mode 100644
index 0000000..8b02395
--- /dev/null
+++ b/grizzly.spec
@@ -0,0 +1,280 @@
+%global namedreltag %{nil}
+%global _version %(echo %version | tr . _)
+%global namedversion %{_version}%{?namedreltag}
+
+# Conditionals to help breaking grizzly <-> jersey dependency cycle
+%if 0%{?fedora}
+%bcond_with jersey
+%bcond_with jaxws
+%endif
+
+Name: grizzly
+Version: 2.3.24
+Release: 8%{?dist}
+Summary: Java NIO Server Framework
+# see Grizzly_THIRDPARTYLICENSEREADME.txt
+License: (CDDL or GPLv2 with exceptions) and BSD and ASL 2.0 and Public Domain
+URL: http://grizzly.java.net/
+# git clone git://java.net/grizzly~git
+# (cd grizzly~git/ && git archive --format=tar --prefix=grizzly-2.3.6/ 2_3_6 | xz > ../grizzly-2.3.6.tar.xz)
+Source0: https://github.com/GrizzlyNIO/grizzly-mirror/archive/%{namedversion}.tar.gz
+
+BuildRequires: maven-local
+BuildRequires: mvn(com.sun.istack:istack-commons-maven-plugin)
+%if %{with jersey}
+BuildRequires: mvn(com.sun.jersey:jersey-client)
+BuildRequires: mvn(com.sun.jersey:jersey-server)
+BuildRequires: mvn(com.sun.jersey:jersey-servlet)
+%endif
+%if %{with jaxws}
+BuildRequires: mvn(com.sun.xml.ws:rt)
+%endif
+BuildRequires: mvn(javax.servlet:javax.servlet-api)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(net.java:jvnet-parent:pom:)
+BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires: mvn(org.codehaus.mojo:exec-maven-plugin)
+BuildRequires: mvn(org.glassfish.gmbal:gmbal)
+BuildRequires: mvn(org.glassfish.gmbal:gmbal-api-only)
+BuildRequires: mvn(org.glassfish.grizzly:grizzly-npn-api)
+BuildRequires: mvn(org.glassfish.grizzly:grizzly-npn-bootstrap)
+BuildRequires: mvn(org.glassfish.hk2:hk2-inhabitant-generator)
+BuildRequires: mvn(org.glassfish.hk2:osgiversion-maven-plugin)
+BuildRequires: mvn(org.mockito:mockito-all)
+BuildRequires: mvn(org.osgi:org.osgi.compendium)
+BuildRequires: mvn(org.osgi:org.osgi.core)
+
+BuildArch: noarch
+
+%description
+Writing scalable server applications in the Java programming
+language has always been difficult. Before the advent of the
+Java New I/O API (NIO), thread management issues made it
+impossible for a server to scale to thousands of users. The
+Grizzly framework has been designed to help developers to take
+advantage of the Java NIO API. Originally developed under the
+GlassFish umbrella, the framework is now available as a
+standalone project. Grizzly goals is to help developers to
+build scalable and robust servers using NIO.
+
+%package samples
+Summary: Grizzly samples
+
+%description samples
+This package contains samples for %{name}.
+
+%package javadoc
+Summary: Javadoc for %{name}
+
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q -n %{name}-mirror-%{namedversion}
+find . -name '*.class' -delete
+find . -name '*.jar' -print -delete
+find . -name '*.js' -print -delete
+
+# unavailable deps
+# org.jvnet.maven-antrun-extended-plugin maven-antrun-extended-plugin
+%pom_disable_module bundles extras
+%pom_disable_module bundles modules
+
+# org.ops4j maven-pax-plugin 1.5
+%pom_disable_module grizzly-httpservice extras
+# Unsupport war extension
+%pom_disable_module comet samples
+%pom_disable_module websockets/chat samples
+%pom_disable_module websockets/chat-ssl samples
+
+%pom_remove_dep :maven-bundle-plugin
+%pom_remove_dep :maven-plugin-tools-api
+%pom_remove_dep org.glassfish.hk2:config-types
+%pom_remove_dep org.glassfish.hk2:core
+%pom_remove_dep org.glassfish.hk2:hk2-config
+%pom_remove_dep org.glassfish.hk2:hk2-locator
+%pom_remove_dep org.glassfish.hk2:osgi-adapter
+
+# wagon-webdav & wagon-ssh-external
+%pom_xpath_remove "pom:build/pom:extensions"
+
+# org.glassfish.grizzly:grizzly-npn-bootstrap:1.0
+%pom_xpath_inject "pom:dependency[pom:artifactId = 'grizzly-spdy']" '<version>${project.version}</version>' samples/spdy-samples
+
+#%% pom_remove_dep org.glassfish.grizzly:documentation bom
+%pom_remove_dep org.glassfish.grizzly:grizzly-comet-server bom
+%pom_remove_dep org.glassfish.grizzly:grizzly-compression bom
+%pom_remove_dep org.glassfish.grizzly:grizzly-core bom
+%pom_remove_dep org.glassfish.grizzly:grizzly-http-all bom
+%pom_remove_dep org.glassfish.grizzly:grizzly-http-server-core bom
+%pom_remove_dep org.glassfish.grizzly:grizzly-http-server-jaxws bom
+%pom_remove_dep org.glassfish.grizzly:grizzly-http-servlet-server bom
+%pom_remove_dep org.glassfish.grizzly:grizzly-websockets-server bom
+%pom_remove_dep org.glassfish.grizzly.osgi:grizzly-httpservice bom
+%pom_remove_dep org.glassfish.grizzly.osgi:grizzly-httpservice-bundle bom
+%pom_remove_plugin :maven-antrun-extended-plugin bom
+%pom_remove_plugin :glassfish-copyright-maven-plugin bom
+
+%pom_remove_plugin :findbugs-maven-plugin
+%pom_remove_plugin :glassfish-copyright-maven-plugin
+%pom_remove_plugin :nexus-maven-plugin
+%pom_remove_plugin :maven-source-plugin
+%pom_xpath_remove "pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:executions"
+
+%if %{without jersey}
+%pom_remove_dep com.sun.jersey: modules/http-servlet
+rm -rf modules/http-servlet/src/test/java/filter/*
+%else
+%pom_add_dep com.sun.jersey:jersey-servlet:'${jersey-version}':test modules/http-servlet
+%endif
+
+cp -p modules/grizzly/src/main/resources/Grizzly_THIRDPARTYLICENSEREADME.txt .
+sed -i 's/\r//' LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt
+
+%pom_xpath_set -r "pom:plugin[pom:groupId='com.sun.istack']/pom:artifactId" istack-commons-maven-plugin
+
+# Force servlet 3.1 apis
+%pom_change_dep -r javax.servlet:servlet-api javax.servlet:javax.servlet-api:'${servlet-version}'
+
+%if %{without jaxws}
+%pom_disable_module http-server-jaxws extras
+%pom_disable_module http-jaxws-samples samples
+%else
+%pom_change_dep com.sun.xml.ws: :rt extras/http-server-jaxws
+%pom_change_dep com.sun.xml.ws: :rt samples/http-jaxws-samples
+%endif
+
+for m in http2 spdy ; do
+%pom_xpath_remove "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:configuration/pom:useDefaultManifestFile" modules/${m}
+%pom_xpath_inject "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:configuration" '
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>' modules/${m}
+done
+
+%mvn_package org.glassfish.grizzly.samples: samples
+
+%build
+# forcing the use of required glassfish-servlet-api 3.1 apis
+# test skipped on arm builder
+# https://bugzilla.redhat.com/show_bug.cgi?id=991712
+%mvn_build \
+%ifarch %{arm}
+ -f -- \
+%else
+ -- -Dmaven.test.failure.ignore=true \
+%endif
+ -Dmaven.local.depmap.file="%{_mavendepmapfragdir}/glassfish-servlet-api.xml"
+
+%install
+%mvn_install
+
+(
+ cd %{buildroot}%{_javadir}/%{name}
+ ln -sf %{name}-framework.jar %{name}.jar
+)
+
+%files -f .mfiles
+%{_javadir}/%{name}/%{name}.jar
+%license LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt
+
+%files samples -f .mfiles-samples
+%license LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt
+
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt
+
+%changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.3.24-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.3.24-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.3.24-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.3.24-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.3.24-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.3.24-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Jun 24 2016 gil cattaneo <puntogil(a)libero.it> 2.3.24-2
+- disable jaxws support
+
+* Thu Feb 18 2016 gil cattaneo <puntogil(a)libero.it> 2.3.24-1
+- update to 2.3.24
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.3.23-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sun Oct 04 2015 gil cattaneo <puntogil(a)libero.it> 2.3.23-1
+- update to 2.3.23
+
+* Tue Aug 11 2015 gil cattaneo <puntogil(a)libero.it> 2.3.21-1
+- update to 2.3.21
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.3.19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon May 04 2015 gil cattaneo <puntogil(a)libero.it> 2.3.19-1
+- update to 2.3.19
+
+* Tue Feb 03 2015 gil cattaneo <puntogil(a)libero.it> 2.3.6-3
+- introduce license macro
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.3.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri Oct 04 2013 gil cattaneo <puntogil(a)libero.it> 2.3.6-1
+- update to 2.3.6
+
+* Fri Aug 09 2013 gil cattaneo <puntogil(a)libero.it> 2.3.4-1
+- update to 2.3.4
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Jul 10 2013 gil cattaneo <puntogil(a)libero.it> 2.3.3-1
+- update to 2.3.3
+- built with XMvn
+- enable glassfish-jaxws support
+
+* Sat May 18 2013 gil cattaneo <puntogil(a)libero.it> 2.3.2-2
+- fix aId for new istack-commons maven plugin
+
+* Sat May 04 2013 gil cattaneo <puntogil(a)libero.it> 2.3.2-1
+- update to 2.3.2
+
+* Sat Apr 20 2013 gil cattaneo <puntogil(a)libero.it> 2.3.1-2
+- fix License tag
+
+* Wed Apr 17 2013 gil cattaneo <puntogil(a)libero.it> 2.3.1-1
+- update to 2.3.1
+
+* Thu Apr 11 2013 gil cattaneo <puntogil(a)libero.it> 2.3-1
+- update to 2.3
+
+* Wed Mar 13 2013 gil cattaneo <puntogil(a)libero.it> 2.3-0.1.rc4
+- update to 2.3-rc4
+
+* Fri Feb 22 2013 gil cattaneo <puntogil(a)libero.it> 2.3-0.1.beta9
+- update to 2.3-beta9
+
+* Thu Dec 13 2012 gil cattaneo <puntogil(a)libero.it> 2.3-0.1.beta8
+- update to 2.3-beta8
+
+* Wed Oct 24 2012 gil cattaneo <puntogil(a)libero.it> 2.3-0.1.beta6
+- update to 2.3-beta6
+
+* Mon Oct 22 2012 gil cattaneo <puntogil(a)libero.it> 2.2.19-1
+- update to 2.2.19
+
+* Wed Sep 19 2012 gil cattaneo <puntogil(a)libero.it> 2.2.18-1
+- initial rpm
diff --git a/sources b/sources
new file mode 100644
index 0000000..647ee44
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+8a2ecf2b812d3f1572e16af09cda2bf7 2_3_24.tar.gz
4 years, 7 months
Architecture specific change in rpms/java-latest-openjdk.git
by githook-noreply@fedoraproject.org
The package rpms/java-latest-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-latest-openjdk.git/commit/?i....
Change:
+%ifarch %{aot_arches}
Thanks.
Full change:
============
commit f3d68a0514546e06dd2d1f770cc33b69fdc96bad
Author: Petra Mikova <pmikova(a)redhat.com>
Date: Wed Aug 14 13:06:39 2019 +0200
Updated to 13+33 sources
diff --git a/.gitignore b/.gitignore
index a77ce00..e1b049a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/jdk-updates-jdk12u-jdk-12.0.2+9.tar.xz
/jdk-jdk13-jdk-13+27.tar.xz
/jdk-jdk13-jdk-13+28.tar.xz
+/jdk-jdk13-jdk-13+33.tar.xz
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 9ade6b8..7c8e405 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -224,7 +224,7 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global minorver 0
-%global buildver 28
+%global buildver 33
%global rpmrelease 1
# priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
@@ -241,7 +241,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 ea_designator ""
%global ea_designator_zip ""
@@ -753,6 +753,10 @@ exit 0
%{_mandir}/man1/jlink-%{uniquesuffix -- %{?1}}.1.gz
%{_mandir}/man1/jmod-%{uniquesuffix -- %{?1}}.1.gz
%{_mandir}/man1/jshell-%{uniquesuffix -- %{?1}}.1.gz
+%{_mandir}/man1/jfr-%{uniquesuffix -- %{?1}}.1.gz
+%ifarch %{aot_arches}
+%{_mandir}/man1/jaotc-%{uniquesuffix -- %{?1}}.1.gz
+%endif
%if %{with_systemtap}
%dir %{tapsetroot}
@@ -1848,6 +1852,11 @@ require "copy_jdk_configs.lua"
%changelog
+* Wed Aug 14 2019 Petra Alice Mikova <pmikova(a)redhat.com> - 1:13.0.0.33-1.rolling
+- updated to 13+33 sources
+- added two manpages to file listings (jfr, jaotc)
+- set is_ga to 1 to match build from jdk.java.net
+
* Fri Jul 19 2019 Petra Alice Mikova <pmikova(a)redhat.com> - 1:13.0.0.28-0.1.ea.rolling
- updated to jdk 13
- adapted pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch
diff --git a/sources b/sources
index e6c12da..c3b1ea2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (jdk-jdk13-jdk-13+28.tar.xz) = 4efc6dba5e9e8f4d75aaced5b187d2d9ba74c00f0c1bce7645fcce8a92f697cb5c8f33209d00901f446eaef1f0e34ee51f22b5203fc90deda89a21bcdc980897
+SHA512 (jdk-jdk13-jdk-13+33.tar.xz) = a2d8f2d837c05e147a9d2e7afb90b3ab781760f287fe9d247f12927014524d7afc7a4654cb5432e34dbc55af387893175d04d36681b6d4f5441edff2660b4397
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
commit 2e2c009d397b95027110418782fd94e913ab3f36
Author: Petra Mikova <pmikova(a)redhat.com>
Date: Fri Jul 12 09:06:02 2019 +0200
Removed jhsdb manpage for s390x arch
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index b25636d..9ade6b8 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -707,6 +707,7 @@ exit 0
%ifarch %{jit_arches}
%ifnarch s390x
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jhsdb
+%{_mandir}/man1/jhsdb-%{uniquesuffix -- %{?1}}.1.gz
%endif
%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jinfo
@@ -749,7 +750,6 @@ exit 0
%{_mandir}/man1/rmic-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/jdeprscan-%{uniquesuffix -- %{?1}}.1.gz
-%{_mandir}/man1/jhsdb-%{uniquesuffix -- %{?1}}.1.gz
%{_mandir}/man1/jlink-%{uniquesuffix -- %{?1}}.1.gz
%{_mandir}/man1/jmod-%{uniquesuffix -- %{?1}}.1.gz
%{_mandir}/man1/jshell-%{uniquesuffix -- %{?1}}.1.gz
commit c2bd7cf54e22148e1b201b31a1d01542975c29a9
Author: Petra Mikova <pmikova(a)redhat.com>
Date: Thu Jul 11 13:33:16 2019 +0200
Update to 13+28 sources
diff --git a/.gitignore b/.gitignore
index 160bfc7..a77ce00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/jdk-updates-jdk12u-jdk-12.0.1+12.tar.xz
/jdk-updates-jdk12u-jdk-12.0.2+9.tar.xz
/jdk-jdk13-jdk-13+27.tar.xz
+/jdk-jdk13-jdk-13+28.tar.xz
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 04413a3..b25636d 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -224,7 +224,7 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global minorver 0
-%global buildver 27
+%global buildver 28
%global rpmrelease 1
# priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
@@ -1848,7 +1848,7 @@ require "copy_jdk_configs.lua"
%changelog
-* Fri Jul 19 2019 Petra Alice Mikova <pmikova(a)redhat.com> - 1:13.0.0.27-0.1.ea.rolling
+* Fri Jul 19 2019 Petra Alice Mikova <pmikova(a)redhat.com> - 1:13.0.0.28-0.1.ea.rolling
- updated to jdk 13
- adapted pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch
- adapted rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
diff --git a/sources b/sources
index 9bfbece..e6c12da 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (jdk-jdk13-jdk-13+27.tar.xz) = ff65b5cccf276a77046079a9da175a604f1702df6e39bb8b585345b358b786f091ac0c4907eaa19c8db3f0d152e296148845c18a1fc8ea52b26445e653d76fd2
+SHA512 (jdk-jdk13-jdk-13+28.tar.xz) = 4efc6dba5e9e8f4d75aaced5b187d2d9ba74c00f0c1bce7645fcce8a92f697cb5c8f33209d00901f446eaef1f0e34ee51f22b5203fc90deda89a21bcdc980897
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
commit 2e6d23a524e95369b37e624acfe772d162f41587
Author: Petra Mikova <pmikova(a)redhat.com>
Date: Thu Jul 11 11:50:53 2019 +0200
Backported patch related to ea designator from ojdk11
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 1ced500..04413a3 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -225,6 +225,7 @@
%global top_level_dir_name %{origin}
%global minorver 0
%global buildver 27
+%global rpmrelease 1
# priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
%global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
@@ -236,6 +237,23 @@
%global javaver %{majorver}
+# Define milestone (EA for pre-releases, GA 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 0
+%if %{is_ga}
+%global ea_designator ""
+%global ea_designator_zip ""
+%global extraver %{nil}
+%global eaprefix %{nil}
+%else
+%global ea_designator ea
+%global ea_designator_zip -%{ea_designator}
+%global extraver .%{ea_designator}
+%global eaprefix 0.
+%endif
+
# parametrized macros are order-sensitive
%global compatiblename java-%{majorver}-%{origin}
%global fullversion %{compatiblename}-%{version}-%{release}
@@ -956,7 +974,7 @@ Version: %{newjavaver}.%{buildver}
# This package needs `.rolling` as part of Release so as to not conflict on install with
# java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as
# java-X-openjdk. See: https://bugzilla.redhat.com/show_bug.cgi?id=1647298
-Release: 0.ea.1.rolling%{?dist}
+Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling%{?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
@@ -1377,7 +1395,7 @@ bash ../configure \
--with-jobs=1 \
%endif
--with-version-build=%{buildver} \
- --with-version-pre="" \
+ --with-version-pre="%{ea_designator}"\
--with-version-opt=%{lts_designator} \
--with-vendor-version-string="%{vendor_version_string}" \
--with-boot-jdk=/usr/lib/jvm/java-%{buildjdkver}-openjdk \
@@ -1600,7 +1618,7 @@ popd
# Install Javadoc documentation
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
-cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
+cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
# Install icons and menu entries
for s in 16 24 32 48 ; do
@@ -1830,11 +1848,14 @@ require "copy_jdk_configs.lua"
%changelog
-* Fri Jul 19 2019 Petra Alice Mikova <pmikova(a)redhat.com> - 1:13.0.0.27-0.ea.1.rolling
+* Fri Jul 19 2019 Petra Alice Mikova <pmikova(a)redhat.com> - 1:13.0.0.27-0.1.ea.rolling
- updated to jdk 13
- adapted pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch
- adapted rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
- fixed file listings
+- included https://src.fedoraproject.org/rpms/java-11-openjdk/pull-request/49:
+- Include 'ea' designator in Release when appropriate
+- Handle milestone as variables so we can alter it easily and set the docs zip filename appropriately
* Thu Jul 18 2019 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:12.0.2.9-1.rolling
- Update to July 2019 CPU update (tag jdk-12.0.2+9)
commit cecef32c88082e0faf1f865525e32e7819342dfa
Author: Petra Mikova <pmikova(a)redhat.com>
Date: Tue Jul 9 10:59:30 2019 +0200
Update of the package to OpenJDK 13
Adapted patches, spec and uploaded new sources
diff --git a/.gitignore b/.gitignore
index e821930..160bfc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
/jdk-updates-jdk12u-jdk-12.0.1+12.tar.xz
/jdk-updates-jdk12u-jdk-12.0.2+9.tar.xz
+/jdk-jdk13-jdk-13+27.tar.xz
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 094cefd..1ced500 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -205,12 +205,12 @@
%endif
# New Version-String scheme-style defines
-%global majorver 12
-%global securityver 2
+%global majorver 13
+%global securityver 0
# buildjdkver is usually same as %%{majorver},
# but in time of bootstrap of next jdk, it is majorver-1,
# and this it is better to change it here, on single place
-%global buildjdkver 11
+%global buildjdkver 12
# Used via new version scheme. JDK 11 was
# GA'ed in March 2019 => 19.3
%global vendor_version_string 19.3
@@ -224,7 +224,7 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global minorver 0
-%global buildver 9
+%global buildver 27
# priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk
%global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
@@ -730,6 +730,12 @@ exit 0
%{_mandir}/man1/jstatd-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/rmic-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1*
+%{_mandir}/man1/jdeprscan-%{uniquesuffix -- %{?1}}.1.gz
+%{_mandir}/man1/jhsdb-%{uniquesuffix -- %{?1}}.1.gz
+%{_mandir}/man1/jlink-%{uniquesuffix -- %{?1}}.1.gz
+%{_mandir}/man1/jmod-%{uniquesuffix -- %{?1}}.1.gz
+%{_mandir}/man1/jshell-%{uniquesuffix -- %{?1}}.1.gz
+
%if %{with_systemtap}
%dir %{tapsetroot}
%dir %{tapsetdirttapset}
@@ -950,7 +956,7 @@ Version: %{newjavaver}.%{buildver}
# This package needs `.rolling` as part of Release so as to not conflict on install with
# java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as
# java-X-openjdk. See: https://bugzilla.redhat.com/show_bug.cgi?id=1647298
-Release: 1.rolling%{?dist}
+Release: 0.ea.1.rolling%{?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
@@ -984,7 +990,7 @@ URL: http://openjdk.java.net/
# to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh
# update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
-Source0: jdk-updates-jdk%{majorver}u-jdk-%{majorver}.%{minorver}.%{securityver}+%{buildver}.tar.xz
+Source0: jdk-jdk%{majorver}-jdk-%{majorver}+%{buildver}.tar.xz
Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
# Desktop files. Adapted from IcedTea
@@ -1053,7 +1059,7 @@ BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
BuildRequires: javapackages-filesystem
-BuildRequires: java-%{buildjdkver}-openjdk-devel
+BuildRequires: java-latest-openjdk-devel
# Zero-assembler build requirement
%ifnarch %{jit_arches}
BuildRequires: libffi-devel
@@ -1594,7 +1600,7 @@ popd
# Install Javadoc documentation
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
-cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}.%{minorver}.%{securityver}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
+cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
# Install icons and menu entries
for s in 16 24 32 48 ; do
@@ -1824,6 +1830,12 @@ require "copy_jdk_configs.lua"
%changelog
+* Fri Jul 19 2019 Petra Alice Mikova <pmikova(a)redhat.com> - 1:13.0.0.27-0.ea.1.rolling
+- updated to jdk 13
+- adapted pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch
+- adapted rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
+- fixed file listings
+
* Thu Jul 18 2019 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:12.0.2.9-1.rolling
- Update to July 2019 CPU update (tag jdk-12.0.2+9)
diff --git a/pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch b/pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch
index 6a1da4c..83bb34b 100644
--- a/pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch
+++ b/pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch
@@ -1,96 +1,112 @@
-diff --git a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
---- openjdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
-+++ openjdk/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
-@@ -180,72 +180,6 @@
- // Elliptic Curves (RFC 4492)
- //
- // See sun.security.util.CurveDB for the OIDs
-- // NIST K-163
-- SECT163_K1 (0x0001, "sect163k1", "1.3.132.0.1", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECT163_R1 (0x0002, "sect163r1", "1.3.132.0.2", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST B-163
-- SECT163_R2 (0x0003, "sect163r2", "1.3.132.0.15", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECT193_R1 (0x0004, "sect193r1", "1.3.132.0.24", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECT193_R2 (0x0005, "sect193r2", "1.3.132.0.25", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST K-233
-- SECT233_K1 (0x0006, "sect233k1", "1.3.132.0.26", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST B-233
-- SECT233_R1 (0x0007, "sect233r1", "1.3.132.0.27", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECT239_K1 (0x0008, "sect239k1", "1.3.132.0.3", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST K-283
-- SECT283_K1 (0x0009, "sect283k1", "1.3.132.0.16", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST B-283
-- SECT283_R1 (0x000A, "sect283r1", "1.3.132.0.17", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST K-409
-- SECT409_K1 (0x000B, "sect409k1", "1.3.132.0.36", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST B-409
-- SECT409_R1 (0x000C, "sect409r1", "1.3.132.0.37", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST K-571
-- SECT571_K1 (0x000D, "sect571k1", "1.3.132.0.38", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST B-571
-- SECT571_R1 (0x000E, "sect571r1", "1.3.132.0.39", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECP160_K1 (0x000F, "secp160k1", "1.3.132.0.9", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECP160_R1 (0x0010, "secp160r1", "1.3.132.0.8", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECP160_R2 (0x0011, "secp160r2", "1.3.132.0.30", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECP192_K1 (0x0012, "secp192k1", "1.3.132.0.31", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
--
-- // NIST P-192
-- SECP192_R1 (0x0013, "secp192r1", "1.2.840.10045.3.1.1", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECP224_K1 (0x0014, "secp224k1", "1.3.132.0.32", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- // NIST P-224
-- SECP224_R1 (0x0015, "secp224r1", "1.3.132.0.33", true,
-- ProtocolVersion.PROTOCOLS_TO_12),
-- SECP256_K1 (0x0016, "secp256k1", "1.3.132.0.10", false,
-- ProtocolVersion.PROTOCOLS_TO_12),
+diff -r b7f68ddec66f src/java.base/share/classes/sun/security/ssl/NamedGroup.java
+--- a/src/java.base/share/classes/sun/security/ssl/NamedGroup.java Tue Jun 25 10:50:59 2019 +0100
++++ b/src/java.base/share/classes/sun/security/ssl/NamedGroup.java Wed Jul 03 16:36:37 2019 +0200
+@@ -50,97 +50,6 @@
+ // Elliptic Curves (RFC 4492)
+ //
+ // See sun.security.util.CurveDB for the OIDs
+- // NIST K-163
+-
+- SECT163_K1(0x0001, "sect163k1", "1.3.132.0.1",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT163_R1(0x0002, "sect163r1", "1.3.132.0.2",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-163
+- SECT163_R2(0x0003, "sect163r2", "1.3.132.0.15",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT193_R1(0x0004, "sect193r1", "1.3.132.0.24",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT193_R2(0x0005, "sect193r2", "1.3.132.0.25",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-233
+- SECT233_K1(0x0006, "sect233k1", "1.3.132.0.26",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-233
+- SECT233_R1(0x0007, "sect233r1", "1.3.132.0.27",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECT239_K1(0x0008, "sect239k1", "1.3.132.0.3",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-283
+- SECT283_K1(0x0009, "sect283k1", "1.3.132.0.16",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-283
+- SECT283_R1(0x000A, "sect283r1", "1.3.132.0.17",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-409
+- SECT409_K1(0x000B, "sect409k1", "1.3.132.0.36",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-409
+- SECT409_R1(0x000C, "sect409r1", "1.3.132.0.37",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST K-571
+- SECT571_K1(0x000D, "sect571k1", "1.3.132.0.38",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST B-571
+- SECT571_R1(0x000E, "sect571r1", "1.3.132.0.39",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP160_K1(0x000F, "secp160k1", "1.3.132.0.9",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP160_R1(0x0010, "secp160r1", "1.3.132.0.8",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP160_R2(0x0011, "secp160r2", "1.3.132.0.30",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP192_K1(0x0012, "secp192k1", "1.3.132.0.31",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST P-192
+- SECP192_R1(0x0013, "secp192r1", "1.2.840.10045.3.1.1",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP224_K1(0x0014, "secp224k1", "1.3.132.0.32",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+- // NIST P-224
+- SECP224_R1(0x0015, "secp224r1", "1.3.132.0.33",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+- SECP256_K1(0x0016, "secp256k1", "1.3.132.0.10",
+- NamedGroupType.NAMED_GROUP_ECDHE,
+- ProtocolVersion.PROTOCOLS_TO_12),
+-
+ // NIST P-256
+ SECP256_R1(0x0017, "secp256r1", "1.2.840.10045.3.1.7",
+ NamedGroupType.NAMED_GROUP_ECDHE,
+diff -r b7f68ddec66f src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
+--- a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java Tue Jun 25 10:50:59 2019 +0100
++++ b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java Wed Jul 03 16:36:37 2019 +0200
+@@ -214,17 +214,6 @@
+ // Secondary XDH curves
+ NamedGroup.X448,
- // NIST P-256
- SECP256_R1 (0x0017, "secp256r1", "1.2.840.10045.3.1.7", true,
-@@ -116,12 +116,6 @@
- NamedGroup.SECP256_R1,
- NamedGroup.SECP384_R1,
- NamedGroup.SECP521_R1,
-- NamedGroup.SECT283_K1,
-- NamedGroup.SECT283_R1,
-- NamedGroup.SECT409_K1,
-- NamedGroup.SECT409_R1,
-- NamedGroup.SECT571_K1,
-- NamedGroup.SECT571_R1,
-
- // FFDHE 2048
- NamedGroup.FFDHE_2048,
-@@ -136,15 +130,6 @@
- NamedGroup.SECP256_R1,
- NamedGroup.SECP384_R1,
- NamedGroup.SECP521_R1,
+- // Secondary NIST curves
- NamedGroup.SECT283_K1,
- NamedGroup.SECT283_R1,
- NamedGroup.SECT409_K1,
@@ -100,12 +116,13 @@ diff --git a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtensi
-
- // non-NIST curves
- NamedGroup.SECP256_K1,
-
- // FFDHE 2048
+-
+ // FFDHE (RFC 7919)
NamedGroup.FFDHE_2048,
-diff --git a/src/java.base/share/classes/sun/security/util/CurveDB.java b/src/java.base/share/classes/sun/security/util/CurveDB.java
---- openjdk/src/java.base/share/classes/sun/security/util/CurveDB.java
-+++ openjdk/src/java.base/share/classes/sun/security/util/CurveDB.java
+ NamedGroup.FFDHE_3072,
+diff -r b7f68ddec66f src/java.base/share/classes/sun/security/util/CurveDB.java
+--- a/src/java.base/share/classes/sun/security/util/CurveDB.java Tue Jun 25 10:50:59 2019 +0100
++++ b/src/java.base/share/classes/sun/security/util/CurveDB.java Wed Jul 03 16:36:37 2019 +0200
@@ -168,114 +168,6 @@
Pattern nameSplitPattern = Pattern.compile(SPLIT_PATTERN);
@@ -657,12 +674,12 @@ diff --git a/src/java.base/share/classes/sun/security/util/CurveDB.java b/src/ja
specCollection = Collections.unmodifiableCollection(oidMap.values());
}
}
-diff --git a/test/jdk/sun/security/ec/TestEC.java b/test/jdk/sun/security/ec/TestEC.java
---- openjdk/test/jdk/sun/security/ec/TestEC.java
-+++ openjdk/test/jdk/sun/security/ec/TestEC.java
-@@ -35,8 +35,8 @@
- * @library ../pkcs11/sslecc
+diff -r b7f68ddec66f test/jdk/sun/security/ec/TestEC.java
+--- a/test/jdk/sun/security/ec/TestEC.java Tue Jun 25 10:50:59 2019 +0100
++++ b/test/jdk/sun/security/ec/TestEC.java Wed Jul 03 16:36:37 2019 +0200
+@@ -37,8 +37,8 @@
* @library ../../../java/security/testlibrary
+ * @library ../../../javax/net/ssl/TLSCommon
* @modules jdk.crypto.cryptoki/sun.security.pkcs11.wrapper
- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
- * @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
@@ -671,11 +688,11 @@ diff --git a/test/jdk/sun/security/ec/TestEC.java b/test/jdk/sun/security/ec/Tes
*/
import java.security.NoSuchProviderException;
-diff -r bd66ea2fdde3 test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
---- openjdk/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Thu Jul 27 18:04:48 2017 +0000
-+++ openjdk/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Fri Oct 06 13:18:47 2017 +0200
+diff -r b7f68ddec66f test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
+--- a/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Tue Jun 25 10:50:59 2019 +0100
++++ b/test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java Wed Jul 03 16:36:37 2019 +0200
@@ -34,9 +34,9 @@
- * @library ..
+ * @library /test/lib .. ../../../../javax/net/ssl/TLSCommon
* @library ../../../../java/security/testlibrary
* @modules jdk.crypto.cryptoki
- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
@@ -685,3 +702,4 @@ diff -r bd66ea2fdde3 test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.ja
+ * @run main/othervm -Djdk.tls.namedGroups="secp256r1"
* ClientJSSEServerJSSE sm policy
*/
+
diff --git a/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch b/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
index a877506..3042186 100644
--- a/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
+++ b/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
@@ -1,10 +1,9 @@
-diff -uNr openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java jdk8/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
---- openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java
-+++ openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java
-@@ -883,9 +883,13 @@
- return null;
- }
- });
+diff -r 618ad1237e73 src/java.desktop/share/classes/java/awt/Toolkit.java
+--- a/src/java.desktop/share/classes/java/awt/Toolkit.java Thu Jun 13 19:37:49 2019 +0200
++++ b/src/java.desktop/share/classes/java/awt/Toolkit.java Thu Jul 04 10:35:42 2019 +0200
+@@ -595,7 +595,11 @@
+ toolkit = new HeadlessToolkit(toolkit);
+ }
if (!GraphicsEnvironment.isHeadless()) {
- loadAssistiveTechnologies();
+ try {
@@ -15,4 +14,3 @@ diff -uNr openjdk/src/java.desktop/share/classes/java/awt/Toolkit.java jdk8/jdk/
}
}
return toolkit;
- }
diff --git a/sources b/sources
index 20e442e..9bfbece 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (jdk-updates-jdk12u-jdk-12.0.2+9.tar.xz) = ed1b5dec108fb29f72a8a80faca22703d3d1378d5a3b535c9e41b8f73d51d6650dd72e0e4b2e79de61c9f85013b26f39f6a7b5292b646bd6f5b3a54c9922fbf9
+SHA512 (jdk-jdk13-jdk-13+27.tar.xz) = ff65b5cccf276a77046079a9da175a604f1702df6e39bb8b585345b358b786f091ac0c4907eaa19c8db3f0d152e296148845c18a1fc8ea52b26445e653d76fd2
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
4 years, 7 months
Architecture specific change in rpms/net-snmp.git
by githook-noreply@fedoraproject.org
The package rpms/net-snmp.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/net-snmp.git/commit/?id=81c40c1ab....
Change:
-%ifarch sparc64 s390 s390x
Thanks.
Full change:
============
commit 81c40c1ab48bc9fdcba5ada2f0491c22315b12dc
Author: Josef dk <jridky(a)redhat.com>
Date: Thu Sep 19 08:39:51 2019 +0200
Resolves: #1753506 - fix invalid free
diff --git a/net-snmp-5.8-v3-forward.patch b/net-snmp-5.8-v3-forward.patch
new file mode 100644
index 0000000..24ac379
--- /dev/null
+++ b/net-snmp-5.8-v3-forward.patch
@@ -0,0 +1,357 @@
+diff -urNp c/agent/snmp_agent.c d/agent/snmp_agent.c
+--- c/agent/snmp_agent.c 2019-09-18 08:44:53.833601845 +0200
++++ d/agent/snmp_agent.c 2019-09-18 08:46:38.176595597 +0200
+@@ -1604,6 +1604,13 @@ free_agent_snmp_session(netsnmp_agent_se
+
+ DEBUGMSGTL(("verbose:asp", "asp %p reqinfo %p freed\n",
+ asp, asp->reqinfo));
++
++ /* Clean up securityStateRef here to prevent a double free */
++ if (asp->orig_pdu && asp->orig_pdu->securityStateRef)
++ snmp_free_securityStateRef(asp->orig_pdu);
++ if (asp->pdu && asp->pdu->securityStateRef)
++ snmp_free_securityStateRef(asp->pdu);
++
+ if (asp->orig_pdu)
+ snmp_free_pdu(asp->orig_pdu);
+ if (asp->pdu)
+diff -urNp c/include/net-snmp/pdu_api.h d/include/net-snmp/pdu_api.h
+--- c/include/net-snmp/pdu_api.h 2019-09-18 08:44:53.822601740 +0200
++++ d/include/net-snmp/pdu_api.h 2019-09-18 08:47:03.620838212 +0200
+@@ -19,6 +19,8 @@ NETSNMP_IMPORT
+ netsnmp_pdu *snmp_fix_pdu( netsnmp_pdu *pdu, int idx);
+ NETSNMP_IMPORT
+ void snmp_free_pdu( netsnmp_pdu *pdu);
++NETSNMP_IMPORT
++void snmp_free_securityStateRef( netsnmp_pdu *pdu);
+
+ #ifdef __cplusplus
+ }
+diff -urNp c/snmplib/snmp_api.c d/snmplib/snmp_api.c
+--- c/snmplib/snmp_api.c 2019-09-18 08:44:53.807601597 +0200
++++ d/snmplib/snmp_api.c 2019-09-18 08:53:19.937435576 +0200
+@@ -4012,7 +4012,12 @@ snmpv3_parse(netsnmp_pdu *pdu,
+ static void
+ free_securityStateRef(netsnmp_pdu* pdu)
+ {
+- struct snmp_secmod_def *sptr = find_sec_mod(pdu->securityModel);
++ struct snmp_secmod_def *sptr;
++
++ if(!pdu->securityStateRef)
++ return;
++
++ sptr = find_sec_mod(pdu->securityModel);
+ if (sptr) {
+ if (sptr->pdu_free_state_ref) {
+ (*sptr->pdu_free_state_ref) (pdu->securityStateRef);
+@@ -4029,6 +4034,17 @@ free_securityStateRef(netsnmp_pdu* pdu)
+ pdu->securityStateRef = NULL;
+ }
+
++/*
++ * This function is here to provide a separate call to
++ * free the securityStateRef memory. This is needed to prevent
++ * a double free if this memory is freed in snmp_free_pdu.
++ */
++void
++snmp_free_securityStateRef(netsnmp_pdu* pdu)
++{
++ free_securityStateRef(pdu);
++}
++
+ #define ERROR_STAT_LENGTH 11
+
+ int
+diff -urNp c/snmplib/snmpusm.c d/snmplib/snmpusm.c
+--- c/snmplib/snmpusm.c 2019-09-18 08:44:53.802601550 +0200
++++ d/snmplib/snmpusm.c 2019-09-18 08:57:35.696872662 +0200
+@@ -299,16 +299,20 @@ usm_free_usmStateReference(void *old)
+
+ if (old_ref) {
+
+- SNMP_FREE(old_ref->usr_name);
+- SNMP_FREE(old_ref->usr_engine_id);
+- SNMP_FREE(old_ref->usr_auth_protocol);
+- SNMP_FREE(old_ref->usr_priv_protocol);
++ if (old_ref->usr_name_length)
++ SNMP_FREE(old_ref->usr_name);
++ if (old_ref->usr_engine_id_length)
++ SNMP_FREE(old_ref->usr_engine_id);
++ if (old_ref->usr_auth_protocol_length)
++ SNMP_FREE(old_ref->usr_auth_protocol);
++ if (old_ref->usr_priv_protocol_length)
++ SNMP_FREE(old_ref->usr_priv_protocol);
+
+- if (old_ref->usr_auth_key) {
++ if (old_ref->usr_auth_key_length && old_ref->usr_auth_key) {
+ SNMP_ZERO(old_ref->usr_auth_key, old_ref->usr_auth_key_length);
+ SNMP_FREE(old_ref->usr_auth_key);
+ }
+- if (old_ref->usr_priv_key) {
++ if (old_ref->usr_priv_key_length && old_ref->usr_priv_key) {
+ SNMP_ZERO(old_ref->usr_priv_key, old_ref->usr_priv_key_length);
+ SNMP_FREE(old_ref->usr_priv_key);
+ }
+@@ -1039,7 +1043,6 @@ usm_generate_out_msg(int msgProcModel,
+ if ((user = usm_get_user(secEngineID, secEngineIDLen, secName))
+ == NULL && secLevel != SNMP_SEC_LEVEL_NOAUTH) {
+ DEBUGMSGTL(("usm", "Unknown User(%s)\n", secName));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_USM_UNKNOWNSECURITYNAME;
+ }
+
+@@ -1091,7 +1094,6 @@ usm_generate_out_msg(int msgProcModel,
+ thePrivProtocolLength) == 1) {
+ DEBUGMSGTL(("usm", "Unsupported Security Level (%d)\n",
+ theSecLevel));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_USM_UNSUPPORTEDSECURITYLEVEL;
+ }
+
+@@ -1121,7 +1123,6 @@ usm_generate_out_msg(int msgProcModel,
+ &msgAuthParmLen, &msgPrivParmLen, &otstlen,
+ &seq_len, &msgSecParmLen) == -1) {
+ DEBUGMSGTL(("usm", "Failed calculating offsets.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_USM_GENERICERROR;
+ }
+
+@@ -1143,7 +1144,6 @@ usm_generate_out_msg(int msgProcModel,
+ ptr = *wholeMsg = globalData;
+ if (theTotalLength > *wholeMsgLen) {
+ DEBUGMSGTL(("usm", "Message won't fit in buffer.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_USM_GENERICERROR;
+ }
+
+@@ -1169,7 +1169,6 @@ usm_generate_out_msg(int msgProcModel,
+ htonl(boots_uint), htonl(time_uint),
+ &ptr[privParamsOffset]) == -1) {
+ DEBUGMSGTL(("usm", "Can't set AES iv.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_USM_GENERICERROR;
+ }
+ }
+@@ -1185,7 +1184,6 @@ usm_generate_out_msg(int msgProcModel,
+ &ptr[privParamsOffset])
+ == -1)) {
+ DEBUGMSGTL(("usm", "Can't set DES-CBC salt.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_USM_GENERICERROR;
+ }
+ }
+@@ -1198,7 +1196,6 @@ usm_generate_out_msg(int msgProcModel,
+ &ptr[dataOffset], &encrypted_length)
+ != SNMP_ERR_NOERROR) {
+ DEBUGMSGTL(("usm", "encryption error.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_USM_ENCRYPTIONERROR;
+ }
+ #ifdef NETSNMP_ENABLE_TESTING_CODE
+@@ -1226,7 +1223,6 @@ usm_generate_out_msg(int msgProcModel,
+ if ((encrypted_length != (theTotalLength - dataOffset))
+ || (salt_length != msgPrivParmLen)) {
+ DEBUGMSGTL(("usm", "encryption length error.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_USM_ENCRYPTIONERROR;
+ }
+
+@@ -1362,7 +1358,6 @@ usm_generate_out_msg(int msgProcModel,
+
+ if (temp_sig == NULL) {
+ DEBUGMSGTL(("usm", "Out of memory.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_USM_GENERICERROR;
+ }
+
+@@ -1376,7 +1371,6 @@ usm_generate_out_msg(int msgProcModel,
+ SNMP_ZERO(temp_sig, temp_sig_len);
+ SNMP_FREE(temp_sig);
+ DEBUGMSGTL(("usm", "Signing failed.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_USM_AUTHENTICATIONFAILURE;
+ }
+
+@@ -1384,7 +1378,6 @@ usm_generate_out_msg(int msgProcModel,
+ SNMP_ZERO(temp_sig, temp_sig_len);
+ SNMP_FREE(temp_sig);
+ DEBUGMSGTL(("usm", "Signing lengths failed.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_USM_AUTHENTICATIONFAILURE;
+ }
+
+@@ -1398,7 +1391,6 @@ usm_generate_out_msg(int msgProcModel,
+ /*
+ * endif -- create keyed hash
+ */
+- usm_free_usmStateReference(secStateRef);
+
+ DEBUGMSGTL(("usm", "USM processing completed.\n"));
+
+@@ -1548,7 +1540,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+ if ((user = usm_get_user(secEngineID, secEngineIDLen, secName))
+ == NULL && secLevel != SNMP_SEC_LEVEL_NOAUTH) {
+ DEBUGMSGTL(("usm", "Unknown User\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_USM_UNKNOWNSECURITYNAME;
+ }
+
+@@ -1601,7 +1592,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+ DEBUGMSGTL(("usm", "Unsupported Security Level or type (%d)\n",
+ theSecLevel));
+
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_USM_UNSUPPORTEDSECURITYLEVEL;
+ }
+
+@@ -1636,7 +1626,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+ DEBUGMSGTL(("usm",
+ "couldn't malloc %d bytes for encrypted PDU\n",
+ (int)ciphertextlen));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_MALLOC;
+ }
+
+@@ -1652,7 +1641,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+ htonl(boots_uint), htonl(time_uint),
+ iv) == -1) {
+ DEBUGMSGTL(("usm", "Can't set AES iv.\n"));
+- usm_free_usmStateReference(secStateRef);
+ SNMP_FREE(ciphertext);
+ return SNMPERR_USM_GENERICERROR;
+ }
+@@ -1667,7 +1655,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+ thePrivKeyLength - 8,
+ iv) == -1)) {
+ DEBUGMSGTL(("usm", "Can't set DES-CBC salt.\n"));
+- usm_free_usmStateReference(secStateRef);
+ SNMP_FREE(ciphertext);
+ return SNMPERR_USM_GENERICERROR;
+ }
+@@ -1686,7 +1673,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+ scopedPdu, scopedPduLen,
+ ciphertext, &ciphertextlen) != SNMP_ERR_NOERROR) {
+ DEBUGMSGTL(("usm", "encryption error.\n"));
+- usm_free_usmStateReference(secStateRef);
+ SNMP_FREE(ciphertext);
+ return SNMPERR_USM_ENCRYPTIONERROR;
+ }
+@@ -1703,7 +1689,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+ ciphertext, ciphertextlen);
+ if (rc == 0) {
+ DEBUGMSGTL(("usm", "Encryption failed.\n"));
+- usm_free_usmStateReference(secStateRef);
+ SNMP_FREE(ciphertext);
+ return SNMPERR_USM_ENCRYPTIONERROR;
+ }
+@@ -1743,7 +1728,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+ DEBUGINDENTLESS();
+ if (rc == 0) {
+ DEBUGMSGTL(("usm", "building privParams failed.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_TOO_LONG;
+ }
+
+@@ -1766,7 +1750,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+ DEBUGINDENTLESS();
+ if (rc == 0) {
+ DEBUGMSGTL(("usm", "building authParams failed.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_TOO_LONG;
+ }
+
+@@ -1789,7 +1772,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+ DEBUGINDENTLESS();
+ if (rc == 0) {
+ DEBUGMSGTL(("usm", "building authParams failed.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_TOO_LONG;
+ }
+
+@@ -1805,7 +1787,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+ if (rc == 0) {
+ DEBUGMSGTL(("usm",
+ "building msgAuthoritativeEngineTime failed.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_TOO_LONG;
+ }
+
+@@ -1821,7 +1802,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+ if (rc == 0) {
+ DEBUGMSGTL(("usm",
+ "building msgAuthoritativeEngineBoots failed.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_TOO_LONG;
+ }
+
+@@ -1833,7 +1813,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+ DEBUGINDENTLESS();
+ if (rc == 0) {
+ DEBUGMSGTL(("usm", "building msgAuthoritativeEngineID failed.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_TOO_LONG;
+ }
+
+@@ -1846,7 +1825,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+ *offset - sp_offset);
+ if (rc == 0) {
+ DEBUGMSGTL(("usm", "building usm security parameters failed.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_TOO_LONG;
+ }
+
+@@ -1860,7 +1838,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+
+ if (rc == 0) {
+ DEBUGMSGTL(("usm", "building msgSecurityParameters failed.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_TOO_LONG;
+ }
+
+@@ -1870,7 +1847,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+ while ((*wholeMsgLen - *offset) < globalDataLen) {
+ if (!asn_realloc(wholeMsg, wholeMsgLen)) {
+ DEBUGMSGTL(("usm", "building global data failed.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_TOO_LONG;
+ }
+ }
+@@ -1886,7 +1862,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+ ASN_CONSTRUCTOR), *offset);
+ if (rc == 0) {
+ DEBUGMSGTL(("usm", "building master packet sequence failed.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_TOO_LONG;
+ }
+
+@@ -1904,7 +1879,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+
+ if (temp_sig == NULL) {
+ DEBUGMSGTL(("usm", "Out of memory.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_USM_GENERICERROR;
+ }
+
+@@ -1915,14 +1889,12 @@ usm_rgenerate_out_msg(int msgProcModel,
+ != SNMP_ERR_NOERROR) {
+ SNMP_FREE(temp_sig);
+ DEBUGMSGTL(("usm", "Signing failed.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_USM_AUTHENTICATIONFAILURE;
+ }
+
+ if (temp_sig_len != msgAuthParmLen) {
+ SNMP_FREE(temp_sig);
+ DEBUGMSGTL(("usm", "Signing lengths failed.\n"));
+- usm_free_usmStateReference(secStateRef);
+ return SNMPERR_USM_AUTHENTICATIONFAILURE;
+ }
+
+@@ -1933,7 +1905,6 @@ usm_rgenerate_out_msg(int msgProcModel,
+ /*
+ * endif -- create keyed hash
+ */
+- usm_free_usmStateReference(secStateRef);
+ DEBUGMSGTL(("usm", "USM processing completed.\n"));
+ return SNMPERR_SUCCESS;
+ } /* end usm_rgenerate_out_msg() */
diff --git a/net-snmp.spec b/net-snmp.spec
index 17bb1c9..28ad55f 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -10,7 +10,7 @@
Summary: A collection of SNMP protocol tools and libraries
Name: net-snmp
Version: 5.8
-Release: 12%{?dist}
+Release: 13%{?dist}
Epoch: 1
License: BSD
@@ -45,6 +45,7 @@ Patch15: net-snmp-5.8-ipv6-clientaddr.patch
Patch16: net-snmp-5.8-licensing.patch
Patch17: net-snmp-5.8-agent-of-death.patch
Patch18: net-snmp-5.8-trapsink.patch
+Patch19: net-snmp-5.8-v3-forward.patch
# Modern RPM API means at least EL6
Patch101: net-snmp-5.8-modern-rpm-api.patch
@@ -217,14 +218,12 @@ cp %{SOURCE10} .
%patch16 -p1
%patch17 -p1 -b .agent-of-death
%patch18 -p1 -b .trapsink
-
+%patch19 -p1 -b .v3-forward
%patch101 -p1 -b .modern-rpm-api
%patch102 -p1
-%ifarch sparc64 s390 s390x
# disable failing test - see https://bugzilla.redhat.com/show_bug.cgi?id=680697
rm testing/fulltests/default/T200*
-%endif
%build
@@ -487,6 +486,9 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make test
%{_libdir}/libnetsnmptrapd*.so.%{soname}*
%changelog
+* Thu Sep 19 2019 Josef Ridky <jridky(a)redhat.com> - 1:5.8-13
+- Fix snmpv3 trap forwarding (#1753506)
+
* Mon Aug 19 2019 Miro Hronok <mhroncok(a)redhat.com> - 1:5.8-12
- Rebuilt for Python 3.8
commit 7dc11217eceb4e603bb622d09ff97a12fb00129b
Merge: f5c7c11 e2746cb
Author: Josef dk <jridky(a)redhat.com>
Date: Wed Sep 18 08:39:46 2019 +0200
Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/net-snmp
commit f5c7c112d1e74fd38cde81b9df98ef4aa509d52b
Author: Josef dk <jridky(a)redhat.com>
Date: Thu Jul 25 08:08:06 2019 +0200
Update autofs skip patch based on upstream code
diff --git a/net-snmp-5.8-autofs-skip.patch b/net-snmp-5.8-autofs-skip.patch
index e6de4f3..a9927d2 100644
--- a/net-snmp-5.8-autofs-skip.patch
+++ b/net-snmp-5.8-autofs-skip.patch
@@ -1,6 +1,31 @@
-diff -urNp b/agent/mibgroup/hardware/fsys/fsys_mntctl.c net-snmp-5.8/agent/mibgroup/hardware/fsys/fsys_mntctl.c
---- b/agent/mibgroup/hardware/fsys/fsys_mntctl.c 2018-07-18 16:12:20.674499629 +0200
-+++ net-snmp-5.8/agent/mibgroup/hardware/fsys/fsys_mntctl.c 2018-07-18 16:15:46.782859398 +0200
+From cf41e6e910158fb4c4cb546c49acd587c5f58232 Mon Sep 17 00:00:00 2001
+From: Josef Ridky <jridky(a)redhat.com>
+Date: Wed, 24 Jul 2019 07:23:47 -0700
+Subject: [PATCH] HOST-MIB: Skip autofs entries
+
+Do not call statfs() for autofs entries.
+
+See also https://sourceforge.net/p/net-snmp/patches/1350/.
+See also https://sourceforge.net/p/net-snmp/bugs/2968/.
+
+[ bvanassche: Made several small edits ]
+---
+ agent/mibgroup/hardware/fsys/fsys_mntctl.c | 8 ++++++--
+ agent/mibgroup/hardware/fsys/fsys_mntent.c | 11 +++++++++++
+ agent/mibgroup/hardware/fsys/mnttypes.h | 3 +++
+ agent/mibgroup/host/hr_filesys.c | 21 +++++++++++++++++++++
+ agent/mibgroup/host/hr_filesys.h | 1 +
+ agent/mibgroup/host/hr_storage.c | 5 ++++-
+ agent/mibgroup/host/hrh_filesys.c | 6 ++++++
+ agent/mibgroup/host/hrh_filesys.h | 1 +
+ agent/mibgroup/host/hrh_storage.c | 5 ++++-
+ include/net-snmp/agent/hardware/fsys.h | 1 +
+ 10 files changed, 58 insertions(+), 4 deletions(-)
+
+diff --git a/agent/mibgroup/hardware/fsys/fsys_mntctl.c b/agent/mibgroup/hardware/fsys/fsys_mntctl.c
+index e7d9a1c5a..782c8edd2 100644
+--- a/agent/mibgroup/hardware/fsys/fsys_mntctl.c
++++ b/agent/mibgroup/hardware/fsys/fsys_mntctl.c
@@ -43,8 +43,9 @@ _fsys_type( int type)
case MNT_NFS:
@@ -12,24 +37,27 @@ diff -urNp b/agent/mibgroup/hardware/fsys/fsys_mntctl.c net-snmp-5.8/agent/mibgr
/*
* The following code covers selected filesystems
-@@ -156,10 +157,12 @@ netsnmp_fsys_arch_load( void )
+@@ -155,12 +156,15 @@ netsnmp_fsys_arch_load( void )
+ */
/*
- * Optionally skip retrieving statistics for remote mounts
-+ * AUTOFS is skipped by default
+- * Optionally skip retrieving statistics for remote mounts
++ * Skip retrieving statistics for AUTOFS and optionally for remote
++ * mounts.
*/
-- if ( (entry->flags & NETSNMP_FS_FLAG_REMOTE) &&
-+ if ( ((entry->flags & NETSNMP_FS_FLAG_REMOTE) &&
+ if ( (entry->flags & NETSNMP_FS_FLAG_REMOTE) &&
netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
-- NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES))
-+ NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES)) ||
-+ entry->type == (NETSNMP_FS_TYPE_AUTOFS))
+ NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES))
continue;
++ if (entry->type == NETSNMP_FS_TYPE_AUTOFS)
++ continue;
if ( statfs( entry->path, &stat_buf ) < 0 ) {
-diff -urNp b/agent/mibgroup/hardware/fsys/fsys_mntent.c net-snmp-5.8/agent/mibgroup/hardware/fsys/fsys_mntent.c
---- b/agent/mibgroup/hardware/fsys/fsys_mntent.c 2018-07-18 16:12:20.674499629 +0200
-+++ net-snmp-5.8/agent/mibgroup/hardware/fsys/fsys_mntent.c 2018-07-18 16:15:46.782859398 +0200
+ snprintf( tmpbuf, sizeof(tmpbuf), "Cannot statfs %s", entry->path );
+diff --git a/agent/mibgroup/hardware/fsys/fsys_mntent.c b/agent/mibgroup/hardware/fsys/fsys_mntent.c
+index 3cdcea1fb..79e6e4f72 100644
+--- a/agent/mibgroup/hardware/fsys/fsys_mntent.c
++++ b/agent/mibgroup/hardware/fsys/fsys_mntent.c
@@ -150,6 +150,13 @@ _fsys_type( char *typename )
!strcmp(typename, MNTTYPE_LOFS))
return NETSNMP_FS_TYPE_OTHER;
@@ -37,7 +65,7 @@ diff -urNp b/agent/mibgroup/hardware/fsys/fsys_mntent.c net-snmp-5.8/agent/mibgr
+ /* Detection of AUTOFS.
+ * This file system will be ignored by default
+ */
-+ else if ( !strcmp(typename, MNTTYPE_AUTOFS))
++ else if (!strcmp(typename, MNTTYPE_AUTOFS))
+ return NETSNMP_FS_TYPE_AUTOFS;
+
+
@@ -48,16 +76,17 @@ diff -urNp b/agent/mibgroup/hardware/fsys/fsys_mntent.c net-snmp-5.8/agent/mibgr
NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES))
continue;
-+ /* Skip AUTOFS enteries */
-+ if ( entry->type == (NETSNMP_FS_TYPE_AUTOFS))
++ /* Skip AUTOFS entries */
++ if (entry->type == NETSNMP_FS_TYPE_AUTOFS)
+ continue;
+
#ifdef irix6
if ( NSFS_STATFS( entry->path, &stat_buf, sizeof(struct statfs), 0) < 0 )
#else
-diff -urNp b/agent/mibgroup/hardware/fsys/mnttypes.h net-snmp-5.8/agent/mibgroup/hardware/fsys/mnttypes.h
---- b/agent/mibgroup/hardware/fsys/mnttypes.h 2018-07-18 16:12:20.674499629 +0200
-+++ net-snmp-5.8/agent/mibgroup/hardware/fsys/mnttypes.h 2018-07-18 16:15:46.782859398 +0200
+diff --git a/agent/mibgroup/hardware/fsys/mnttypes.h b/agent/mibgroup/hardware/fsys/mnttypes.h
+index bb1b40173..53f1cc896 100644
+--- a/agent/mibgroup/hardware/fsys/mnttypes.h
++++ b/agent/mibgroup/hardware/fsys/mnttypes.h
@@ -165,6 +165,9 @@
#ifndef MNTTYPE_APP
#define MNTTYPE_APP "app"
@@ -68,9 +97,10 @@ diff -urNp b/agent/mibgroup/hardware/fsys/mnttypes.h net-snmp-5.8/agent/mibgroup
#ifndef MNTTYPE_DEVPTS
#define MNTTYPE_DEVPTS "devpts"
#endif
-diff -urNp b/agent/mibgroup/host/hr_filesys.c net-snmp-5.8/agent/mibgroup/host/hr_filesys.c
---- b/agent/mibgroup/host/hr_filesys.c 2018-07-18 16:12:20.668499652 +0200
-+++ net-snmp-5.8/agent/mibgroup/host/hr_filesys.c 2018-07-18 16:15:46.783859399 +0200
+diff --git a/agent/mibgroup/host/hr_filesys.c b/agent/mibgroup/host/hr_filesys.c
+index 56c8b2095..8caeecf4e 100644
+--- a/agent/mibgroup/host/hr_filesys.c
++++ b/agent/mibgroup/host/hr_filesys.c
@@ -834,6 +834,27 @@ Check_HR_FileSys_NFS (void)
return 0; /* no NFS file system */
}
@@ -80,14 +110,14 @@ diff -urNp b/agent/mibgroup/host/hr_filesys.c net-snmp-5.8/agent/mibgroup/host/h
+ * return 1 if AutoFs, 0 otherwise
+ */
+int
-+Check_HR_FileSys_AutoFs (void)
++Check_HR_FileSys_AutoFs(void)
+{
+#if HAVE_GETFSSTAT
-+ if ( HRFS_entry->HRFS_type != NULL &&
++ if (HRFS_entry->HRFS_type != NULL &&
+#if defined(MNTTYPE_AUTOFS)
-+ !strcmp( HRFS_entry->HRFS_type, MNTTYPE_AUTOFS)
++ !strcmp(HRFS_entry->HRFS_type, MNTTYPE_AUTOFS)
+#else
-+ !strcmp( HRFS_entry->HRFS_type, "autofs")
++ !strcmp(HRFS_entry->HRFS_type, "autofs")
+#endif
+ )
+#endif /* HAVE_GETFSSTAT */
@@ -99,9 +129,10 @@ diff -urNp b/agent/mibgroup/host/hr_filesys.c net-snmp-5.8/agent/mibgroup/host/h
void
End_HR_FileSys(void)
{
-diff -urNp b/agent/mibgroup/host/hr_filesys.h net-snmp-5.8/agent/mibgroup/host/hr_filesys.h
---- b/agent/mibgroup/host/hr_filesys.h 2018-07-18 16:12:20.669499648 +0200
-+++ net-snmp-5.8/agent/mibgroup/host/hr_filesys.h 2018-07-18 16:15:46.784859400 +0200
+diff --git a/agent/mibgroup/host/hr_filesys.h b/agent/mibgroup/host/hr_filesys.h
+index 2f00355f3..36cd7dd08 100644
+--- a/agent/mibgroup/host/hr_filesys.h
++++ b/agent/mibgroup/host/hr_filesys.h
@@ -10,6 +10,7 @@ extern void Init_HR_FileSys(void);
extern FindVarMethod var_hrfilesys;
extern int Get_Next_HR_FileSys(void);
@@ -110,9 +141,33 @@ diff -urNp b/agent/mibgroup/host/hr_filesys.h net-snmp-5.8/agent/mibgroup/host/h
extern int Get_FSIndex(char *);
extern long Get_FSSize(char *); /* Temporary */
-diff -urNp b/agent/mibgroup/host/hrh_filesys.c net-snmp-5.8/agent/mibgroup/host/hrh_filesys.c
---- b/agent/mibgroup/host/hrh_filesys.c 2018-07-18 16:12:20.668499652 +0200
-+++ net-snmp-5.8/agent/mibgroup/host/hrh_filesys.c 2018-07-18 16:15:46.785859402 +0200
+diff --git a/agent/mibgroup/host/hr_storage.c b/agent/mibgroup/host/hr_storage.c
+index a86898451..6b459ec51 100644
+--- a/agent/mibgroup/host/hr_storage.c
++++ b/agent/mibgroup/host/hr_storage.c
+@@ -544,6 +544,8 @@ var_hrstore(struct variable *vp,
+ NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) &&
+ Check_HR_FileSys_NFS())
+ return NULL; /* or goto try_next; */
++ if (Check_HR_FileSys_AutoFs())
++ return NULL;
+ if (HRFS_statfs(HRFS_entry->HRFS_mount, &stat_buf) < 0) {
+ snmp_log_perror(HRFS_entry->HRFS_mount);
+ goto try_next;
+@@ -683,7 +685,8 @@ Get_Next_HR_Store(void)
+ if (HRS_index >= 0) {
+ if (!(netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) &&
+- Check_HR_FileSys_NFS())) {
++ Check_HR_FileSys_NFS()) &&
++ !Check_HR_FileSys_AutoFs()) {
+ return HRS_index + NETSNMP_MEM_TYPE_MAX;
+ }
+ } else {
+diff --git a/agent/mibgroup/host/hrh_filesys.c b/agent/mibgroup/host/hrh_filesys.c
+index 5ad82b20f..5d2102e24 100644
+--- a/agent/mibgroup/host/hrh_filesys.c
++++ b/agent/mibgroup/host/hrh_filesys.c
@@ -429,3 +429,9 @@ Check_HR_FileSys_NFS (void)
{
return (HRFS_entry->flags & NETSNMP_FS_FLAG_REMOTE) ? 1 : 0;
@@ -121,11 +176,12 @@ diff -urNp b/agent/mibgroup/host/hrh_filesys.c net-snmp-5.8/agent/mibgroup/host/
+int
+Check_HR_FileSys_AutoFs (void)
+{
-+ return (HRFS_entry->type == (NETSNMP_FS_TYPE_AUTOFS)) ? 1 : 0;
++ return HRFS_entry->type == NETSNMP_FS_TYPE_AUTOFS;
+}
-diff -urNp b/agent/mibgroup/host/hrh_filesys.h net-snmp-5.8/agent/mibgroup/host/hrh_filesys.h
---- b/agent/mibgroup/host/hrh_filesys.h 2018-07-18 16:12:20.669499648 +0200
-+++ net-snmp-5.8/agent/mibgroup/host/hrh_filesys.h 2018-07-18 16:15:46.785859402 +0200
+diff --git a/agent/mibgroup/host/hrh_filesys.h b/agent/mibgroup/host/hrh_filesys.h
+index 568917e09..c0f5d6e8c 100644
+--- a/agent/mibgroup/host/hrh_filesys.h
++++ b/agent/mibgroup/host/hrh_filesys.h
@@ -10,6 +10,7 @@ extern void Init_HR_FileSys(void);
extern FindVarMethod var_hrhfilesys;
extern int Get_Next_HR_FileSys(void);
@@ -134,23 +190,20 @@ diff -urNp b/agent/mibgroup/host/hrh_filesys.h net-snmp-5.8/agent/mibgroup/host/
extern int Get_FSIndex(char *);
extern long Get_FSSize(char *); /* Temporary */
-diff -urNp b/agent/mibgroup/host/hrh_storage.c net-snmp-5.8/agent/mibgroup/host/hrh_storage.c
---- b/agent/mibgroup/host/hrh_storage.c 2018-07-18 16:12:20.668499652 +0200
-+++ net-snmp-5.8/agent/mibgroup/host/hrh_storage.c 2018-07-18 16:15:46.786859402 +0200
-@@ -367,9 +367,10 @@ really_try_next:
- store_idx = name[ HRSTORE_ENTRY_NAME_LENGTH ];
- if (HRFS_entry &&
- store_idx > NETSNMP_MEM_TYPE_MAX &&
-- netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
-+ ((netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
+diff --git a/agent/mibgroup/host/hrh_storage.c b/agent/mibgroup/host/hrh_storage.c
+index 810766946..6f8ff6c53 100644
+--- a/agent/mibgroup/host/hrh_storage.c
++++ b/agent/mibgroup/host/hrh_storage.c
+@@ -371,6 +371,8 @@ var_hrstore(struct variable *vp,
NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) &&
-- Check_HR_FileSys_NFS())
-+ Check_HR_FileSys_NFS()) ||
-+ Check_HR_FileSys_AutoFs()))
+ Check_HR_FileSys_NFS())
return NULL;
++ if (Check_HR_FileSys_AutoFs())
++ return NULL;
if (store_idx <= NETSNMP_MEM_TYPE_MAX ) {
mem = (netsnmp_memory_info*)ptr;
-@@ -508,7 +509,8 @@ Get_Next_HR_Store(void)
+ }
+@@ -508,7 +510,8 @@ Get_Next_HR_Store(void)
if (HRS_index >= 0) {
if (!(netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) &&
@@ -160,40 +213,16 @@ diff -urNp b/agent/mibgroup/host/hrh_storage.c net-snmp-5.8/agent/mibgroup/host/
return HRS_index + NETSNMP_MEM_TYPE_MAX;
}
} else {
-diff -urNp b/agent/mibgroup/host/hr_storage.c net-snmp-5.8/agent/mibgroup/host/hr_storage.c
---- b/agent/mibgroup/host/hr_storage.c 2018-07-18 16:12:20.670499644 +0200
-+++ net-snmp-5.8/agent/mibgroup/host/hr_storage.c 2018-07-18 16:15:46.786859402 +0200
-@@ -540,9 +540,10 @@ really_try_next:
-
- store_idx = name[ HRSTORE_ENTRY_NAME_LENGTH ];
- if (store_idx > NETSNMP_MEM_TYPE_MAX ) {
-- if ( netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
-+ if ( (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
- NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) &&
-- Check_HR_FileSys_NFS())
-+ Check_HR_FileSys_NFS()) ||
-+ Check_HR_FileSys_AutoFs())
- return NULL; /* or goto try_next; */
- if (HRFS_statfs(HRFS_entry->HRFS_mount, &stat_buf) < 0) {
- snmp_log_perror(HRFS_entry->HRFS_mount);
-@@ -683,7 +684,8 @@ Get_Next_HR_Store(void)
- if (HRS_index >= 0) {
- if (!(netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
- NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) &&
-- Check_HR_FileSys_NFS())) {
-+ Check_HR_FileSys_NFS()) &&
-+ !Check_HR_FileSys_AutoFs()) {
- return HRS_index + NETSNMP_MEM_TYPE_MAX;
- }
- } else {
-diff -urNp b/include/net-snmp/agent/hardware/fsys.h net-snmp-5.8/include/net-snmp/agent/hardware/fsys.h
---- b/include/net-snmp/agent/hardware/fsys.h 2018-07-18 16:12:20.649499726 +0200
-+++ net-snmp-5.8/include/net-snmp/agent/hardware/fsys.h 2018-07-18 16:19:33.994918912 +0200
-@@ -41,6 +41,7 @@ typedef struct netsnmp_fsys_info_s netsn
+diff --git a/include/net-snmp/agent/hardware/fsys.h b/include/net-snmp/agent/hardware/fsys.h
+index 3f2b28440..54ab9d806 100644
+--- a/include/net-snmp/agent/hardware/fsys.h
++++ b/include/net-snmp/agent/hardware/fsys.h
+@@ -41,6 +41,7 @@ typedef struct netsnmp_fsys_info_s netsnmp_fsys_info;
#define NETSNMP_FS_TYPE_SYSFS (4 | _NETSNMP_FS_TYPE_LOCAL | _NETSNMP_FS_TYPE_SKIP_BIT)
#define NETSNMP_FS_TYPE_TMPFS (5 | _NETSNMP_FS_TYPE_LOCAL)
#define NETSNMP_FS_TYPE_USBFS (6 | _NETSNMP_FS_TYPE_LOCAL)
-+#define NETSNMP_FS_TYPE_AUTOFS (7 | _NETSNMP_FS_TYPE_LOCAL | _NETSNMP_FS_TYPE_SKIP_BIT)
++#define NETSNMP_FS_TYPE_AUTOFS (7 | _NETSNMP_FS_TYPE_LOCAL | _NETSNMP_FS_TYPE_SKIP_BIT)
#define NETSNMP_FS_FLAG_ACTIVE 0x01
#define NETSNMP_FS_FLAG_REMOTE 0x02
+
4 years, 7 months
Architecture specific change in rpms/gthree.git
by githook-noreply@fedoraproject.org
The package rpms/gthree.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/gthree.git/commit/?id=6f3b7288e6e....
Change:
+ExcludeArch: armv7hl i686
Thanks.
Full change:
============
commit 6f3b7288e6e81c9e2f0ea05b4427d8a4933168d4
Author: Artem Polishchuk <ego.cordatus(a)gmail.com>
Date: Wed Sep 11 11:51:42 2019 +0300
Add temporary 'ExcludeArch' for armv7hl and i686
diff --git a/gthree.spec b/gthree.spec
index 1533f53..dcb9553 100644
--- a/gthree.spec
+++ b/gthree.spec
@@ -4,12 +4,13 @@
Name: gthree
Version: 0.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Gthree is a GObject/Gtk+ port of three.js
License: MIT
URL: https://github.com/alexlarsson/gthree
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+ExcludeArch: armv7hl i686
BuildRequires: gcc
BuildRequires: meson
@@ -61,6 +62,9 @@ Devel files for %{name}.
%{_libdir}/pkgconfig/%{name}-1.0.pc
%changelog
+* Wed Sep 11 2019 Artem Polishchuk <ego.cordatus(a)gmail.com> - 0.2.0-2
+- Add temporary 'ExcludeArch' for armv7hl and i686
+
* Mon Sep 09 2019 Artem Polishchuk <ego.cordatus(a)gmail.com> - 0.2.0-1
- Update to 0.2.0
commit 1137c0ec7766ae7a1455b427a9a74ff20ddade9a
Author: Artem Polishchuk <ego.cordatus(a)gmail.com>
Date: Wed Sep 11 11:31:24 2019 +0300
Initial import (#1740416).
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d84ee0b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/gthree-0.2.0.tar.gz
diff --git a/gthree.spec b/gthree.spec
new file mode 100644
index 0000000..1533f53
--- /dev/null
+++ b/gthree.spec
@@ -0,0 +1,71 @@
+# Enable LTO
+%global optflags %{optflags} -flto
+%global build_ldflags %{build_ldflags} -flto
+
+Name: gthree
+Version: 0.2.0
+Release: 1%{?dist}
+Summary: Gthree is a GObject/Gtk+ port of three.js
+
+License: MIT
+URL: https://github.com/alexlarsson/gthree
+Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+
+BuildRequires: gcc
+BuildRequires: meson
+BuildRequires: pkgconfig(epoxy) >= 1.4
+BuildRequires: pkgconfig(glib-2.0) >= 2.43.2
+BuildRequires: pkgconfig(gobject-2.0)
+BuildRequires: pkgconfig(gobject-introspection-1.0)
+BuildRequires: pkgconfig(graphene-1.0)
+BuildRequires: pkgconfig(graphene-gobject-1.0) >= 1.10.0
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.22
+BuildRequires: pkgconfig(json-glib-1.0) >= 1.2.0
+
+%description
+Gthree is a port of three.js to GObject and Gtk3. The code is a partial copy of
+three.js, and the API is very similar, although it only supports OpenGL.
+
+For information about three.js, see: http://threejs.org
+
+
+%package devel
+
+Summary: Devel files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+Devel files for %{name}.
+
+
+%prep
+%autosetup
+
+%build
+%meson
+%meson_build
+
+%install
+%meson_install
+
+%files
+%license COPYING
+%doc README
+%{_libdir}/girepository-1.0/Gthree-1.0.typelib
+%{_libdir}/libgthree-1.so.0*
+
+%files devel
+%{_datadir}/gir-1.0/Gthree-1.0.gir
+%{_includedir}/%{name}-1.0
+%{_libdir}/libgthree-1.so
+%{_libdir}/pkgconfig/%{name}-1.0.pc
+
+%changelog
+* Mon Sep 09 2019 Artem Polishchuk <ego.cordatus(a)gmail.com> - 0.2.0-1
+- Update to 0.2.0
+
+* Mon Sep 02 2019 Artem Polishchuk <ego.cordatus(a)gmail.com> - 0.1.0-1.20190825git400d8bb
+- Update to latest git snapshot
+
+* Wed Jun 05 2019 Artem Polishchuk <ego.cordatus(a)gmail.com> - 0-9.20190808gita38a231
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..f4dab48
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (gthree-0.2.0.tar.gz) = acf133c288f27862776120dcaf56235e49e4d6f7ea72b8418e4ad6d0925a987bc5c2fb4e7b75adadd5face31670c60d407aec4b8cf0d76023385eb704daf92d7
4 years, 7 months